1,单位更名变更修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationNameDto.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -111,4 +111,10 @@ public class JgChangeRegistrationNameDto extends BaseDto {
      */
     private String nextExecuteUserIds;
 
+
+    /**
+     * 转办后执行人的Id逗号分割
+     */
+    private String transferToUserIds;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationName.java

@@ -161,4 +161,9 @@ public class JgChangeRegistrationName extends BaseEntity {
     @TableField("next_execute_user_ids")
     private String nextExecuteUserIds;
 
+    /**
+     * 转办后执行人的Id逗号分割
+     */
+    @TableField("transfer_to_user_ids")
+    private String transferToUserIds;
 }

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

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationNameDto;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationName;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -24,5 +23,5 @@ public interface JgChangeRegistrationNameMapper extends BaseMapper<JgChangeRegis
 
     void deleteHistoryInfoById(@Param("code") String code);
 
-    Page<Map<String, Object>> getListPage(@Param("page") Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationNameDto dto, @Param("roleIds") List<String> roleIds, @Param("companyCode") String companyCode);
+    Page<Map<String, Object>> getListPage(@Param("page") Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationNameDto dto, @Param("roleIds") List<String> roleIds, @Param("companyCode") String companyCode, @Param("currentUserId") String exeUserId);
 }

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

@@ -35,7 +35,8 @@
     ur.promoter,
     ur.create_user_id as createUserId,
     ur.next_executor_ids as nextExecutorIds,
-    ur.next_execute_user_ids as nextExecuteUserIds
+    ur.next_execute_user_ids as nextExecuteUserIds,
+    ur.next_task_id as nextTaskId
     from tzs_jg_change_registration_name ur
     <where>
         and  ur.is_delete = 0
@@ -62,6 +63,7 @@
         <if test="dto.type == 'company'">
             and ur.use_unit_credit_code = #{dto.useUnitCreditCode}
         </if>
+           and (1=1 or ur.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
     </where>
     order by ur.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/controller/JgChangeRegistrationNameController.java

@@ -143,5 +143,4 @@ public class JgChangeRegistrationNameController extends BaseController {
         return ResponseHelper.buildResponse(WorkFlowStatusEnum.getInfoList(code));
     }
 
-
 }

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

@@ -55,7 +55,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
 
     @Override
     public ProcessTaskDTO completeOrReject(String taskId, TaskResultDTO data, String operate) {
-        ProcessTaskDTO processTaskDTO = null;
+        ProcessTaskDTO processTaskDTO;
         try {
             if(PASS_OPERATE.equals(operate)){
                 // 通过操作
@@ -63,7 +63,6 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
                 processTaskDTO = Workflow.taskV2Client.completeByTaskFroStandard(taskId, data).getResult();
             } else if(REJECT_OPERATE.equals(operate)) {
                 // 驳回操作
-               // todo 需要工作流适配调整后 进行切换 Workflow.taskV2Client.reject(taskId, data);
                 log.info("开始请求工作流驳回任务接口:/reject/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
                 processTaskDTO = Workflow.taskV2Client.reject(taskId, data).getResult();
             } else {

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

@@ -698,6 +698,6 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 dto.setReceiveOrgCode(receiveOrgIdList[0]);
             }
         }
-        return this.baseMapper.getListPage(page, dto, roleIds, companyCode);
+        return this.baseMapper.getListPage(page, dto, roleIds, companyCode, RequestContext.getExeUserId());
     }
 }
\ No newline at end of file