人力资源调整

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

@@ -38,7 +38,7 @@ public class FinanceApiFallbackFactory implements FallbackFactory<IFinanceApi> {
             }
 
             @Override
-            public void insertMembers(String projectId, String membersId) {
+            public void insertMembers(String projectId, String membersId,String userId) {
 
             }
 

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

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

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

@@ -303,7 +303,7 @@ public class HandoverService extends ServiceImpl<HandoverMapper, Handover> {
                 List<String> membersIdList = SpringUtil.getBean(IFinanceApi.class).getMembersId(id);
                 if (!membersIdList.contains(report.getProjectManager())) {
                     //将这个项目经理加入到项目组成员中
-                    SpringUtil.getBean(IFinanceApi.class).insertMembers(id,report.getProjectManager());
+                    SpringUtil.getBean(IFinanceApi.class).insertMembers(id,report.getProjectManager(),userDTO.getId());
                 }
             });
 
@@ -437,7 +437,7 @@ public class HandoverService extends ServiceImpl<HandoverMapper, Handover> {
         workattachment.setUpdateTime(new Date());
         //先查询数据库中是否已经对数据进行保存
         //若未保存，则进行保存，否则直接跳过
-        List<WorkAttachmentInfo> byAttachmentIdAndUrl = SpringUtil.getBean ( IWorkAttachmentApi.class ).getByAttachmentIdAndUrlAndAttachmentFlag(workattachment);
+        List<WorkAttachmentInfo> byAttachmentIdAndUrl = SpringUtil.getBean ( IWorkAttachmentApi.class ).selectListByAttachmentId(workattachment.getAttachmentId());
         if(byAttachmentIdAndUrl.size() == 0){
             Map<String,String> map = new HashMap<>();
             String workAttachment = JSON.toJSONString((workattachment));

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

@@ -131,7 +131,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
                 socialSecurityCardMapper.insert(securityCard);
             }
 
-            if (null == currentToken) {
+            //if (null == currentToken) {
                 //发起员工入职流程
                 Map map = SpringUtil.getBean(IFlowableApi.class).getByNameForFen("员工入职");
                 String procDefId = map.get("id")+"";
@@ -155,9 +155,9 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
                 Map<String, String> newMap = pingMap(procDefId, procDefKey, businessTable, businessId, title, assignee, recordType);
                 allMap.put("入职",newMap);
                 SpringUtil.getBean(IFlowableApi.class).startForFenNew(allMap);
-            } else {
+            /*} else {
                 mapper.insert(report);
-            }
+            }*/
         }
 
         return report;

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/register/service/RegistrationService.java

@@ -380,7 +380,7 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
 
 
 
-            if (null == currentToken) {
+            //if (null == currentToken) {
                 //发起实习登记流程
                 Map map = SpringUtil.getBean(IFlowableApi.class).getByNameForFen("实习登记");
                 String procDefId = map.get("id")+"";
@@ -404,9 +404,9 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
                 Map<String, String> newMap = pingMap(procDefId, procDefKey, businessTable, businessId, title, assignee, recordType);
                 allMap.put("实习",newMap);
                 SpringUtil.getBean(IFlowableApi.class).startForFenNew(allMap);
-            } else {
+            /*} else {
                 mapper.insert(report);
-            }
+            }*/
 
         }
 
@@ -450,8 +450,13 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
      * @return
      */
     public List<Registration> getTimeOutRegisters() {
+        String dictValue = SpringUtil.getBean(IDictApi.class).getDictValue("remind_day", "practice_log_remind_day", "");
+        Integer day = 7;//给个默认值，防止没有字典信息
+        if(StringUtils.isNotBlank(dictValue)){
+            day = Integer.valueOf(dictValue);
+        }
         //获取3天前的时间
-        String threeDayAgo = LocalDateTime.now().plusDays(-3).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String threeDayAgo = LocalDateTime.now().plusDays(-day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         List<Registration> registrations = mapper.getTimeOutRegisters(threeDayAgo);
         return registrations;
     }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/signature/controller/HumanSignatureCallBackController.java

@@ -146,7 +146,7 @@ public class HumanSignatureCallBackController {
                     workattachment.setUpdateTime(new Date());
                     //先查询数据库中是否已经对数据进行保存
                     //若未保存，则进行保存，否则直接跳过
-                    List<WorkAttachmentInfo> byAttachmentIdAndUrl = SpringUtil.getBean ( IWorkAttachmentApi.class ).getByAttachmentIdAndUrlAndAttachmentFlag(workattachment);
+                    List<WorkAttachmentInfo> byAttachmentIdAndUrl = SpringUtil.getBean ( IWorkAttachmentApi.class ).selectListByAttachmentId(workattachment.getAttachmentId());
                     if(byAttachmentIdAndUrl.size() == 0){
                         Map<String,String> map = new HashMap<>();
                         String workAttachment = JSON.toJSONString((workattachment));