重点项目库-储备库修改

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoQueryApiController.java

@@ -64,40 +64,31 @@ public class SubInfoQueryApiController extends BaseController {
     public ListMessage queryAll(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
         ListMessage message = new ListMessage();
         try {
-            Page pageData = subInfoQueryService.queryPage(page, getCurUser().getLoginUser(), queryVO);
+            Page pageData = subInfoQueryService.pageAll(page, getCurUser().getLoginUser(), queryVO);
+         /*   for (int i = 0; i < pageData.getList().size(); i++) {
+
+                Map<String, Object> map = (Map<String, Object>) pageData.getList().get(i);
+                //查询资金来源
+                String subId = map.get("id") == null ? "" : map.get("id") + "";
+                map.put("zjlyName", "--");
+                if (StringUtil.isNotEmpty(subId)) {
+                    List<SubSourceVO> list = subSourceDao.findBySubId(subId);
+                    String name = "";
+
+                    for (SubSourceVO subSourceVO : list) {
+                        name = name + (subSourceVO.getSourceName()==null?"--":subSourceVO.getSourceName()) + "</br>";
+                    }
+
+                    map.put("zjlyName", name);
+                }
+            }*/
+
             message.add(pageData.getList(), pageData.getTotalCount());
         } catch (Exception e) {
             logger.error("", e);
             message.add("查询失败");
         }
         return message;
-        // ListMessage message = new ListMessage();
-        // try {
-        //     Page pageData = subInfoQueryService.pageAll(page, getCurUser().getLoginUser(), queryVO);
-        //  /*   for (int i = 0; i < pageData.getList().size(); i++) {
-        //
-        //         Map<String, Object> map = (Map<String, Object>) pageData.getList().get(i);
-        //         //查询资金来源
-        //         String subId = map.get("id") == null ? "" : map.get("id") + "";
-        //         map.put("zjlyName", "--");
-        //         if (StringUtil.isNotEmpty(subId)) {
-        //             List<SubSourceVO> list = subSourceDao.findBySubId(subId);
-        //             String name = "";
-        //
-        //             for (SubSourceVO subSourceVO : list) {
-        //                 name = name + (subSourceVO.getSourceName()==null?"--":subSourceVO.getSourceName()) + "</br>";
-        //             }
-        //
-        //             map.put("zjlyName", name);
-        //         }
-        //     }*/
-        //
-        //     message.add(pageData.getList(), pageData.getTotalCount());
-        // } catch (Exception e) {
-        //     logger.error("", e);
-        //     message.add("查询失败");
-        // }
-        // return message;
     }
 
     // 查询项目

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_reserve.jsp

@@ -89,15 +89,6 @@
                             <input type="hidden" name="fixCat" value="3">
                             <input type="hidden" name="isFix" value="1">
                             <div class="layui-row">
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">年份</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" id="year" readonly="readonly" name="year"
-                                                   class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label label-longers required">项目名称</label>
@@ -107,55 +98,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">建设地点</label>
-                                        <div class="layui-input-block">
-                                            <select name="subjectId">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${JSDD }" var="hy">
-                                                    <option value="${hy.code }">${hy.title }</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">所属行业</label>
-                                        <div class="layui-input-block">
-                                            <div id="indusKind"></div>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">金额(万元)</label>
-                                        <div class="layui-input-block time_box">
-                                            <input type="text" id="startAmt" name="startAmt"
-                                                   placeholder="请输入最小金额"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${minAmt}">
-                                            <span class="split_txt">至</span>
-                                            <input type="text" id="endAmt" name="endAmt" placeholder="请输入最大金额"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${maxAmt}">
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers">项目单位</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" name="sbdw" placeholder="请输入项目项目单位名称"
-                                                   autocomplete="off"
-                                                   class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
-
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label label-longers">领导</label>
@@ -245,7 +187,14 @@
                                         </div>
                                     </div>
                                 </div>
-
+                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label label-longers required">所属行业</label>
+                                        <div class="layui-input-block">
+                                            <div id="indusKind"></div>
+                                        </div>
+                                    </div>
+                                </div>
                                 <c:if test="${isHydw }">
                                     <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                         <div class="layui-form-item">
@@ -259,6 +208,30 @@
                                         </div>
                                     </div>
                                 </c:if>
+                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label label-longers">项目单位</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="sbdw" placeholder="请输入项目项目单位名称"
+                                                   autocomplete="off"
+                                                   class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label label-longers required">建设地点</label>
+                                        <div class="layui-input-block">
+                                            <select name="subjectId">
+                                                <option value="">请选择</option>
+                                                <c:forEach items="${JSDD }" var="hy">
+                                                    <option value="${hy.code }">${hy.title }</option>
+                                                </c:forEach>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+
 
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
                                     <div class="layui-form-item">
@@ -305,6 +278,33 @@
                                     </div>
                                 </div>
 
+
+                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label label-longers required">年份</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" id="year" readonly="readonly" name="year"
+                                                   class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label label-longers required">金额(万元)</label>
+                                        <div class="layui-input-block time_box">
+                                            <input type="text" id="startAmt" name="startAmt"
+                                                   placeholder="请输入最小金额"
+                                                   autocomplete="off"
+                                                   class="layui-input" value="${minAmt}">
+                                            <span class="split_txt">至</span>
+                                            <input type="text" id="endAmt" name="endAmt" placeholder="请输入最大金额"
+                                                   autocomplete="off"
+                                                   class="layui-input" value="${maxAmt}">
+                                        </div>
+                                    </div>
+                                </div>
+
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParams">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label"></label>
@@ -318,13 +318,13 @@
                                             <button type="button" class="layui-btn layui-btn-normal"
                                                     style="margin-left: 80px" @click="intoSub">纳入
                                             </button>
-<%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
-<%--                                                    style="margin-left: 20px"--%>
-<%--                                                    @click="downLoadTemplate">模板下载--%>
-<%--                                            </button>--%>
-<%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
-<%--                                                    style="margin-left: 20px" @click="uploadProject">导入--%>
-<%--                                            </button>--%>
+                                            <button type="button" class="layui-btn layui-btn-norma"
+                                                    style="margin-left: 20px"
+                                                    @click="downLoadTemplate">模板下载
+                                            </button>
+                                            <button type="button" class="layui-btn layui-btn-norma"
+                                                    style="margin-left: 20px" @click="uploadProject">导入
+                                            </button>
                                         </div>
                                     </div>
                                 </div>
@@ -1070,7 +1070,7 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/subFixCbAll", param, function (res) {
+                    App.postJson("/api/subInfo/query/all", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
@@ -1173,11 +1173,25 @@
                                 }
                             },
                             {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
-                            {field: 'subjectId', fixed: 'left', title: '建设地点', minWidth: 200},
-                            {field: 'content', fixed: 'left', title: '建设内容', minWidth: 200},
-                            {field: 'amtTotal', fixed: 'left', title: '投资金额', minWidth: 250},
-                            {field: 'progress', fixed: 'left', title: '项目进度', minWidth: 200},
-                            {field: 'remark', fixed: 'left', title: '备注', minWidth: 200},
+                            // {field: 'abc',type:'string', title: 'ABC',fixed: 'left', align:'center', width: 60, templet: "#abcSpan"},
+                            /*                 {field: 'offset', title: '偏离状态', fixed: 'left', minWidth: 150},*/
+                            {
+                                field: 'offsetLight',
+                                title: '偏离状态',
+                                type: 'string',
+                                align: 'center',
+                                fixed: 'left',
+                                width: 100,
+                                templet: '#offsetLight'
+                            },
+                            {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort: true},
+                            {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
+                            {field: 'state', title: '计划时间', width: 140, templet: '#date'},
+                            // {field: 'leaderName', title: '分管领导', minWidth: 180, templet: '#leaderInfo'},
+                            {field: 'statusName', title: '项目进度', width: 60},
+                            {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
+                            {field: 'unitName', title: '项目单位', minWidth: 110},
+                            // { field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight' },
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,