1

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

@@ -58,8 +58,8 @@ public class SalesOrderController {
     @RequestMapping("/list")
     public HttpRespMsg list(String inchargerId,Integer orderType, String orderName,
                             String orderCode,Integer customId,String businessName,
-                            Integer receivedStatus,String startDate,String endDate, String productCode, Integer pageIndex, Integer pageSize,Integer isDelete){
-        return salesOrderService.getList(inchargerId,orderType,orderName,orderCode,customId,businessName,receivedStatus,startDate,endDate,productCode,pageIndex,pageSize,isDelete);
+                            Integer receivedStatus,String startTime,String endTime, String productCode, Integer pageIndex, Integer pageSize,Integer isDelete){
+        return salesOrderService.getList(inchargerId,orderType,orderName,orderCode,customId,businessName,receivedStatus,startTime,endTime,productCode,pageIndex,pageSize,isDelete);
     }
 
     /**
@@ -285,8 +285,8 @@ public class SalesOrderController {
     * @Date: 2024/5/14
     */
     @RequestMapping("/exportData")
-    public HttpRespMsg exportData(String userId, String orderName,String orderCode, String productCode) throws Exception {
-        return salesOrderService.exportData(userId,orderName,orderCode,productCode);
+    public HttpRespMsg exportData(String userId, String orderName,String orderCode, String productCode,String startTime,String endTime) throws Exception {
+        return salesOrderService.exportData(userId,orderName,orderCode,productCode,startTime,endTime);
     }
 
 

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

@@ -17,11 +17,11 @@ public interface SalesOrderService extends IService<SalesOrder> {
 
     HttpRespMsg getList(String inchargerId,Integer orderType, String orderName,
                         String orderCode,Integer customId,String businessName,
-                        Integer receivedStatus,String startDate,String endDate, String productCode, Integer pageIndex, Integer pageSize,Integer isDelete);
+                        Integer receivedStatus,String startTime,String endTime, String productCode, Integer pageIndex, Integer pageSize,Integer isDelete);
 
     HttpRespMsg importData(MultipartFile multipartFile);
 
-    HttpRespMsg exportData(String userId, String orderName, String orderCode, String productCode) throws Exception;
+    HttpRespMsg exportData(String userId, String orderName, String orderCode, String productCode,String startTime,String endTime) throws Exception;
 
     HttpRespMsg salesKit(Integer queryType,Integer dateType, String startDate, String endDate);
 

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

@@ -94,7 +94,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
     @Override
     public HttpRespMsg getList(String inchargerId,Integer orderType, String orderName,
                                String orderCode,Integer customId,String businessName,
-                               Integer receivedStatus,String startDate,String endDate, String productCode, Integer pageIndex, Integer pageSize,Integer isDelete) {
+                               Integer receivedStatus,String startTime,String endTime, String productCode, Integer pageIndex, Integer pageSize,Integer isDelete) {
         HttpRespMsg msg=new HttpRespMsg();
         User user = userMapper.selectById(request.getHeader("token"));
         List<Department> departments = departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getCompanyId, user.getCompanyId()));
@@ -164,8 +164,8 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                 orderLambdaQueryWrapper.and(wrapper->wrapper.isNull(SalesOrder::getReceivedPayment).or().eq(SalesOrder::getReceivedPayment,0));
             }
         }
-        if(!StringUtils.isEmpty(startDate)&&!StringUtils.isEmpty(endDate)){
-            orderLambdaQueryWrapper.lt(SalesOrder::getOrderStartDate,endDate).gt(SalesOrder::getOrderEndDate,startDate);
+        if(!StringUtils.isEmpty(startTime)&&!StringUtils.isEmpty(endTime)){
+            orderLambdaQueryWrapper.lt(SalesOrder::getOrderStartDate,endTime).gt(SalesOrder::getOrderEndDate,startTime);
         }
         if(!StringUtils.isEmpty(orderName)){
             orderLambdaQueryWrapper.like(SalesOrder::getOrderName,orderName);
@@ -560,7 +560,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
     }
 
     @Override
-    public HttpRespMsg exportData(String userId, String orderName, String orderCode, String productCode) throws Exception {
+    public HttpRespMsg exportData(String userId, String orderName, String orderCode, String productCode,String startTime,String endTime) throws Exception {
         User user = userMapper.selectById(request.getHeader("token"));
         SysForm sysForm = sysFormMapper.selectOne(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCompanyId, user.getCompanyId()).eq(SysForm::getCode, "Order").eq(SysForm::getIsCurrent, 1));
         WxCorpInfo wxCorpInfo = wxCorpInfoService.getOne(new LambdaQueryWrapper<WxCorpInfo>().eq(WxCorpInfo::getCompanyId, user.getCompanyId()));
@@ -586,7 +586,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             }
         }
         dataList.add(titleList);
-        HttpRespMsg respMsg = getList( userId,null, orderName,orderCode,null,null,null,null,null,productCode, null,null,0);
+        HttpRespMsg respMsg = getList( userId,null, orderName,orderCode,null,null,null,startTime,endTime,productCode, null,null,0);
         Map<String, Object> msgData = (Map<String, Object>) respMsg.getData();
         List<SalesOrder> salesOrderList = (List<SalesOrder>) msgData.get("record");
         for (SalesOrder salesOrder : salesOrderList) {