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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationUnitMapper.java

@@ -37,4 +37,6 @@ public interface JgChangeRegistrationUnitMapper extends CustomBaseMapper<JgChang
      */
     @MapKey("sequenceNbr")
     List<Map<String, Object>> queryEquipInformation(@Param("sequenceNbr") long sequenceNbr);
+
+    String queryEquipIdBySeq(@Param("sequenceNbr") long sequenceNbr);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgEnableDisableMapper.java

@@ -18,7 +18,8 @@ public interface JgEnableDisableMapper extends BaseMapper<JgEnableDisable> {
 
     Page<Map<String, Object>> pageList(@Param("page") Page<Map<String, Object>> page,
                                        @Param("dto") JgEnableDisableDto dto,
-                                       @Param("type") String type);
+                                       @Param("type") String type,
+                                       @Param("userId") String userId);
 
     Map<String, Object> getDetail(@Param("sequenceNbr") Long sequenceNbr);
 }

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

@@ -118,4 +118,13 @@
             isn.sequence_nbr = #{sequenceNbr}
             LIMIT 1
     </select>
+    <select id="queryEquipIdBySeq" resultType="java.lang.String">
+
+        select
+            equ_id as equid
+        from
+            tzs_jg_change_registration_unit_eq
+        where
+            unit_change_registration_id = #{sequenceNbr}
+    </select>
 </mapper>

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

@@ -26,6 +26,7 @@
                jed.promoter,
                jed.next_execute_user_ids as nextExecuteUserIds,
                jed.create_user_id as createUserId,
+               jed.next_task_id as nextTaskId,
                oi.SUPERVISORY_CODE as supervisoryCode
 
         FROM tzs_jg_enable_disable jed
@@ -34,6 +35,7 @@
                  LEFT JOIN idx_biz_jg_use_info use on jri.RECORD = use.RECORD
                  LEFT JOIN idx_biz_jg_other_info oi on jri.RECORD = oi.RECORD
         <where>
+            jed.is_delete = 0
             <if test="dto.applyNo != null and dto.applyNo != '' ">
               and  jed.apply_no like concat('%',#{dto.applyNo},'%')
             </if>
@@ -53,6 +55,7 @@
             <if test="dto.applyType != null and dto.applyType != ''">
                 and  jed.apply_type = #{dto.applyType}
             </if>
+            or jed.transfer_to_user_ids like concat('%',#{userId},'%')
         </where>
         order by jed.rec_date desc
     </select>

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

@@ -657,21 +657,22 @@ public class CommonServiceImpl implements ICommonService {
         cmWorkflowService.assign(flowTaskVo);
         //修改待办
         List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(instanceId).getResult();
-        TaskV2Model taskV2Model = result.stream().filter(r -> r.getFlowCode()!= null && r.getFlowCode().equals(taskId)).findFirst().orElse(null);
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        taskV2Model.setExecuteUserIds(reginParams.getUserModel().getUserId());
+        List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
+        if (collect == null || collect.size() == 0) {
+            return null;
+        }
+        TaskV2Model taskV2Model = collect.get(0);
+        taskV2Model.setExecuteUserIds(RequestContext.getExeUserId());
         taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_TRANSFER.getCode());
         taskV2Model.setTaskStatusLabel(FlowStatusEnum.TO_BE_TRANSFER.getName());
-        taskV2Model.setEndUserId(reginParams.getUserModel().getUserId());
-        Date createDate = taskV2Model.getCreateDate();
-        taskV2Model.setCreateDate(new Date());
+        taskV2Model.setEndUserId(RequestContext.getExeUserId());
         taskV2Model.setEndDate(new Date());
         String routhPath = taskV2Model.getRoutePath().replace("nextExecuteUserIds", "executeUserId") + "&nextExecuteUserIds=" + assignee;
         taskV2Model.setRoutePath(routhPath);
         Systemctl.taskV2Client.update(taskV2Model, taskV2Model.getSequenceNbr());
         //创建新待办
         taskV2Model.setExecuteUserIds(assignee);
-        taskV2Model.setCreateDate(createDate);
+        taskV2Model.setCreateDate(new Date());
         taskV2Model.setTaskStatus(0);
         taskV2Model.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
         taskV2Model.setEndUserId(null);
@@ -817,7 +818,7 @@ public class CommonServiceImpl implements ICommonService {
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
                 if (map.get("type").equals(collect.get(0).getTaskType()) && map.get("pageType").equals("look")) {
-                    urlParams = map.get("url").toString().replace("{roleIds}", "") + urlParams + "&nextExecuteUserIds=";
+                    urlParams = map.get("url").toString().replace("{roleIds}", "") + urlParams + "&taskStatus" + collect.get(0).getTaskStatus() + "&nextExecuteUserIds=";
                     break;
                 }
             }

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

@@ -636,7 +636,11 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             Map<String, Object> map1 = new HashMap<>();
             map1.put("USE_ORG_CODE", newUseRegistrationCertificateNumber);
             resultMap.put(equipId, map1);
-            tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
+            try {
+                tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
+            }catch (Exception e){
+                log.error("改造变更登记------------更新es中的编号信息失败，请及时检查ES的状态");
+            }
         }
     }
 

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

@@ -361,7 +361,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             dto.setTaskCode(oldTransfer.getApplyNo());
             dto.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
             dto.setRelationId(oldTransfer.getSequenceNbr() + "");
-            dto.setFlowCode(oldTransfer.getNextTaskId());
             modelDtos.add(dto);
             commonService.buildTaskModel(modelDtos);
         }
@@ -1122,7 +1121,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 toDoTask.setTaskStatusLabel(flowStatusEnum.getName());
                 toDoTask.setFlowStatus(commonService.getDictionaryCodeByName(transfer.getStatus()));
                 toDoTask.setFlowStatusLabel(transfer.getStatus());
-                toDoTask.setFlowCode(transfer.getNextTaskId());
+                toDoTask.setFlowCode(sorkflow.getNextTaskId());
                 toDoTask.setStartUserId(transfer.getCreateUserId());
                 toDoTask.setStartUser(transfer.getCreateUserName());
                 toDoTask.setStartUserCompanyName(transfer.getCreateUserCompanyName());

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

@@ -170,6 +170,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         // 设备信息
         List<Map<String, Object>> equipmentInfos = JgChangeRegistrationUnitMapper.queryEquipInformation(sequenceNbr);
+        String equipId = JgChangeRegistrationUnitMapper.queryEquipIdBySeq(sequenceNbr);
+        Map<String, Object> detailFieldCamelCaseByRecord = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
+        detailFieldCamelCaseByRecord.remove("useUnitCreditCode");
+
 
         for (String s : fields) {
             if (changeInfo.containsKey(s) && !ObjectUtils.isEmpty(changeInfo.get(s))) {
@@ -183,7 +187,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         Map<String, Object> newMap = new HashMap<>();
         newMap.putAll(changeInfo);
         newMap.putAll(equipmentInfos.get(0));
-
+        newMap.putAll(detailFieldCamelCaseByRecord);
         return new HashMap<String, Map<String, Object>>() {{
             this.put("changeRegisInfo", newMap);
         }};

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

@@ -232,8 +232,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         //摘要 按原有规则组装
         dto.setTaskContent(
                 String.format("来自%s【%s】的业务办理，【申请单号：%s】",
-                ObjectUtils.isEmpty(jgEnableDisable.getEquList()) ? "null" : jgEnableDisable.getEquList(),
-                ObjectUtils.isEmpty(jgEnableDisable.getSupervisoryCode()) ? "null" : jgEnableDisable.getSupervisoryCode(),
+                ObjectUtils.isEmpty(jgEnableDisable.getEquList()) ? "" : jgEnableDisable.getEquList(),
+                ObjectUtils.isEmpty(jgEnableDisable.getSupervisoryCode()) ? "" : jgEnableDisable.getSupervisoryCode(),
                 jgEnableDisable.getApplyNo()));
         //申请单号
         dto.setTaskCode(jgEnableDisable.getApplyNo());
@@ -334,7 +334,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             dto.setReceiveCompanyCode(reginParams.getCompany().getCompanyCode());
         }
         String level =  reginParams.getCompany().getLevel();
-        return this.baseMapper.pageList(page, dto, level);
+        String userId =  reginParams.getUserModel().getUserId();
+        return this.baseMapper.pageList(page, dto, level,userId);
     }
 
 

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

@@ -197,6 +197,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
         Map<String, Object> detail = equipmentInfos.get(0);
         Map<String, Object> equInfo = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(detail.get("equId").toString());
+        equInfo.put("useUnitCreditCodeUse", equInfo.getOrDefault("useUnitCreditCode", ""));
+        equInfo.put("useUnitNameUse", equInfo.getOrDefault("useUnitName", ""));
         equInfo.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
         equInfo.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
         equInfo.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));

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

@@ -142,6 +142,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
         Map<String, Object> detail = equipmentInfos.get(0);
         Map<String, Object> equInfo = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(detail.get("equId").toString());
+        equInfo.put("useUnitCreditCodeUse", equInfo.getOrDefault("useUnitCreditCode", ""));
+        equInfo.put("useUnitNameUse", equInfo.getOrDefault("useUnitName", ""));
         equInfo.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
         equInfo.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
         equInfo.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));

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,7 +167,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode) {
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
-        lambda.eq(JgRegistrationHistory::getEquId, equipId);
+       // lambda.eq(JgRegistrationHistory::getEquId, equipId);
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
         lambda.eq(JgRegistrationHistory::getRegistrationClass, "使用登记");
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
@@ -395,6 +395,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                     taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                     taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                    taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
                     if (WorkFlowStatusEnum.USE_SUBMIT.getCode().equals(taskCode) && "1".equals(operate)) {
                         taskModelDto.setPageType("edit");
                     }
@@ -563,7 +564,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
             LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambda.eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr);
-            lambda.eq(JgRegistrationHistory::getEquId, id);
+            //lambda.eq(JgRegistrationHistory::getEquId, id);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode() + "_" + jgUseRegistration.getReceiveOrgName());

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

@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sun.org.apache.bcel.internal.generic.NEW;
-import com.sun.org.apache.regexp.internal.RE;
+
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;