1

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

@@ -17,6 +17,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.sql.Timestamp;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -114,7 +116,7 @@ public class ProjectController {
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
             @ApiImplicitParam(name = "id", value = "项目id", required = true, paramType = "query", dataType = "String"),
     })
-    public MessageResult getPersonListByProject(@RequestHeader("token") String token, String id) {
+    public MessageResult getPersonListByProject(@RequestHeader("token") String token, String id) throws ParseException {
 
         String number = JWTUtil.getCacheNumber(token);
         if (StringUtils.isEmpty(number)) {
@@ -122,12 +124,23 @@ public class ProjectController {
         }
         List<Map<String, Object>> memberManagementcoll = projectPersonService.getMemberManagementInfoByPerobjectId(id);
         Map<String, Object> map = memberManagementcoll.get(0);
+        String expectedEndTime = map.get("expectedEndTime").toString();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
+        Date parse = sdf.parse(expectedEndTime);
+        int status = 0;
+        if (parse.compareTo(new Date()) >= 0) {
+            status = 1;
+        }
         Map data = new HashMap();
+        for (int i = 0; i < memberManagementcoll.size(); i++) {
+            Map<String, Object> memberMap = memberManagementcoll.get(i);
+            memberMap.put("expectedEndTime", memberMap.get("expectedEndTime").toString());
+        }
         data.put("datalist", memberManagementcoll);
         return MessageResult.success().add("list", memberManagementcoll)
-                .add("projectName", map.get("projectName"));
-                //.add("projectRoleName", map.get("projectRoleName"))
-                //.add("projectRoleId", map.get("projectRoleId"));
+                .add("name", map.get("projectName")).add("status", status);
+        //.add("projectRoleName", map.get("projectRoleName"))
+        //.add("projectRoleId", map.get("projectRoleId"));
         //return MessageResult.success().add("dataList", memberManagementcoll);
     }
 
@@ -138,9 +151,9 @@ public class ProjectController {
 
     })
     public MessageResult enableDisablePerson(@RequestHeader("token") String token, @RequestBody ProjectPersonVo personVo) {
-        String personID =personVo.getPersonID();
-        String projectID=personVo.getProjectID();
-        Boolean state=personVo.getState();
+        String personID = personVo.getPersonID();
+        String projectID = personVo.getProjectID();
+        Boolean state = personVo.getState();
 
         Map resultMap = new HashMap();
         String number = JWTUtil.getCacheNumber(token);
@@ -170,9 +183,9 @@ public class ProjectController {
     })
     public MessageResult addProjectPerson(@RequestHeader("token") String token, @RequestBody ProjectPersonVo personVo) throws JsonProcessingException {
         log.error("addProjectPerson----");
-        String personID=personVo.getPersonID(),
-                projectID=personVo.getProjectID(),
-                projectRoleID=personVo.getProjectRoleID();
+        String personID = personVo.getPersonID(),
+                projectID = personVo.getProjectID(),
+                projectRoleID = personVo.getProjectRoleID();
         Map mapParam = new HashMap();
         String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {

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

@@ -132,21 +132,22 @@ public interface ProjectMapper {
      * @param perobjectId
      * @return
      */
-    @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" +
-            "    projectType.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.CFPROJECTMANAGEMENID\n" +
-            "    left join CT_PRO_ProjectType projectType on projectType.fid = projectRole.CFTypeID " +
-            "where  projectManagement.fid = #{perobjectId}")
+    //@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" +
+    //        "    projectManagement.CFExpectedEndTime as \"expectedEndTime\",\n" +
+    //        "    projectType.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.CFPROJECTMANAGEMENID\n" +
+    //        "    left join CT_PRO_ProjectType projectType on projectType.fid = projectRole.CFTypeID " +
+    //        "where  projectManagement.fid = #{perobjectId}")
     List<Map<String, Object>> getMemberManagementInfoByPerobjectId(@Param("perobjectId") String perobjectId);
 
     /**

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

@@ -2,45 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qy.worksheetsystem.model.mapper.ProjectMapper">
     <insert id="addProjectPerson" parameterType="java.util.Map">
-        insert into
-        CT_PRO_MemberManagement(fid,CFEmployeeID,CFPROJECTMANAGEMENID,
-                                CFProjectRoleID,FCreatorID,FLastUpdateUserID,
-               FCreateTime,FLastUpdateTime,FControlUnitID,
-                                CFState,CFProjectCode,CFProjectName,
-                                FHROrgUnitID,fnumber)
-               values (
-        #{id},
-        #{personID},
-        #{projectID},
-        #{projectRoleID},
-        #{currentUser},
-        #{currentUser},
-        sysdate,
-        sysdate,
-        #{controUnit},
-        #{state},
-        #{projectName},
-        #{projectNumber},
-        #{hrOrgUnit},
-        #{number}
-        )
+        insert into CT_PRO_MemberManagement(fid, CFEmployeeID, CFPROJECTMANAGEMENID,
+                                            CFProjectRoleID, FCreatorID, FLastUpdateUserID,
+                                            FCreateTime, FLastUpdateTime, FControlUnitID,
+                                            CFState, CFProjectCode, CFProjectName,
+                                            FHROrgUnitID, fnumber)
+        values (#{id},
+                #{personID},
+                #{projectID},
+                #{projectRoleID},
+                #{currentUser},
+                #{currentUser},
+                sysdate,
+                sysdate,
+                #{controUnit},
+                #{state},
+                #{projectName},
+                #{projectNumber},
+                #{hrOrgUnit},
+                #{number})
     </insert>
 
-    <select id="getProjectManagementByState"  resultType="java.util.Map">
+    <select id="getProjectManagementByState" resultType="java.util.Map">
 
         select
-        projectManagement.fid as  "id",
+        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.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",
+        FProDayConsumption as "proDayConsumption",
         projectManagement.fnumber as "number",
         projectManagement.FBillState as "billState",
         CFProjectLevel as "projectLevel" ,
@@ -59,9 +56,27 @@
         </if>
         to_date(#{dateTime},'YYYY-MM-DD')
     </select>
-    <select id="getProjectListByState"  resultType="java.util.Map">
+    <select id="getMemberManagementInfoByPerobjectId" resultType="java.util.Map">
+        select projectRole.fid                     as "projectRoleId",
+               projectRole.fname_l2                as "projectRoleName",
+               person.fid                          as "personId",
+               person.Fname_l2                     as "personName",
+               projectManagement.CFProjectName     as "projectName",
+               projectManagement.CFExpectedEndTime as "expectedEndTime",
+               projectType.fname_l2                as "projectTypeName",
+               projectType.fid                     as "projectTypeId",
+               projectType.fnumber                 as "projectTypeNumber"
+        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   
+    </select>
+    <select id="getProjectListByState" resultType="java.util.Map">
         select fid as "id" ,fnumber as "number" ,CFProjectName as "name" from CT_PRO_ProjectManagement
-        where CFProjectManagerID = (select  fid from T_bd_person where fnumber = #{personNumber})
+        where CFProjectManagerID = (select fid from T_bd_person where fnumber = #{personNumber})
         <!--        where CFExpectedEndTime-->
         <!--        <if test="state==1">-->
         <!--            &gt;=-->