Browse Source

优化调整

“luojun” 6 months ago
parent
commit
4a5b0fdc2d

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

@@ -47,7 +47,7 @@ public class ProjectController {
         Date currentDate = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String dateTime = sdf.format(currentDate);
-        List<Map<String, String>> projectManagementByState = projectPersonService.getProjectListByState(state, dateTime);
+        List<Map<String, String>> projectManagementByState = projectPersonService.getProjectListByState(state, dateTime,number);
         if (projectManagementByState.size() > 0) {
             result.put("code", 200);
             result.put("data", projectManagementByState);
@@ -99,7 +99,7 @@ public class ProjectController {
         }
         Map data = new HashMap();
 
-        data.put("dataList", projectManagementByState);
+        data.put("datalist", projectManagementByState);
         return MessageResult.success().add("data", data);
         //return MessageResult.success().add("dataList", projectManagementByState);
     }
@@ -118,7 +118,7 @@ public class ProjectController {
         }
         List<Map<String, String>> memberManagementcoll = projectPersonService.getMemberManagementInfoByPerobjectId(id);
         Map data = new HashMap();
-        data.put("dataList", memberManagementcoll);
+        data.put("datalist", memberManagementcoll);
         return MessageResult.success().add("data", data);
         //return MessageResult.success().add("dataList", memberManagementcoll);
     }
@@ -207,7 +207,7 @@ public class ProjectController {
         }
         List<Map<String, String>> personAll = projectPersonService.getPersonAll();
         Map data = new HashMap();
-        data.put("dataList", personAll);
+        data.put("datalist", personAll);
         return MessageResult.success().add("data", data);
         //return MessageResult.success().add("dataList", personAll);
     }
@@ -235,7 +235,7 @@ public class ProjectController {
         //    result.put("msg", "未查询到数据!");
         //}
         Map data = new HashMap();
-        data.put("dataList", projectPersonColl);
+        data.put("datalist", projectPersonColl);
         return MessageResult.success().add("data", data);
         //return MessageResult.success().add("dataList", data);
     }

+ 2 - 1
app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/mapper/ProjectMapper.java

@@ -163,10 +163,11 @@ public interface ProjectMapper {
      * @param dateTime
      * @return
      */
-    List<Map<String, String>> getProjectListByState(String state, String dateTime);
+    List<Map<String, String>> getProjectListByState(String state, String dateTime, String personNumber);
 
     /**
      * 选择项目角色列表
+     *
      * @return
      */
     @Select("select\n" +

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

@@ -58,7 +58,8 @@
         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
+        select fid as "id" ,fnumber as "number" ,CFProjectName as "name" from CT_PRO_ProjectManagement
+                                                                         where CFProjectManagerID = (select  id from T_bd_person where fnumber = #{personNumber})
 <!--        where CFExpectedEndTime-->
 <!--        <if test="state==1">-->
 <!--            &gt;=-->

+ 1 - 1
app/workSheetSystem/src/main/java/com/qy/worksheetsystem/service/ProjectPersonService.java

@@ -81,7 +81,7 @@ public interface ProjectPersonService {
      * @param dateTime
      * @return
      */
-    List<Map<String, String>> getProjectListByState(String state,String dateTime);
+    List<Map<String, String>> getProjectListByState(String state,String dateTime,String personNumber);
     /**
      * 选择项目角色列表
      * @return

+ 2 - 2
app/workSheetSystem/src/main/java/com/qy/worksheetsystem/service/impl/ProjectPersonServiceImpl.java

@@ -28,8 +28,8 @@ public class ProjectPersonServiceImpl implements ProjectPersonService {
     }
 
     @Override
-    public List<Map<String, String>> getProjectListByState(String state, String dateTime) {
-        return projectMapper.getProjectListByState(state, dateTime);
+    public List<Map<String, String>> getProjectListByState(String state, String dateTime,String personNumber) {
+        return projectMapper.getProjectListByState(state, dateTime,personNumber);
     }
 
     @Override