Explorar o código

1.立项更新项目组成员

WoNiu %!s(int64=4) %!d(string=hai) anos
pai
achega
f75efbdd7d

+ 0 - 5
src/main/java/com/galaxis/manatee/service/ChuanyunService.java

@@ -39,9 +39,4 @@ public interface ChuanyunService {
      */
     void updateU9Department();
 
-    /**
-     * 立项时更新项目组成员
-     */
-    @Async
-    void updateMember(String param);
 }

+ 43 - 0
src/main/java/com/galaxis/manatee/service/ProjectMemberService.java

@@ -0,0 +1,43 @@
+package com.galaxis.manatee.service;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.galaxis.manatee.dao.ChuanyunGroupProjectDao;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunGroupProjectDO;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunManagerProjectDO;
+import com.galaxis.manatee.manager.ChuanYunManager;
+import com.galaxis.manatee.task.ChuanyunBasicDataScheduledTask;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class ProjectMemberService {
+
+    private final ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask;
+    private final ChuanYunManager chuanYunManager;
+    private final ChuanyunGroupProjectDao chuanyunGroupProjectDao;
+
+    public ProjectMemberService(ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask, ChuanYunManager chuanYunManager, ChuanyunGroupProjectDao chuanyunGroupProjectDao) {
+        this.chuanyunBasicDataScheduledTask = chuanyunBasicDataScheduledTask;
+        this.chuanYunManager = chuanYunManager;
+        this.chuanyunGroupProjectDao = chuanyunGroupProjectDao;
+    }
+
+    @Async
+    public void updateMember(String param){
+        var objectMapper=new ObjectMapper();
+        param=param.substring(14,param.length()-2);
+        var chuanyunFindResponse =  chuanYunManager.find(ChuanyunManagerProjectDO.SCHEMA_CODE,param);
+        if (chuanyunFindResponse.getReturnData()!=null){
+            ChuanyunManagerProjectDO chuanyunManagerProjectDO = objectMapper.convertValue(chuanyunFindResponse.getReturnData().getBizObject(), new TypeReference<>(){});
+            log.info("管理项目"+chuanyunManagerProjectDO);
+            ChuanyunGroupProjectDO chuanyunGroupProjectDO = chuanyunGroupProjectDao.findByProjectCode(chuanyunManagerProjectDO.getSeqNo());
+            chuanyunBasicDataScheduledTask.chuanyunUpdateProjectMemberManually(chuanyunGroupProjectDO);
+            log.info("更新项目组成员成功"+chuanyunGroupProjectDO);
+        }else {
+            log.info("更新项目组成员失败");
+        }
+    }
+}

+ 0 - 16
src/main/java/com/galaxis/manatee/service/impl/ChuanyunServiceImpl.java

@@ -232,22 +232,6 @@ public class ChuanyunServiceImpl implements ChuanyunService {
         }
     }
 
-    @Override
-    public void updateMember(String param) {
-        var objectMapper=new ObjectMapper();
-        param=param.substring(14,param.length()-2);
-        var chuanyunFindResponse =  chuanYunManager.find(ChuanyunManagerProjectDO.SCHEMA_CODE,param);
-        if (chuanyunFindResponse.getReturnData()!=null){
-            ChuanyunManagerProjectDO chuanyunManagerProjectDO = objectMapper.convertValue(chuanyunFindResponse.getReturnData().getBizObject(), new TypeReference<>(){});
-            log.info("管理项目"+chuanyunManagerProjectDO);
-            ChuanyunGroupProjectDO chuanyunGroupProjectDO = chuanyunGroupProjectDao.findByProjectCode(chuanyunManagerProjectDO.getSeqNo());
-            chuanyunBasicDataScheduledTask.chuanyunUpdateProjectMemberManually(chuanyunGroupProjectDO);
-            log.info("更新项目组成员成功"+chuanyunGroupProjectDO);
-        }else {
-            log.info("更新项目组成员失败");
-        }
-    }
-
     /**
      * 更新外部部门名称
      * @param

+ 5 - 2
src/main/java/com/galaxis/manatee/webservice/CountryEndpoint.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.galaxis.manatee.chuanyun_web_service.*;
 import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunWebServiceDTO;
 import com.galaxis.manatee.service.ChuanyunService;
+import com.galaxis.manatee.service.ProjectMemberService;
 import com.galaxis.manatee.task.ChuanyunBasicDataScheduledTask;
 import com.galaxis.manatee.task.ChuanyunHumanResourceScheduledTask;
 import lombok.extern.slf4j.Slf4j;
@@ -26,11 +27,13 @@ public class CountryEndpoint {
 	private final ChuanyunHumanResourceScheduledTask chuanyunHumanResourceScheduledTask;
 	private final ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask;
 	private final ChuanyunService chuanyunService;
+	private final ProjectMemberService projectMemberService;
 
-	public CountryEndpoint(ChuanyunHumanResourceScheduledTask chuanyunHumanResourceScheduledTask, ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask, ChuanyunService chuanyunService) {
+	public CountryEndpoint(ChuanyunHumanResourceScheduledTask chuanyunHumanResourceScheduledTask, ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask, ChuanyunService chuanyunService, ProjectMemberService projectMemberService) {
 		this.chuanyunHumanResourceScheduledTask = chuanyunHumanResourceScheduledTask;
 		this.chuanyunBasicDataScheduledTask = chuanyunBasicDataScheduledTask;
 		this.chuanyunService = chuanyunService;
+		this.projectMemberService = projectMemberService;
 	}
 
 
@@ -72,7 +75,7 @@ public class CountryEndpoint {
 		log.info("开始数据同步");
 		if (request.getMethodName().equals("projectApproval")){
 			log.info("同步项目组成员");
-			chuanyunService.updateMember(request.getParam());
+			projectMemberService.updateMember(request.getParam());
 		}else {
 			chuanyunHumanResourceScheduledTask.getPayrollManually();
 			chuanyunBasicDataScheduledTask.getUserCompanyManually();