1

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

@@ -86,7 +86,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.getProjectManagementByState(state, dateTime);
+        List<Map<String, String>> projectManagementByState = projectPersonService.getProjectManagementByState(state, dateTime,number);
         if (projectManagementByState.size() > 0) {
             for (int i = 0; i < projectManagementByState.size(); i++) {
                 Map<String, String> projectManagement = projectManagementByState.get(i);

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

@@ -156,7 +156,7 @@ public interface ProjectMapper {
      * @param state
      * @return
      */
-    List<Map<String, String>> getProjectManagementByState(String state, String dateTime);
+    List<Map<String, String>> getProjectManagementByState(String state, String dateTime, String personNumber);
 
     /**
      * 获取员工有效项目列表

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

@@ -25,6 +25,36 @@
 
     <select id="getProjectManagementByState" resultType="java.util.Map">
 
+        <!--        select-->
+        <!--        projectManagement.fid as "id",-->
+        <!--        projectManagement.CFProjectName as "projectName",-->
+        <!--        projectManagement.CFExpectedStartTime as "expectedStartTime",-->
+        <!--        projectManagement.CFExpectedEndTime as "expectedEndTime",-->
+        <!--        person.fid as "personId",-->
+        <!--        person.Fname_l2 as "personName",-->
+        <!--        person.Fnumber as "personNumber",-->
+        <!--        CFTotalPersonDays as "totalPersonDays",-->
+        <!--        CFCostAmount as "costAmount",-->
+        <!--        CFNotes as "notes",-->
+        <!--        FWorkerDaysReported as "workerDaysReported",-->
+        <!--        FProDayConsumption as "proDayConsumption",-->
+        <!--        projectManagement.fnumber as "number",-->
+        <!--        projectManagement.FBillState as "billState",-->
+        <!--        CFProjectLevel as "projectLevel" ,-->
+        <!--        CFProjectState as "projectState",-->
+        <!--        CFBeingChanged as "beingChanged" ,-->
+        <!--        CFChangedManDays as "changedManDays"-->
+        <!--        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;=-->
+        <!--        </if>-->
+        <!--        <if test="state==0">-->
+        <!--            &lt;=-->
+        <!--        </if>-->
+        <!--        to_date(#{dateTime},'YYYY-MM-DD')-->
         select
         projectManagement.fid as "id",
         projectManagement.CFProjectName as "projectName",
@@ -33,19 +63,21 @@
         person.fid as "personId",
         person.Fname_l2 as "personName",
         person.Fnumber as "personNumber",
-        CFTotalPersonDays as "totalPersonDays",
-        CFCostAmount as "costAmount",
-        CFNotes as "notes",
-        FWorkerDaysReported as "workerDaysReported",
-        FProDayConsumption as "proDayConsumption",
+        projectManagement.CFTotalPersonDays as "totalPersonDays",
+        projectManagement.CFCostAmount as "costAmount",
+        projectManagement.CFNotes as "notes",
+        projectManagement.FWorkerDaysReported as "workerDaysReported",
+        projectManagement.FProDayConsumption as "proDayConsumption",
         projectManagement.fnumber as "number",
         projectManagement.FBillState as "billState",
-        CFProjectLevel as "projectLevel" ,
-        CFProjectState as "projectState",
-        CFBeingChanged as "beingChanged" ,
-        CFChangedManDays as "changedManDays"
-        from CT_PRO_ProjectManagement projectManagement
-        left join T_BD_Person person on person.fid = projectManagement.CFProjectManagerID
+        projectManagement.CFProjectLevel as "projectLevel" ,
+        projectManagement.CFProjectState as "projectState",
+        projectManagement.CFBeingChanged as "beingChanged" ,
+        projectManagement.CFChangedManDays as "changedManDays"
+        from CT_PRO_MemberManagement memberManagement
+        left join CT_PRO_ProjectManagement projectManagement on memberManagement.CFPROJECTMANAGEMENID =
+        projectManagement.fid
+        left join T_BD_Person person on person.fid = memberManagement.CFEMPLOYEEID
         left join T_org_admin adminOrg on adminOrg.fid = projectManagement.FAdminOrgUnitId
         where CFExpectedEndTime
         <if test="state==1">
@@ -55,6 +87,7 @@
             &lt;=
         </if>
         to_date(#{dateTime},'YYYY-MM-DD')
+        and person.fnumber = #{personNumber}
     </select>
     <select id="getMemberManagementInfoByPerobjectId" resultType="java.util.Map">
         select projectRole.fid                     as "projectRoleId",
@@ -67,13 +100,13 @@
                projectType.fname_l2                as "projectTypeName",
                projectType.fid                     as "projectTypeId",
                projectType.fnumber                 as "projectTypeNumber"
-        from CT_PRO_MemberManagement memberManagement
+            from CT_PRO_MemberManagement memberManagement
                  left join CT_PRO_ProjectRole projectRole on projectRole.fid = memberManagement.CFProjectRoleID
-                 left join T_BD_person person on person.fid = memberManagement.CFEmployeeID
-                 left join CT_PRO_ProjectManagement projectManagement
-                           on projectManagement.fid = memberManagement.CFPROJECTMANAGEMENID
-                 left join CT_PRO_ProjectType projectType on projectType.fid = projectRole.CFTypeID
-        where projectManagement.fid = #{perobjectId} order by  projectType.fnumber
+            left join T_BD_person person on person.fid = memberManagement.CFEmployeeID
+            left join CT_PRO_ProjectManagement projectManagement
+            on projectManagement.fid = memberManagement.CFPROJECTMANAGEMENID
+            left join CT_PRO_ProjectType projectType on projectType.fid =memberManagement.CFPTYPEID
+        where projectManagement.fid = #{perobjectId}  order by  projectType.fnumber ,projectRole.fnumber ,projectManagement.CFEXPECTEDENDTIME desc
     </select>
     <select id="getProjectListByState" resultType="java.util.Map">
         <!--        select fid as "id" ,fnumber as "number" ,CFProjectName as "name" from CT_PRO_ProjectManagement-->
@@ -87,9 +120,10 @@
         <!--                to_date(#{dateTime},'YYYY-MM-DD')-->
         <!--                  and CFProjectManagerID = (select fid from T_bd_person where fnumber = #{personNumber})-->
 
-        SELECT fid as "id" ,
+        SELECT CFPROJECTMANAGEMENID as "id" ,
         CFPROJECTCODE as "funumber" ,
         CFPROJECTNAME as "name"
+        fid as "memberManagementId"
         FROM CT_PRO_MemberManagement
         where CFEMPLOYEEId =(select fid from T_bd_person where fnumber =#{personNumber})
     </select>

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

@@ -74,7 +74,7 @@ public interface ProjectPersonService {
      * @param state
      * @return
      */
-    List<Map<String, String>> getProjectManagementByState(String state, String dateTime);
+    List<Map<String, String>> getProjectManagementByState(String state, String dateTime, String personNumber);
 
     /**
      * 获取员工有效项目列表

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

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