From a8b0ea052505f7c99a674cd98338d71d3686ba88 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 30 Jun 2023 08:43:29 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 40b0aba717..1f3d488a3c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -6800,6 +6800,7 @@ public class BusSalesOrderService extends MybatisBaseService details = getSaleOrderDetails(sid); + busSalesOrder = fetchBySid(sid); AppOrderDetailsVo vo = details.getData(); //为三方金融和担保贷款 if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) { From 917e55cbed642b1ee90ae6012c0ffc0a314404e2 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 30 Jun 2023 09:41:44 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E4=B8=BB=E7=AE=A1=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=90=8E=E5=8F=AF=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/organizationManage/organizationManage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-system-ui/src/views/organizationManage/organizationManage.vue b/anrui-system-ui/src/views/organizationManage/organizationManage.vue index df37ffdab0..e9b5159ba3 100644 --- a/anrui-system-ui/src/views/organizationManage/organizationManage.vue +++ b/anrui-system-ui/src/views/organizationManage/organizationManage.vue @@ -36,7 +36,7 @@ 主管人员 - + @@ -210,7 +210,7 @@ 主管人员 - + From 9d5562a0fc07f1a6f99a0d1c60b0cf6119d73d0d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 30 Jun 2023 09:51:21 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E6=94=BF=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue index 10815c4c94..bcbc1fbf8f 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue @@ -48,7 +48,7 @@ - + From 11e1d93d0ebb2df5da6699e754b92f992654ec70 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 30 Jun 2023 10:30:38 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinSelectReceivablesDetailedVo.java | 28 +++++++++---------- .../FinSelectedReceivablesDetailedMapper.xml | 13 ++++++++- .../SysFlowableConfigMapper.java | 2 ++ .../SysFlowableConfigMapper.xml | 6 +++- .../SysFlowableConfigService.java | 4 ++- .../sysorganization/SysOrganizationRest.java | 4 ++- 6 files changed, 38 insertions(+), 19 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java index e665961935..c9cc0ae5d6 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java @@ -1,6 +1,5 @@ package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; -import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,27 +13,26 @@ import lombok.Data; public class FinSelectReceivablesDetailedVo implements Vo { private static final long serialVersionUID = -1672232048017802807L; - @ApiModelProperty("应收未收款项sid") - private String sid; // 应收未收款项sid - @ApiModelProperty("合同sid") - private String contractSid; // 合同sid + @ApiModelProperty("当前行sid") + private String sid; + @ApiModelProperty("应收未收记录sid") + private String receivablesSid; @ApiModelProperty("合同编号") - private String contractNo; // 合同编号 + private String contractNo; @ApiModelProperty("客户sid") - private String customerSid; // 客户sid + private String customerSid; @ApiModelProperty("客户名称") - private String customerName; // 客户名称 + private String customerName; @ApiModelProperty("车架号") - @JsonProperty("VIN") - private String VIN; // 车架号 + private String vinNo; @ApiModelProperty("联系电话") - private String customerPhone; // 联系电话 + private String customerPhone; @ApiModelProperty("应收项目名称") - private String receivablesName; // 应收项目名称 - @ApiModelProperty("当前应收金额") - private String currentReceivableMoney; // 当前应收金额 + private String receivablesName; + @ApiModelProperty("当前应收") + private String currentReceivableMoney; - @ApiModelProperty("应收金额") + @ApiModelProperty("剩余应收") private String reveivableMoney; @ApiModelProperty("业务车辆sid") private String busVinSid; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index 241eb830fd..caab90e726 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -288,7 +288,18 @@ select * from sys_flowable_config where userSid = #{userSid} - and(startDate is null or startDate <#{nowDate}) + and(startDate <#{nowDate}) and(endDate is null or endDate>#{nowDate}) @@ -29,4 +29,8 @@ left join sys_staffinfo si on si.sid = su.staffSid where su.sid = #{changeUserSid} + + + update sys_flowable_config set startDate = NULL,endDate = NULL WHERE userSid = #{userSid} + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java index a203b8dc14..0df635d53f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java @@ -50,6 +50,8 @@ public class SysFlowableConfigService extends MybatisBaseService Date: Fri, 30 Jun 2023 10:39:00 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseBrandletpricepowimitService.java | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java index 215ea7be82..9681e0acc1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java @@ -124,9 +124,9 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService baseRoleletpricepowimits = dto.getBaseRoleletpricepowimits(); - List baseRoleletpricepowimitsNew = new ArrayList<>(); + List baseRoleletpricepowimitsNew = dto.getBaseRoleletpricepowimits(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); return rb.success(); @@ -152,24 +152,25 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService(); - qw.eq("bbw.brandSid",dto.getBrandSid()); - qw.eq("bbw.useOrgSid",dto.getUseOrgSid()); - qw.eq("brw.deptSid",baseRoleletpricepowimit.getDeptSid()); - qw.eq("brw.roleSid",baseRoleletpricepowimit.getRoleSid()); - qw.ne("brw.mainSid",dtoSid); + qw.eq("bbw.brandSid", dto.getBrandSid()); + qw.eq("bbw.useOrgSid", dto.getUseOrgSid()); + qw.eq("brw.deptSid", baseRoleletpricepowimit.getDeptSid()); + qw.eq("brw.roleSid", baseRoleletpricepowimit.getRoleSid()); + qw.ne("brw.mainSid", dtoSid); int i = baseRoleletpricepowimitService.selDeptAndRoleSid(qw); - if (i > 0){ + if (i > 0) { return rb.setMsg("选择的关系已存在，请重新选择"); } - //判断选择的数据是否重复 - if (baseRoleletpricepowimitsNew.size() == 0){ - baseRoleletpricepowimitsNew.add(baseRoleletpricepowimit); - } - for (BaseRoleletpricepowimitDto baseRoleletpricepowimitDto : baseRoleletpricepowimitsNew) { - if (baseRoleletpricepowimit.getDeptSid().equals(baseRoleletpricepowimitDto.getDeptSid()) && baseRoleletpricepowimit.getRoleSid().equals(baseRoleletpricepowimitDto.getRoleSid())){ - return rb.setMsg("选择的部门和角色不可重复，请重新选择"); - }else { - baseRoleletpricepowimitsNew.add(baseRoleletpricepowimit); + } + //判断选择的数据是否存在重复数据 + for (int i = 0; i < baseRoleletpricepowimits.size(); i++) { + BaseRoleletpricepowimitDto baseRoleletpricepowimitDto = baseRoleletpricepowimits.get(i); + for (int j = i + 1; j < baseRoleletpricepowimitsNew.size(); j++) { + BaseRoleletpricepowimitDto baseRoleletpricepowimitDto1 = baseRoleletpricepowimitsNew.get(j); + if (baseRoleletpricepowimitDto1 != null){ + if (baseRoleletpricepowimitDto1.getDeptSid().equals(baseRoleletpricepowimitDto.getDeptSid()) && baseRoleletpricepowimitDto1.getRoleSid().equals(baseRoleletpricepowimitDto.getRoleSid())) { + return rb.setMsg("选择的部门和角色不可重复，请重新选择"); + } } } } @@ -226,10 +227,10 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService Date: Fri, 30 Jun 2023 10:52:26 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinSelectReceivablesDetailedVo.java | 14 +++++--- ...ilsOfReceivablesAndUncollectedItemsVo.java | 3 ++ ...FinSelectedReceivablesDetailedService.java | 34 +++++++++---------- ...UncollectedReceivablesDetailedService.java | 1 + 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java index c9cc0ae5d6..f3f92c7266 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,8 +16,8 @@ public class FinSelectReceivablesDetailedVo implements Vo { @ApiModelProperty("当前行sid") private String sid; - @ApiModelProperty("应收未收记录sid") - private String receivablesSid; + @ApiModelProperty("合同sid") + private String contractSid; @ApiModelProperty("合同编号") private String contractNo; @ApiModelProperty("客户sid") @@ -24,15 +25,18 @@ public class FinSelectReceivablesDetailedVo implements Vo { @ApiModelProperty("客户名称") private String customerName; @ApiModelProperty("车架号") - private String vinNo; + @JsonProperty("VIN") + private String VIN; @ApiModelProperty("联系电话") private String customerPhone; @ApiModelProperty("应收项目名称") private String receivablesName; - @ApiModelProperty("当前应收") + @ApiModelProperty("当前应收金额") private String currentReceivableMoney; + @ApiModelProperty("应收未收sid") + private String receivablesSid; - @ApiModelProperty("剩余应收") + @ApiModelProperty("应收金额") private String reveivableMoney; @ApiModelProperty("业务车辆sid") private String busVinSid; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java index 567a53d681..eb44c594bb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java @@ -81,4 +81,7 @@ public class DetailsOfReceivablesAndUncollectedItemsVo implements Vo { @ApiModelProperty("是否是已认款的选择：0不是（应收未收），1是（已认款）") private int subscribedOf; + + @ApiModelProperty("应收未收sid") + private String receivablesSid; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index b5fa8baf35..230ac50f92 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -317,7 +317,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService fetchByReceivablesSidLimt(String ysSid) { @@ -350,13 +350,13 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService stringList = baseMapper.selectUnSelectList(pagerQuery.getParams().getPurchaseSystemSid(),userSid,useOrgSid); + /* List stringList = baseMapper.selectUnSelectList(pagerQuery.getParams().getPurchaseSystemSid(),userSid,useOrgSid); stringList.removeAll(Collections.singleton(null)); if(!stringList.isEmpty()){ qw.notIn("receivablesSid",stringList); - } - List collList = baseMapper.selectPageList(qw,params.getName()); - /*if (collList.isEmpty()) { + }*/ + List collList = baseMapper.selectPageList(qw, params.getName()); + if (collList.isEmpty()) { collList = baseMapper.selectPageList(qw, ""); for (FinSelectReceivablesDetailedVo record : collList) { record.setSubscribedOf(1); @@ -366,20 +366,20 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList()); + collList = collList.stream().filter(v -> v.getVIN().contains(pagerQuery.getParams().getName())).collect(Collectors.toList()); } } else { for (FinSelectReceivablesDetailedVo record : collList) { @@ -390,28 +390,28 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService cll = collList.stream().filter(v -> v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList()); + List cll = collList.stream().filter(v -> v.getVIN().contains(pagerQuery.getParams().getName())).collect(Collectors.toList()); collList = Stream.of(collList, cll).flatMap(Collection::stream).collect(Collectors.toList()); } - }*/ + } //将collList根据sid去重 collList = collList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(FinSelectReceivablesDetailedVo::getSid))), ArrayList::new)); //根据合同编号倒序排序 -// collList = collList.stream().sorted(Comparator.comparing(FinSelectReceivablesDetailedVo::getContractId).reversed()).collect(Collectors.toList()); + collList = collList.stream().sorted(Comparator.comparing(FinSelectReceivablesDetailedVo::getContractNo).reversed()).collect(Collectors.toList()); //分页 IPage page1 = new Page<>(); page1.setRecords(collList); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 0b3632d5c2..211f175b0c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -203,6 +203,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService String busVinSid = v.getBusVinSid(); ResultBean resultBean = busSalesOrderVehicleFeign.details(busVinSid); if (resultBean.getData() != null) { + v.setReceivablesSid(v.getSid()); String vinNo = resultBean.getData().getLinkNo(); String vinSid = resultBean.getData().getLinkSid(); String temporaryNo = resultBean.getData().getTemporaryNo(); From d17082e252aec4794f322db2b402feae1e0eec3d Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 30 Jun 2023 10:52:38 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml | 10 +++++++--- .../portal/biz/sysmenurole/SysMenuRoleService.java | 5 ----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml index 5fda000c5b..3a06198e72 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml @@ -44,9 +44,13 @@