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/resources/mapper/JgChangeRegistrationTransferMapper.xml

@@ -44,10 +44,13 @@
             <if test="dto.equCode != null and dto.equCode != ''">
                 and jri.EQU_CODE like concat('%',#{dto.equCode},'%')
             </if>
-            <if test="dto.useUnitName != null and dto.useUnitName != ''">
-                and  crt.use_unit_name like concat('%',#{dto.useUnitName},'%')
+            <if test="dto.useUnitCreditCode != null and dto.useUnitCreditCode != ''">
+                and  crt.use_unit_credit_code = #{dto.useUnitCreditCode}
             </if>
-            <if test="roleIds != null and dto.dataType == 'jg'">
+            <if test="dto.receiveOrgCode != null and dto.receiveOrgCode != ''">
+                and  crt.receive_company_code = #{dto.receiveOrgCode}
+            </if>
+            <if test="roleIds != null and dto.dataType == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     crt.execute_sequence like concat('%',#{role},'%')
                 </foreach>

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

@@ -319,13 +319,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         TaskV2Model taskV2Model = new TaskV2Model();
         if ("0".equals(operate)) {
             if (StringUtils.isEmpty(workflowResultDto.getNextExecutorRoleIds())) {
-                LambdaQueryWrapper<JgEnableDisableEq> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(JgEnableDisableEq::getEnableDisableApplyId, id);
-                JgEnableDisableEq jgEnableDisableEq = jgEnableDisableEqMapper.selectOne(queryWrapper);
-
-                LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
-                queryWrapper2.eq(RegistrationInfo::getRecord, jgEnableDisableEq.getEquId());
-                RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
                 jgEnableDisable.setPromoter("");
                 jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getName()));
                 // 上个代办改为已办
@@ -336,7 +329,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
                 taskMap.put("model", jgEnableDisable);
-                taskV2Model = commonService.updateTaskModel(taskMap);
+                commonService.updateTaskModel(taskMap);
             } else {
                 jgEnableDisable.setNextExecutorIds(workflowResultDto.getNextExecutorRoleIds());
                 if (!ObjectUtils.isEmpty(jgEnableDisable.getExecuteSequence())) {
@@ -414,11 +407,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         workDto.setResultCode("approvalStatus");
         workDto.setTaskId(jgEnableDisable.getNextTaskId());
         HashMap<String, Object> commMap = new HashMap<>();
-        if (jgEnableDisable.getAuditStatus().equals("已驳回") || jgEnableDisable.getAuditStatus().equals("已撤回")) {
-            commMap.put("approvalStatus", "提交");
-        } else {
-            commMap.put("approvalStatus", op);
-        }
+        commMap.put("approvalStatus", op);
         workDto.setVariable(commMap);
         workDto.setComment(opinion);
         processTaskDTO = iCmWorkflowService.complete(jgEnableDisable.getNextTaskId(), workDto);