流程代码调整提交

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/factory/AssessApiFallbackFactory.java

@@ -76,6 +76,10 @@ public class AssessApiFallbackFactory implements FallbackFactory<IAssessApi> {
                 return null;
             }
 
+            @Override
+            public String getReimbursementCreateUserIdByProcessInstanceId(String id) {
+                return "";
+            }
         };
     }
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/factory/FinanceApiFallbackFactory.java

@@ -66,6 +66,11 @@ public class FinanceApiFallbackFactory implements FallbackFactory<IFinanceApi> {
             public void updateOldData() {
 
             }
+            @Override
+            public String getReimbursementCreateUserIdByProcessInstanceId(String id) {
+                return "";
+            }
+
 
         };
     }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/factory/ZsApiFallbackFactory.java

@@ -19,6 +19,11 @@ public class ZsApiFallbackFactory implements FallbackFactory<IZsApi> {
             public void updateOldData() {
 
             }
+
+            @Override
+            public String getReimbursementCreateUserIdByProcessInstanceId(String id) {
+                return "";
+            }
         };
     }
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/feign/IAssessApi.java

@@ -77,4 +77,12 @@ public interface IAssessApi {
     @GetMapping(value = "/reimbursement/info/getUserBySignatureScribe")
     String getUserBySignatureScribe(@RequestParam(value = "name") String name,@RequestParam(value = "userId") String userId);
 
+    /**
+     * 根据流程id获取报销创建人id
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/reimbursement/info/getReimbursementCreateUserIdByProcessInstanceId")
+    String getReimbursementCreateUserIdByProcessInstanceId(@RequestParam(value = "id") String id);
+
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/feign/IFinanceApi.java

@@ -63,4 +63,13 @@ public interface IFinanceApi {
     @GetMapping(value = "/reimbursementApproval/info/updateOldData")
     void updateOldData();
 
+
+    /**
+     * 根据流程id获取报销创建人id
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/reimbursementApproval/info/getReimbursementCreateUserIdByProcessInstanceId")
+    String getReimbursementCreateUserIdByProcessInstanceId(@RequestParam(value = "id") String id);
+
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/feign/IZsApi.java

@@ -4,6 +4,7 @@ import com.jeeplus.common.constant.AppNameConstants;
 import com.jeeplus.flowable.factory.ZsApiFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @author: 王强
@@ -17,4 +18,13 @@ public interface IZsApi {
      */
     @GetMapping(value = "/zsReimbursement/info/updateOldData")
     void updateOldData();
+
+    /**
+     * 根据流程id获取报销创建人id
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/zsReimbursement/info/getReimbursementCreateUserIdByProcessInstanceId")
+    String getReimbursementCreateUserIdByProcessInstanceId(@RequestParam(value = "id") String id);
+
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/controller/ReimbursementInfoController.java

@@ -475,4 +475,12 @@ public class ReimbursementInfoController {
         return ResponseEntity.ok(dto);
     }
 
+    @ApiOperation(value = "根据流程id获取报销创建人id")
+    @GetMapping(value = "/getReimbursementCreateUserIdByProcessInstanceId")
+    public String getReimbursementCreateUserIdByProcessInstanceId(@RequestParam("id") String id) {
+        String currentUserId = service.getReimbursementCreateUserIdByProcessInstanceId(id);
+        return currentUserId;
+    }
+
+
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/ReimbursementFileSupplementMapper.java

@@ -10,4 +10,7 @@ public interface ReimbursementFileSupplementMapper extends BaseMapper<Reimbursem
 
     //修改文件补充状态
     void updateFileStatusById(@Param("fileSuppleId") String fileSuppleId, @Param("fileStatus") String fileStatus);
+
+    //根据流程id获取报销创建人id
+    String getReimbursementCreateUserIdByProcessInstanceId(@Param("id") String id);
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/xml/ReimbursementFileSupplementMapper.xml

@@ -19,4 +19,9 @@
         update reimbursement_file_supplement set status = #{fileStatus} where id = #{fileSuppleId}
     </update>
 
+    <select id="getReimbursementCreateUserIdByProcessInstanceId" resultType="java.lang.String">
+        select create_by_id from reimbursement_info where del_flag = 0 and proc_ins_id = #{id} limit 1
+    </select>
+
+
 </mapper>

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -2080,4 +2080,14 @@ public class ReimbursementInfoService {
         ReimbursementFileSupplement fileSupplement = reimbursementFileSupplementMapper.getByReimId(id);
         return fileSupplement;
     }
+
+    /**
+     * 根据流程id获取报销创建人id
+     * @param id
+     * @return
+     */
+    public String getReimbursementCreateUserIdByProcessInstanceId(String id) {
+        String createUserId = reimbursementFileSupplementMapper.getReimbursementCreateUserIdByProcessInstanceId(id);
+        return createUserId;
+    }
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/controller/ZsReimbursementInfoController.java

@@ -487,4 +487,12 @@ public class ZsReimbursementInfoController {
         return ResponseEntity.ok(dto);
     }
 
+    @ApiOperation(value = "根据流程id获取报销创建人id")
+    @GetMapping(value = "/getReimbursementCreateUserIdByProcessInstanceId")
+    public String getReimbursementCreateUserIdByProcessInstanceId(@RequestParam("id") String id) {
+        String currentUserId = service.getReimbursementCreateUserIdByProcessInstanceId(id);
+        return currentUserId;
+    }
+
+
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/ZsReimbursementFileSupplementMapper.java

@@ -10,4 +10,6 @@ public interface ZsReimbursementFileSupplementMapper extends BaseMapper<ZsReimbu
 
     //修改文件补充状态
     void updateFileStatusById(@Param("fileSuppleId") String fileSuppleId, @Param("fileStatus") String fileStatus);
+    //根据流程id获取报销创建人id
+    String getReimbursementCreateUserIdByProcessInstanceId(@Param("id") String id);
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/xml/ZsReimbursementFileSupplementMapper.xml

@@ -19,4 +19,9 @@
         update zs_reimbursement_file_supplement set status = #{fileStatus} where id = #{fileSuppleId}
     </update>
 
+    <select id="getReimbursementCreateUserIdByProcessInstanceId" resultType="java.lang.String">
+        select create_by_id from zs_reimbursement_info where del_flag = 0 and proc_ins_id = #{id} limit 1
+    </select>
+
+
 </mapper>

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/ZsReimbursementInfoService.java

@@ -1527,4 +1527,15 @@ public class ZsReimbursementInfoService {
         ZsReimbursementFileSupplement fileSupplement = zsReimbursementFileSupplementMapper.getByReimId(id);
         return fileSupplement;
     }
+
+
+    /**
+     * 根据流程id获取报销创建人id
+     * @param id
+     * @return
+     */
+    public String getReimbursementCreateUserIdByProcessInstanceId(String id) {
+        String createUserId = zsReimbursementFileSupplementMapper.getReimbursementCreateUserIdByProcessInstanceId(id);
+        return createUserId;
+    }
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/controller/CwReimbursementInfoController.java

@@ -654,4 +654,11 @@ public class CwReimbursementInfoController {
         return ResponseEntity.ok(iPage);
     }
 
+    @ApiOperation(value = "根据流程id获取报销创建人id")
+    @GetMapping(value = "/getReimbursementCreateUserIdByProcessInstanceId")
+    public String getReimbursementCreateUserIdByProcessInstanceId(@RequestParam("id") String id) {
+        String currentUserId = service.getReimbursementCreateUserIdByProcessInstanceId(id);
+        return currentUserId;
+    }
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementInfoMapper.java

@@ -96,4 +96,7 @@ public interface CwReimbursementInfoMapper extends BaseMapper<CwReimbursementInf
     @InterceptorIgnore(tenantLine = "true")
     IPage<RetureListDto> computerList (Page<RetureListDto> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("officeIds")String officeIds);
 
+    //根据流程id获取报销创建人id
+    String getReimbursementCreateUserIdByProcessInstanceId(@Param("id") String id);
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/xml/CwReimbursementInfoMapper.xml

@@ -948,4 +948,10 @@ select
 			del_flag = 0
 			AND attachment_id = #{infoId} and attachment_flag = #{attachmentFlag}
 	</select>
+
+
+	<select id="getReimbursementCreateUserIdByProcessInstanceId" resultType="java.lang.String">
+		select create_by_id from cw_reimbursement_info where del_flag = 0 and proc_ins_id = #{id} limit 1
+	</select>
+
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -1977,4 +1977,15 @@ public class CwReimbursementInfoService {
 //
         return list;
     }
+
+
+    /**
+     * 根据流程id获取报销创建人id
+     * @param id
+     * @return
+     */
+    public String getReimbursementCreateUserIdByProcessInstanceId(String id) {
+        String createUserId = infoMapper.getReimbursementCreateUserIdByProcessInstanceId(id);
+        return createUserId;
+    }
 }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/common/handler/ExtUserTaskActivityBehavior.java

@@ -7,6 +7,9 @@ import com.jeeplus.common.TokenProvider;
 import com.jeeplus.extension.domain.TaskDefExtension;
 import com.jeeplus.extension.service.TaskDefExtensionService;
 import com.jeeplus.extension.service.dto.FlowAssigneeDTO;
+import com.jeeplus.flowable.feign.IAssessApi;
+import com.jeeplus.flowable.feign.IFinanceApi;
+import com.jeeplus.flowable.feign.IZsApi;
 import com.jeeplus.flowable.utils.FlowableUtils;
 import com.jeeplus.flowable.utils.StringUtils;
 import com.jeeplus.sys.feign.IUserApi;
@@ -124,9 +127,36 @@ public class ExtUserTaskActivityBehavior extends UserTaskActivityBehavior {
                         //如果字符串中包含 "currentUserSql:" 则进行如下代码替换和处理
                         if(flowAssignee.getValue ().contains("currentUserSql:")){
                             //对应sql为：select su.* from sys_user_role a left join sys_role sr on sr.id = a.role_id left join sys_user su on su.id = a.user_id left join sys_office so on so.id = su.office_id where sr.en_name= 'bmzr' and so.id = (select office_id from sys_user where id = @currentUser.id)
-                            //用于查询当前登录人的部门主任人员信息
 
                             UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getByToken (currentToken);
+
+                            if(task.getFormKey().equals("/reimbursement/info/ReimbursementForm")){
+                                if(StringUtils.isNotBlank(task.getProcessInstanceId())){
+                                    //根据processInstanceId查询隶属报销中的创建人信息
+                                    String createUserId = SpringUtil.getBean(IAssessApi.class).getReimbursementCreateUserIdByProcessInstanceId(task.getProcessInstanceId());
+                                    if(StringUtils.isNotBlank(createUserId)){
+                                        currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getById (createUserId);
+                                    }
+                                }
+                            }else if(task.getFormKey().equals("/cw/reimbursementApproval/info/ReimbursementForm")){
+
+                                if(StringUtils.isNotBlank(task.getProcessInstanceId())){
+                                    //根据processInstanceId查询隶属报销中的创建人信息
+                                    String createUserId = SpringUtil.getBean(IFinanceApi.class).getReimbursementCreateUserIdByProcessInstanceId(task.getProcessInstanceId());
+                                    if(StringUtils.isNotBlank(createUserId)){
+                                        currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getById (createUserId);
+                                    }
+                                }
+                            }else if(task.getFormKey().equals("/zs/reimbursement/info/ReimbursementForm")){
+
+                                if(StringUtils.isNotBlank(task.getProcessInstanceId())){
+                                    //根据processInstanceId查询隶属报销中的创建人信息
+                                    String createUserId = SpringUtil.getBean(IZsApi.class).getReimbursementCreateUserIdByProcessInstanceId(task.getProcessInstanceId());
+                                    if(StringUtils.isNotBlank(createUserId)){
+                                        currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getById (createUserId);
+                                    }
+                                }
+                            }
                             String sql = flowAssignee.getValue ();
                             if(sql.contains("@currentUser.id")){
                                 //将标志进行去除