fix(jg)：气瓶提交验证修改

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

@@ -2525,7 +2525,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 .eq(JgUseRegistration::getProjectContraption, jsonObject.get("projectContraption"))
                 .eq(JgUseRegistration::getUseUnitCreditCode, useUnitCreditCode)
                 .eq(JgUseRegistration::getIsAddEquip, "0")
-                .ne(JgUseRegistration::getStatus, "已作废")).isEmpty()) {
+                .ne(JgUseRegistration::getStatus, "已作废")).isEmpty() && "0".equals(jsonObject.get("isAddEquip"))) {
                 throw new BadRequest("该工程装置已做过使用登记，再选择增补功能进行登记！");
             }
             return jgUseRegistrationMapper.queryForUnitPipelineEquipmentPage(page, jsonObject, records);

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

@@ -1091,7 +1091,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     LambdaQueryWrapper<JgInstallationNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
                     queryWrapper.eq(JgInstallationNoticeEq::getEquipTransferId, dto.getSequenceNbr());
                     List<JgInstallationNoticeEq> jgRelationEquips = jgInstallationNoticeEqMapper.selectList(queryWrapper);
-                    this.saveHisDataBeforeUpdate(jgInstallationNotice);
+
                     jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                     // 上个代办改为已办
                     HashMap<String, Object> taskMap = new HashMap<>();
@@ -1259,6 +1259,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
             this.updateById(jgInstallationNotice);
+            this.saveHisDataBeforeUpdate(jgInstallationNotice);
             commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgInstallationNotice));
         } catch (InterruptedException e) {
             e.printStackTrace();
@@ -1349,7 +1350,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             // 更新注册信息表的设备代码字段
             String equCode = this.getEquCode(registerInfo, receiveCompanyCode);
             registerInfo.setEquCode(equCode);
-            updateHisDataEquCode(registerInfo, jgInstallationNotice, equCode);
+            //updateHisDataEquCode(registerInfo, jgInstallationNotice, equCode);
         }
     }