修改接口

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ErpOrderInfoController.java

@@ -30,7 +30,7 @@ public class ErpOrderInfoController {
     }
 
     @RequestMapping("/getInfoByProjectIdAndGroupId")
-    public HttpRespMsg getInfoByProjectIdAndGroupId(Integer projectId, Integer groupId, String date, HttpServletRequest request) {
+    public HttpRespMsg getInfoByProjectIdAndGroupId(String projectId, Integer groupId, String date, HttpServletRequest request) {
         return erpOrderInfoService.getInfoByProjectIdAndGroupId(projectId,groupId,date, request);
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ErpOrderInfoMapper.java

@@ -19,5 +19,5 @@ public interface ErpOrderInfoMapper extends BaseMapper<ErpOrderInfo> {
 
     List<ErpOrderInfo> getActiveErpInfoList(@Param("projectId") String projectId, @Param("date") String date);
 
-    List<ErpOrderInfo> getActiveErpInfoListForClean(Integer projectId, String curMonth, String preMonth);
+    List<ErpOrderInfo> getActiveErpInfoListForClean(String projectId, String curMonth, String preMonth);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ErpOrderInfoService.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 
 public interface ErpOrderInfoService extends IService<ErpOrderInfo> {
     HttpRespMsg getInfoByProjectId(String projectId, String date,HttpServletRequest request);
-    HttpRespMsg getInfoByProjectIdAndGroupId(Integer projectId, Integer groupId, String date,HttpServletRequest request);
+    HttpRespMsg getInfoByProjectIdAndGroupId(String projectId, Integer groupId, String date,HttpServletRequest request);
 
     HttpRespMsg getInfoPage(ErpOrderInfo erpOrderInfo, HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ErpOrderInfoServiceImpl.java

@@ -58,7 +58,7 @@ public class ErpOrderInfoServiceImpl extends ServiceImpl<ErpOrderInfoMapper, Erp
     }
 
     @Override
-    public HttpRespMsg getInfoByProjectIdAndGroupId(Integer projectId, Integer groupId,String date, HttpServletRequest request) {
+    public HttpRespMsg getInfoByProjectIdAndGroupId(String projectId, Integer groupId,String date, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         //通过group分组来判断
         TaskGroup taskGroup = taskGroupMapper.selectById(groupId);
@@ -75,7 +75,7 @@ public class ErpOrderInfoServiceImpl extends ServiceImpl<ErpOrderInfoMapper, Erp
             String preMonth = YearMonth.parse(curMonth).minusMonths(1).toString();
             erpOrderInfos = erpOrderInfoMapper.getActiveErpInfoListForClean(projectId, curMonth, preMonth);
         } else {
-            erpOrderInfos = erpOrderInfoMapper.getActiveErpInfoList(""+projectId, date);
+            erpOrderInfos = erpOrderInfoMapper.getActiveErpInfoList(projectId, date);
         }
 
         List<String> orderIds = new ArrayList<>();