代码调整

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

@@ -25,8 +25,8 @@ public interface IFinanceApi {
     List<String> getCwProjectData(@RequestParam(value = "id") String id);
 
     @GetMapping(value = "/cwProjectRecords/getMembersId")
-    List<String> getMembersId(String id);
+    List<String> getMembersId(@RequestParam(value = "id")String id);
 
     @RequestMapping(value = "/cwProjectRecords/insertMembers", method = RequestMethod.POST)
-    void insertMembers(String projectId,String membersId);
+    void insertMembers(@RequestParam(value = "projectId")String projectId,@RequestParam(value = "membersId")String membersId);
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/handover/service/HandoverService.java

@@ -294,8 +294,6 @@ public class HandoverService extends ServiceImpl<HandoverMapper, Handover> {
             handoverImprest.setType("2");
             handoverImprestService.saveOrUpdate(handoverImprest);
 
-            SpringUtil.getBean(IFlowableApi.class).startForFenNew(allMap);
-
             //将交接人添加到离职人员所有项目的项目组中
             //查出所有的项目id
             List<String> ids = SpringUtil.getBean(IFinanceApi.class).getCwProjectData(report.getCreateById());
@@ -309,6 +307,7 @@ public class HandoverService extends ServiceImpl<HandoverMapper, Handover> {
                 }
             });
 
+            SpringUtil.getBean(IFlowableApi.class).startForFenNew(allMap);
 
 
         }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRiceCardService.java

@@ -60,6 +60,7 @@ public class EnrollmentRiceCardService extends ServiceImpl<EnrollmentRiceCardMap
 
             EnrollmentRiceCard report = riceCardMapper.getById(registration.getId());
             if (report != null){
+                registration.setProcessDefinitionId(report.getProcessDefinitionId());
                 registration.setEnrollmentRegistrationId(report.getEnrollmentRegistrationId());
                 return update(registration);
             }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/logwrite/mapper/RegistrationWorkLogMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
  * @date 2023-09-15 10:00
  */
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface RegistrationWorkLogMapper extends BaseMapper<RegistrationWorkLog> {
 
     /**

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/logwrite/service/RegistrationWorkLogService.java

@@ -64,7 +64,7 @@ public class RegistrationWorkLogService extends ServiceImpl<RegistrationWorkLogM
             queryWrapper.eq("a.type",projectReportData.getType());
         }
         if (StringUtils.isNotBlank(projectReportData.getWorkName())){
-            queryWrapper.eq("a.work_name",projectReportData.getWorkName());
+            queryWrapper.like("a.work_name",projectReportData.getWorkName());
         }
         if (ObjectUtil.isNotEmpty(projectReportData.getCreateDates())) {
             queryWrapper.between("start_time", projectReportData.getCreateDates()[0], projectReportData.getCreateDates()[1])

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/reimburseRegister/mapper/xml/ReimburseRegisterMapper.xml

@@ -50,7 +50,7 @@
         su.mobile as mobilePhone
         from human_resources_practice_reimburse_register a
         LEFT JOIN act_ru_task d ON a.proc_ins_id = d.PROC_INST_ID_
-        sys_user su on a.create_by_id = su.id
+        LEFT JOIN sys_user su on a.create_by_id = su.id
         where a.id = #{id} and a.del_flag = '0'
     </select>
 </mapper>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/reimburseRegister/service/ReimburseRegisterService.java

@@ -59,6 +59,8 @@ public class ReimburseRegisterService extends ServiceImpl<ReimburseRegisterMappe
             ReimburseRegister report = registerMapper.getById(registration.getId());
             if (report != null){
                 registration.setCreateById(report.getCreateById());
+                registration.setMobilePhone(report.getMobilePhone());
+                registration.setCreateName(report.getCreateName());
                 return update(registration);
             }
         }