提交

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/controller/ProjectController.java

@@ -7,6 +7,7 @@ import com.qy.worksheetsystem.model.MessageResultV2;
 import com.qy.worksheetsystem.service.ProjectPersonService;
 import com.qy.worksheetsystem.util.JWTUtil;
 import com.qy.worksheetsystem.vo.InsertJobWorkingVO;
+import com.qy.worksheetsystem.vo.ProjectPersonVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -134,11 +135,13 @@ public class ProjectController {
     @RequestMapping(value = "/enableDisablePerson", method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
-            @ApiImplicitParam(name = "personID", value = "员工ID", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "projectID", value = "项目ID", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "state", value = "true启用，false禁用", required = true, paramType = "query", dataType = "Boolean"),
+
     })
-    public MessageResult enableDisablePerson(@RequestHeader("token") String token, String personID, String projectID, Boolean state) {
+    public MessageResult enableDisablePerson(@RequestHeader("token") String token, @RequestBody ProjectPersonVo personVo) {
+        String personID =personVo.getPersonID();
+        String projectID=personVo.getProjectID();
+        Boolean state=personVo.getState();
+
         Map resultMap = new HashMap();
         String number = JWTUtil.getCacheNumber(token);
         if (StringUtils.isEmpty(number)) {
@@ -164,12 +167,12 @@ public class ProjectController {
     @RequestMapping(value = "/addProjectPerson", method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
-            @ApiImplicitParam(name = "personID", value = "员工ID", required = true, paramType = "query", dataType = "String"),
-            @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) throws JsonProcessingException {
+    public MessageResult addProjectPerson(@RequestHeader("token") String token, @RequestBody ProjectPersonVo personVo) throws JsonProcessingException {
         log.error("addProjectPerson----");
+        String personID=personVo.getPersonID(),
+                projectID=personVo.getProjectID(),
+                projectRoleID=personVo.getProjectRoleID();
         Map mapParam = new HashMap();
         String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/service/impl/PersonWorkServiceImpl.java

@@ -79,7 +79,7 @@ public class PersonWorkServiceImpl implements PersonWorkService {
                 billMap.put("fillingEndDate", endDate);
                 billMap.put("adminOrg", person.get("adminOrgId"));
                 billMap.put("hrOrgUnit", person.get("hrOrgUnitID"));
-                billMap.put("billState", Integer.parseInt(jobWork.getState())-1);
+                billMap.put("billState", jobWork.getState());
                 billMap.put("number", number);
                 billMap.put("CU", person.get("controlUnitID"));
                 Date createTime = new Date();

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/vo/ProjectPersonVo.java

@@ -0,0 +1,11 @@
+package com.qy.worksheetsystem.vo;
+
+import lombok.Data;
+
+@Data
+public class ProjectPersonVo {
+    private String personID;
+    private String projectID;
+    private String projectRoleID;
+    private Boolean state;
+}