优化

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

@@ -34,7 +34,7 @@ public class ProjectController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
             @ApiImplicitParam(name = "month", value = "月份", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "state", value = "项目状态",  paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "state", value = "项目状态", paramType = "query", dataType = "String"),
     })
     public MessageResult getProjectList(@RequestHeader("token") String token, String state) {
         Map result = new HashMap();
@@ -59,7 +59,7 @@ public class ProjectController {
             result.put("msg", "未查询到数据！");
         }
         MessageResultV2 resultV2 = MessageResultV2.success();
-        resultV2.setData( projectManagementByState);
+        resultV2.setData(projectManagementByState);
         return resultV2;
     }
 
@@ -67,7 +67,7 @@ public class ProjectController {
     @RequestMapping(value = "/getProjectByTimeList", method = RequestMethod.GET)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
-            @ApiImplicitParam(name = "state", value = "项目状态",  required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "state", value = "项目状态", required = true, paramType = "query", dataType = "String"),
     })
     public MessageResult getProjectByTimeList(@RequestHeader("token") String token, String state) {
         Map result = new HashMap();
@@ -97,7 +97,11 @@ public class ProjectController {
             result.put("data", projectManagementByState);
             result.put("msg", "未查询到数据！");
         }
-        return MessageResult.success().add("dataList", projectManagementByState);
+        Map data = new HashMap();
+
+        data.put("dataList", projectManagementByState);
+        return MessageResult.success().add("data", data);
+        //return MessageResult.success().add("dataList", projectManagementByState);
     }
 
     @ApiOperation(value = "获取项目里面员工详情", notes = "获取项目里面员工详情")
@@ -113,7 +117,10 @@ public class ProjectController {
             return MessageResult.error("token异常");
         }
         List<Map<String, String>> memberManagementcoll = projectPersonService.getMemberManagementInfoByPerobjectId(id);
-        return MessageResult.success().add("dataList", memberManagementcoll);
+        Map data = new HashMap();
+        data.put("dataList", memberManagementcoll);
+        return MessageResult.success().add("data", data);
+        //return MessageResult.success().add("dataList", memberManagementcoll);
     }
 
     @ApiOperation(value = "获取项目里员工启用或禁用", notes = "获取项目里员工启用或禁用")
@@ -199,7 +206,10 @@ public class ProjectController {
             return MessageResult.error("token异常");
         }
         List<Map<String, String>> personAll = projectPersonService.getPersonAll();
-        return MessageResult.success().add("dataList", personAll);
+        Map data = new HashMap();
+        data.put("dataList", personAll);
+        return MessageResult.success().add("data", data);
+        //return MessageResult.success().add("dataList", personAll);
     }
 
     @ApiOperation(value = "选择项目角色列表", notes = "选择项目角色列表")
@@ -213,7 +223,7 @@ public class ProjectController {
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
-        List<Map<String, String>> data = projectPersonService.getProjectRoleList();
+        List<Map<String, String>> projectPersonColl = projectPersonService.getProjectRoleList();
         //if (data.size() > 0) {
         //    result.put("code", 200);
         //    result.put("data", data);
@@ -224,7 +234,10 @@ public class ProjectController {
         //    result.put("data", data);
         //    result.put("msg", "未查询到数据！");
         //}
-        return MessageResult.success().add("dataList", data);
+        Map data = new HashMap();
+        data.put("dataList", projectPersonColl);
+        return MessageResult.success().add("data", data);
+        //return MessageResult.success().add("dataList", data);
     }
 
 }

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/mapper/ProjectMapper.xml

@@ -48,7 +48,6 @@
         from CT_PRO_ProjectManagement projectManagement
         left join T_BD_Person person on person.fid = projectManagement.CFProjectManagerID
         left join T_org_admin adminOrg on adminOrg.fid = projectManagement.FAdminOrgUnitId
-
         where CFExpectedEndTime
         <if test="state==1">
             &gt;=
@@ -67,7 +66,7 @@
         <if test="state==0">
             &lt;=
         </if>
-        to_date(#{dateTime},'YYYY-MM')
+        to_date(#{dateTime},'YYYY-MM-DD')
     </select>
 
 </mapper>