修改bug

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

@@ -58,7 +58,8 @@
         cru.instance_status as instanceStatus,
         cru.promoter,
         cru.next_executor_ids as nextExecutorIds,
-        cru.instance_id as instanceId
+        cru.instance_id as instanceId,
+        cru.create_user_id as createUserId
         from tzs_jg_change_vehicle_registration_unit cru
         <where>
             <if test="dto.applyNo != null and dto.applyNo != ''">

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

@@ -43,12 +43,10 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XIAN_YANG;
 import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XI_XIAN;
 
@@ -63,7 +61,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     private static final String SUBMIT_TYPE_FLOW = "1";
     private static final String PROCESS_DEFINITION_KEY = "vehicleGasCylinderChange";
     private static final String BUSINESS_NAME = "车用气瓶变更";
-    private static final String template = "%s发起车用气瓶变更登记业务申请，【申请单号：%s】";
+    private static final String template = "发起【车用气瓶变更登记】业务申请，【申请单号：%s】";
     @Autowired
     JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
     @Autowired
@@ -198,7 +196,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 // 数据参数
                 taskDto.setModel(taskMessageDto);
                 // 摘要
-                taskDto.setTaskContent(String.format(template, dto.getCreateUserName(), dto.getApplyNo()));
+                taskDto.setTaskContent(String.format(template, dto.getApplyNo()));
                 // 申请单号
                 taskDto.setTaskCode(dto.getApplyNo());
                 // 业务类型
@@ -353,6 +351,26 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         return jgChangeVehicleRegistrationUnit;
     }
 
+    public void updateEsData(List<String> ids, JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit, String useRegistCode) {
+        // 更新es
+        HashMap<String, Map<String, Object>> objMap = new HashMap<>();
+        ids.forEach(item -> {
+            HashMap<String, Object> param = new HashMap<>();
+            param.put("USE_UNIT_NAME", jgChangeVehicleRegistrationUnit.getNewUseUnitName());
+            param.put("USE_UNIT_CREDIT_CODE", jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
+            if (!ObjectUtils.isEmpty(useRegistCode)) {
+                param.put("USE_ORG_CODE", useRegistCode);
+                LambdaQueryWrapper<IdxBizJgOtherInfo> eq = new QueryWrapper<IdxBizJgOtherInfo>().lambda().eq(IdxBizJgOtherInfo::getRecord, item);
+                IdxBizJgOtherInfo idxBizJgOtherInfo = otherInfoMapper.selectOne(eq);
+                if (!ObjectUtils.isEmpty(idxBizJgOtherInfo)) {
+                    param.put("SUPERVISORY_CODE", idxBizJgOtherInfo.getSupervisoryCode());
+                }
+            }
+            objMap.put(item, param);
+        });
+        tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
+    }
+
     public void saveRecord(JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit, TaskV2Model taskV2Model) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, jgChangeVehicleRegistrationUnit.getUseRegistCode()).one();
@@ -418,6 +436,12 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             collect.forEach(a -> {
                 createCode(jgChangeVehicleRegistrationUnit, manage.getEquDefineCode(), a);
             });
+            // 更新es数据
+            updateEsData(collect, jgChangeVehicleRegistrationUnit, code);
+        }
+        // 区内变更
+        if ("1".equals(jgChangeVehicleRegistrationUnit.getChangeType()) && !ObjectUtils.isEmpty(collect)) {
+            updateEsData(collect, jgChangeVehicleRegistrationUnit, null);
         }
         // 修改证管理信息
         manage.setUseUnitName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
@@ -508,7 +532,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         jgChangeVehicleRegistrationUnit.setNextExecutorIds(workflowResultDto.getNextExecutorRoleIds());
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtil.copyProperties(jgChangeVehicleRegistrationUnit, taskMessageDto);
-        dto.setTaskContent(String.format(template, jgChangeVehicleRegistrationUnit.getCreateUserName(), jgChangeVehicleRegistrationUnit.getApplyNo()));
+        dto.setTaskContent(String.format(template, jgChangeVehicleRegistrationUnit.getApplyNo()));
         dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
         dto.setFlowCode(jgChangeVehicleRegistrationUnit.getNextTaskId());
@@ -583,6 +607,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
 
     public Map<String, Object> getEquList(String useRegistrationCode) {
         HashMap<String, Object> map = new HashMap<>();
+        // 组件回显
+        map.put("useRegistrationCode", useRegistrationCode);
         JgUseRegistrationManage registrationManage = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode).one();
         List<JSONObject> jsonObjects = jgUseRegistrationManageService.queryEquByCertificateSeq(registrationManage.getSequenceNbr());
         if (!ObjectUtils.isEmpty(jsonObjects)) {
@@ -596,7 +622,6 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             });
             map.put("dataList", equList);
             // 组件回显
-            map.put("useRegistrationCode", useRegistrationCode);
             if (!ObjectUtils.isEmpty(information) && !ObjectUtils.isEmpty(information.getCarNumber())) {
                 map.put("carNumber", information.getCarNumber());
             }
@@ -621,10 +646,13 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     }
 
     public Map<String, Object> getDetails(String sequenceNbr) {
+        JgChangeVehicleRegistrationUnit registrationUnit = this.getById(sequenceNbr);
         JgRegistrationHistory history = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).eq(JgRegistrationHistory::getRegistrationClass, BUSINESS_NAME).one();
         if (!ObjectUtils.isEmpty(history) && !ObjectUtils.isEmpty(history.getChangeData())) {
             JSONObject object = JSONObject.parseObject(history.getChangeData());
             object.put("sequenceNbr", sequenceNbr);
+            object.put("applyNo", registrationUnit.getApplyNo());
+            object.put("status", registrationUnit.getStatus());
             return object;
         } else {
             return new HashMap<>();