Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgProjectContraptionServiceImpl.java

@@ -220,7 +220,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
      */
     private void judgeCheckResult(IdxBizJgProjectContraption record) {
         record.setDisableBasicButton(true);
-        if("8200".equals(record.getEquCategory()) || "8100".equals(record.getEquCategory())){
+        if ("8200".equals(record.getEquCategory()) || "8100".equals(record.getEquCategory()) || "8300".equals(record.getEquCategory())) {
             int notNullCount = this.baseMapper.selectCheckCountByNotNull(String.valueOf(record.getSequenceNbr()));
             long total = this.baseMapper.selectEquipCount(String.valueOf(record.getSequenceNbr()));
             if(total==notNullCount && total !=0){
@@ -346,8 +346,8 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
     }
 
     public void exportSummaryBasicInfo(String sequenceNbr, HttpServletResponse response, String category) {
-        //长输/公共管道汇总
-        if ("8200".equals(category) || "8100".equals(category)) {
+        // 长输/公共管道/工业管道汇总
+        if ("8200".equals(category) || "8100".equals(category) || "8300".equals(category)) {
             // 总数
             double total;
             // 每页显示条数，默认 10