qingyang_zhang 6 months ago
parent
commit
f835ffa5e9

+ 6 - 2
app/workSheetSystem/src/main/java/com/qy/worksheetsystem/controller/ProjectController.java

@@ -1,6 +1,7 @@
 package com.qy.worksheetsystem.controller;
 
 import com.qy.worksheetsystem.model.MessageResult;
+import com.qy.worksheetsystem.model.MessageResultV2;
 import com.qy.worksheetsystem.service.ProjectPersonService;
 import com.qy.worksheetsystem.util.JWTUtil;
 import com.qy.worksheetsystem.vo.InsertJobWorkingVO;
@@ -32,7 +33,8 @@ public class ProjectController {
     @RequestMapping(value = "/getProjectList", 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 = "month", value = "月份", required = true, 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();
@@ -56,7 +58,9 @@ public class ProjectController {
             result.put("data", projectManagementByState);
             result.put("msg", "未查询到数据!");
         }
-        return MessageResult.success().add("data", result);
+        MessageResultV2 resultV2 = MessageResultV2.success();
+        resultV2.setData( projectManagementByState);
+        return resultV2;
     }
 
     @ApiOperation(value = "获取员工时间范围内项目列表", notes = "获取员工时间范围内项目列表")

+ 9 - 8
app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/mapper/ProjectMapper.xml

@@ -59,14 +59,15 @@
         to_date(#{dateTime},'YYYY-MM-DD')
     </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-DD')
+        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')-->
     </select>
 
 </mapper>