From bea25d54ecbb1c29f69c4d51d5f9a8a8dcd53d45 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 18 Oct 2022 15:00:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=AF=86=E7=A0=81=E4=B8=8D=E6=B8=85=E6=A5=9A=E7=BC=93?= =?UTF-8?q?=E5=AD=98token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/portal/biz/sysuser/SysUserService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 71429a7db0..3fdf7678bc 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -240,8 +240,8 @@ public class SysUserService extends MybatisBaseService { if (!oldPasswordMd5.equals(user.getPassword())) { return rb.setMsg("原始密码输入错误"); } - if (!newPassword.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,10}$")) { - return rb.setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合"); + if (!newPassword.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,16}$")) { + return rb.setMsg("密码格式错误，必须为8至16位大小写字母和数字的组合"); } int i = baseMapper.updatePasswordApp(user.getSid(), Encodes.md5(newPassword)); SysUserVo sysUserVo = selectUserOne(user); @@ -261,7 +261,7 @@ public class SysUserService extends MybatisBaseService { sysUserVo.setNeedResetPsd(isTrue); } if (i == 1) { - redisUtil.remove(token); +// redisUtil.remove(token); return rb.success().setData(sysUserVo); } else { return rb.setMsg("修改失败"); From eb7613c000b6c794bb7cb1d47c138be7e790f57d Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 18 Oct 2022 15:30:04 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=9D=E5=AD=98=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml | 2 +- .../base/biz/basemanufacturer/BaseManufacturerService.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index bdbe863428..df1323a4b5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -287,7 +287,7 @@ from base_manufacturer where createOrg = #{orgSid} and manBankSid = #{mankSid} - and supplyTypeValue = #{type} + and supplierTypeValue = #{type} AND isDelete = 0 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 69958ae26a..0d14d0914b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -466,6 +466,9 @@ public class BaseManufacturerService extends MybatisBaseService Date: Tue, 18 Oct 2022 15:44:24 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml | 1 + .../biz/scmvehiclegression/ScmVehicleGressionService.java | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml index 3507fe52be..d3042d93d6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml @@ -68,6 +68,7 @@ , '%') + GROUP BY svg.sid ORDER BY svg.id DESC diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 38d2d96dbb..321e3cde80 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -321,10 +321,7 @@ public class ScmVehicleGressionService extends MybatisBaseService scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(record.getSid()); -// int size = vins.size(); -// record.setVinNum(String.valueOf(size)); -// String vin = StringUtils.join(vins, ","); -// record.setVin(vin); + record.setScmVehicleGressionVehs(scmVehicleGressionVehVos); if ("已办结".equals(record.getState())) { From 81df841eeff5b1d70f6f89f6194e8c6cfcd458fe Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 18 Oct 2022 16:27:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E4=B8=8A=E4=BC=A0=E7=9A=84=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-base-biz/src/main/resources/application-test.yml | 2 +- .../anrui-buscenter-biz/src/main/resources/application-test.yml | 2 +- anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml | 2 +- anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml | 2 +- .../anrui-flowable-biz/src/main/resources/application-test.yml | 2 +- .../anrui-portal-biz/src/main/resources/application-test.yml | 2 +- anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml | 2 +- .../anrui-terminal-biz/src/main/resources/application-test.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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 ae25a3669d..a3bef1c3ef 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 @@ -23,7 +23,7 @@ spring: image: upload: - path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload + path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/ url: prefix: http://anrui.yyundong.com/upload/ templateUrl: diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml index dbfbaf2f58..9b8311d9ff 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml @@ -23,7 +23,7 @@ spring: image: upload: - path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload + path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/ url: prefix: http://anrui.yyundong.com/upload/ diff --git a/anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml b/anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml index 3cd258899b..3fa1a9a351 100644 --- a/anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml +++ b/anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml @@ -24,7 +24,7 @@ spring: image: upload: - path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload + path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/ url: prefix: http://anrui.yyundong.com/upload/ diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml b/anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml index f723ec753b..3d0642f2a3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml +++ b/anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml @@ -21,6 +21,6 @@ spring: timeout: 0 # 连接超时时间（毫秒） image: upload: - path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload + path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/ url: prefix: http://anrui.yyundong.com/upload/ diff --git a/anrui-flowable/anrui-flowable-biz/src/main/resources/application-test.yml b/anrui-flowable/anrui-flowable-biz/src/main/resources/application-test.yml index be8fed1907..dda42befb0 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/resources/application-test.yml +++ b/anrui-flowable/anrui-flowable-biz/src/main/resources/application-test.yml @@ -23,7 +23,7 @@ spring: image: upload: - path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload + path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/ url: prefix: http://anrui.yyundong.com/upload/ 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 de2824e752..d5f0d24b54 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 @@ -23,7 +23,7 @@ spring: image: upload: - path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload + path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/ url: prefix: http://anrui.yyundong.com/upload/ login: diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml b/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml index 72c8563d4d..1731237fe6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml +++ b/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml @@ -21,6 +21,6 @@ spring: timeout: 0 # 连接超时时间（毫秒） image: upload: - path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload + path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/ url: prefix: http://anrui.yyundong.com/upload/ \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml b/anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml index 43aad4f87c..185ab3b3af 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml +++ b/anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml @@ -19,7 +19,7 @@ spring: image: upload: - path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload + path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/ url: prefix: http://anrui.yyundong.com/upload/ From 2058fefa2f1459467e57275dd9e277f7d69d178d Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Tue, 18 Oct 2022 17:36:49 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4?= =?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 --- ...ppFinCollectionConfirmationDetailedVo.java | 3 + .../AppFinCollectionConfirmationDto.java | 40 +++++---- .../AppFinCollectionConfirmationInitVo.java | 8 +- .../AppFinCollectionConfirmationPageVo.java | 26 +++--- .../FinCollectionConfirmationMapper.xml | 16 ++-- .../FinCollectionConfirmationRest.java | 8 +- .../FinCollectionConfirmationService.java | 84 +++++++++---------- .../FinSelectedReceivablesDetailedMapper.xml | 11 ++- .../AppFinCollectionConfirmationFeign.java | 2 +- ...inCollectionConfirmationFeignFallback.java | 2 +- .../AppFinCollectionConfirmationRest.java | 2 +- .../AppFinCollectionConfirmationService.java | 27 ++++-- 12 files changed, 132 insertions(+), 97 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java index 909dcfaf4f..dd3b1dfbd5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java @@ -13,6 +13,9 @@ public class AppFinCollectionConfirmationDetailedVo implements Vo { private static final long serialVersionUID = 1283485126933789095L; + + private String sid; + @ApiModelProperty("收款银行") private String collectionBank; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java index c2208a7a54..d79537a832 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java @@ -1,11 +1,13 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; @Data @@ -16,53 +18,55 @@ public class AppFinCollectionConfirmationDto implements Dto { @ApiModelProperty("收款银行") private String collectionBank; - @ApiModelProperty("收款银行key") private String collectionBankKey; - @ApiModelProperty("汇款确认") - private List payConfirmFiles; - @ApiModelProperty("付款金额") - private BigDecimal paymentMoney; + @JsonProperty("paymentMoney") + private BigDecimal collectionMoney; @ApiModelProperty("收款日期") private String collectionDate; @ApiModelProperty("付款方名称") - private String paymentName; + @JsonProperty("paymentName") + private String payerName; @ApiModelProperty("收款账号") - private String collectionNum; + @JsonProperty("collectionNum") + private String collectionBankNum; @ApiModelProperty("收款账号key") - private String collectionNumKey; + @JsonProperty("collectionNumKey") + private String collectionBankNumKey; @ApiModelProperty("收款记录sid") + @JsonProperty("collectionBillSid") private String collectionBillSid; - @ApiModelProperty("下载模板") - private String downLoadUrl; - @ApiModelProperty("备注") private String remarks; @ApiModelProperty("收款方式") - private String collectionType; + @JsonProperty("collectionType") + private String collectionTypeValue; @ApiModelProperty("收款方式key") + @JsonProperty("collectionTypeKey") private String collectionTypeKey; - @ApiModelProperty("打款凭证") - private List payFiles; - - @ApiModelProperty("款项明细") - private List paymentDetail; - @ApiModelProperty("余额") private String balance; @ApiModelProperty("用户sid") private String userSid; + @ApiModelProperty("汇款确认") + private List payConfirmFiles = new ArrayList<>(); + + @ApiModelProperty("打款凭证") + private List payFiles; + + @ApiModelProperty("款项明细") + private List contractList; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java index 9df01da6bc..430399b904 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java @@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -20,7 +21,7 @@ public class AppFinCollectionConfirmationInitVo implements Vo { private String collectionBankKey; @ApiModelProperty("汇款确认") - private List payConfirmFiles; + private List payConfirmFiles = new ArrayList<>(); @ApiModelProperty("付款金额") private String paymentMoney; @@ -53,10 +54,10 @@ public class AppFinCollectionConfirmationInitVo implements Vo { private String collectionTypeKey; @ApiModelProperty("打款凭证") - private List payFiles; + private List payFiles = new ArrayList<>(); @ApiModelProperty("款项明细") - private List paymentDetail; + private List contractList = new ArrayList<>(); @ApiModelProperty("余额") private String balance; @@ -65,5 +66,4 @@ public class AppFinCollectionConfirmationInitVo implements Vo { private String userSid; - } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java index 5971e931d1..57e6e520d8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java @@ -1,40 +1,44 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + @Data public class AppFinCollectionConfirmationPageVo implements Vo { @ApiModelProperty("确认单sid") - private String collectionBillSid; + private String sid; @ApiModelProperty("收款账号") - private String collectionNum; - @ApiModelProperty("状态") - private int collectionBillState; + private String collectionBankNum; + @ApiModelProperty("审核状态") + private int auditState; @ApiModelProperty("收款银行") private String collectionBank; @ApiModelProperty("收款类型") - private String collectionType; + private String collectionTypeValue; @ApiModelProperty("收款时间") private String collectionDate; - @ApiModelProperty("付款人") - private String paymentName; @ApiModelProperty("收款金额") private String collectionMoney; + @ApiModelProperty("付款人") + private String payerName; @ApiModelProperty("备注") private String remarks; - @ApiModelProperty("余额") - private Integer balance; + @ApiModelProperty("认款状态") + private int paymentState; @ApiModelProperty("是否显示办理") private boolean showHandle; @ApiModelProperty("是否显示下载") private boolean showDownload; @ApiModelProperty("是否显示删除") private boolean showDelete; - @ApiModelProperty("认款状态") - private int state; + + @ApiModelProperty("余额") + private BigDecimal balance; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index fb26e201c9..192d6b026b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -19,14 +19,14 @@