From 42ee9c8056fa0c79aa6df266fdadde4c70e36752 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 29 Jun 2023 18:01:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue index c56c60990e..8373812efc 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue @@ -502,6 +502,10 @@ export default { this.$message({ showClose: true, type: 'error', message: '请检查保险状态需选择是或否' }) return } + if (this.temp.scmVehicleGressionVehs.length === 0) { + this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' }) + return + } if (this.temp.applicantFunds === '') { this.temp.applicantFunds = '0' } From a8b0ea052505f7c99a674cd98338d71d3686ba88 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 30 Jun 2023 08:43:29 +0800 Subject: [PATCH 2/5] =?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 3/5] =?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 4/5] =?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 5/5] =?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