From c4c23406e434ad5a2106ac8c6b3f71df30d3a636 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 28 Sep 2022 17:57:04 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E8=BF=94=E5=88=A9?=
=?UTF-8?q?=E9=A2=84=E6=8F=90=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=EF=BC=8C?=
=?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=E5=AE=8C?=
=?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...cmCollectionrebateCheckapplyDetailsVo.java | 10 ++
.../ScmCollectionrebateCheckapplyDto.java | 11 ++
.../ScmCollectionrebateCheckapplyQuery.java | 25 +----
.../ScmCollectionrebateCheckapplyVo.java | 8 ++
...cmCollectionrebateCheckapplydetailDto.java | 6 +-
.../ScmCollectionRebateWithDetailsVo.java | 18 ++-
.../ScmCollectionRebateWithDto.java | 4 +
...ScmCollectionRebateWithApplyDetailsVo.java | 10 +-
.../ScmCollectionRebateWithApplyDto.java | 8 +-
.../ScmCollectionRebateWithApplyQuery.java | 25 +----
.../ScmCollectionRebateWithApplyVo.java | 6 +
.../ScmVehPatrolinspectionmonthVo.java | 6 +-
.../ScmCollectionrebateCheckapplyMapper.xml | 37 +++++--
.../ScmCollectionrebateCheckapplyRest.java | 4 +-
.../ScmCollectionrebateCheckapplyService.java | 101 +++++++++++++++--
...ollectionrebateCheckapplydetailMapper.java | 4 +
...llectionrebateCheckapplydetailService.java | 4 +
.../ScmCollectionRebateWithMapper.java | 7 ++
.../ScmCollectionRebateWithMapper.xml | 14 +++
.../ScmCollectionRebateWithService.java | 8 ++
.../ScmCollectionRebateWithApplyMapper.java | 2 +
.../ScmCollectionRebateWithApplyMapper.xml | 20 +++-
.../ScmCollectionRebateWithApplyRest.java | 12 +-
.../ScmCollectionRebateWithApplyService.java | 103 ++++++++++++++++--
.../ScmVehiclePatrolinspectionService.java | 17 +--
...ScmVehiclePatrolinspectionsheetMapper.java | 3 +-
.../ScmVehiclePatrolinspectionsheetMapper.xml | 17 ++-
...cmVehiclePatrolinspectionsheetService.java | 2 +-
28 files changed, 389 insertions(+), 103 deletions(-)
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java
index eab0a4443f..0b61622a97 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java
@@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: anrui-scm(回款返利)
* File: ScmCollectionrebateCheckapplyVo.java
@@ -51,6 +54,8 @@ public class ScmCollectionrebateCheckapplyDetailsVo implements Vo {
private String sid; // sid
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@@ -78,4 +83,9 @@ public class ScmCollectionrebateCheckapplyDetailsVo implements Vo {
@ApiModelProperty("taskId")
private String taskId; // taskId
+ @ApiModelProperty("本月核对本月已上传回款返利信息")
+ private List scmWhenCollectionrebateCheckapplydetailDetails; // 本月核对本月已上传回款返利信息
+ @ApiModelProperty("本月核对往月已上传回款返利信息")
+ private List scmLastCollectionrebateCheckapplydetailDetails; // 本月核对往月已上传回款返利信息
+
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java
index 1f43fd5c93..b85a0fb13f 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java
@@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: anrui-scm(回款返利)
* File: ScmCollectionrebateCheckapplyDto.java
@@ -51,6 +54,10 @@ public class ScmCollectionrebateCheckapplyDto implements Dto {
private String sid; // sid
+ @ApiModelProperty("创建人sid")
+ private String createBySid; // 创建人sid
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@@ -78,4 +85,8 @@ public class ScmCollectionrebateCheckapplyDto implements Dto {
@ApiModelProperty("taskId")
private String taskId; // taskId
+ @ApiModelProperty("本月核对本月已上传回款返利信息")
+ private List scmWhenCollectionrebateCheckapplydetailDetails; // 本月核对本月已上传回款返利信息
+ @ApiModelProperty("本月核对往月已上传回款返利信息")
+ private List scmLastCollectionrebateCheckapplydetailDetails; // 本月核对往月已上传回款返利信息
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java
index f635c51c9f..9607bd4f84 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java
@@ -51,29 +51,12 @@ public class ScmCollectionrebateCheckapplyQuery implements Query {
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
- @ApiModelProperty("品牌名称")
- private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题
- @ApiModelProperty("创建人姓名")
- private String createByName; // 创建人姓名
- @ApiModelProperty("使用组织sid")
- private String useOrgSid; // 使用组织sid
- @ApiModelProperty("使用组织名称")
- private String useOrgName; // 使用组织名称
+ @ApiModelProperty(value = "创建开始日期")
+ private String createStartTime;
+ @ApiModelProperty(value = "创建结束日期")
+ private String createEndTime;
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
- @ApiModelProperty("创建组织名称")
- private String createOrgName; // 创建组织名称
- @ApiModelProperty("流程状态")
- private String nodeState; // 流程状态
- @ApiModelProperty("流程定义的id")
- private String procDefId; // 流程定义的id
- @ApiModelProperty("环节定义的sid")
- private String nodeSid; // 环节定义的sid
- @ApiModelProperty("流程实例的sid")
- private String procInstId; // 流程实例的sid
- @ApiModelProperty("taskId")
- private String taskId; // taskId
-
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java
index 535a4d6cba..b289f0e8c5 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java
@@ -67,6 +67,14 @@ public class ScmCollectionrebateCheckapplyVo implements Vo {
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
+ @ApiModelProperty("回款金额")
+ private String collectionMoney; // 回款金额
+ @ApiModelProperty("预计返利")
+ private String estimateRebate; // 预计返利
+ @ApiModelProperty("上传金额")
+ private String uploadMoney; // 上传金额
+ @ApiModelProperty("调整金额")
+ private String adjustmentMoney; // 调整金额
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java
index 714f579578..8490fe3531 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java
@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: anrui-scm(回款返利)
* File: ScmCollectionrebateCheckapplydetailDto.java
@@ -51,8 +53,8 @@ public class ScmCollectionrebateCheckapplydetailDto implements Dto {
private String sid; // sid
- @ApiModelProperty("回款返利sid")
- private String collectionRebateSid; // 回款返利sid
+ @ApiModelProperty("回款返利sid")
+ private List collectionRebateSids; // 回款返利sid
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java
index b06b4f9926..5f1ed0b0ed 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java
@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: anrui-scm(回款返利)
* File: ScmCollectionRebateWithVo.java
@@ -51,9 +53,21 @@ public class ScmCollectionRebateWithDetailsVo implements Vo {
private String sid; // sid
- @ApiModelProperty("回款返利sid")
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+ @ApiModelProperty("预提返利")
+ private String withRebate; // 预提返利
+ @ApiModelProperty("台数")
+ private String num; // 台数
+ @ApiModelProperty("回款返利sid")
+ private List collectionRebateSids; // 回款返利sid
+ @ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid
- @ApiModelProperty("回款返利预提申请sid")
+ @ApiModelProperty("回款方式key")
+ private String collectionTypeKey; // 回款方式key
+ @ApiModelProperty("回款方式value")
+ private String collectionTypeValue; // 回款方式value
+ @ApiModelProperty("回款返利预提申请sid")
private String mainSid; // 回款返利预提申请sid
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java
index f9fd75d5f2..7c143037a2 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java
@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: anrui-scm(回款返利)
* File: ScmCollectionRebateWithDto.java
@@ -51,6 +53,8 @@ public class ScmCollectionRebateWithDto implements Dto {
private String sid; // sid
+ @ApiModelProperty("回款返利sid")
+ private List collectionRebateSids; // 回款返利sid
@ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid
@ApiModelProperty("回款返利预提申请sid")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java
index ea151f022b..a8a1cb0430 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java
@@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: anrui-scm(回款返利)
* File: ScmCollectionRebateWithApplyVo.java
@@ -51,6 +54,10 @@ public class ScmCollectionRebateWithApplyDetailsVo implements Vo {
private String sid; // sid
+ @ApiModelProperty("申请人sid")
+ private String createBySid; // 申请人sid
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@@ -77,5 +84,6 @@ public class ScmCollectionRebateWithApplyDetailsVo implements Vo {
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
private String taskId; // taskId
-
+ @ApiModelProperty("回款返利预提列表")
+ private List scmCollectionRebateWiths; // 回款返利预提列表
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java
index 80dacb91ec..da52c75964 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java
@@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: anrui-scm(回款返利)
* File: ScmCollectionRebateWithApplyDto.java
@@ -51,6 +54,8 @@ public class ScmCollectionRebateWithApplyDto implements Dto {
private String sid; // sid
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@@ -77,5 +82,6 @@ public class ScmCollectionRebateWithApplyDto implements Dto {
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
private String taskId; // taskId
-
+ @ApiModelProperty("回款返利预提列表")
+ private List scmCollectionRebateWiths; // 回款返利预提列表
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java
index 86b52e3115..3e771febe1 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java
@@ -51,29 +51,12 @@ public class ScmCollectionRebateWithApplyQuery implements Query {
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
- @ApiModelProperty("品牌名称")
- private String brandName; // 品牌名称
@ApiModelProperty("回款申请标题")
private String collectionApply; // 回款申请标题
- @ApiModelProperty("创建人姓名")
- private String createByName; // 创建人姓名
- @ApiModelProperty("使用组织sid")
- private String useOrgSid; // 使用组织sid
- @ApiModelProperty("使用组织名称")
- private String useOrgName; // 使用组织名称
+ @ApiModelProperty(value = "创建开始日期")
+ private String createStartTime;
+ @ApiModelProperty(value = "创建结束日期")
+ private String createEndTime;
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
- @ApiModelProperty("创建组织名称")
- private String createOrgName; // 创建组织名称
- @ApiModelProperty("流程状态")
- private String nodeState; // 流程状态
- @ApiModelProperty("流程定义的id")
- private String procDefId; // 流程定义的id
- @ApiModelProperty("环节定义的sid")
- private String nodeSid; // 环节定义的sid
- @ApiModelProperty("流程实例的sid")
- private String procInstId; // 流程实例的sid
- @ApiModelProperty("taskId")
- private String taskId; // taskId
-
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java
index 23c63c6445..3a135389bd 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java
@@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
/**
* Project: anrui-scm(回款返利)
* File: ScmCollectionRebateWithApplyVo.java
@@ -51,6 +54,9 @@ public class ScmCollectionRebateWithApplyVo implements Vo {
private String sid; // sid
+ @ApiModelProperty("创建日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime; // 创建日期
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java
index 877a267a0e..c2b0ab4574 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java
@@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
/**
* Project: aaa(aaa)
* File: ScmVehPatrolinspectionmonthVo.java
@@ -57,7 +60,8 @@ public class ScmVehPatrolinspectionmonthVo implements Vo {
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("创建时间")
- private String createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime;
@ApiModelProperty("剩余巡检记录数量")
private String surplusNumber;
@ApiModelProperty("巡检记录总数数量")
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml
index 612cfd8a21..ae4b927e4c 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml
@@ -1,13 +1,32 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java
index 24929e1a82..4e2647cc7a 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java
@@ -75,9 +75,7 @@ public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateChe
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto dto){
- ResultBean rb = ResultBean.fireFail();
- scmCollectionrebateCheckapplyService.saveOrUpdateDto(dto);
- return rb.success();
+ return scmCollectionrebateCheckapplyService.saveOrUpdateDto(dto);
}
@Override
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
index 7a5721b602..0f790e028b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
@@ -28,19 +28,22 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto;
+import com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailService;
+import com.yxt.common.core.result.ResultBean;
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 com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDto;
-import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeign;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -60,6 +63,10 @@ import java.util.List;
*/
@Service
public class ScmCollectionrebateCheckapplyService extends MybatisBaseService {
+
+ @Autowired
+ private ScmCollectionrebateCheckapplydetailService scmCollectionrebateCheckapplydetailService;
+
private QueryWrapper createQueryWrapper(ScmCollectionrebateCheckapplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -69,26 +76,100 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService listPageVo(PagerQuery pq) {
ScmCollectionrebateCheckapplyQuery query = pq.getParams();
- QueryWrapper qw = createQueryWrapper(query);
+ QueryWrapper qw = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getBrandSid())) {
+ qw.eq("ssc.brandSid", query.getBrandSid());
+ }
+ if (StringUtils.isNotBlank(query.getCheckApply())) {
+ qw.like("ssc.checkApply", query.getCheckApply());
+ }
+ String createStartTime = query.getCreateStartTime();
+ String createEndTime = query.getCreateEndTime();
+ qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (ssc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+ apply(StringUtils.isNotBlank(createEndTime), "date_format (ssc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+ );
+ qw.eq("ssc.createOrgSid", query.getCreateOrgSid());
IPage page = PagerUtil.queryToPage(pq);
IPage pagging = baseMapper.selectPageVo(page, qw);
+ List records = pagging.getRecords();
+ for (ScmCollectionrebateCheckapplyVo record : records) {
+ record.setEstimateRebate(record.getEstimateRebate().substring(0,record.getEstimateRebate().lastIndexOf(".")));
+ record.setUploadMoney(record.getUploadMoney().substring(0,record.getUploadMoney().lastIndexOf(".")));
+ record.setCollectionMoney(record.getCollectionMoney().substring(0,record.getCollectionMoney().lastIndexOf(".")));
+ record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0,record.getAdjustmentMoney().lastIndexOf(".")));
+ }
PagerVo p = PagerUtil.pageToVo(pagging, null);
return p;
}
- public void saveOrUpdateDto(ScmCollectionrebateCheckapplyDto dto){
- String dtoSid = dto.getSid();
- if (StringUtils.isBlank(dtoSid)) {
- this.insertByDto(dto);
- return;
- }
+ public ResultBean saveOrUpdateDto(ScmCollectionrebateCheckapplyDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ String dtoSid = dto.getSid();
+ List scmWhenCollectionrebateCheckapplydetailDetails = dto.getScmWhenCollectionrebateCheckapplydetailDetails();
+ List scmLastCollectionrebateCheckapplydetailDetails = dto.getScmLastCollectionrebateCheckapplydetailDetails();
+ if (scmWhenCollectionrebateCheckapplydetailDetails.size() < 1 && scmLastCollectionrebateCheckapplydetailDetails.size() < 1) {
+ return rb.setMsg("请选择已核对回款返利信息");
+ }
+ if (StringUtils.isBlank(dtoSid)) {
+ String sid = this.insertByDto(dto).getData();
+ if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) {
+ for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) {
+ for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) {
+ ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail();
+ scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid);
+ scmCollectionrebateCheckapplydetail1.setMainSid(sid);
+ scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1);
+ }
+ }
+ }
+ if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) {
+ for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) {
+ for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) {
+ ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail();
+ scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid);
+ scmCollectionrebateCheckapplydetail1.setMainSid(sid);
+ scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1);
+ }
+ }
+ }
+ return rb.success().setMsg("添加成功").setData(sid);
+ }
+ ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(dtoSid);
+ if (scmCollectionrebateCheckapply == null) {
+ return rb.setMsg("该核对申请单不存在");
+ }
this.updateByDto(dto);
+ scmCollectionrebateCheckapplydetailService.delByMainSid(dtoSid);
+ if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) {
+ for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) {
+ for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) {
+ ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail();
+ scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid);
+ scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid);
+ scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1);
+ }
+ }
+ }
+ if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) {
+ for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) {
+ for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) {
+ ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail();
+ scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid);
+ scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid);
+ scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1);
+ }
+ }
+ }
+ return rb.success().setMsg("修改成功").setData(dtoSid);
}
- public void insertByDto(ScmCollectionrebateCheckapplyDto dto){
+ public ResultBean insertByDto(ScmCollectionrebateCheckapplyDto dto){
+ ResultBean rb = ResultBean.fireFail();
ScmCollectionrebateCheckapply entity = new ScmCollectionrebateCheckapply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
+ entity.setNodeState("待提交");
baseMapper.insert(entity);
+ return rb.success().setData(entity.getSid());
}
public void updateByDto(ScmCollectionrebateCheckapplyDto dto){
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java
index 21a234afcc..578b8e6c1b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java
@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,7 @@ public interface ScmCollectionrebateCheckapplydetailMapper extends BaseMapper selectListVo();
+
+ @Delete("delete from scm_collectionrebate_checkapplydetail where mainSid = #{dtoSid}")
+ void delByMainSid(String dtoSid);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java
index 40647bb41f..fe6ad89af4 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java
@@ -107,4 +107,8 @@ public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseServi
BeanUtil.copyProperties(entity, vo);
return vo;
}
+
+ public void delByMainSid(String dtoSid) {
+ baseMapper.delByMainSid(dtoSid);
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java
index c10c7e8bec..378c4bcf8c 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java
@@ -29,6 +29,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -65,4 +67,9 @@ public interface ScmCollectionRebateWithMapper extends BaseMapper fetchByCollectionReBateSid(String sid);
+
+ @Delete("delete from scm_collection_rebate_with where mainSid = #{dtoSid}")
+ void delByMainSid(String dtoSid);
+
+ List fetchByMainSid(String sid);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml
index 5eaec3ec1e..b6f49e1296 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml
@@ -10,4 +10,18 @@
+
+
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java
index fdd7f85075..f6ba498b97 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java
@@ -111,4 +111,12 @@ public class ScmCollectionRebateWithService extends MybatisBaseService fetchByCollectionReBateSid(String sid) {
return baseMapper.fetchByCollectionReBateSid(sid);
}
+
+ public void delByMainSid(String dtoSid) {
+ baseMapper.delByMainSid(dtoSid);
+ }
+
+ public List fetchByMainSid(String sid) {
+ return baseMapper.fetchByMainSid(sid);
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java
index 49630ba2e0..0a2371cfb2 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java
@@ -62,4 +62,6 @@ public interface ScmCollectionRebateWithApplyMapper extends BaseMapper selectListVo();
+
+ int selectBySid(String join);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml
index 498cc50ac4..0b89e8ae89 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml
@@ -4,10 +4,28 @@
+
+
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java
index af5bd0f3da..d77ed982a6 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java
@@ -75,26 +75,20 @@ public class ScmCollectionRebateWithApplyRest implements ScmCollectionRebateWith
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmCollectionRebateWithApplyDto dto){
- ResultBean rb = ResultBean.fireFail();
- scmCollectionRebateWithApplyService.saveOrUpdateDto(dto);
- return rb.success();
+ return scmCollectionRebateWithApplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
- ResultBean rb = ResultBean.fireFail();
- scmCollectionRebateWithApplyService.delBySids(sids);
- return rb.success();
+ return scmCollectionRebateWithApplyService.delAll(sids);
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
- ResultBean rb = ResultBean.fireFail();
- ScmCollectionRebateWithApplyDetailsVo vo = scmCollectionRebateWithApplyService.fetchDetailsVoBySid(sid);
- return rb.success().setData(vo);
+ return scmCollectionRebateWithApplyService.fetchAllDetailsVo(sid);
}
}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
index 5e6bb5ef14..e466dda661 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
@@ -28,6 +28,10 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto;
+import com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@@ -41,8 +45,10 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWit
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyFeign;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
/**
@@ -60,6 +66,10 @@ import java.util.List;
*/
@Service
public class ScmCollectionRebateWithApplyService extends MybatisBaseService {
+
+ @Autowired
+ private ScmCollectionRebateWithService scmCollectionRebateWithService;
+
private QueryWrapper createQueryWrapper(ScmCollectionRebateWithApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -69,26 +79,72 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService listPageVo(PagerQuery pq) {
ScmCollectionRebateWithApplyQuery query = pq.getParams();
- QueryWrapper qw = createQueryWrapper(query);
+ QueryWrapper qw = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getBrandSid())) {
+ qw.eq("scrwa.brandSid", query.getBrandSid());
+ }
+ if (StringUtils.isNotBlank(query.getCollectionApply())) {
+ qw.like("scrwa.withApply", query.getCollectionApply());
+ }
+ String createStartTime = query.getCreateStartTime();
+ String createEndTime = query.getCreateEndTime();
+ qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (scrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+ apply(StringUtils.isNotBlank(createEndTime), "date_format (scrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+ );
+ qw.eq("scrwa.createOrgSid", query.getCreateOrgSid());
+ qw.groupBy("scrwa.sid");
+ qw.orderByDesc("scrwa.createTime");
IPage page = PagerUtil.queryToPage(pq);
IPage pagging = baseMapper.selectPageVo(page, qw);
PagerVo p = PagerUtil.pageToVo(pagging, null);
return p;
}
- public void saveOrUpdateDto(ScmCollectionRebateWithApplyDto dto){
- String dtoSid = dto.getSid();
- if (StringUtils.isBlank(dtoSid)) {
- this.insertByDto(dto);
- return;
- }
+ public ResultBean saveOrUpdateDto(ScmCollectionRebateWithApplyDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ String dtoSid = dto.getSid();
+ List scmCollectionRebateWiths = dto.getScmCollectionRebateWiths();
+ if (scmCollectionRebateWiths == null) {
+ return rb.setMsg("请选择回款返利信息");
+ }
+ if (StringUtils.isBlank(dtoSid)) {
+ String sid = this.insertByDto(dto).getData();
+ for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) {
+ List collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids();
+ for (String collectionRebateSid : collectionRebateSids) {
+ ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith();
+ scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid);
+ scmCollectionRebateWith.setMainSid(sid);
+ scmCollectionRebateWithService.save(scmCollectionRebateWith);
+ }
+ }
+ return rb.success().setMsg("添加成功").setData(sid);
+ }
+ ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(dtoSid);
+ if (scmCollectionRebateWithApply == null) {
+ rb.setMsg("该回款返利预提申请单不存在");
+ }
this.updateByDto(dto);
+ scmCollectionRebateWithService.delByMainSid(dtoSid);
+ for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) {
+ List collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids();
+ for (String collectionRebateSid : collectionRebateSids) {
+ ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith();
+ scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid);
+ scmCollectionRebateWith.setMainSid(dtoSid);
+ scmCollectionRebateWithService.save(scmCollectionRebateWith);
+ }
+ }
+ return rb.success().setMsg("修改成功").setData(dtoSid);
}
- public void insertByDto(ScmCollectionRebateWithApplyDto dto){
+ public ResultBean insertByDto(ScmCollectionRebateWithApplyDto dto){
+ ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateWithApply entity = new ScmCollectionRebateWithApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
+ entity.setNodeState("待提交");
baseMapper.insert(entity);
+ return rb.success().setData(entity.getSid());
}
public void updateByDto(ScmCollectionRebateWithApplyDto dto){
@@ -107,4 +163,35 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService 0) {
+ return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+ }
+ delBySids(sids);
+ for (String sid : sids) {
+ scmCollectionRebateWithService.delByMainSid(sid);
+ }
+ return rb.success().setMsg("删除成功");
+ }
+
+ public ResultBean fetchAllDetailsVo(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ ScmCollectionRebateWithApplyDetailsVo scmCollectionRebateWithApplyDetailsVo = new ScmCollectionRebateWithApplyDetailsVo();
+ ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(sid);
+ BeanUtil.copyProperties(scmCollectionRebateWithApply, scmCollectionRebateWithApplyDetailsVo);
+ List scmCollectionRebateWithDetailsVos = scmCollectionRebateWithService.fetchByMainSid(sid);
+ for (ScmCollectionRebateWithDetailsVo scmCollectionRebateWithDetailsVo : scmCollectionRebateWithDetailsVos) {
+ String[] specialRebateSids = scmCollectionRebateWithDetailsVo.getCollectionRebateSid().split(",");
+ scmCollectionRebateWithDetailsVo.setCollectionRebateSids(Arrays.asList(specialRebateSids));
+ String withRebate = scmCollectionRebateWithDetailsVo.getWithRebate();
+ withRebate = withRebate.substring(0, withRebate.lastIndexOf("."));
+ scmCollectionRebateWithDetailsVo.setWithRebate(withRebate);
+ }
+ scmCollectionRebateWithApplyDetailsVo.setScmCollectionRebateWiths(scmCollectionRebateWithDetailsVos);
+ return rb.success().setData(scmCollectionRebateWithApplyDetailsVo);
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
index 180b47910b..d26d1abf41 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
@@ -34,6 +34,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.scm.api.scmfile.ScmFile;
import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDetailsVo;
import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
@@ -108,7 +109,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService= date_format('" + patrolInspectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(patrolInspectionEndDate), "date_format (patrolInspectionDate,'%Y-%m-%d') <= date_format('" + patrolInspectionEndDate + "','%Y-%m-%d')"
);
- qw.eq("patrolInspectionStateKey",002).or().eq("patrolInspectionStateKey",003);
+ qw.and(wrapper -> wrapper.eq("patrolInspectionStateKey", "002").or().eq("patrolInspectionStateKey", "003"));
IPage page = PagerUtil.queryToPage(pq);
IPage pagging = baseMapper.selectPageVo(page, qw);
PagerVo p = PagerUtil.pageToVo(pagging, null);
@@ -125,7 +126,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService wrapper.eq("patrolInspectionStateKey", "000").or().eq("patrolInspectionStateKey", "001"));
IPage page = PagerUtil.queryToPage(pq);
IPage pagging = baseMapper.selectPageVo(page, qw);
for (ScmVehiclePatrolinspectionVo record : pagging.getRecords()) {
@@ -144,12 +145,12 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService scmFileVos = scmFileService.fetchByMainSid(sid);
List strings = new ArrayList<>();
for (ScmFileVo scmFileVo : scmFileVos) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java
index ff45a39f8d..07439c5d9b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java
@@ -85,6 +85,5 @@ public interface ScmVehiclePatrolinspectionsheetMapper extends BaseMapper
SELECT * FROM scm_vehicle_patrolinspectionsheet
- ${ew.sqlSegment}
+
+ ${ew.sqlSegment}
+
@@ -41,7 +41,7 @@
FROM
sys_mapping sm
LEFT JOIN dict_common dc ON sm.dictSid = dc.sid
- LEFT JOIN dict_type dt ON dc.parentSid = dt.sid
+ LEFT JOIN dict_type dt ON dc.dictType = dt.dictTypeCode
${ew.sqlSegment}
From 54d7ae41d8503acf1bb2e7fb9a421e6456b655bb Mon Sep 17 00:00:00 2001
From: lzh
Date: Thu, 29 Sep 2022 09:54:08 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9Linux=E4=B8=AD=E7=9A=84?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/application-test.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/anrui-portal/anrui-portal-biz/src/main/resources/application-test.yml b/anrui-portal/anrui-portal-biz/src/main/resources/application-test.yml
index b35d269c05..f997cfb181 100644
--- a/anrui-portal/anrui-portal-biz/src/main/resources/application-test.yml
+++ b/anrui-portal/anrui-portal-biz/src/main/resources/application-test.yml
@@ -22,9 +22,9 @@ spring:
timeout: 0 # 连接超时时间（毫秒）
image:
upload:
- path: D:\\anrui\\upload\\
+ path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
url:
- prefix: http://127.0.0.1:7003/upload/
+ prefix: http://anrui.yyundong.com/upload/
login:
- path: D:\\images\\pic-click
+ path: /home/lzh/webapps/anrui/anrui-portal/images/pic-click
From daf1715b36161081fd2d50c87a717ff6aaee8652 Mon Sep 17 00:00:00 2001
From: hp <2969694837@qq.com>
Date: Thu, 29 Sep 2022 09:59:23 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E7=9B=98=E5=BA=93=E5=B7=A1=E6=A3=80?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../biz/basevehicle/BaseVehicleService.java | 7 ++---
.../AppScmVehiclePatrolinspectionPageVo.java | 2 ++
.../AppScmVehInventorymonthInfoVo.java | 6 ++++
.../AppScmVehInventorymonthVo.java | 2 +-
.../RecipientListVo.java | 16 ++++++++++
.../AppLiableListVo.java | 15 ++++++++++
.../AppScmVehPatrolinspectionmonthInfoVo.java | 6 ++++
.../ScmVehicleInventoryService.java | 10 +++----
.../ScmVehiclePatrolinspectionMapper.java | 8 +++++
.../ScmVehiclePatrolinspectionMapper.xml | 15 ++++++++++
.../ScmVehiclePatrolinspectionService.java | 11 +++++++
...ScmVehiclePatrolinspectionsheetMapper.java | 6 ++++
...cmVehiclePatrolinspectionsheetService.java | 30 +++++++++++++++++--
.../ScmVehInventorymonthService.java | 27 ++++++++++++++---
.../ScmVehInventoryreportMapper.java | 22 ++++++++------
.../ScmVehInventoryreportService.java | 5 ++++
.../ScmVehPatrolinspectionmonthService.java | 16 ++++++++++
.../ScmVehPatrolinspectionreportMapper.java | 22 ++++++++------
.../ScmVehPatrolinspectionreportService.java | 14 +++++++++
.../VehPatrolinspectionmonthInfoVo.java | 8 +++++
.../supplychain/inventory/ReportListVo.java | 13 ++++++++
.../inventory/VehInventorymonthInfoVo.java | 6 ++++
22 files changed, 232 insertions(+), 35 deletions(-)
create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/RecipientListVo.java
create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppLiableListVo.java
create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/ReportListVo.java
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 0658b3d0c4..5b100b6133 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -2588,12 +2588,11 @@ public class BaseVehicleService extends MybatisBaseService qw = new QueryWrapper<>();
- if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
- qw.like("bv.vinNo", pagerQuery.getParams().getName());
- }
+ qw.like("bv.vinNo", pagerQuery.getParams().getName());
qw.eq("bv.createOrgSid", pagerQuery.getParams().getUseOrgSid());
qw.eq("bv.isDelete", 0);
- qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
+ qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
+// qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
IPage iPage = baseMapper.getInspectionVinList(page, qw);
for (InspectionVinVo record : iPage.getRecords()) {
String addressSid = record.getAddressSid();
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java
index 8f8b15f42b..0b9b38b121 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java
@@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
@Data
public class AppScmVehiclePatrolinspectionPageVo implements Vo {
+ private String id;
+
@ApiModelProperty("记录sid")
private String sid;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java
index 06cf8bd0d0..7396c360d4 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java
@@ -1,9 +1,13 @@
package com.yxt.anrui.scm.api.scmvehinventorymonth;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
@Data
public class AppScmVehInventorymonthInfoVo implements Vo {
private static final long serialVersionUID = -8077170646957590520L;
@@ -30,6 +34,8 @@ public class AppScmVehInventorymonthInfoVo implements Vo {
private String recipient;
@ApiModelProperty("创建日期")
private String date;
+ @ApiModelProperty("接收人集合")
+ private List recipientList = new ArrayList<>();
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java
index b2f0bb47e6..f7c6411e8c 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java
@@ -50,7 +50,7 @@ public class AppScmVehInventorymonthVo implements Vo {
private String sid; // sid
@ApiModelProperty("生成报告状态")
- private String state;
+ private int state;
@ApiModelProperty("编号（yyyyMMdd）")
private String reportId; // 编号（yyyyMMdd）
@ApiModelProperty("创建时间")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/RecipientListVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/RecipientListVo.java
new file mode 100644
index 0000000000..62f8fe5400
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/RecipientListVo.java
@@ -0,0 +1,16 @@
+package com.yxt.anrui.scm.api.scmvehinventoryreport;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RecipientListVo implements Vo {
+
+ private static final long serialVersionUID = -2236972592829923353L;
+ @ApiModelProperty("接收人sid")
+ private String sid; // 接收人sid
+ @ApiModelProperty("接收人姓名")
+ private String name; // 接收人姓名
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppLiableListVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppLiableListVo.java
new file mode 100644
index 0000000000..d5bfd20e9f
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppLiableListVo.java
@@ -0,0 +1,15 @@
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppLiableListVo implements Vo {
+ private static final long serialVersionUID = -1049339684785700179L;
+
+ @ApiModelProperty("相关责任人名称")
+ private String liableName;
+ @ApiModelProperty("相关责任人sid")
+ private String liableSid;
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java
index 1e67ffe577..27b5d3d0eb 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java
@@ -4,6 +4,9 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
@Data
public class AppScmVehPatrolinspectionmonthInfoVo implements Vo {
private static final long serialVersionUID = -5082102320532147476L;
@@ -23,4 +26,7 @@ public class AppScmVehPatrolinspectionmonthInfoVo implements Vo {
@ApiModelProperty("创建日期")
private String date;
+ @ApiModelProperty("接收人集合")
+ private List recipientList = new ArrayList<>();
+
}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
index 823d479abc..1a563792a3 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
@@ -144,7 +144,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService scmVehicleStayInventoryVos = baseMapper.selectInventory(vinNo, id, createOrgSid);
- if (scmVehicleStayInventoryVos.size() > 0){
+ if (scmVehicleStayInventoryVos.size() > 0) {
ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
record.setInventoryName(scmVehicleStayInventoryVo.getLastName());
record.setInventoryDate(scmVehicleStayInventoryVo.getLastDate());
@@ -370,10 +370,10 @@ public class ScmVehicleInventoryService extends MybatisBaseService selectByMandSid(@Param("sid") String sid, @Param("vin") String vin);
+
+ @Update("update scm_vehicle_patrolinspection set isDelete = 1 where vinNo = #{vinNo} and id = #{id} ")
+ void deleteByVinNo(@Param("vinNo") String vinNo,@Param("id") String id);
+
+ List selectByVinNo(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
index d77c3cf898..9005d90066 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
@@ -97,6 +97,21 @@
and svp.patrolInspectionStateKey = #{stateKey}
+
+
update scm_vehicle_patrolinspection
set patrolInspectionStateKey = #{stateKey},
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
index d26d1abf41..a6fa701df0 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
@@ -328,4 +328,15 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService selectByMandSid(String sid,String vin) {
+ return baseMapper.selectByMandSid(sid,vin);
+ }
+
+ public void deleteByVinNo(String vinNo, String id) {
+ baseMapper.deleteByVinNo(vinNo,id);
+ }
+
+ public List selectByVinNo(String vinNo,String useOrgSid) {
+ return baseMapper.selectByVinNo(vinNo,useOrgSid);
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java
index 07439c5d9b..ee33f0a8ee 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java
@@ -86,4 +86,10 @@ public interface ScmVehiclePatrolinspectionsheetMapper extends BaseMapper list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), useOrgSid);
+ if (list.size() > 0) {
+ String id = list.get(0).getId();
+ String mainSid = list.get(0).getSid();
+ scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
+ int count = baseMapper.selectByMainSidNum(mainSid);
+ if (count > 0) {
+ baseMapper.deleteByMainSid(mainSid);
+ }
+ }
ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
@@ -413,7 +426,16 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), useOrgSid);
+ if (list.size() > 0) {
+ String id = list.get(0).getId();
+ String mainSid = list.get(0).getSid();
+ scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
+ int count = baseMapper.selectByMainSidNum(mainSid);
+ if (count > 0) {
+ baseMapper.deleteByMainSid(mainSid);
+ }
+ }
ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
@@ -435,8 +457,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService
* File: BaseMiddlemanDto.java
@@ -53,8 +55,10 @@ public class BaseMiddlemanDto implements Dto {
private String sid;
@ApiModelProperty("姓名")
+ @NotBlank(message = "姓名不能为空")
private String name;
@ApiModelProperty("手机号")
+ @NotBlank(message = "手机号不能为空")
private String mobile;
@ApiModelProperty("所在单位")
private String company;
@@ -63,6 +67,7 @@ public class BaseMiddlemanDto implements Dto {
@ApiModelProperty("银行账号")
private String bankAccount;
@ApiModelProperty(value = "用户sid")
+ @NotBlank(message = "参数错误：用户sid不能为空")
private String createBySid;
@ApiModelProperty(value = "备注")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java
index 278480ec6a..6d610878d8 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java
@@ -64,7 +64,7 @@ public interface BaseMiddlemanFeign {
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
- public ResultBean save(@RequestBody BaseMiddlemanDto dto);
+ public ResultBean save(@Valid @RequestBody BaseMiddlemanDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
index 1ac6a38eb3..92992b2400 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
@@ -15,7 +15,9 @@ import java.util.List;
public class BaseVehicleOutDto implements Dto {
private static final long serialVersionUID = 7393182384733981516L;
- private List queryList;
+
+ private String vinSid;
+ private String vinNo;
@ApiModelProperty("出库类型")
private String type;
private String typeKey;
@@ -41,17 +43,26 @@ public class BaseVehicleOutDto implements Dto {
private String mobile;
@ApiModelProperty("赠品说明")
private String giftsDescription;
- @ApiModelProperty("二次经销商")
- private String distributorName;
- @ApiModelProperty("二次经销商sid")
- private String distributorSid;
+
@ApiModelProperty("返利金额")
private String rebateAmount;
- @ApiModelProperty("实际购车人名称")
+ /* @ApiModelProperty("实际购车人名称")
private String actualCustomer;
@ApiModelProperty("实际购车人电话")
private String actualMobile;
@ApiModelProperty("实际购车人sid")
- private String actualSid;
+ private String actualSid;*/
+ /* @ApiModelProperty("二次经销商")
+ private String distributorName;
+ @ApiModelProperty("二次经销商sid")
+ private String distributorSid;*/
+ private List queryList;
+
+ //销售折让
+ //中介人1
+ //返利金额1
+ //中介人2
+ //返利金额2
+ //备注
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java
index c4a31cde3b..69eb9808f7 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java
@@ -32,6 +32,7 @@ import com.yxt.anrui.base.api.basemiddleman.*;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.HanZiConverterPinYin;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -85,6 +86,8 @@ public class BaseMiddlemanService extends MybatisBaseService map = genetrateCustomerNum(dto.getCustomerTypeKey(), userOrgInfoVo);
+// Map map = genetrateCustomerNum(dto.getCustomerTypeKey(), userOrgInfoVo);
customerTemp.setCreateBySid(dto.getUserSid());
customerTemp.setStaffSid(userOrgInfoVo.getStaffSid());
customerTemp.setCreateOrgSid(userOrgInfoVo.getOrgSid());
- customerTemp.setCustomerNo(map.get("code"));
+// customerTemp.setCustomerNo(map.get("code"));
customerTemp.setCertificateTypeKey(customerTemp.getCustomerTypeKey().equals("1") ? "01" : "02");
customerTemp.setCertificateType(customerTemp.getCustomerTypeKey().equals("1") ? "身份证" : "营业执照");
ResultBean resultBean = dictCommonFeign.getFirstDictKeyByType(DictCommonType.FOLLOW_STATE, "0");
@@ -592,6 +591,9 @@ public class CrmCustomerTempService extends MybatisBaseService paramMap = new HashMap<>();
@@ -756,14 +758,17 @@ public class CrmCustomerTempService extends MybatisBaseService map = genetrateCustomerNumO(dto.getCustomerTypeKey(), sysUserInfoVo);
- crmCustomerTemp.setCustomerNo(map.get("code"));
+ /*Map map = genetrateCustomerNumO(dto.getCustomerTypeKey(), sysUserInfoVo);
+ crmCustomerTemp.setCustomerNo(map.get("code"));*/
ResultBean resultBean = dictCommonFeign.getFirstDictKeyByType(DictCommonType.FOLLOW_STATE, "0");
if (resultBean.getSuccess() && resultBean.getData() != null) {
String key = resultBean.getData().toString();
crmCustomerTemp.setFollow_state_key(key);
crmCustomerTemp.setFollow_state(dictCommonFeign.selectBykey(key, DictCommonType.FOLLOW_STATE).getData().getDictValue());
}
+ //客户编码
+ String customerNo = HanZiConverterPinYin.getPinYinFirst(crmCustomerTemp.getName()) + crmCustomerTemp.getMobile();
+ crmCustomerTemp.setCustomerNo(customerNo);
save(crmCustomerTemp);
// 增加跟进记录
String visitSid = crmVisitService.insertCrmVisitOne(dto.getUserSid(), crmCustomerTemp.getSid(), crmCustomerTemp.getIsOnRemindkey(), crmCustomerTemp.getIsOnRemind(), dto.getVisitWay(), dto.getVisitWayKey());
@@ -839,8 +844,10 @@ public class CrmCustomerTempService extends MybatisBaseService
Date: Thu, 29 Sep 2022 10:43:02 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9Linux=E4=B8=AD=E7=9A=84?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../anrui-base-biz/src/main/resources/application-test.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/anrui-base/anrui-base-biz/src/main/resources/application-test.yml b/anrui-base/anrui-base-biz/src/main/resources/application-test.yml
index 962c91e497..eeffb3dcfd 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/application-test.yml
+++ b/anrui-base/anrui-base-biz/src/main/resources/application-test.yml
@@ -21,3 +21,7 @@ spring:
port: 6379
timeout: 0 # 连接超时时间（毫秒）
+
+templateUrl:
+ uploadUrl: http://anrui.yyundong.com/template
+ prefixUrl: http://120.46.131.15:8111//template/
From 9d08d9719c14895059362f8e0a34ae5cbbbaeb12 Mon Sep 17 00:00:00 2001
From: lzh
Date: Thu, 29 Sep 2022 10:51:18 +0800
Subject: [PATCH 8/8] =?UTF-8?q?API=E7=89=88=E6=9C=AC=E5=8F=B7=E6=94=B9?=
=?UTF-8?q?=E4=B8=BA-SNAPSHOT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
anrui-base/anrui-base-api/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/anrui-base/anrui-base-api/pom.xml b/anrui-base/anrui-base-api/pom.xml
index d88dd66887..1bc428d5fb 100644
--- a/anrui-base/anrui-base-api/pom.xml
+++ b/anrui-base/anrui-base-api/pom.xml
@@ -13,7 +13,7 @@
anrui-base-api
com.yxt.anrui
- 0.0.1
+ 0.0.1-SNAPSHOT