|
@@ -1,9 +1,11 @@
|
|
package com.malk.aiwei.service.impl;
|
|
package com.malk.aiwei.service.impl;
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.malk.aiwei.server.AWServer;
|
|
import com.malk.aiwei.server.AWServer;
|
|
import com.malk.aiwei.service.AWClint;
|
|
import com.malk.aiwei.service.AWClint;
|
|
|
|
+import com.malk.aiwei.service.AwDingService;
|
|
import com.malk.server.aliwork.YDConf;
|
|
import com.malk.server.aliwork.YDConf;
|
|
import com.malk.server.aliwork.YDParam;
|
|
import com.malk.server.aliwork.YDParam;
|
|
import com.malk.server.common.McException;
|
|
import com.malk.server.common.McException;
|
|
@@ -16,6 +18,7 @@ import com.malk.utils.*;
|
|
import lombok.Synchronized;
|
|
import lombok.Synchronized;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
+import org.checkerframework.checker.units.qual.A;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -35,6 +38,9 @@ public class AWImplClient implements AWClint {
|
|
@Autowired
|
|
@Autowired
|
|
private YDConf ydConf;
|
|
private YDConf ydConf;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private AwDingService awDingService;
|
|
|
|
+
|
|
// 项目主数据表
|
|
// 项目主数据表
|
|
String _matchFormUuid(String code) {
|
|
String _matchFormUuid(String code) {
|
|
Map<String, String> formUuid = UtilMap.empty();
|
|
Map<String, String> formUuid = UtilMap.empty();
|
|
@@ -465,12 +471,14 @@ public class AWImplClient implements AWClint {
|
|
String projectId = UtilMap.getString(formData, "textField_lqxtykce");
|
|
String projectId = UtilMap.getString(formData, "textField_lqxtykce");
|
|
log.info("项目主数据, {}, {}", projectId, formData);
|
|
log.info("项目主数据, {}, {}", projectId, formData);
|
|
if (StringUtils.isBlank(projectId)) {
|
|
if (StringUtils.isBlank(projectId)) {
|
|
|
|
+ Map upMap=UtilMap.map("textField_lqxtykce", projectId);
|
|
|
|
+ awDingService.saveGroup(upMap,formData);
|
|
// 通过模板创建项目, 创建项目并更新项目TB项目ID
|
|
// 通过模板创建项目, 创建项目并更新项目TB项目ID
|
|
Map result = tbClient.projectCreateWithTemplate(projectCode, templateId, tbConf.getOperatorId());
|
|
Map result = tbClient.projectCreateWithTemplate(projectCode, templateId, tbConf.getOperatorId());
|
|
projectId = UtilMap.getString(result, "id");
|
|
projectId = UtilMap.getString(result, "id");
|
|
ydClient.operateData(YDParam.builder()
|
|
ydClient.operateData(YDParam.builder()
|
|
.formInstanceId(UtilMap.getString(formData, "formInstanceId"))
|
|
.formInstanceId(UtilMap.getString(formData, "formInstanceId"))
|
|
- .updateFormDataJson(JSON.toJSONString(UtilMap.map("textField_lqxtykce", projectId)))
|
|
|
|
|
|
+ .updateFormDataJson(JSON.toJSONString(upMap))
|
|
.build(), YDConf.FORM_OPERATION.update);
|
|
.build(), YDConf.FORM_OPERATION.update);
|
|
}
|
|
}
|
|
_syncProjectRole(formData, projectId);
|
|
_syncProjectRole(formData, projectId);
|