“luojun” 1 سال پیش
والد
کامیت
30ff9a6a62

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

@@ -161,8 +161,6 @@ public interface ProjectMapper {
     /**
      * 获取员工有效项目列表
      *
-     * @param state
-     * @param dateTime
      * @return
      */
     List<Map<String, String>> getProjectListByState(String state, String dateTime, String personNumber);
@@ -189,7 +187,7 @@ public interface ProjectMapper {
     @Select("select fname_l2 as \"name\" ,fnumber as \"number\" ,fid as \"id\" from T_BD_PERSON where fid = #{personID}")
     Map<String, String> getPerson(String personID);
 
-@Select("select fid as \"id\",FNAME_L2 as \"name\",FNUMBER as \"number\" from CT_PRO_ProjectType ")
+    @Select("select fid as \"id\",FNAME_L2 as \"name\",FNUMBER as \"number\" from CT_PRO_ProjectType ")
     List<Map<String, String>> getProjectTypeList();
 
 }

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

@@ -120,22 +120,20 @@
         <!--                to_date(#{dateTime},'YYYY-MM-DD')-->
         <!--                  and CFProjectManagerID = (select fid from T_bd_person where fnumber = #{personNumber})-->
 
-        -- 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 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
         projectManagement.fid as "id",
         memberManagement.CFPROJECTCODE as "number",
         memberManagement.CFPROJECTNAME as "name"
         FROM CT_PRO_MemberManagement memberManagement
-        left join CT_PRO_ProjectManagement projectManagement on memberManagement.CFPROJECTMANAGEMENID =
-        projectManagement.fid
-        where CFEMPLOYEEId =(select fid from T_bd_person where fnumber =#{personNumber}) and CFSTATE = 1 and
-        CFPROJECTSTATE in(1)
+        left join CT_PRO_ProjectManagement projectManagement on memberManagement.CFPROJECTMANAGEMENID =projectManagement.fid
+        where CFEMPLOYEEId =(select fid from T_bd_person where fnumber =#{personNumber}) and CFSTATE = 1 and CFPROJECTSTATE in(1)
 
     </select>
 

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

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