|
@@ -23,6 +23,7 @@ import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+
|
|
|
@Slf4j
|
|
|
@RestController
|
|
|
@RequestMapping("/work/project/")
|
|
@@ -161,6 +162,7 @@ public class ProjectController {
|
|
|
@ApiImplicitParam(name = "projectRoleID", value = "项目角色", required = true, paramType = "query", dataType = "String"),
|
|
|
})
|
|
|
public MessageResult addProjectPerson(@RequestHeader("token") String token, String personID, String projectID, String projectRoleID) throws JsonProcessingException {
|
|
|
+ log.error("addProjectPerson----");
|
|
|
Map mapParam = new HashMap();
|
|
|
String number = JWTUtil.getNumber(token);
|
|
|
if (StringUtils.isEmpty(number)) {
|
|
@@ -185,7 +187,7 @@ public class ProjectController {
|
|
|
String id = projectPersonService.getMemberManagementID();
|
|
|
mapParam.put("id", id);
|
|
|
ObjectMapper mapper = new ObjectMapper();
|
|
|
-
|
|
|
+ log.error("projectID----" + projectID);
|
|
|
//获取项目名称和编码
|
|
|
//Map<String, String> projectManagementMap = projectPersonService.getProjectManagementInfoBYId(projectID);
|
|
|
List<Map<String, String>> projectManagementlist = projectPersonService.getProjectManagementInfoBYId(projectID);
|
|
@@ -195,7 +197,7 @@ public class ProjectController {
|
|
|
log.error("projectManagementMap----" + mapper.writeValueAsString(projectManagementMap));
|
|
|
mapParam.put("projectName", projectName);
|
|
|
mapParam.put("projectNumber", projectNumber);
|
|
|
- String billNumber = projectNumber + number;
|
|
|
+ String billNumber = projectNumber + "-"+number;
|
|
|
mapParam.put("number", billNumber);
|
|
|
List<Map<String, String>> managementByNumber = projectPersonService.getManagementByNumber(billNumber);
|
|
|
String mapvalue = mapper.writeValueAsString(mapParam);
|