Merge branch 'master' of http://8.137.121.180:10880/longping/subject_gxj

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -188,10 +188,10 @@
                 and s.subject_id = #{vo.subjectId}
             </if>
             <if test="vo.indusKind!=null and vo.indusKind!=''">
-                <if test='vo.indusKind != "@com.rtrh.projects.modules.projects.enums.NullValueEnum@UNKNOWN_INDUS_KIND.code"'>
+                <if test='vo.indusKind != "UNKNOWN_INDUS_KIND"'>
                     and s.indus_kind like CONCAT(#{vo.indusKind}, '%')
                 </if>
-                <if test='vo.indusKind.toString() == "@com.rtrh.projects.modules.projects.enums.NullValueEnum@UNKNOWN_INDUS_KIND.code"'>
+                <if test='vo.indusKind.toString() == "UNKNOWN_INDUS_KIND"'>
                     AND ISNULL(s.indus_kind)
                 </if>
             </if>

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoQueryServiceImpl.java

@@ -166,19 +166,25 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
 
     @Override
     public List<SubInfoGxj> queryAll(LoginUserVO loginUser, SubInfoQueryTzVO queryVO) {
-        queryVO.setMonth(DateUtil.thisYear() +"");
+        queryVO.setMonth(DateUtil.thisYear() + "");
         List<SubInfoGxj> data = subInfoMapper.queryPage(queryVO);
         if (CollectionUtil.isEmpty(data)) {
             return new ArrayList<>();
         }
         List<String> ids = data.stream().map(SubInfoGxj::getId).collect(Collectors.toList());
-        // 项目前期手续办理情况
-        List<SubInfoFixDetailPreNew> preNewList = subInfoMapper.selectSubPreNewBySubIds(ids);
-        Map<String, List<SubInfoFixDetailPreNew>> preNewMap = preNewList.stream().collect(Collectors.groupingBy(SubInfoFixDetailPreNew::getSubId));
+        // [新建] 项目前期手续办理情况
+        Map<String, List<SubInfoFixDetailPreNew>> preNewMap = new HashMap<>();
+        if (SubInfoStatusEnum.XJ.getCode().equals(queryVO.getStatus())) {
+            List<SubInfoFixDetailPreNew> preNewList = subInfoMapper.selectSubPreNewBySubIds(ids);
+            preNewMap = preNewList.stream().collect(Collectors.groupingBy(SubInfoFixDetailPreNew::getSubId));
+        }
 
-        // 查询项目 最新月报内容(建设进度)
-        List<RptCont> rptContList = subInfoMapper.selectNewestMonthReport(ids);
-        Map<String, String> rptContentMap = rptContList.stream().collect(Collectors.toMap(RptCont::getSubId, RptCont::getContent));
+        // [在建、投产] 查询项目 最新月报内容(建设进度)
+        Map<String, String> rptContentMap = new HashMap<>();
+        if (Arrays.asList(SubInfoStatusEnum.ZJ.getCode(), SubInfoStatusEnum.TC.getCode()).contains(queryVO.getStatus())) {
+            List<RptCont> rptContList = subInfoMapper.selectNewestMonthReport(ids);
+            rptContentMap = rptContList.stream().collect(Collectors.toMap(RptCont::getSubId, RptCont::getContent));
+        }
 
         List<TSystable> byKind = tSysTableService.getByKind(SysTableKind.JSDD);
         Map<String, String> kindMap = byKind.stream().collect(Collectors.toMap(TSystable::getCode, TSystable::getTitle));
@@ -202,7 +208,7 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
                     }
                 }
 
-                // 项目前期手续办理情况
+                // 项目前期手续办理情况 [导出]
                 List<SubInfoFixDetailPreNew> subInfoFixDetailPreNewList = preNewMap.get(e.getId());
                 StringBuilder sb = new StringBuilder();
                 if (com.rtrh.common.util.CollectionUtil.isNotEmpty(subInfoFixDetailPreNewList)) {
@@ -248,21 +254,21 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         if (StringUtils.isNotBlank(queryVO.getEndAmt())) {
             queryVO.setEndAmt(new BigDecimal(queryVO.getEndAmt()).multiply(new BigDecimal("10000")).toString());
         }
-        if (StringUtils.isNotBlank(queryVO.getIndusKinds())){
+        if (StringUtils.isNotBlank(queryVO.getIndusKinds())) {
             queryVO.setIndusKind(queryVO.getIndusKinds());
         }
 
 
         PageHelper.startPage(page.getPageNo(), page.getPageSize());
         List<SubInfoGxj> data = this.queryAll(loginUser, queryVO);
-        data.forEach(e->{
-            if (StringUtils.isNotBlank(e.getContent())){
+        data.forEach(e -> {
+            if (StringUtils.isNotBlank(e.getContent())) {
                 int maxLength = Math.min(e.getContent().length(), 100);
-                e.setContent(e.getContent().substring(0, maxLength)+"...");
+                e.setContent(e.getContent().substring(0, maxLength) + "...");
             }
-            if (StringUtils.isNotBlank(e.getProgress())){
+            if (StringUtils.isNotBlank(e.getProgress())) {
                 int maxLength = Math.min(e.getProgress().length(), 100);
-                e.setProgress(e.getProgress().substring(0, maxLength)+"...");
+                e.setProgress(e.getProgress().substring(0, maxLength) + "...");
             }
         });
         PageInfo<SubInfoGxj> pageInfo = new PageInfo<>(data);
@@ -345,8 +351,8 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
     }
 
     @Override
-    public List<SubFixGetBeginRateVo> subFixGetBeginRate(SubInfoQueryTzVO queryVO,List<String> indusKinds) {
-        return subInfoMapper.subFixGetBeginRate(queryVO,indusKinds);
+    public List<SubFixGetBeginRateVo> subFixGetBeginRate(SubInfoQueryTzVO queryVO, List<String> indusKinds) {
+        return subInfoMapper.subFixGetBeginRate(queryVO, indusKinds);
     }
 
     @Override

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoExportController.java

@@ -917,7 +917,6 @@ public class SubInfoExportController extends BaseController {
                 exportList.addAll(hyList);
                 index++;
             }
-            list.clear();
             ExportParams exportParams = new ExportParams("“四个一批”工业项目表（投产项目库）","投产项目库",ExcelType.XSSF);
             workbook = ExcelExportUtil.exportExcel(exportParams, SubInfoTcVO.class, exportList);
             extracted(response, list, workbook, allSize);
@@ -952,7 +951,6 @@ public class SubInfoExportController extends BaseController {
                 exportList.addAll(hyList);
                 index++;
             }
-            list.clear();
             ExportParams exportParams = new ExportParams("“四个一批”工业项目表（项目总库）", "项目总库", ExcelType.XSSF);
             workbook = ExcelExportUtil.exportExcel(exportParams, SubInfoZkVO.class, exportList);
             // workbook = ExcelExportUtil.exportBigExcel(exportParams, SubInfoZkVO.class, new IExcelExportServer() {
@@ -1016,7 +1014,6 @@ public class SubInfoExportController extends BaseController {
             exportList.addAll(hyList);
             index++;
         }
-        list.clear();
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, clazz, exportList);
         extracted(response, list, workbook, allSize);
     }
@@ -1045,9 +1042,10 @@ public class SubInfoExportController extends BaseController {
             }
         }
         // 设置自适应行高,i为需要自适应行高的起始行号, 起始行号为3 但是因为下标从0开始3需要减一,因为表格是循环生成,需要一行一行设置自适应高度
-        for (int i = 2; i <= list.size() + 3; i++) {
+        for (int i = 4; i <= list.size() + 3; i++) {
             sheet.getRow(i).setHeight((short) -1);
         }
+        list.clear();
         try (OutputStream outputStream = response.getOutputStream()) {
             workbook.write(outputStream);
             workbook.close();

projects/src/main/webapp/vmodules/subject/subInfo/editSubInfo.jsp

@@ -310,30 +310,30 @@
                              </div>
                          </div>--%>
                     </div>
-                    <div class="layui-row" id="isFix" name="isFix" style="display: none">
-                        <div class="layui-col-xs6 layui-col-sm6">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label required">是否纳入年度固定资产投资项目库:</label>
-                                <div class="layui-input-block">
-                                    <select lay-verify="required" v-model="subInfo.isFix" lay-filter="isFix">
-                                        <option value="1">是</option>
-                                        <option value="0">否</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-col-xs6 layui-col-sm6" id="stateFix" name="stateFix" style="display: none">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label required">项目性质:</label>
-                                <div class="layui-input-block">
-                                    <select lay-verify="required" v-model="subInfo.stateFix" lay-filter="stateFix">
-                                        <option value="1">新建项目</option>
-                                        <option value="3">储备项目</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+<%--                    <div class="layui-row" id="isFix" name="isFix" style="display: none">--%>
+<%--                        <div class="layui-col-xs6 layui-col-sm6">--%>
+<%--                            <div class="layui-form-item">--%>
+<%--                                <label class="layui-form-label required">是否纳入年度固定资产投资项目库:</label>--%>
+<%--                                <div class="layui-input-block">--%>
+<%--                                    <select lay-verify="required" v-model="subInfo.isFix" lay-filter="isFix">--%>
+<%--                                        <option value="1">是</option>--%>
+<%--                                        <option value="0">否</option>--%>
+<%--                                    </select>--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+<%--                        <div class="layui-col-xs6 layui-col-sm6" id="stateFix" name="stateFix" style="display: none">--%>
+<%--                            <div class="layui-form-item">--%>
+<%--                                <label class="layui-form-label required">项目性质:</label>--%>
+<%--                                <div class="layui-input-block">--%>
+<%--                                    <select lay-verify="required" v-model="subInfo.stateFix" lay-filter="stateFix">--%>
+<%--                                        <option value="1">新建项目</option>--%>
+<%--                                        <option value="3">储备项目</option>--%>
+<%--                                    </select>--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
                     <div class="layui-row">
                         <h2 style="width: 80%;background-color: #EDE9EC;margin-bottom: 20px;margin-top: 20px">项目进度</h2>
                     </div>
@@ -675,9 +675,9 @@
                 layui.form.on("select(indusKind)", function (data) {
                     self.subInfo.indusKind = data.value;
                 });
-                layui.form.on("select(propKind)", function (data) {
-                    self.subInfo.propKind = data.value;
-                });
+                // layui.form.on("select(propKind)", function (data) {
+                //     self.subInfo.propKind = data.value;
+                // });
                 //layui监听input内容变动
                 $(function () {
                     //输入框的值改变时触发
@@ -686,37 +686,37 @@
                         var totalInvestment = e.delegateTarget.value;
                         var query = ${queryType};
                         if (totalInvestment >= 500 && query == '1') {
-                            var select = document.getElementById('isFix'); // 获取下拉框的DOM元素
+                            // var select = document.getElementById('isFix'); // 获取下拉框的DOM元素
                             // 根据值的大小显示或隐藏下拉框
                             if (totalInvestment >= 500) {
-                                select.style.display = 'block'; // 显示下拉框
+                                // select.style.display = 'block'; // 显示下拉框
                                 layui.form.render('select'); // 更新下拉框的渲染
                             } else {
-                                select.style.display = 'none'; // 隐藏下拉框
+                                // select.style.display = 'none'; // 隐藏下拉框
                                 layui.form.render('select'); // 更新下拉框的渲染
                             }
                         }
                     })
                 });
-                layui.form.on("select(isFix)", function (data) {
-                    self.subInfo.isFix = data.value;
-                    if (data.value == "1") {
-                        var select = document.getElementById('stateFix'); // 获取下拉框的DOM元素
-                        select.style.display = 'block'; // 显示下拉框
-                        layui.form.render('select'); // 更新下拉框的渲染
-                    } else {
-                        var select = document.getElementById('stateFix'); // 获取下拉框的DOM元素
-                        select.style.display = 'none'; // 显示下拉框
-                        layui.form.render('select'); // 更新下拉框的渲染
-                    }
-                });
+                // layui.form.on("select(isFix)", function (data) {
+                //     self.subInfo.isFix = data.value;
+                //     if (data.value == "1") {
+                //         var select = document.getElementById('stateFix'); // 获取下拉框的DOM元素
+                //         select.style.display = 'block'; // 显示下拉框
+                //         layui.form.render('select'); // 更新下拉框的渲染
+                //     } else {
+                //         var select = document.getElementById('stateFix'); // 获取下拉框的DOM元素
+                //         select.style.display = 'none'; // 显示下拉框
+                //         layui.form.render('select'); // 更新下拉框的渲染
+                //     }
+                // });
                 layui.form.on("select(stateFix)", function (data) {
                     self.subInfo.stateFix = data.value;
                 });
-                layui.form.on("select(testAmt)", function (data) {
-                    self.testAmt = data.value;
-                    self.testAmtName = this.innerText;
-                });
+                // layui.form.on("select(testAmt)", function (data) {
+                //     self.testAmt = data.value;
+                //     self.testAmtName = this.innerText;
+                // });
 
                 layui.form.on("submit(saveSubInfo)", function (obj) {
                     self.saveSubInfo();
@@ -747,24 +747,24 @@
                 //     $("input[name='tel']").val(self.currObjData.tel);
                 //     self.setJgDept(data.value);
                 // });
-                layui.form.on("select(departId)", function (data) {
-                    self.currObjData.departId = data.value;
-                    self.currObjData.departName = this.innerText;
-                });
+                // layui.form.on("select(departId)", function (data) {
+                //     self.currObjData.departId = data.value;
+                //     self.currObjData.departName = this.innerText;
+                // });
 
-                layui.table.on("edit(amtSource)", function (obj) {
-                    var oldText = $(this).prev().text();
-                    if (obj.value != '' && !isNumber(obj.value)) {
-                        App.msg.warn("请填写数字");
-                        $(this).val(oldText);
-                        obj.value = oldText;
-                        obj.data[obj.field] = oldText;
-                        obj.update(obj.data);
-                        self.amtSource = layui.table.getData("amtSource");
-                    } else {
-                        self.amtSource = layui.table.getData("amtSource");
-                    }
-                });
+                // layui.table.on("edit(amtSource)", function (obj) {
+                //     var oldText = $(this).prev().text();
+                //     if (obj.value != '' && !isNumber(obj.value)) {
+                //         App.msg.warn("请填写数字");
+                //         $(this).val(oldText);
+                //         obj.value = oldText;
+                //         obj.data[obj.field] = oldText;
+                //         obj.update(obj.data);
+                //         self.amtSource = layui.table.getData("amtSource");
+                //     } else {
+                //         self.amtSource = layui.table.getData("amtSource");
+                //     }
+                // });
                 this.getForm();
             },
             // initAmtSource: function () {
@@ -856,20 +856,20 @@
             //         }
             //     }
             // },
-            addAmt: function () {
-                var self = this;
-                $("#zjAmt").val("");
-                $("#zjAmtSj").val("");
-                this.planEditPanl = layer.open({
-                    title: "资金选择",
-                    type: 1,
-                    content: $("#amtSourceEdit"),
-                    area: ['400px', '320px']
-                });
-            },
-            closePane: function () {
-                layer.close(this.planEditPanl);
-            },
+            // addAmt: function () {
+            //     var self = this;
+            //     $("#zjAmt").val("");
+            //     $("#zjAmtSj").val("");
+            //     this.planEditPanl = layer.open({
+            //         title: "资金选择",
+            //         type: 1,
+            //         content: $("#amtSourceEdit"),
+            //         area: ['400px', '320px']
+            //     });
+            // },
+            // closePane: function () {
+            //     layer.close(this.planEditPanl);
+            // },
             // onChangeActive: function(ind){
             // 	this.tabActive = ind;
             // 	$(".layui-colla-content").removeClass("layui-show");
@@ -883,6 +883,17 @@
                     layer.msg("开始时间必须小于结束时间");
                     return;
                 }
+                const abc = self.subInfo.abc;
+                if (!abc){
+                    layer.msg("请选择ABC类");
+                    return;
+                }
+                const indusKind = self.subInfo.indusKind;
+                if (!indusKind){
+                    layer.msg("请选择行业类型");
+                    return;
+                }
+
                 var saveUrl = "/api/subject/subInfo/saveEditSubInfo";
                 // var saveAmtSource = this.amtSource.concat(this.delAmtSource);
                 // this.subInfo.subSource = saveAmtSource;