|
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
|
|
|
import com.fasterxml.jackson.core.type.TypeReference;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.galaxis.manatee.constant.ChuanYunConstant;
|
|
|
+import com.galaxis.manatee.constant.StringConstant;
|
|
|
import com.galaxis.manatee.dao.*;
|
|
|
import com.galaxis.manatee.entity.chuanyun.data.object.*;
|
|
|
import com.galaxis.manatee.entity.chuanyun.dto.*;
|
|
@@ -108,10 +109,10 @@ public class ChuanyunBasicDataScheduledTask {
|
|
|
*/
|
|
|
@Scheduled(fixedDelay = 3600000L)
|
|
|
private void getDataFromChuanyun() {
|
|
|
- //获取人员-归属公司信息
|
|
|
- getUserCompany();
|
|
|
//获取集团项目数据
|
|
|
getGroupProject();
|
|
|
+ //获取人员-归属公司信息
|
|
|
+ getUserCompany();
|
|
|
//获取用户数据
|
|
|
getUserList();
|
|
|
//支出档案类型
|
|
@@ -222,8 +223,14 @@ public class ChuanyunBasicDataScheduledTask {
|
|
|
*/
|
|
|
private void projectMemberListCheck(ChuanyunGroupProjectDO chuanyunGroupProjectDO){
|
|
|
var objectMapper=new ObjectMapper();
|
|
|
+ //将项目组成员名称拼成字符串
|
|
|
+ String memberString = "";
|
|
|
+ for(int i=0;i<chuanyunGroupProjectDO.getProjectMemberList().length;i++){
|
|
|
+ memberString+=chuanyunGroupProjectDO.getProjectMemberList()[i]+ StringConstant.SEMICOLON;
|
|
|
+ }
|
|
|
//第一步,清除项目负责人、项目经理数据。保证能够触发权限修改流程
|
|
|
GroupProjectMemberListUpdateDTO groupProjectMemberListUpdateDTO=new GroupProjectMemberListUpdateDTO(chuanyunGroupProjectDO);
|
|
|
+ groupProjectMemberListUpdateDTO.setProjectMemberString(memberString);
|
|
|
if(groupProjectMemberListUpdateDTO.getProjectMemberList()!=null&&groupProjectMemberListUpdateDTO.getProjectMemberList().length>0){
|
|
|
groupProjectMemberListUpdateDTO.add();
|
|
|
try {
|
|
@@ -977,6 +984,9 @@ public class ChuanyunBasicDataScheduledTask {
|
|
|
@JsonProperty("F0000034")
|
|
|
private String[] projectMemberList;
|
|
|
|
|
|
+ @JsonProperty("F0000049")
|
|
|
+ private String projectMemberString;
|
|
|
+
|
|
|
public void add(){
|
|
|
String[] newProjectMemberList=new String[projectMemberList.length+1];
|
|
|
System.arraycopy(projectMemberList,0,newProjectMemberList,0,projectMemberList.length);
|