1.修改A0032导致的无检验信息报错问题保存时

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

@@ -34,6 +34,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.boot.module.ymt.api.service.InspectionDetectionInfoService;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -49,6 +50,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -209,11 +211,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         useInfoMapper.update(useInfo, lambda);
         InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
         BeanUtil.copyProperties(map, inspectionDetectionInfo);
-        LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
-        inspectionLambda.eq(InspectionDetectionInfo::getRecord, map.get("equipId"));
+
         // 更新检验检测信息
-//        inspectionDetectionInfo.setInspectReport(null);
-        inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
+        this.updateOrCreateInspectionDetection(map.get("equipId"), inspectionDetectionInfo);
         // 更新注册登记信息表
         LambdaQueryWrapper<JgUseRegistrationEq> jgUseRegEqWrapper = new QueryWrapper<JgUseRegistrationEq>().lambda();
         jgUseRegEqWrapper.eq(JgUseRegistrationEq::getEquipTransferId, currentDocumentId);
@@ -240,6 +240,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
     }
 
+    private void updateOrCreateInspectionDetection(Object equipId, InspectionDetectionInfo inspectionDetectionInfo) {
+        LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
+        inspectionLambda.eq(InspectionDetectionInfo::getRecord, equipId);
+        InspectionDetectionInfo inspectionDetectionInfoDb = inspectionDetectionInfoMapper.selectOne(inspectionLambda);
+        Bean.copyExistPropertis(inspectionDetectionInfo, inspectionDetectionInfoDb);
+        inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
+    }
+
     /**
      * 递归属地监管部门树匹配监管部门
      *