修改 项目管理接口

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

@@ -77,6 +77,13 @@ public class ProjectController {
         String dateTime = sdf.format(currentDate);
         List<Map<String, String>> projectManagementByState = projectPersonService.getProjectManagementByState(state, dateTime);
         if (projectManagementByState.size() > 0) {
+            for (int i = 0; i < projectManagementByState.size(); i++) {
+                Map<String, String> projectManagement = projectManagementByState.get(i);
+                String expectedStartTime = String.valueOf(projectManagement.get("expectedStartTime"));
+                String expectedEndTime = String.valueOf(projectManagement.get("expectedEndTime"));
+                projectManagement.put("expectedStartTime", expectedStartTime);
+                projectManagement.put("expectedEndTime", expectedEndTime);
+            }
             result.put("code", 200);
             result.put("data", projectManagementByState);
             result.put("msg", "查询成功");

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

@@ -131,18 +131,21 @@ public interface ProjectMapper {
      * @param perobjectId
      * @return
      */
-    @Select("\n" +
-            "select \n" +
-            "projectRole.fid as projectRoleId,\n" +
-            "projectRole.fname_l2 as projectRoleName,\n" +
-            "person.fid as personId,\n" +
-            "person.Fname_l2 as persnName,\n" +
-            "projectManagement.CFProjectName as projectName\n" +
-            " from CT_PRO_MemberManagement memberManagement\n" +
-            "left join  CT_PRO_ProjectRole projectRole on projectRole.fid = memberManagement.CFProjectRoleID\n" +
-            "left join T_BD_person person on person.fid = memberManagement.CFEmployeeID\n" +
-            "left join CT_PRO_ProjectManagement projectManagement on projectManagement.fid =memberManagement.CFProjectManagementID\n" +
-            "where CFProjectManagementID = #{perobjectId}\n")
+    @Select("select\n" +
+            "    projectRole.fid as projectRoleId,\n" +
+            "    projectRole.fname_l2 as projectRoleName,\n" +
+            "    person.fid as personId,\n" +
+            "    person.Fname_l2 as personName,\n" +
+            "    projectManagement.CFProjectName as projectName,\n" +
+            "\tprojectType.fname_l2 as projectTypeName,\n" +
+            "projectType.fid as projectTypeId,\n" +
+            "projectType.fnumber  as projectTypeNumber\n" +
+            "from CT_PRO_MemberManagement memberManagement\n" +
+            "    left join CT_PRO_ProjectRole projectRole on projectRole.fid = memberManagement.CFProjectRoleID\n" +
+            "    left join T_BD_person person on person.fid = memberManagement.CFEmployeeID\n" +
+            "    left join CT_PRO_ProjectManagement projectManagement on projectManagement.fid =memberManagement.CFProjectManagementID\n" +
+            "left join CT_PRO_ProjectType projectType on projectType.fid = projectRole.CFTypeID\n" +
+            "where CFProjectManagementID = #{perobjectId}")
     List<Map<String, String>> getMemberManagementInfoByPerobjectId(@Param("perobjectId") String perobjectId);
 
     /**

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

@@ -25,7 +25,31 @@
     </insert>
 
     <select id="getProjectManagementByState"  resultType="java.util.Map">
-        select * from CT_PRO_ProjectManagement where CFExpectedEndTime
+
+        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>