refactor(jyjc) ：报检规则

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/rule/service/EnableRuleDataPreparationService.java

@@ -142,6 +142,16 @@ public class EnableRuleDataPreparationService {
     }
 
     /**
+     * 获取使用单位的code:逻辑监督检验时，页面上送为useUnitCreditCode，定检时为登录的
+     * @param useUnitCreditCode 使用单位code
+     * @param reginParams 登录人信息
+     * @return 使用单位的code
+     */
+    private String getUseUnit(String useUnitCreditCode, ReginParams reginParams) {
+        return StringUtils.isNotEmpty(useUnitCreditCode) ? useUnitCreditCode : reginParams.getCompany().getCompanyCode();
+    }
+
+    /**
      * 设置按照设备种类、类别
      *
      * @param equipInfoModel      上送数据
@@ -157,6 +167,9 @@ public class EnableRuleDataPreparationService {
         if (EquipmentClassifityEnum.YLSS.getCode().equals(equipInfoModel.getEquList())) {
             // 设备分类
             inspectionEquipInfo.setEquipTag1(equipInfoModel.getEquipTag1());
+            // 使用单位
+            String useUnitCode = this.getUseInfo(equipInfoModel.getRecord());
+            inspectionEquipInfo.setUseUnitCreditCode(useUnitCode);
         }
         // 锅炉设置技术参数
         if (EquipmentClassifityEnum.GL.getCode().equals(equipInfoModel.getEquList())) {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/rule/InspectionEquipInfo.java

@@ -72,4 +72,7 @@ public class InspectionEquipInfo implements Serializable {
     @ApiModelProperty(value = "公司信息")
     private Map<String, Object> companyInfo;
 
+    @ApiModelProperty(value = "设备的使用单位")
+    private String useUnitCreditCode;
+
 }

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

@@ -407,14 +407,13 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 List<BaseEnterpriseCertDto> certDtos = hisData.getJSONArray(BizCommonConstant.UNIT_LICENCE_KEY).toJavaList(BaseEnterpriseCertDto.class);
                 // 修改资质及证为超期状态
                 this.overdueLicense(certDtos, jyjcOpeningApplication);
+            }
             // 单据修改为作废状态
-                UpdateWrapper<JyjcOpeningApplication> updateWrapper = new UpdateWrapper<>();
-                updateWrapper
-                        .set("status", FlowStatusEnum.TO_BE_DISCARD.getName())
-                        .set("remark", remark)
-                        .eq("SEQUENCE_NBR", sequenceNbr);
+            LambdaUpdateWrapper<JyjcOpeningApplication> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.set(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_DISCARD.getName())
+                    .set(JyjcOpeningApplication::getRemark, remark)
+                    .eq(org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity::getSequenceNbr, sequenceNbr);
             this.update(updateWrapper);
-            }
         } else {
             LambdaUpdateWrapper<JyjcOpeningApplication> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.set(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_DISCARD.getName())