差旅报销和普通报销台账接口修改

zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/controller/vo/CommonCostPageReqVO.java

@@ -43,7 +43,7 @@ public class CommonCostPageReqVO extends PageParam {
     private String projectDeptId;
 
     @Schema(description = "项目ID列表")
-    private Set<String> projectIds;
+    private String[] projectIds;
 
     @Schema(description = "费用类型")
     private String costType;

zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/service/CommonCostServiceImpl.java

@@ -248,8 +248,9 @@ public class CommonCostServiceImpl implements CommonCostService {
     @Override
     public PageResult<CommonCostRespVO> getCommonCostPage(CommonCostPageReqVO pageReqVO) {
         Set<String> ids = Collections.emptySet();
-        if(CollectionUtil.isNotEmpty(pageReqVO.getProjectIds())){
-            List<CommonCostDetailDO> detailList = commonCostDetailService.getListByProjectIds(pageReqVO.getProjectIds());
+        Set<String> projectIds = new HashSet<>(Arrays.asList(pageReqVO.getProjectIds()));
+        if(CollectionUtil.isNotEmpty(projectIds)){
+            List<CommonCostDetailDO> detailList = commonCostDetailService.getListByProjectIds(projectIds);
             ids = convertSet(detailList, CommonCostDetailDO::getCommonCostId);
         }
         PageResult<CommonCostDO> pageResult = commonCostDao.getCommonCostPage(pageReqVO, commonService.getDeptCondition(pageReqVO.getDeptId()), ids);
@@ -271,8 +272,9 @@ public class CommonCostServiceImpl implements CommonCostService {
     @Override
     public CommonCostOverviewVO getCommonCostOverview(CommonCostPageReqVO pageReqVO) {
         Set<String> ids = Collections.emptySet();
-        if(CollectionUtil.isNotEmpty(pageReqVO.getProjectIds())){
-            List<CommonCostDetailDO> detailList = commonCostDetailService.getListByProjectIds(pageReqVO.getProjectIds());
+        Set<String> projectIds = new HashSet<>(Arrays.asList(pageReqVO.getProjectIds()));
+        if(CollectionUtil.isNotEmpty(projectIds)){
+            List<CommonCostDetailDO> detailList = commonCostDetailService.getListByProjectIds(projectIds);
             ids = convertSet(detailList, CommonCostDetailDO::getCommonCostId);
         }
         PageResult<CommonCostDO> pageResult = commonCostDao.getCommonCostPage(pageReqVO, commonService.getDeptCondition(pageReqVO.getDeptId()), ids);

zjugis-business/src/main/java/com/zjugis/business/flow/travelcost/controller/vo/TravelCostPageReqVO.java

@@ -43,7 +43,7 @@ public class TravelCostPageReqVO extends PageParam {
     private String projectName;
 
     @Schema(description = "项目IDs")
-    private Set<String> projectIds;
+    private String[] projectIds;
 
     @Schema(description = "费用类型")
     private String costType;