|
|
@@ -135,7 +135,7 @@ public class ZhongcheServiceImpl implements ZhongcheService {
|
|
|
String projectId = UtilMap.getString(formData, "textField_mkkrgg8u");//项目id
|
|
|
String taskId = UtilMap.getString(formData, "textField_mkkrgg8y");//任务id
|
|
|
long dueDate = UtilMap.getLong(formData, "dateField_mn757w7y");//预计完成时间
|
|
|
- List<String> questionTypes = UtilMap.getList(formData, "multiSelectField_mn757w7v");//任务类型
|
|
|
+ List<String> questionTypes = UtilMap.getList(formData, "checkboxField_mp28uz2w");//任务类型
|
|
|
|
|
|
Map taskInfo = tbClient.queryTaskDetail(taskId, null, null).get(0);
|
|
|
|
|
|
@@ -213,31 +213,33 @@ public class ZhongcheServiceImpl implements ZhongcheService {
|
|
|
|
|
|
String parentTaskId = UtilMap.getString(taskInfo, "parentTaskId");
|
|
|
|
|
|
- Map parentTaskInfo = tbClient.queryTaskDetail(parentTaskId, null, null).get(0);
|
|
|
+ if (Strings.isNotBlank(parentTaskId)){
|
|
|
+ Map parentTaskInfo = tbClient.queryTaskDetail(parentTaskId, null, null).get(0);
|
|
|
|
|
|
- String projectId = UtilMap.getString(parentTaskInfo, "projectId");
|
|
|
- String sfcId = UtilMap.getString(parentTaskInfo, "sfcId");
|
|
|
+ String projectId = UtilMap.getString(parentTaskInfo, "projectId");
|
|
|
+ String sfcId = UtilMap.getString(parentTaskInfo, "sfcId");
|
|
|
|
|
|
- //获取项目任务类型
|
|
|
- List<Map> result = searchProjectSfc(projectId);
|
|
|
+ //获取项目任务类型
|
|
|
+ List<Map> result = searchProjectSfc(projectId);
|
|
|
|
|
|
- String sfcId2 = "";//任务(企业)
|
|
|
- String sfcId3 = "";//末级任务(企业)
|
|
|
+ String sfcId2 = "";//任务(企业)
|
|
|
+ String sfcId3 = "";//末级任务(企业)
|
|
|
|
|
|
- for (Map resultMap : result) {
|
|
|
- String name = UtilMap.getString(resultMap, "name");
|
|
|
- String id = UtilMap.getString(resultMap, "id");
|
|
|
+ for (Map resultMap : result) {
|
|
|
+ String name = UtilMap.getString(resultMap, "name");
|
|
|
+ String id = UtilMap.getString(resultMap, "id");
|
|
|
|
|
|
- switch (name){
|
|
|
- case "任务(企业)":sfcId2 = id;break;
|
|
|
- case "末级任务(企业)":sfcId3 = id;break;
|
|
|
- default:break;
|
|
|
+ switch (name){
|
|
|
+ case "任务(企业)":sfcId2 = id;break;
|
|
|
+ case "末级任务(企业)":sfcId3 = id;break;
|
|
|
+ default:break;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- //若父任务任务类型为末级任务(企业),更新为任务(企业)
|
|
|
- if (sfcId.equals(sfcId3)){
|
|
|
- updateTaskSfc(parentTaskId, sfcId2);
|
|
|
+ //若父任务任务类型为末级任务(企业),更新为任务(企业)
|
|
|
+ if (sfcId.equals(sfcId3)){
|
|
|
+ updateTaskSfc(parentTaskId, sfcId2);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return McR.success();
|