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())) { 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 @@ - + 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 主管人员 - + @@ -210,7 +210,7 @@ 主管人员 - +