改造变更登记业务调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationNameController.java

@@ -135,7 +135,7 @@ public class JgChangeRegistrationNameController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getTableData")
-    @ApiOperation(httpMethod = "GET", value = "获取", notes = "根据sequenceNbr查询单个详情")
+    @ApiOperation(httpMethod = "GET", value = "获取当前企业下，某个接收机构下的使用登记证信息", notes = "获取当前企业下，某个接收机构下的使用登记证信息")
     public ResponseModel<Map<String, Object>> getTableData(JgUseRegistrationManageDto dto) {
         if (ValidationUtil.isEmpty(dto.getUseUnitCreditCode())) {
             // 不传的话取当前登录单位的统一信用代码

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationReformController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -127,4 +132,56 @@ public class JgChangeRegistrationReformController extends BaseController {
 							   @RequestParam(value = "printType", defaultValue = "0") String printType){
 		jgChangeRegistrationReformServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response, printType);
 	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping (value = "/getEquDetail")
+	@ApiOperation(httpMethod = "GET", value = "根据使用登记证查询设备详情(前端组件默认传参record)", notes = "根据使用登记证查询设备详情")
+	public ResponseModel<Map<String, Object>> getEquDetail(@RequestParam String record) {
+		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getEquDetail(record));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping (value = "/getUseRegistrationCodeData")
+	@ApiOperation(httpMethod = "GET", value = "获取当前企业，某接收机构审批的使用登记证信息", notes = "获取当前企业，某接收机构审批的使用登记证信息")
+	public ResponseModel<Page<JgUseRegistrationManageDto>> getUseRegistrationCodeData(
+																		 @RequestParam(value = "current") int current,
+																		 @RequestParam(value = "size") int size,
+																		 @RequestParam(value = "EQU_LIST_CODE", required = false) String EQU_LIST_CODE,
+																		 @RequestParam(value = "EQU_CATEGORY_CODE", required = false) String EQU_CATEGORY_CODE,
+																		 @RequestParam(value = "equList", required = false) String equList,
+																		 @RequestParam(value = "receiveCompanyCode") String receiveCompanyCode
+																		 ) {
+		JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto();
+		Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
+		page.setCurrent(current);
+		page.setSize(size);
+		ReginParams info = getSelectedOrgInfo();
+		if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
+			dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
+			dto.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(info.getCompany().getCompanyType()) ?
+					info.getCompany().getCompanyCode().split("_")[1] : info.getCompany().getCompanyCode());
+		} else {
+			dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
+			dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
+		}
+		// 新增时使用EQU_LIST_CODE，适配组件，适配原有表单
+		if (!ObjectUtils.isEmpty(EQU_LIST_CODE)){
+			dto.setEquListCode(EQU_LIST_CODE);
+		}
+		// 流程页面使用equList，适配组件，适配原有表单
+		if (!ObjectUtils.isEmpty(equList)){
+			dto.setEquListCode(equList);
+		}
+		// 流程页面使用equList，适配组件，适配原有表单
+		if (!ObjectUtils.isEmpty(EQU_CATEGORY_CODE)){
+			dto.setEquCategoryCode(EQU_CATEGORY_CODE);
+		}
+		if (!ValidationUtil.isEmpty(receiveCompanyCode)){
+			String[] codes = receiveCompanyCode.split("_");
+			if (!ValidationUtil.isEmpty(codes)){
+				dto.setReceiveCompanyCode(codes[0]);
+			}
+		}
+		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getUseRegistrationCodeData(page, dto));
+	}
 }

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

@@ -567,6 +567,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 registerInfoMap.put("registerinfoSeq", registerInfo.getSequenceNbr());
                 registerInfoMap.put("sequenceNbr", registerInfo.getSequenceNbr());
                 registerInfoMap.put("productPhoto", JSON.parseArray(registerInfo.getProductPhoto()));
+                registerInfoMap.put("useRegistrationCode", registerInfo.getUseOrgCode());
                 if (CollectionUtils.isNotEmpty(categoryList0)) {
                     registerInfoMap.put("equListDesc", categoryList0.get(0).getName());
                 }

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

@@ -44,6 +44,7 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
@@ -148,6 +149,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     private JgCertificateChangeRecordEqServiceImpl jgCertificateChangeRecordEqService;
 
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public List<JgChangeRegistrationName> save2(String submitType, JSONObject requestParam) {
         Map<String, JSONObject> jgRegistrationInfoMap = (Map<String, JSONObject>) JSONObject.parseObject(JSONObject.toJSONString(requestParam), Map.class);
         return Collections.singletonList(this.save(submitType, jgRegistrationInfoMap));
@@ -211,6 +213,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public JgChangeRegistrationName save(String submitType, Map<String, JSONObject> jgRegistrationInfoMap) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String[] taskName = new String[]{"流程结束"};
@@ -381,6 +385,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
 
 
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public JgChangeRegistrationNameDto updateInfo(String submitType, JgChangeRegistrationNameDto jgChangeRegistrationNameDto, String op) {
         if (Objects.isNull(jgChangeRegistrationNameDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
@@ -553,6 +558,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     }
 
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public void revocation(String instanceId, String taskId) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
@@ -624,6 +630,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     }
 
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public void flowExecute(Long id, String instanceId, String operate, String comment, String nextTaskId) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
@@ -725,10 +732,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             // 完成时 下一步骤可执行人清空
             jgChangeRegistrationName.setNextExecuteUserIds("");
             jgChangeRegistrationName.setNextTaskId(nextTaskId);
-            // 修改业务信息
-            updateInfoOther(jgChangeRegistrationName);
             // 更新代办
-            updateTaskModel(jgChangeRegistrationName, operate);
+            TaskV2Model taskV2Model = updateTaskModel(jgChangeRegistrationName, operate);
+            // 修改业务信息
+            updateInfoOther(taskV2Model, jgChangeRegistrationName);
         }
         // 保存redis最新流程数据
         commonService.saveExecuteFlowData2Redis(jgChangeRegistrationName.getInstanceId(), this.buildInstanceRuntimeData(jgChangeRegistrationName));
@@ -769,7 +776,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         return commonService.getDictionaryCodeByName(auditStatus);
     }
 
-    public void updateInfoOther(JgChangeRegistrationName jgChangeRegistrationName) {
+    public void updateInfoOther(TaskV2Model taskV2Model, JgChangeRegistrationName jgChangeRegistrationName) {
 //        LambdaQueryWrapper<JgChangeRegistrationNameEq> wrapper = new LambdaQueryWrapper<>();
 //        wrapper.eq(JgChangeRegistrationNameEq::getNameChangeRegistrationId, jgChangeRegistrationName.getSequenceNbr());
 //        List<String> collect = jgChangeRegistrationNameEqService.list(wrapper).stream().map(JgChangeRegistrationNameEq::getEquId).collect(Collectors.toList());
@@ -846,6 +853,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         lambda.in(JgUseRegistrationManage::getSequenceNbr, collect);
         JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
         jgUseRegistrationManage.setUseUnitName(jgChangeRegistrationName.getNewUseUnitName());
+        jgUseRegistrationManage.setAuditPassDate(new Date());
         jgUseRegistrationManageService.update(jgUseRegistrationManage, lambda);
 
         // 业务流水生成
@@ -874,6 +882,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             jgCertificateChangeRecord.setUseUnitName(jgChangeRegistrationName.getUseUnitName());
             jgCertificateChangeRecord.setEquCategory(!ObjectUtils.isEmpty(object.get("equCategoryCode")) ? object.get("equCategoryCode").toString() : null);
             jgCertificateChangeRecord.setReceiveCompanyCode(jgChangeRegistrationName.getReceiveOrgCode());
+            jgCertificateChangeRecord.setRoutePath(taskV2Model.getRoutePath());
             // 保存证流水信息
             jgCertificateChangeRecordService.save(jgCertificateChangeRecord);
             // 生成证下设备流水信息

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

@@ -10,14 +10,13 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReformEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
+import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 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.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
@@ -28,11 +27,13 @@ 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.IdxBizJgTechParamsElevatorMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.service.ITzsJgRegistrationInfoService;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.commons.collections.CollectionUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -48,6 +49,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -121,6 +123,21 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Autowired
     private RedissonClient redissonClient;
 
+    @Autowired
+    private IJgChangeRegistrationTransferService jgChangeRegistrationTransferService;
+
+    @Autowired
+    private IdxBizJgRegisterInfoServiceImpl jgRegisterInfoService;
+
+    @Autowired
+    private JgUseRegistrationManageServiceImpl jgUseRegistrationManageService;
+
+    @Autowired
+    private JgCertificateChangeRecordServiceImpl jgCertificateChangeRecordService;
+
+    @Autowired
+    private JgCertificateChangeRecordEqServiceImpl jgCertificateChangeRecordEqService;
+
     /***
      * @deprecated 根据查询调教获取分页对象
      * @param dto 查询的dto对象
@@ -135,6 +152,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     }
 
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public List<Map<String, Object>> save(JSONObject map) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         UseInfo useInfo = new UseInfo();
@@ -369,9 +387,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgChangeRegistrationReform.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
 //            String newUseRegistrationCertificateNumber = getCode(jgChangeRegistrationReform.getSupervisoryCode());
-            String newUseRegistrationCertificateNumber = commonServiceImpl.generateRegistrationCode(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getReceiveCompanyCode());
-            jgChangeRegistrationReform.setUseRegistrationCode(newUseRegistrationCertificateNumber);
-            updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(), newUseRegistrationCertificateNumber, jgChangeRegistrationReform.getApplyNo());
+//            String newUseRegistrationCertificateNumber = commonServiceImpl.generateRegistrationCode(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getReceiveCompanyCode());
+//            jgChangeRegistrationReform.setUseRegistrationCode(newUseRegistrationCertificateNumber);
+            updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(), null, jgChangeRegistrationReform.getApplyNo());
             HashMap<String, Object> map = new HashMap<>();
             map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
             map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
@@ -381,13 +399,57 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgChangeRegistrationReform.setNextExecuteUserIds("");
             jgChangeRegistrationReform.setNextTaskId(nextTaskId);
             map.put("model", conveterTaskMessageDTO(jgChangeRegistrationReform));
-            commonServiceImpl.updateTaskModel(map);
+            TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
+            // 生成流水信息
+            saveRecord(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform, taskV2Model);
         }
         // redis流程实时数据更新
         commonServiceImpl.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgChangeRegistrationReform));
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
     }
 
+    public void saveRecord(String equipId, JgChangeRegistrationReform jgChangeRegistrationReform, TaskV2Model taskV2Model){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
+                .eq("equ_id", equipId)
+                .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
+                .eq("registration_class", bussinessType));
+
+        JSONObject object = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
+        // 更新使用登记证信息
+        JgUseRegistrationManage useRegistrationCode = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, object.get("useRegistrationCode")).one();
+        useRegistrationCode.setAuditPassDate(new Date());
+        jgUseRegistrationManageService.updateById(useRegistrationCode);
+        // 生成业务流水信息
+        JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
+        jgCertificateChangeRecord.setApplyNo(jgChangeRegistrationReform.getApplyNo());
+        jgCertificateChangeRecord.setReceiveOrgName(jgChangeRegistrationReform.getReceiveOrgName());
+        jgCertificateChangeRecord.setAuditPassDate(new Date());
+        jgCertificateChangeRecord.setRegType(bussinessType);
+        jgCertificateChangeRecord.setRegDate(jgChangeRegistrationReform.getCreateDate());
+        jgCertificateChangeRecord.setChangeContent(jgChangeRegistrationReform.getCreateUserName() + "办理了【" + bussinessType + "】," + "单号【" + jgChangeRegistrationReform.getApplyNo() +
+                "】"  + ",办理日期" + sdf.format(jgChangeRegistrationReform.getAuditPassDate()));
+        jgCertificateChangeRecord.setRecUserId(jgChangeRegistrationReform.getRecUserId());
+        jgCertificateChangeRecord.setRecDate(new Date());
+        jgCertificateChangeRecord.setCreateDate(new Date());
+        jgCertificateChangeRecord.setCreateUserId(jgChangeRegistrationReform.getCreateUserId());
+        jgCertificateChangeRecord.setUseRegistrationCode(!ObjectUtils.isEmpty(object.get("useRegistrationCode")) ? object.get("useRegistrationCode").toString() : null);
+        jgCertificateChangeRecord.setCertificateNo(useRegistrationCode.getCertificateNo());
+        jgCertificateChangeRecord.setUseUnitCreditCode(jgChangeRegistrationReform.getUseUnitCreditCode());
+        jgCertificateChangeRecord.setUseUnitName(jgChangeRegistrationReform.getUseUnitName());
+        jgCertificateChangeRecord.setEquCategory(!ObjectUtils.isEmpty(object.get("equCategory")) ? object.get("equCategory").toString() : null);
+        jgCertificateChangeRecord.setReceiveCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode());
+        jgCertificateChangeRecord.setRoutePath(taskV2Model.getRoutePath());
+        // 保存证流水信息
+        jgCertificateChangeRecordService.save(jgCertificateChangeRecord);
+        // 生成设备流水信息
+        JgCertificateChangeRecordEq jgCertificateChangeRecordEq = new JgCertificateChangeRecordEq();
+        jgCertificateChangeRecordEq.setEquId(!ObjectUtils.isEmpty(object.get("record")) ? object.get("record").toString() : null);
+        jgCertificateChangeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());
+        jgCertificateChangeRecordEq.setProductCode(!ObjectUtils.isEmpty(object.get("factoryNum")) ? object.get("factoryNum").toString() : null);
+        jgCertificateChangeRecordEqService.save(jgCertificateChangeRecordEq);
+    }
+
     public InstanceRuntimeData buildInstanceRuntimeData(JgChangeRegistrationReform jgChangeRegistrationReform) {
         return InstanceRuntimeData.builder()
                 .nextExecuteUserIds(jgChangeRegistrationReform.getNextExecuteUserIds())
@@ -397,6 +459,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     }
 
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public void flowExecute(Long id, String instanceId, String operate, String comment, String nextTaskId) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
@@ -440,6 +503,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     }
 
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public void withdraw(String instanceId, String nextTaskId) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
@@ -493,6 +557,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     }
 
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public void deleteBatch(List<Long> ids) {
         // 删除暂存的待办
         ids.forEach(id -> {
@@ -520,7 +585,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         Map<String, Object> originalData = new HashMap<>();
         Map<String, Object> originalDataOther = new HashMap<>();
 
-        if (("已完成".equals(jgChangeRegistrationReform.getStatus()) || "流程结束".equals(jgChangeRegistrationReform.getStatus()))) {
+//        if (!("已完成".equals(jgChangeRegistrationReform.getStatus()) || !"流程结束".equals(jgChangeRegistrationReform.getStatus()))) {
             // 完成时显示历史数据
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                     .eq("equ_id", equipId)
@@ -528,13 +593,14 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                     .eq("registration_class", bussinessType));
             originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
             detail.putAll(originalData);
-        } else {
-            // 非完成显示最新数据
-            originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
-            originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
-            detail.putAll(originalDataOther);
-            detail.put("techInfo", originalData);
-        }
+//        } else {
+//            // 完成显示最新数据
+//            originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
+//            originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
+//            detail.putAll(originalDataOther);
+//            detail.put("techInfo", originalData);
+//        }
+        jgChangeRegistrationReform.setReceiveCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode() + "_" + jgChangeRegistrationReform.getReceiveOrgName());
         detail.putAll(JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform), Map.class));
         if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
             detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
@@ -714,19 +780,20 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgRegistrationHistory.setChangeData(newData);
             jgRegistrationHistory.setStatus("history");
             jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
-            makeEquipmentsInvalid(equipId, currentDocumentId);
+ //         makeEquipmentsInvalid(equipId, currentDocumentId);
             //更新使用注册登记证编号
-            idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(equipId, newUseRegistrationCertificateNumber);
+            // 改造变更登记使用登记证不变
+            //idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(equipId, newUseRegistrationCertificateNumber);
             //es中的编号信息
-            Map<String, Map<String, Object>> resultMap = new HashMap<>();
-            Map<String, Object> map1 = new HashMap<>();
-            map1.put("USE_ORG_CODE", newUseRegistrationCertificateNumber);
-            resultMap.put(equipId, map1);
-            try {
-                tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
-            }catch (Exception e){
-                log.error("改造变更登记------------更新es中的编号信息失败，请及时检查ES的状态");
-            }
+//            Map<String, Map<String, Object>> resultMap = new HashMap<>();
+//            Map<String, Object> map1 = new HashMap<>();
+//            map1.put("USE_ORG_CODE", newUseRegistrationCertificateNumber);
+//            resultMap.put(equipId, map1);
+//            try {
+//                tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
+//            }catch (Exception e){
+//                log.error("改造变更登记------------更新es中的编号信息失败，请及时检查ES的状态");
+//            }
         }
     }
 
@@ -885,8 +952,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      * @deprecated 动态获取
      */
     public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
-        String result = "来自%s【%s】的业务办理，【申请单号：%s】";
-        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), Optional.ofNullable(jgChangeRegistrationReform.getSupervisoryCode()).orElse("无"), jgChangeRegistrationReform.getApplyNo());
+        String result = "%s发起%s的业务申请，【申请单号：%s】";
+        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getCreateUserName()).orElse("无"), bussinessType, jgChangeRegistrationReform.getApplyNo());
     }
 
     /**
@@ -1016,4 +1083,23 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         // 2、3级驳回时，单位code为接收单位code
         return jgChangeRegistrationReform.getReceiveCompanyCode();
     }
+
+    public Map<String, Object> getEquDetail(String useRegistrationCode){
+        IdxBizJgRegisterInfo registerInfo = jgRegisterInfoService.lambdaQuery().eq(IdxBizJgRegisterInfo::getUseOrgCode, useRegistrationCode).one();
+        HashMap<String, Object> detail = new HashMap<>();
+        if (!ObjectUtils.isEmpty(registerInfo)){
+            Map<String, Object> originalData = idxBizJgRegisterInfoService.getDetailByRecord(registerInfo.getRecord());
+            Map<String, Object> originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(registerInfo.getRecord());
+            detail.putAll(originalDataOther);
+            detail.put("techInfo", originalData);
+//            return jgChangeRegistrationTransferService.getDetailFieldCamelCase(registerInfo.getRecord());
+//
+        }
+            return detail;
+    }
+
+    public Page<JgUseRegistrationManageDto> getUseRegistrationCodeData(Page<JgUseRegistrationManageDto> page,
+                                                                       JgUseRegistrationManageDto dto){
+        return jgUseRegistrationManageService.queryForJgUseRegistrationManagePage(page, dto, null);
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -129,19 +129,19 @@
     "type": "108",
     "pageType": "draft",
     "name": "更名变更登记-暂存打开",
-    "url": "/mixuap?appId=1742358052905971713&id=1739168596900212738&roleIds={roleIds}&userId={userId}&formType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1739168596900212738&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "108",
     "pageType": "look",
     "name": "更名变更登记-查看",
-    "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=detail"
+    "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&pageType=detail"
   },
   {
     "type": "108",
     "pageType": "edit",
     "name": "更名变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "109",