|
@@ -1,5 +1,7 @@
|
|
|
package com.qy.worksheetsystem.controller;
|
|
|
|
|
|
+import com.fasterxml.jackson.core.JsonProcessingException;
|
|
|
+import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.qy.worksheetsystem.model.MessageResult;
|
|
|
import com.qy.worksheetsystem.model.MessageResultV2;
|
|
|
import com.qy.worksheetsystem.service.ProjectPersonService;
|
|
@@ -157,7 +159,7 @@ public class ProjectController {
|
|
|
@ApiImplicitParam(name = "projectID", value = "项目ID", required = true, paramType = "query", dataType = "String"),
|
|
|
@ApiImplicitParam(name = "projectRoleID", value = "项目角色", required = true, paramType = "query", dataType = "String"),
|
|
|
})
|
|
|
- public MessageResult addProjectPerson(@RequestHeader("token") String token, String personID, String projectID, String projectRoleID) {
|
|
|
+ public MessageResult addProjectPerson(@RequestHeader("token") String token, String personID, String projectID, String projectRoleID) throws JsonProcessingException {
|
|
|
Map mapParam = new HashMap();
|
|
|
String number = JWTUtil.getNumber(token);
|
|
|
if (StringUtils.isEmpty(number)) {
|
|
@@ -181,23 +183,27 @@ public class ProjectController {
|
|
|
mapParam.put("hrOrgUnit", "00000000-0000-0000-0000-000000000000CCE7AED4");
|
|
|
String id = projectPersonService.getMemberManagementID();
|
|
|
mapParam.put("id", id);
|
|
|
+ ObjectMapper mapper = new ObjectMapper();
|
|
|
+
|
|
|
//获取项目名称和编码
|
|
|
Map<String, String> projectManagementMap = projectPersonService.getProjectManagementInfoBYId(projectID);
|
|
|
String projectName = projectManagementMap.get("projectName");
|
|
|
String projectNumber = projectManagementMap.get("number");
|
|
|
+ System.out.println("projectManagementMap----" + mapper.writeValueAsString(projectManagementMap));
|
|
|
mapParam.put("projectName", projectName);
|
|
|
mapParam.put("projectNumber", projectNumber);
|
|
|
String billNumber = projectNumber + number;
|
|
|
mapParam.put("number", billNumber);
|
|
|
|
|
|
List<Map<String, String>> managementByNumber = projectPersonService.getManagementByNumber(billNumber);
|
|
|
-
|
|
|
+ String mapvalue = mapper.writeValueAsString(mapParam);
|
|
|
+ System.out.println("mapvalue----" + mapvalue);
|
|
|
Map map = new HashMap();
|
|
|
if (managementByNumber.size() <= 0) {
|
|
|
map = projectPersonService.addProjectPerson(mapParam);
|
|
|
} else {
|
|
|
- map.put("code","500");
|
|
|
- map.put("msg","编码重复:"+billNumber);
|
|
|
+ map.put("code", "500");
|
|
|
+ map.put("msg", "编码重复:" + billNumber);
|
|
|
}
|
|
|
return MessageResult.success().add("result", map);
|
|
|
}
|