Browse Source

离职申请-项目查询调整

wangqiang 1 year ago
parent
commit
669ee00cd1

+ 1 - 1
jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/factory/FinanceApiFallbackFactory.java

@@ -28,7 +28,7 @@ public class FinanceApiFallbackFactory implements FallbackFactory<IFinanceApi> {
             }
 
             @Override
-            public List<String> getCwProjectData() {
+            public List<String> getCwProjectData(String id) {
                 return null;
             }
 

+ 1 - 1
jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/feign/IFinanceApi.java

@@ -22,7 +22,7 @@ public interface IFinanceApi {
     String getNotFiledYetList();
 
     @GetMapping(value = "/cwProjectRecords/getCwProjectData")
-    List<String> getCwProjectData();
+    List<String> getCwProjectData(@RequestParam(value = "id") String id);
 
     @GetMapping(value = "/cwProjectRecords/getMembersId")
     List<String> getMembersId(String id);

+ 2 - 7
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/controller/CwProjectRecordsController.java

@@ -48,13 +48,8 @@ public class CwProjectRecordsController {
      */
     @ApiLog("查询财务项目信息列表")
     @GetMapping("getCwProjectData")
-    public List<String> getCwProjectData() throws Exception {
-        IPage<CwProjectRecordsDTO> result = new Page<CwProjectRecordsDTO>();
-        result = cwProjectRecordsService.findList (null,null);
-        List<String> idList = new ArrayList<>();
-        result.getRecords().forEach(re->{
-            idList.add(re.getId());
-        });
+    public List<String> getCwProjectData(String id) throws Exception {
+        List<String> idList = cwProjectRecordsService.findAllList (id);
         return idList;
     }
 

+ 4 - 1
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwProjectRecordsMapper.java

@@ -86,5 +86,8 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
      * @param id
      * @return
      */
-    List<String> getMembersId(String id);
+    List<String> getMembersId(@Param("id") String id);
+
+    List<String> findAllList(@Param("id") String id);
+
 }

+ 3 - 0
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -531,6 +531,9 @@
             and project_id = #{id}
         </where>
     </select>
+    <select id="findAllList" resultType="java.lang.String">
+        select id from cw_project_records where create_by_id = #{id} and del_flag=0
+    </select>
 
 
 </mapper>

+ 8 - 0
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -686,4 +686,12 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
 
         cwProjectMembersService.save(members);
     }
+
+    /**
+     * 根据用户id查询所有的项目信息
+     * @return
+     */
+    public List<String> findAllList(String id) {
+        return cwProjectRecordsMapper.findAllList(id);
+    }
 }