优化

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

@@ -97,7 +97,7 @@ public class ProjectController {
             result.put("data", projectManagementByState);
             result.put("msg", "未查询到数据！");
         }
-        return MessageResult.success().add("data", result);
+        return MessageResult.success().add("dataList", projectManagementByState);
     }
 
     @ApiOperation(value = "获取项目里面员工详情", notes = "获取项目里面员工详情")
@@ -113,7 +113,7 @@ public class ProjectController {
             return MessageResult.error("token异常");
         }
         List<Map<String, String>> memberManagementcoll = projectPersonService.getMemberManagementInfoByPerobjectId(id);
-        return MessageResult.success().add("list", memberManagementcoll);
+        return MessageResult.success().add("dataList", memberManagementcoll);
     }
 
     @ApiOperation(value = "获取项目里员工启用或禁用", notes = "获取项目里员工启用或禁用")
@@ -199,7 +199,7 @@ public class ProjectController {
             return MessageResult.error("token异常");
         }
         List<Map<String, String>> personAll = projectPersonService.getPersonAll();
-        return MessageResult.success().add("persons", personAll);
+        return MessageResult.success().add("dataList", personAll);
     }
 
     @ApiOperation(value = "选择项目角色列表", notes = "选择项目角色列表")
@@ -214,17 +214,17 @@ public class ProjectController {
             return MessageResult.error("token异常");
         }
         List<Map<String, String>> data = projectPersonService.getProjectRoleList();
-        if (data.size() > 0) {
-            result.put("code", 200);
-            result.put("data", data);
-            result.put("msg", "查询成功");
-
-        } else {
-            result.put("code", 500);
-            result.put("data", data);
-            result.put("msg", "未查询到数据！");
-        }
-        return MessageResult.success().add("data", result);
+        //if (data.size() > 0) {
+        //    result.put("code", 200);
+        //    result.put("data", data);
+        //    result.put("msg", "查询成功");
+        //
+        //} else {
+        //    result.put("code", 500);
+        //    result.put("data", data);
+        //    result.put("msg", "未查询到数据！");
+        //}
+        return MessageResult.success().add("dataList", data);
     }
 
 }

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

@@ -60,14 +60,14 @@
     </select>
     <select id="getProjectListByState"  resultType="java.util.Map">
         select fid as id ,fnumber as "number" ,CFProjectName as "name" from CT_PRO_ProjectManagement
-<!--        where CFExpectedEndTime-->
-<!--        <if test="state==1">-->
-<!--            &gt;=-->
-<!--        </if>-->
-<!--        <if test="state==0">-->
-<!--            &lt;=-->
-<!--        </if>-->
-<!--        to_date(#{dateTime},'YYYY-MM')-->
+        where CFExpectedEndTime
+        <if test="state==1">
+            &gt;=
+        </if>
+        <if test="state==0">
+            &lt;=
+        </if>
+        to_date(#{dateTime},'YYYY-MM')
     </select>
 
 </mapper>