|
@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
import com.jeeplus.common.config.Global;
|
|
import com.jeeplus.common.config.Global;
|
|
import com.jeeplus.common.persistence.Page;
|
|
import com.jeeplus.common.persistence.Page;
|
|
import com.jeeplus.common.utils.StringUtils;
|
|
import com.jeeplus.common.utils.StringUtils;
|
|
|
|
+import com.jeeplus.modules.centerservice.enums.TaskAliasEnum;
|
|
import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
|
|
import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
|
|
import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
|
|
import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
|
|
import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
|
|
import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
|
|
@@ -34,9 +35,10 @@ public class ConvertServiceUtil {
|
|
} else if ("cpa".equals(workProjectNotify.getBelongProject())) {
|
|
} else if ("cpa".equals(workProjectNotify.getBelongProject())) {
|
|
if (StringUtils.isNotBlank(workProjectNotify.getType())) {
|
|
if (StringUtils.isNotBlank(workProjectNotify.getType())) {
|
|
if (StringUtils.isNotBlank(cpa_task) && cpa_task.contains(workProjectNotify.getType())) {
|
|
if (StringUtils.isNotBlank(cpa_task) && cpa_task.contains(workProjectNotify.getType())) {
|
|
- // 评估-报销审批
|
|
|
|
- if ("Process_1665383385070".equals(workProjectNotify.getType())) {
|
|
|
|
- workProjectNotify.setType("13");
|
|
|
|
|
|
+ TaskAliasEnum byCpaEnum = TaskAliasEnum.getByCpa(workProjectNotify.getType());
|
|
|
|
+ if (Objects.nonNull(byCpaEnum)) {
|
|
|
|
+ String[] split = byCpaEnum.getCcpmTaskAlias().split(",");
|
|
|
|
+ workProjectNotify.setType(Arrays.asList(split).get(0));
|
|
resp.add(workProjectNotify);
|
|
resp.add(workProjectNotify);
|
|
}
|
|
}
|
|
}
|
|
}
|