更改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java

@@ -38,23 +38,9 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
-
 import javax.validation.Valid;
 import java.util.List;
 
-/**
- * Project: anrui-base(内申请管理) <br/>
- * File: BaseInternalPurchaseFeign.java <br/>
- * Class: com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign <br/>
- * Description: 内购表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-16 13:46:25 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "内购表")
 @FeignClient(
         contextId = "anrui-base-BaseInternalPurchase",
@@ -72,12 +58,12 @@ public interface BaseInternalPurchaseFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody BaseInternalPurchaseDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
@@ -91,6 +77,7 @@ public interface BaseInternalPurchaseFeign {
 
     /**
      * 申请方审批同意、应对方审批同意（除申请方最后一个环节）
+     *
      * @param bvd
      * @return
      */
@@ -100,6 +87,7 @@ public interface BaseInternalPurchaseFeign {
 
     /**
      * 申请方跳应对方的同意
+     *
      * @param bvd
      * @return
      */
@@ -109,6 +97,7 @@ public interface BaseInternalPurchaseFeign {
 
     /**
      * 分公司到事业部同意
+     *
      * @param bvd
      * @return
      */
@@ -138,6 +127,6 @@ public interface BaseInternalPurchaseFeign {
 
     @ApiOperation(value = "移动端调车详情")
     @PostMapping(value = "/getCompanyShunting/{sid}")
-    ResultBean<AppCompanyShuntingVo> getCompanyShunting(@PathVariable("sid")String sid);
+    ResultBean<AppCompanyShuntingVo> getCompanyShunting(@PathVariable("sid") String sid);
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -28,7 +28,6 @@ package com.yxt.anrui.base.biz.baseaccadjapply;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.baseaccadjapply.*;
@@ -37,25 +36,13 @@ import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery;
 import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo;
 import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
 import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh;
-import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo;
-import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo;
-import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
-import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
-import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
 import com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService;
-import com.yxt.anrui.base.biz.baseinternalpurchase.BaseInternalPurchaseService;
 import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
-import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
 import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
@@ -80,7 +67,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
-import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -88,43 +74,24 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
 import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
 import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign;
-import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
 import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
-import com.yxt.common.base.utils.HanZiConverterPinYin;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * Project: anrui-base(调账管理) <br/>
- * File: BaseAccadjApplyService.java <br/>
- * Class: com.yxt.anrui.base.biz.baseaccadjapply.BaseAccadjApplyService <br/>
- * Description: 调账申请表 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-07-07 16:57:24 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMapper, BaseAccadjApply> {
 
@@ -1083,6 +1050,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             return rb.setMsg("参数错误：userSid");
         }
         BaseAccadjApply baseAccadjApply = fetchBySid(query.getBusinessSid());
+        List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
         if (query.getUserSid().equals(baseAccadjApply.getCreateBySid())) {
             FlowTaskVo flowTaskVo = new FlowTaskVo();
             BeanUtil.copyProperties(query, flowTaskVo);
@@ -1092,9 +1060,11 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             }
             Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
             updateFlowFiled(map);
+            for (String purchaseSid : purchaseSids) {
+                baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid, "0");
+            }
             return rb.success().setData(resultBean.getData());
         }
-        List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
         String businessTaskId = baseAccadjApply.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
             if (businessTaskId.equals(query.getTaskId())) {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehrebate;
 
-import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithQuery;
-import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -35,25 +33,11 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.List;
 
-/**
- * Project: anrui-scm(单车返利) <br/>
- * File: ScmVehRebateFeign.java <br/>
- * Class: com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign <br/>
- * Description: 单车返利表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-24 09:01:54 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "单车返利表")
 @FeignClient(
         contextId = "anrui-scm-ScmVehRebate",

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -151,6 +151,54 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         if (StringUtils.isNotBlank(query.getState())) {
             qw.eq("state", query.getState());
         }
+        if (StringUtils.isNotBlank(query.getPalceGenDate())) {
+            qw.eq("palceGenDate", query.getPalceGenDate());
+        }
+        if (StringUtils.isNotBlank(query.getWithholdingDate())) {
+            String withholdingDate = query.getWithholdingDate().replace("年", "-").replace("月", "");
+            qw.eq("withholdingDate", withholdingDate);
+        }
+        if (StringUtils.isNotBlank(query.getUploadState())) {
+            if (query.getUploadState().equals("未上传")) {
+                qw.and(wrapper -> wrapper.eq("uploadDate", "")
+                        .or().isNull("uploadDate")
+                );
+            } else {
+                qw.ne("uploadDate", "");
+                qw.isNotNull("uploadDate");
+            }
+        }
+        if (StringUtils.isNotBlank(query.getIsAdjustment())) {
+            qw.eq("isAdjustment", query.getIsAdjustment());
+        }
+        if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
+            if (query.getIsUploadFinish().equals("是")) {
+                qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
+            } else {
+                qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
+            }
+        }
+        if (StringUtils.isNotBlank(query.getOnceCheckState())) {
+            qw.eq("onceCheckState", query.getOnceCheckState());
+        }
+        if (StringUtils.isNotBlank(query.getSecondUploadState())) {
+            if (query.getSecondUploadState().equals("是")) {
+                qw.isNotNull("secondaryUploadMoney");
+                qw.ne("secondaryUploadMoney", "");
+                qw.ne("secondaryUploadMoney", 0);
+                qw.eq("isAdjustment", "是");
+            } else {
+                qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", ""));
+            }
+        }
+        String uploadStartDate = query.getUploadStartDate();
+        String uploadEndDate = query.getUploadEndDate();
+        qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')").
+                or().
+                apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
+                );
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -391,6 +439,54 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         if (StringUtils.isNotBlank(query.getOnceCheckState())) {
             qw.eq("onceCheckState", query.getOnceCheckState());
         }
+        if (StringUtils.isNotBlank(query.getPalceGenDate())) {
+            qw.eq("palceGenDate", query.getPalceGenDate());
+        }
+        if (StringUtils.isNotBlank(query.getWithholdingDate())) {
+            String withholdingDate = query.getWithholdingDate().replace("年", "-").replace("月", "");
+            qw.eq("withholdingDate", withholdingDate);
+        }
+        if (StringUtils.isNotBlank(query.getUploadState())) {
+            if (query.getUploadState().equals("未上传")) {
+                qw.and(wrapper -> wrapper.eq("uploadDate", "")
+                        .or().isNull("uploadDate")
+                );
+            } else {
+                qw.ne("uploadDate", "");
+                qw.isNotNull("uploadDate");
+            }
+        }
+        if (StringUtils.isNotBlank(query.getIsAdjustment())) {
+            qw.eq("isAdjustment", query.getIsAdjustment());
+        }
+        if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
+            if (query.getIsUploadFinish().equals("是")) {
+                qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
+            } else {
+                qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
+            }
+        }
+        if (StringUtils.isNotBlank(query.getOnceCheckState())) {
+            qw.eq("onceCheckState", query.getOnceCheckState());
+        }
+        if (StringUtils.isNotBlank(query.getSecondUploadState())) {
+            if (query.getSecondUploadState().equals("是")) {
+                qw.isNotNull("secondaryUploadMoney");
+                qw.ne("secondaryUploadMoney", "");
+                qw.ne("secondaryUploadMoney", 0);
+                qw.eq("isAdjustment", "是");
+            } else {
+                qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", ""));
+            }
+        }
+        String uploadStartDate = query.getUploadStartDate();
+        String uploadEndDate = query.getUploadEndDate();
+        qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')").
+                or().
+                apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
+                );
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -473,6 +569,54 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         if (StringUtils.isNotBlank(query.getOnceCheckState())) {
             qw.eq("onceCheckState", query.getOnceCheckState());
         }
+        if (StringUtils.isNotBlank(query.getPalceGenDate())) {
+            qw.eq("palceGenDate", query.getPalceGenDate());
+        }
+        if (StringUtils.isNotBlank(query.getWithholdingDate())) {
+            String withholdingDate = query.getWithholdingDate().replace("年", "-").replace("月", "");
+            qw.eq("withholdingDate", withholdingDate);
+        }
+        if (StringUtils.isNotBlank(query.getUploadState())) {
+            if (query.getUploadState().equals("未上传")) {
+                qw.and(wrapper -> wrapper.eq("uploadDate", "")
+                        .or().isNull("uploadDate")
+                );
+            } else {
+                qw.ne("uploadDate", "");
+                qw.isNotNull("uploadDate");
+            }
+        }
+        if (StringUtils.isNotBlank(query.getIsAdjustment())) {
+            qw.eq("isAdjustment", query.getIsAdjustment());
+        }
+        if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
+            if (query.getIsUploadFinish().equals("是")) {
+                qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
+            } else {
+                qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
+            }
+        }
+        if (StringUtils.isNotBlank(query.getOnceCheckState())) {
+            qw.eq("onceCheckState", query.getOnceCheckState());
+        }
+        if (StringUtils.isNotBlank(query.getSecondUploadState())) {
+            if (query.getSecondUploadState().equals("是")) {
+                qw.isNotNull("secondaryUploadMoney");
+                qw.ne("secondaryUploadMoney", "");
+                qw.ne("secondaryUploadMoney", 0);
+                qw.eq("isAdjustment", "是");
+            } else {
+                qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", ""));
+            }
+        }
+        String uploadStartDate = query.getUploadStartDate();
+        String uploadEndDate = query.getUploadEndDate();
+        qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')").
+                or().
+                apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
+                );
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -54,7 +54,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
@@ -150,10 +149,11 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             qw.like("purchaseSystemName", query.getPurchaseSystemName());
         }
         if (StringUtils.isNotBlank(query.getPalceGenDate())) {
-            qw.like("palceGenDate", query.getPalceGenDate());
+            qw.eq("palceGenDate", query.getPalceGenDate());
         }
         if (StringUtils.isNotBlank(query.getWithholdingDate())) {
-            qw.like("withholdingDate", query.getWithholdingDate());
+            String withholdingDate = query.getWithholdingDate().replace("年", "-").replace("月", "");
+            qw.eq("withholdingDate", withholdingDate);
         }
         if (StringUtils.isNotBlank(query.getUploadState())) {
             if (query.getUploadState().equals("未上传")) {
@@ -166,7 +166,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             }
         }
         if (StringUtils.isNotBlank(query.getIsAdjustment())) {
-            qw.like("isAdjustment", query.getIsAdjustment());
+            qw.eq("isAdjustment", query.getIsAdjustment());
         }
         if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
             if (query.getIsUploadFinish().equals("是")) {
@@ -179,15 +179,15 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             qw.eq("onceCheckState", query.getOnceCheckState());
         }
         if (StringUtils.isNotBlank(query.getSecondUploadState())) {
-            if (query.getSecondUploadState().equals("是")){
+            if (query.getSecondUploadState().equals("是")) {
-                //qw.eq()
+                qw.isNotNull("secondaryUploadMoney");
+                qw.ne("secondaryUploadMoney", "");
+                qw.ne("secondaryUploadMoney", 0);
+                qw.eq("isAdjustment", "是");
+            } else {
+                qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", ""));
             }
         }
-        String createStartTime = query.getCreateStartTime();
-        String createEndTime = query.getCreateEndTime();
-        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
-                );
         String uploadStartDate = query.getUploadStartDate();
         String uploadEndDate = query.getUploadEndDate();
         qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
@@ -196,6 +196,11 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
                 );
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
         qw.orderByDesc("createTime");
         IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -399,6 +404,54 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         if (StringUtils.isNotBlank(query.getUseOrgName())) {
             qw.like("useOrgName", query.getUseOrgName());
         }
+        if (StringUtils.isNotBlank(query.getPalceGenDate())) {
+            qw.eq("palceGenDate", query.getPalceGenDate());
+        }
+        if (StringUtils.isNotBlank(query.getWithholdingDate())) {
+            String withholdingDate = query.getWithholdingDate().replace("年", "-").replace("月", "");
+            qw.eq("withholdingDate", withholdingDate);
+        }
+        if (StringUtils.isNotBlank(query.getUploadState())) {
+            if (query.getUploadState().equals("未上传")) {
+                qw.and(wrapper -> wrapper.eq("uploadDate", "")
+                        .or().isNull("uploadDate")
+                );
+            } else {
+                qw.ne("uploadDate", "");
+                qw.isNotNull("uploadDate");
+            }
+        }
+        if (StringUtils.isNotBlank(query.getIsAdjustment())) {
+            qw.eq("isAdjustment", query.getIsAdjustment());
+        }
+        if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
+            if (query.getIsUploadFinish().equals("是")) {
+                qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
+            } else {
+                qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
+            }
+        }
+        if (StringUtils.isNotBlank(query.getOnceCheckState())) {
+            qw.eq("onceCheckState", query.getOnceCheckState());
+        }
+        if (StringUtils.isNotBlank(query.getSecondUploadState())) {
+            if (query.getSecondUploadState().equals("是")) {
+                qw.isNotNull("secondaryUploadMoney");
+                qw.ne("secondaryUploadMoney", "");
+                qw.ne("secondaryUploadMoney", 0);
+                qw.eq("isAdjustment", "是");
+            } else {
+                qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", ""));
+            }
+        }
+        String uploadStartDate = query.getUploadStartDate();
+        String uploadEndDate = query.getUploadEndDate();
+        qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')").
+                or().
+                apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
+                );
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -484,6 +537,54 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         if (StringUtils.isNotBlank(query.getUseOrgName())) {
             qw.like("useOrgName", query.getUseOrgName());
         }
+        if (StringUtils.isNotBlank(query.getPalceGenDate())) {
+            qw.eq("palceGenDate", query.getPalceGenDate());
+        }
+        if (StringUtils.isNotBlank(query.getWithholdingDate())) {
+            String withholdingDate = query.getWithholdingDate().replace("年", "-").replace("月", "");
+            qw.eq("withholdingDate", withholdingDate);
+        }
+        if (StringUtils.isNotBlank(query.getUploadState())) {
+            if (query.getUploadState().equals("未上传")) {
+                qw.and(wrapper -> wrapper.eq("uploadDate", "")
+                        .or().isNull("uploadDate")
+                );
+            } else {
+                qw.ne("uploadDate", "");
+                qw.isNotNull("uploadDate");
+            }
+        }
+        if (StringUtils.isNotBlank(query.getIsAdjustment())) {
+            qw.eq("isAdjustment", query.getIsAdjustment());
+        }
+        if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
+            if (query.getIsUploadFinish().equals("是")) {
+                qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
+            } else {
+                qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
+            }
+        }
+        if (StringUtils.isNotBlank(query.getOnceCheckState())) {
+            qw.eq("onceCheckState", query.getOnceCheckState());
+        }
+        if (StringUtils.isNotBlank(query.getSecondUploadState())) {
+            if (query.getSecondUploadState().equals("是")) {
+                qw.isNotNull("secondaryUploadMoney");
+                qw.ne("secondaryUploadMoney", "");
+                qw.ne("secondaryUploadMoney", 0);
+                qw.eq("isAdjustment", "是");
+            } else {
+                qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", ""));
+            }
+        }
+        String uploadStartDate = query.getUploadStartDate();
+        String uploadEndDate = query.getUploadEndDate();
+        qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')").
+                or().
+                apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
+                );
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -1606,7 +1707,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())){
+                if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
                     //上传返利金额
                     BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost()));
@@ -2099,7 +2200,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())){
+                if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
                     int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
                     //上传返利金额
                     BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost()));