更新

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

@@ -38,8 +38,8 @@
             <if test="dto.equCategory != null and dto.equCategory != ''">
                 and jri.EQU_CATEGORY = #{dto.equCategory}
             </if>
-            <if test="dto.auditStatus != null and dto.auditStatus != ''">
-                and ur.audit_status = #{dto.auditStatus}
+            <if test="dto.status != null and dto.status != ''">
+                and ur.status = #{dto.status}
             </if>
             <if test="dto.equCode != null and dto.equCode != ''">
                 and jri.EQU_CODE like concat('%',#{dto.equCode},'%')

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

@@ -167,8 +167,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 业务管理设备信息保存
             JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
             jgRelationEquip.setEquId(map.get("equipId").toString());
-            List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
-            jgUseRegistration.setApplyNo(applicationFormCode.get(0));
+//            List<String> applicationFormCode = iCreateCodeServicevice.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
+//            jgUseRegistration.setApplyNo(applicationFormCode.get(0));
+            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
+            if(!ObjectUtils.isEmpty(listResponseModel)){
+                jgUseRegistration.setApplyNo(listResponseModel.getResult().get(0));
+            }
             jgUseRegistration.setAuditStatus("待提交");
             jgUseRegistration.setStatus(WorkFlowStatusEnum.USE_SUBMIT.getPass());
             this.save(jgUseRegistration);