Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/PipingExcelDto.java

@@ -128,6 +128,10 @@ public class PipingExcelDto extends BaseDto {
     @ExcelProperty(value = "检验报告编号")
     private String inspectReportNo;
 
+    @ApiModelProperty(value = "检验报告附件")
+    @ExcelIgnore
+    private String inspectReport;
+
     //-----------------------------------------------------------------------设计信息
 
     @ApiModelProperty(value = "设计单位统一社会信用代码")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -80,6 +80,7 @@
             ur.supervision_org_code,
             ur.use_address as fullAddress,
             ur.cancel_reason as cancelReason,
+            ur.project_contraption_id as projectContraptionId,
             (select group_concat(re.equ_id) from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id) as equipId,
             (SELECT
                  group_concat(DISTINCT other.supervisory_code)

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DataDockController.java

@@ -75,7 +75,7 @@ public class DataDockController {
      **/
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/savePipingData")
-    @ApiOperation(httpMethod = "POST", value = "工业管道批量保存", notes = "工业管道批量保存")
+    @ApiOperation(httpMethod = "POST", value = "工业 、公用、长输管道批量保存", notes = "工业 、公用、长输管道批量保存")
     @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<?> savePipingData(@RequestBody Map<String, Object> paramMap) {
         return ResponseHelper.buildResponse(dataDockService.savePipingData(paramMap));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProjectContraptionMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -29,6 +30,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -45,6 +47,8 @@ public class JgUseRegistrationController extends BaseController {
 
     @Autowired
     JgUseRegistrationServiceImpl jgUseRegistrationServiceImpl;
+    @Resource
+    private IdxBizJgProjectContraptionMapper jgProjectContraptionMapper;
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -143,6 +147,9 @@ public class JgUseRegistrationController extends BaseController {
         list.getRecords().forEach(x -> {
             x.put("companyType", info.getCompany().getCompanyType());
             x.put("regType", "1".equals(x.get("regType")) ? "历史登记": "2".equals(x.get("regType")) ? "特殊历史登记": "新增登记");
+            if ("8000".equals(String.valueOf(x.get("equListCode")))){
+                x.put("canVoided", jgProjectContraptionMapper.countContraptionInUseTimesForDeleteByIntoManagement(Long.parseLong((String) x.get("projectContraptionId"))) == 0);
+            }
         });
         return ResponseHelper.buildResponse(list);
     }

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

@@ -209,7 +209,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
                             .collect(Collectors.joining())
             );
             record.setCanEdit(this.checkContraptionIsCanEdit(record.getSequenceNbr()));
-            record.setCanDelete(this.checkContraptionIsCanDelete(record.getSequenceNbr()));
+            record.setCanDelete(this.checkContraptionIsCanDelete(record.getSequenceNbr(),isIntoManagement));
             //判断是否有检验结果录入
             judgeCheckResult(record);
         });
@@ -236,8 +236,13 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         return inUseTime <= 0;
     }
 
-    private Boolean checkContraptionIsCanDelete(Long projectContraptionId) {
-        Integer inUseTime = this.baseMapper.countContraptionInUseTimesForDelete(projectContraptionId);
+    private Boolean checkContraptionIsCanDelete(Long projectContraptionId,Boolean isIntoManagement) {
+        Integer inUseTime = 0;
+        if(isIntoManagement){
+            inUseTime= this.baseMapper.countContraptionInUseTimesForDeleteByIntoManagement(projectContraptionId);
+        }else {
+            inUseTime = this.baseMapper.countContraptionInUseTimesForDelete(projectContraptionId);
+        }
         return inUseTime <= 0;
     }
 

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/JgUseRegistrationServiceImpl.java

@@ -3991,7 +3991,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             JSONObject hisJson = JSON.parseObject(history.getChangeData());
             Map<String, Object> fieldMappings = new HashMap<>();
             fieldMappings.put("useRegistrationCode", projectContraption.getUseRegistrationCode());
-            fieldMappings.put("safetyManager", hisJson.get("safetyManager"));
+            fieldMappings.put("safetyManager", hisJson.get("safetyManagerId") + "_" +hisJson.get("safetyManager"));
             fieldMappings.put("useDate", hisJson.get("useDate"));
             fieldMappings.put("otherAccessories", hisJson.get("otherAccessories"));
             fieldMappings.put("factoryUseSiteStreet", hisJson.get("factoryUseSiteStreet"));
@@ -4002,6 +4002,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             fieldMappings.put("county", hisJson.get("county"));
             fieldMappings.put("longitudeLatitude", hisJson.get("longitudeLatitude"));
             fieldMappings.put("estateUnitName", hisJson.get("estateUnitName"));
+            fieldMappings.put("orgBranchCode", hisJson.get("orgBranchCode"));
             fieldMappings.forEach(re::put);
         }
     }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgProjectContraptionMapper.java

@@ -79,4 +79,11 @@ public interface IdxBizJgProjectContraptionMapper extends BaseMapper<IdxBizJgPro
      * 获取不为空的检验信息个数
      */
     int selectCheckCountByNotNull(@Param("sequenceNbr") String sequenceNbr);
+
+    /**
+     * 统计已纳管设备被引用的次数（只有存在就算引用-作废除外）
+     * @param projectContraptionId 设备唯一标识
+     * @return 被引用次数 > 0 则设备不可删除
+     */
+    Integer countContraptionInUseTimesForDeleteByIntoManagement(@Param("projectContraptionId")Long projectContraptionId);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgProjectContraptionMapper.xml

@@ -264,4 +264,112 @@
         A.inspectOrgName != NULL AND A.inspectOrgName != '' AND A.inspectConclusion!=NULL and A.inspectConclusion!=''
         and A.nextInspectDate  != NULL
     </select>
+
+    <select id="countContraptionInUseTimesForDeleteByIntoManagement" resultType="java.lang.Integer">
+        SELECT
+        SUM(inUseNumber)
+        FROM (
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_equip_transfer a
+        LEFT JOIN tzs_jg_equip_transfer_eq b ON b.equip_transfer_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.apply_status != '6617')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM
+        tzs_jg_use_registration a
+        WHERE a.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.status != '已作废')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_change_registration_unit a
+        LEFT JOIN tzs_jg_change_registration_unit_eq b ON b.unit_change_registration_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.status != '已作废')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_enable_disable a
+        LEFT JOIN tzs_jg_enable_disable_eq b ON b.enable_disable_apply_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.audit_status != '已作废')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_scrap_cancel a
+        LEFT JOIN tzs_jg_scrap_cancel_eq b ON b.equip_transfer_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.audit_status != '使用单位已撤回')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_change_registration_transfer a
+        LEFT JOIN tzs_jg_change_registration_transfer_eq b ON b.equip_transfer_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.audit_status != '使用单位已撤回')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_change_registration_name a
+        LEFT JOIN tzs_jg_change_registration_name_eq b ON b.name_change_registration_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.audit_status != '使用单位已撤回')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM
+        tzs_jg_installation_notice a
+        WHERE a.project_contraption_id = #{projectContraptionId}
+        AND (a.notice_status != '6617')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_maintain_notice a
+        LEFT JOIN tzs_jg_maintain_notice_eq b ON b.equip_transfer_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.notice_status != '6617')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_reform_notice a
+        LEFT JOIN tzs_jg_reform_notice_eq b ON b.equip_transfer_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.notice_status != '6617')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_transfer_notice a
+        LEFT JOIN tzs_jg_transfer_notice_eq b ON b.equip_transfer_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.notice_status != '6617')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tz_jyjc_inspection_application a
+        WHERE a.project_contraption_id = #{projectContraptionId}
+        AND ( a.status != '6617')
+        )
+    </select>
 </mapper>