改造登记代码调整：解决作废失效问题

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationReformEqMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Update;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationReformEqMapper extends BaseMapper<JgChangeRegistrationReformEq> {
-    @Update("update jg_change_registration_reform set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
+    @Update("update tzs_jg_change_registration_reform_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgRegistrationHistoryMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Select;
  * @date 2023-12-20
  */
 public interface JgRegistrationHistoryMapper extends BaseMapper<JgRegistrationHistory> {
-    @Select("select sequence_nbr from jg_registration_history where equ_id = #{equid} and current_document_id = #{documentId}")
+    @Select("select sequence_nbr from tzs_jg_registration_history where equ_id = #{equid} and current_document_id = #{documentId}")
     Long getSequenceNbrByEquidAndDocumentId(@Param("equid") String equid, @Param("documentId") String documentId);
 }

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

@@ -190,7 +190,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         //启动流程
         try {
             ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-            dto.setProcessDefinitionKey("useRegistration");
+            dto.setProcessDefinitionKey("renovationRegistrationReview");
             dto.setBusinessKey("submit");
             AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
             instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
@@ -325,7 +325,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         Map<String, Object> detail = this.baseMapper.getDetail(id);
         Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(id);
         Map<String, Object> useDetail = this.baseMapper.getUseDetail(id);
-        if(detail.get("").equals("已完成")){
+        if(detail.get("status").equals("已完成")){
+
+        }else {
 
         }
         detail.putAll(inspectDetail);
@@ -359,7 +361,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      */
     public void updateTechparamsByEquIdAndCurrentDoucumentId(String equipId, String currentDocumentId){
         ResponseModel<String> responseModel = tzsServiceFeignClient.useRegistrationCode(idxBizJgOtherInfoMapper.getSupervisoryCodeByEquipmentCode(equipId));
-        String newUseRegistrationCertificateNumber=responseModel.getResult().split("-")[0];
+        String newUseRegistrationCertificateNumber=responseModel.getResult();
         IdxBizJgTechParamsElevator idxBizJgTechParamsElevator =idxBizJgTechParamsElevatorMapper.selectOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD",equipId));
         JgRegistrationHistory jgRegistrationHistory=jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                 .eq("equ_id",equipId)
@@ -373,7 +375,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             String newData = jgRegistrationHistory.getChangeData();
             //将历史数据更新到技术参数表中
             IdxBizJgTechParamsElevator idxBizJgTechParamsElevatorNew = JSONObject.parseObject(newData,IdxBizJgTechParamsElevator.class);
-            BeanUtil.copyProperties(idxBizJgTechParamsElevatorNew,idxBizJgTechParamsElevator, "SEQUENCE_NBR","RECORD");
+            BeanUtil.copyProperties(idxBizJgTechParamsElevatorNew,idxBizJgTechParamsElevator, "sequenceNbr","record");
             idxBizJgTechParamsElevatorMapper.updateById(idxBizJgTechParamsElevator);
             //将历史数据回填到历史记录表中
             jgRegistrationHistory.setChangeData(historyData);