Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/pom.xml

@@ -26,12 +26,6 @@
             <artifactId>httpmime</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.yeejoin</groupId>
-            <artifactId>amos-feign-workflow</artifactId>
-            <version>1.10.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>com.aspose</groupId>
             <artifactId>aspose-words</artifactId>
             <version>19.5jdk</version>

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

@@ -38,6 +38,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
@@ -81,8 +82,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Autowired
     private IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
     @Autowired
-    private ICreateCodeService iCreateCodeService;
-    @Autowired
     private IdxBizJgOtherInfoMapper idxBizJgOtherInfoMapper;
 
 
@@ -178,8 +177,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             // 业务管理设备信息保存
             JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
             jgChangeRegistrationReformEq.setEquId(equipId);
-            List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
-            jgChangeRegistrationReform.setApplyNo(applicationFormCode.get(0));
+            ResponseModel<List<String>> result =tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
+            if(!result.getResult().isEmpty()){
+                jgChangeRegistrationReform.setApplyNo(result.getResult().get(0));
+            }else {
+                throw  new BadRequest("申请单编号生成失败,请稍后重试!");
+            }
             jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
             jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
             jgChangeRegistrationReform.setRegDate(new Date());

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

@@ -16,7 +16,6 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
@@ -27,10 +26,10 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.InspectionDetectionInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -66,14 +65,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     WorkFlowFeignService workFlowFeginService;
     @Autowired
-    private ICreateCodeService iCreateCodeService;
-    @Autowired
     RedisUtils redisUtils;
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
     JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
-
+    @Autowired
+    IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
     public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
         return listPage;
@@ -83,7 +81,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return this.baseMapper.getEquipListPage(page, factoryNum, equList, equCategory);
     }
 
-    public void updateEquipMessage(String currentDocumentId){
+    public void updateEquipMessage(String currentDocumentId, String useOrgCode){
         LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
@@ -101,6 +99,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 更新检验检测信息
         inspectionDetectionInfo.setInspectReport(null);
         inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
+        // 更新设备使用登记证
+        idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(String.valueOf(map.get("equipId")), useOrgCode);
     }
 
     public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode){
@@ -316,7 +316,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 jgUseRegistration.setAuditPassDate(new Date());
             }
             // 更新设备信息
-            updateEquipMessage(String.valueOf(sequenceNbr));
+            updateEquipMessage(String.valueOf(sequenceNbr), jgUseRegistration.getUseRegistrationCode());
         }
         this.getBaseMapper().updateById(jgUseRegistration);
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/pom.xml

@@ -22,12 +22,6 @@
             <artifactId>amos-boot-module-common-biz</artifactId>
             <version>${amos-biz-boot.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.yeejoin</groupId>
-            <artifactId>amos-feign-workflow</artifactId>
-            <version>1.10.1</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

amos-boot-system-tzs/pom.xml

@@ -43,12 +43,17 @@
             <artifactId>commons-text</artifactId>
             <version>1.9</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.yeejoin</groupId>-->
+<!--            <artifactId>amos-feign-privilege</artifactId>-->
+<!--            <version>1.8.6</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.yeejoin</groupId>
-            <artifactId>amos-feign-privilege</artifactId>
-            <version>1.8.6</version>
+            <artifactId>amos-feign-workflow</artifactId>
+            <version>1.10.3</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>

pom.xml

@@ -214,7 +214,7 @@
 		<dependency>
 			<groupId>com.yeejoin</groupId>
 			<artifactId>amos-feign-privilege</artifactId>
-			<version>${amos.version}</version>
+			<version>1.8.7</version>
 		</dependency>
 	</dependencies>
 	<dependencyManagement>