查询
@@ -238,6 +274,26 @@ export default {
FormLoading: false,
listLoading: false,
rebateType_list: [],
+ uploadState_list: [
+ {
+ dictKey: '1',
+ dictValue: '已上传'
+ },
+ {
+ dictKey: '0',
+ dictValue: '未上传'
+ }
+ ],
+ whether_list: [
+ {
+ dictKey: '1',
+ dictValue: '是'
+ },
+ {
+ dictKey: '0',
+ dictValue: '否'
+ }
+ ],
state_list: [
{
dictKey: '0',
@@ -272,6 +328,14 @@ export default {
vinNo: '',
vehModelName: '',
brandName: '',
+ palceGenDate: '',
+ withholdingDate: '',
+ uploadStartDate: '',
+ uploadEndDate: '',
+ uploadState: '',
+ isAdjustment: '',
+ isUploadFinish: '',
+ secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
@@ -399,6 +463,14 @@ export default {
vinNo: '',
vehModelName: '',
brandName: '',
+ palceGenDate: '',
+ withholdingDate: '',
+ uploadStartDate: '',
+ uploadEndDate: '',
+ uploadState: '',
+ isAdjustment: '',
+ isUploadFinish: '',
+ secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
index d5892e58d6..7e2dadb519 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
@@ -34,9 +34,40 @@
至
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
@@ -83,7 +114,7 @@
-
+
@@ -410,6 +441,26 @@ export default {
sids: [],
FormLoading: false,
rebateType_list: [],
+ uploadState_list: [
+ {
+ dictKey: '1',
+ dictValue: '已上传'
+ },
+ {
+ dictKey: '0',
+ dictValue: '未上传'
+ }
+ ],
+ whether_list: [
+ {
+ dictKey: '1',
+ dictValue: '是'
+ },
+ {
+ dictKey: '0',
+ dictValue: '否'
+ }
+ ],
state_list: [
{
dictKey: '0',
@@ -436,6 +487,14 @@ export default {
onceCheckState: '',
createEndTime: '',
createStartTime: '',
+ palceGenDate: '',
+ withholdingDate: '',
+ uploadStartDate: '',
+ uploadEndDate: '',
+ uploadState: '',
+ isAdjustment: '',
+ isUploadFinish: '',
+ secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
@@ -583,6 +642,14 @@ export default {
onceCheckState: '',
createEndTime: '',
createStartTime: '',
+ palceGenDate: '',
+ withholdingDate: '',
+ uploadStartDate: '',
+ uploadEndDate: '',
+ uploadState: '',
+ isAdjustment: '',
+ isUploadFinish: '',
+ secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
index 1df8cd08c9..d871a689c5 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
@@ -22,6 +22,17 @@
至
+
+
+
+
+
+
+
+
+ 至
+
+
@@ -30,11 +41,36 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
查询
@@ -213,6 +249,26 @@ export default {
FormLoading: false,
listLoading: false,
rebateType_list: [],
+ uploadState_list: [
+ {
+ dictKey: '1',
+ dictValue: '已上传'
+ },
+ {
+ dictKey: '0',
+ dictValue: '未上传'
+ }
+ ],
+ whether_list: [
+ {
+ dictKey: '1',
+ dictValue: '是'
+ },
+ {
+ dictKey: '0',
+ dictValue: '否'
+ }
+ ],
state_list: [
{
dictKey: '0',
@@ -254,6 +310,14 @@ export default {
createOrgName: '',
purchaseSystemName: '',
brandName: '',
+ palceGenDate: '',
+ withholdingDate: '',
+ uploadStartDate: '',
+ uploadEndDate: '',
+ uploadState: '',
+ isAdjustment: '',
+ isUploadFinish: '',
+ secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
@@ -385,6 +449,14 @@ export default {
createOrgName: '',
purchaseSystemName: '',
brandName: '',
+ palceGenDate: '',
+ withholdingDate: '',
+ uploadStartDate: '',
+ uploadEndDate: '',
+ uploadState: '',
+ isAdjustment: '',
+ isUploadFinish: '',
+ secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
From 07c92aaa1bde92a0bfb5c3348183bfebd9581e8e Mon Sep 17 00:00:00 2001
From: ligaode
Date: Tue, 25 Feb 2025 15:39:40 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BaseInternalPurchaseFeign.java | 23 +--
.../BaseAccadjApplyService.java | 38 +----
.../api/scmvehrebate/ScmVehRebateFeign.java | 16 --
.../ScmSpecialRebateService.java | 144 ++++++++++++++++++
.../biz/scmvehrebate/ScmVehRebateService.java | 127 +++++++++++++--
5 files changed, 268 insertions(+), 80 deletions(-)
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java
index 383ab4681d..a88b1278f5 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java
+++ b/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(内申请管理)
- * File: BaseInternalPurchaseFeign.java
- * Class: com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign
- * Description: 内购表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-16 13:46:25
- *
- * @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 getCompanyShunting(@PathVariable("sid")String sid);
+ ResultBean getCompanyShunting(@PathVariable("sid") String sid);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
index e36c63305a..018357a735 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
+++ b/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(调账管理)
- * File: BaseAccadjApplyService.java
- * Class: com.yxt.anrui.base.biz.baseaccadjapply.BaseAccadjApplyService
- * Description: 调账申请表 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-07-07 16:57:24
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Service
public class BaseAccadjApplyService extends MybatisBaseService {
@@ -1083,6 +1050,7 @@ public class BaseAccadjApplyService extends MybatisBaseService 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 map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
+ for (String purchaseSid : purchaseSids) {
+ baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid, "0");
+ }
return rb.success().setData(resultBean.getData());
}
- List purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
String businessTaskId = baseAccadjApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
index 55cf9d34c4..5fdc75f1ea 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
+++ b/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(单车返利)
- * File: ScmVehRebateFeign.java
- * Class: com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign
- * Description: 单车返利表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-08-24 09:01:54
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "单车返利表")
@FeignClient(
contextId = "anrui-scm-ScmVehRebate",
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
index a78532c70b..2862ce2998 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
+++ b/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 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 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 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')").
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
index 2c4fc1208c..7c74d53b98 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
+++ b/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 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= 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 page = PagerUtil.queryToPage(pq);
IPage pagging = baseMapper.selectPageVo(page, qw);
@@ -399,6 +404,54 @@ public class ScmVehRebateService extends MybatisBaseService 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 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
Date: Tue, 25 Feb 2025 15:55:24 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scm/biz/scmspecialrebate/ScmSpecialRebateService.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
index 2862ce2998..a05c7cbede 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
@@ -975,10 +975,6 @@ public class ScmSpecialRebateService extends MybatisBaseService
Date: Tue, 25 Feb 2025 16:03:27 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scm/biz/scmspecialrebate/ScmSpecialRebateService.java | 6 +++---
.../yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
index a05c7cbede..b8a72ef646 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
@@ -155,7 +155,7 @@ public class ScmSpecialRebateService extends MybatisBaseService
Date: Tue, 25 Feb 2025 16:03:58 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?=
=?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86=E3=80=81=E4=B8=93=E9=A1=B9?=
=?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86=E3=80=81=E5=8D=95=E8=BD=A6?=
=?UTF-8?q?=E8=BF=94=E5=88=A9=E5=BE=85=E6=A0=B8=E5=AF=B9=E3=80=81=E4=B8=93?=
=?UTF-8?q?=E9=A1=B9=E8=BF=94=E5=88=A9=E5=BE=85=E6=A0=B8=E5=AF=B9--?=
=?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue | 2 +-
.../bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue | 2 +-
.../specialrebatecheck/specialrebatetobechecked.vue | 2 +-
.../specialrebatemanagement/specialrebatemanagement.vue | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
index 1ce250d3f7..e974332868 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
@@ -11,7 +11,7 @@