From 15ed7a35347ca138a40fae028b54cf951b3a3901 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Mon, 25 Jul 2022 17:38:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E7=94=B3=E8=AF=B7?= =?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 --- .../api/busdelivered/BusDelivered.java | 11 +++++-- .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- .../ScmVehicleGressionVo.java | 2 ++ .../ScmVehicleGressionMapper.java | 2 ++ .../ScmVehicleGressionMapper.xml | 13 +++++++- .../ScmVehicleGressionService.java | 33 +++++++++++++++---- .../AppBusDeliveredApplyService.java | 9 ++++- 7 files changed, 61 insertions(+), 11 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java index ce20d7bbf8..00d223bb4b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java @@ -26,6 +26,7 @@ package com.yxt.anrui.buscenter.api.busdelivered; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -50,8 +51,14 @@ import lombok.Data; public class BusDelivered extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("类型：1车款交清、2欠款提车") - private Integer type; + @ApiModelProperty("类型 1 已认款 2 未认款") + private String subscription; + @ApiModelProperty("类型 1 已认款 2 未认款") + private String subscriptionKey; + @ApiModelProperty("付款方式 1 全款 2 贷款") + private String paymentMethod; + @ApiModelProperty("付款方式 1 全款 2 贷款") + private String paymentMethodKey; @ApiModelProperty("合同编号") private String contractNo; @ApiModelProperty("客户名称") diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index a8effc044b..368b83a557 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -23,7 +23,7 @@ public enum ProcDefEnum { BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:3:365004"),//TODO BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:5:280004"), BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:2:315150"), - SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:4:300008"), //TODO + SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:5:382504"), //TODO FINCOSTAPPLY("费用申请","process_u0pahv0s:4:320016"), FINPAYAPPLY("付款申请","process_gin2tntb:2:320012"), BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"), diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionVo.java index fb6f3b8391..f069b80536 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionVo.java @@ -71,5 +71,7 @@ public class ScmVehicleGressionVo implements Vo { private String InsuranceState; // 保险状态 @ApiModelProperty("临牌") private String temporaryCard; // 临牌 + @ApiModelProperty("审核状态") + private String nodeState; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java index 7fa97e46f5..2716cb6d10 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java @@ -113,4 +113,6 @@ public interface ScmVehicleGressionMapper extends BaseMapper void updateStateBySid(@Param("sid") String sid, @Param("state") String state); int selectNum(String bill); + + List getlastTimeEqual(@Param("vinNo") String vinNo, @Param("targetLocationSid") String targetLocationSid); } \ No newline at end of file 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 2a2e3a344d..a7069bbcff 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 @@ -91,11 +91,22 @@ + + + UPDATE scm_vehicle_gression SET nodeState=#{nodeState} 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 82964d9966..0d1e198c0c 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 @@ -201,8 +201,11 @@ public class ScmVehicleGressionService extends MybatisBaseService pcQueryWrapper(ScmVehicleGressionPageQuery query) { QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("svg.useOrgSid", query.getUseOrgSid()); +// if (StringUtils.isNotBlank(query.getUseOrgSid())) { +// qw.eq("svg.useOrgSid", query.getUseOrgSid()); +// } + if (StringUtils.isNotBlank(query.getUserSid())) { + qw.eq("svg.createBySid", query.getUserSid()); } if (StringUtils.isNotBlank(query.getType())) { qw.eq("svg.handleState", query.getType()); @@ -259,8 +262,11 @@ public class ScmVehicleGressionService extends MybatisBaseService appQueryWrapper(AppScmVehicleGressionPageQuery query) { QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("svg.useOrgSid", query.getUseOrgSid()); +// if (StringUtils.isNotBlank(query.getUseOrgSid())) { +// qw.eq("svg.useOrgSid", query.getUseOrgSid()); +// } + if (StringUtils.isNotBlank(query.getUserSid())) { + qw.eq("svg.createBySid", query.getUserSid()); } if (StringUtils.isNotBlank(query.getType())) { qw.eq("svg.handleState", query.getType()); @@ -306,12 +312,12 @@ public class ScmVehicleGressionService extends MybatisBaseService stringStringMap = generateBillNo(userSid); String billNo = getApplyCode(dto); scmVehicleGression.setApplicantNo(billNo); - save(scmVehicleGression); if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片 List factoryImage = dto.getPolicyImage(); if (factoryImage.size() <= 0) { @@ -332,13 +338,13 @@ public class ScmVehicleGressionService extends MybatisBaseService factoryImage = dto.getPolicyImage(); if (factoryImage.size() <= 0) { @@ -356,6 +362,7 @@ public class ScmVehicleGressionService extends MybatisBaseService scmVehicleGressionVos = baseMapper.getlastTimeEqual(dto.getVinNo(), dto.getTargetLocationSid()); + if (scmVehicleGressionVos.size() > 0) { + if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) { + if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("已终止") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) { + return rb.setMsg("该申请已存在，请务重复提交！"); + } + } + } //新增修改保存 ResultBean resultBean = saveCarTransferInfo(dto); if (!resultBean.getSuccess()) { @@ -742,6 +757,9 @@ public class ScmVehicleGressionService extends MybatisBaseService> getRetrievalNotList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); @@ -115,6 +119,9 @@ public class AppBusDeliveredApplyService { } public ResultBean> getRetrievalCarVin(String sid) { - return null; + ResultBean> rb = ResultBean.fireFail(); + ResultBean> retrievalCarVin = busDeliveredApplyDetailsFeign.getRetrievalCarVin(sid); + List data = retrievalCarVin.getData(); + return rb.success().setData(data); } } \ No newline at end of file From 4672ab96c2e265c66a3474d563aed5ca50819eff Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 25 Jul 2022 18:03:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=87=BA=E7=BA=B3=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E9=99=8D=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 25e31849bc..a93bc55b74 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -93,7 +93,7 @@ public class FinPaymentrecordService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); From 1431d20b28dc0a4c70e16c3ab4a19265a9795111 Mon Sep 17 00:00:00 2001 From: yxt_djz <313618925@qq.com> Date: Mon, 25 Jul 2022 18:20:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=96=E9=87=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseOutsourcingApplicationMapper.xml | 2 +- .../baseoutsourcingapplication.vue | 2 +- .../baseoutsourcingapplicationAdd.vue | 15 +++++++++++++-- .../baseoutsourcingapplicationInfo.vue | 4 +++- .../workflow/baseoutsourcingapplication.vue | 3 +++ .../workflow/baseoutsourcingapplicationAdd.vue | 3 +++ .../workflow/baseoutsourcingapplicationInfo.vue | 5 ++++- .../ruzhangguanli/ruzhangInfo.vue | 5 +++-- 8 files changed, 31 insertions(+), 8 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml index bb5b331ca6..e9f588c9d5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml @@ -4,7 +4,7 @@