From d0a2f1decc5300da9b80c9d2d126c49c9f07c6aa Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 26 Jan 2024 17:52:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=9B=9E=E8=BD=A6=E8=BE=86=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E9=94=80=E5=94=AE=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompleteLoanSecondarySalesApplyDto.java   |  2 +
 .../LoanSecondarySalesCost.java               |  2 +-
 .../LoanSecondarySalesApplyRest.java          |  2 +-
 .../LoanSecondarySalesApplyService.java       | 22 +++++-
 .../LoanSecondarySalesCostMapper.java         |  1 +
 .../LoanSecondarySalesCostMapper.xml          |  6 ++
 .../LoanSecondarySalesCostService.java        |  1 +
 doc/databases/risk_center.sql                 | 70 +++++++++----------
 8 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/CompleteLoanSecondarySalesApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/CompleteLoanSecondarySalesApplyDto.java
index e79da2ed75..1fc0592fa4 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/CompleteLoanSecondarySalesApplyDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/CompleteLoanSecondarySalesApplyDto.java
@@ -32,4 +32,6 @@ public class CompleteLoanSecondarySalesApplyDto {
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
+    @ApiModelProperty("车辆评估价格")
+    private String vehicleEvaluation;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java
index 7cbbac89af..6b1667867c 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java
@@ -69,7 +69,7 @@ public class LoanSecondarySalesCost extends BaseEntity {
     @ApiModelProperty("附件")
     private String files;
     @ApiModelProperty("车辆评估")
-    private String vehicleEvaluation;
+    private BigDecimal vehicleEvaluation;
 
 
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java
index afd9f06452..a10da5a193 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java
@@ -60,7 +60,7 @@ public class LoanSecondarySalesApplyRest implements LoanSecondarySalesApplyFeign
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
         bv.setModelId("");
-        return loanSecondarySalesApplyService.complete(bv);
+        return loanSecondarySalesApplyService.complete(bv,query.getVehicleEvaluation());
     }
 
     @Override
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
index de6efc40dd..1fde4978f8 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
@@ -35,6 +35,7 @@ import com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTr
 import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.*;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable.*;
+import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCostVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVeh;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
@@ -43,6 +44,7 @@ import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
 import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loanreturninboundapply.LoanReturnInboundApplyService;
 import com.yxt.anrui.riskcenter.biz.loanreturnvehledger.LoanReturnVehLedgerService;
+import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostMapper;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalesveh.LoanSecondarySalesVehService;
 import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsMapper;
@@ -105,6 +107,8 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
     private LoanSolutionsMapper loanSolutionsMapper;
     @Autowired
     private LoanSolutionsDetailService loanSolutionsDetailService;
+    @Autowired
+    private LoanSecondarySalesCostMapper loanSecondarySalesCostMapper;
 
     public PagerVo<LoanSecondarySalesApplyVo> listPageVo(PagerQuery<LoanSecondarySalesApplyQuery> pq) {
         LoanSecondarySalesApplyQuery query = pq.getParams();
@@ -377,12 +381,26 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
         return rb.success();
     }
 
-    public ResultBean complete(BusinessVariables bv) {
+    public ResultBean complete(BusinessVariables bv, String price) {
         ResultBean rb = ResultBean.fireFail();
         String businessSid = bv.getBusinessSid();
         LoanSecondarySalesApply loanSecondarySalesApply = fetchBySid(businessSid);
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
+        if ("Activity_0rm74ey".equals(bv.getTaskDefKey())) {//风控处置岗审批
+            if (StringUtils.isBlank(price)) {
+                return rb.setMsg("请填写评估价格");
+            }
+            //保存评估价格
+            LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostMapper.selectMainSid(businessSid);
+            loanSecondarySalesCost.setVehicleEvaluation(new BigDecimal(price));
+            loanSecondarySalesCostService.updateById(loanSecondarySalesCost);
+            if (loanSecondarySalesCost.getVehicleEvaluation().compareTo(loanSecondarySalesCost.getVehPrice()) > 0) {
+                variables.put("isTrue", true);
+            } else {
+                variables.put("isTrue", false);
+            }
+        }
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         bv.setFormVariables(variables);
@@ -498,7 +516,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
             bv.setTaskDefKey(loanSecondarySalesApply.getTaskDefKey());
             bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
-            return complete(bv);
+            return complete(bv, "");
         }
         return rb;
     }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.java
index e9f6828415..a34122194f 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.java
@@ -15,4 +15,5 @@ public interface LoanSecondarySalesCostMapper extends BaseMapper<LoanSecondarySa
     int deleteByMainSid(String s);
 
     LoanSecondarySalesCostVo selectByMainSid(String sid);
+    LoanSecondarySalesCost selectMainSid(String sid);
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.xml
index 516d4b7dba..e0d9f5914d 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.xml
@@ -13,4 +13,10 @@
         FROM loan_secondary_sales_cost
         where mainSid = #{sid}
     </select>
+
+    <select id="selectMainSid" resultType="com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost">
+        select *
+        from loan_secondary_sales_cost
+        where mainSid = #{sid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostService.java
index 54a9bc8905..0f4dfe5022 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostService.java
@@ -31,6 +31,7 @@ public class LoanSecondarySalesCostService extends MybatisBaseService<LoanSecond
         return baseMapper.selectByMainSid(sid);
     }
 
+
     public void saveCost(LoanSecondarySalesCostVo loanSecondarySalesCost, String sid) {
         baseMapper.deleteByMainSid(sid);
         LoanSecondarySalesCost loanSecondarySalesCost1 = new LoanSecondarySalesCost();
diff --git a/doc/databases/risk_center.sql b/doc/databases/risk_center.sql
index 5aec1577c7..07050a74ef 100644
--- a/doc/databases/risk_center.sql
+++ b/doc/databases/risk_center.sql
@@ -1618,48 +1618,48 @@ CREATE TABLE `loan_secondary_sales_veh`
 DROP TABLE IF EXISTS `loan_secondary_sales_cost`;
 CREATE TABLE `loan_secondary_sales_cost`
 (
-    `id`                         int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `sid`                        varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`                int(32)              DEFAULT '0' COMMENT '版本锁',
-    `createTime`                 timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `modifyTime`                 timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`                   int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`                      int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`                   int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
-    `remarks`                    varchar(255)         DEFAULT NULL COMMENT '备注',
-    `createBySid`                varchar(64)          DEFAULT NULL COMMENT '创建人sid',
-    `updateBySid`                varchar(64)          DEFAULT NULL COMMENT '修改人sid',
-    `mainSid`                    varchar(64)          DEFAULT NULL COMMENT '主表sid',
-    `arrearsAll`                 decimal(10, 2)       DEFAULT NULL COMMENT '欠款合计',
-    `loanDeposit`                decimal(10, 2)       DEFAULT NULL COMMENT '贷款保证金',
-    `vehPrice`                   decimal(10, 2)       DEFAULT NULL COMMENT '车辆售价',
-    `collectionCost`             decimal(10, 2)       DEFAULT NULL COMMENT '催收费用',
-    `bankSettleCost`             decimal(10, 2)       DEFAULT NULL COMMENT '资方结清费用',
-    `bankSettleCostAssume`       varchar(64)          DEFAULT NULL COMMENT '资方结清费用承担方',
+    `id`                            int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                           varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`                   int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`                    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`                    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`                      int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                         int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`                      int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`                       varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`                   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`                   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `mainSid`                       varchar(64)          DEFAULT NULL COMMENT '主表sid',
+    `arrearsAll`                    decimal(10, 2)       DEFAULT NULL COMMENT '欠款合计',
+    `loanDeposit`                   decimal(10, 2)       DEFAULT NULL COMMENT '贷款保证金',
+    `vehPrice`                      decimal(10, 2)       DEFAULT NULL COMMENT '车辆售价',
+    `collectionCost`                decimal(10, 2)       DEFAULT NULL COMMENT '催收费用',
+    `bankSettleCost`                decimal(10, 2)       DEFAULT NULL COMMENT '资方结清费用',
+    `bankSettleCostAssume`          varchar(64)          DEFAULT NULL COMMENT '资方结清费用承担方',
     `bankSettleCostAssumeKey`       varchar(64)          DEFAULT NULL COMMENT '资方结清费用承担方',
-    `vehicleViolationCost`       decimal(10, 2)       DEFAULT NULL COMMENT '车辆违章费用',
-    `vehicleViolationCostAssume` varchar(64)          DEFAULT NULL COMMENT '车辆违章费用承担方',
+    `vehicleViolationCost`          decimal(10, 2)       DEFAULT NULL COMMENT '车辆违章费用',
+    `vehicleViolationCostAssume`    varchar(64)          DEFAULT NULL COMMENT '车辆违章费用承担方',
     `vehicleViolationCostAssumeKey` varchar(64)          DEFAULT NULL COMMENT '车辆违章费用承担方',
-    `inspectYearCost`            decimal(10, 2)       DEFAULT NULL COMMENT '年检费',
-    `inspectYearCostAssume`      varchar(64)          DEFAULT NULL COMMENT '年检费承担方',
+    `inspectYearCost`               decimal(10, 2)       DEFAULT NULL COMMENT '年检费',
+    `inspectYearCostAssume`         varchar(64)          DEFAULT NULL COMMENT '年检费承担方',
     `inspectYearCostAssumeKey`      varchar(64)          DEFAULT NULL COMMENT '年检费承担方',
-    `insureCost`                 decimal(10, 2)       DEFAULT NULL COMMENT '保险费',
-    `insureCostAssume`           varchar(64)          DEFAULT NULL COMMENT '保险费承担方',
+    `insureCost`                    decimal(10, 2)       DEFAULT NULL COMMENT '保险费',
+    `insureCostAssume`              varchar(64)          DEFAULT NULL COMMENT '保险费承担方',
     `insureCostAssumeKey`           varchar(64)          DEFAULT NULL COMMENT '保险费承担方',
-    `ownershipCost`              decimal(10, 2)       DEFAULT NULL COMMENT '过户费',
-    `ownershipCostAssume`        varchar(64)          DEFAULT NULL COMMENT '过户费承担方',
+    `ownershipCost`                 decimal(10, 2)       DEFAULT NULL COMMENT '过户费',
+    `ownershipCostAssume`           varchar(64)          DEFAULT NULL COMMENT '过户费承担方',
     `ownershipCostAssumeKey`        varchar(64)          DEFAULT NULL COMMENT '过户费承担方',
-    `stopCost`                   decimal(10, 2)       DEFAULT NULL COMMENT '停车费',
-    `stopCostAssume`             varchar(64)          DEFAULT NULL COMMENT '停车费承担方',
+    `stopCost`                      decimal(10, 2)       DEFAULT NULL COMMENT '停车费',
+    `stopCostAssume`                varchar(64)          DEFAULT NULL COMMENT '停车费承担方',
     `stopCostAssumeKey`             varchar(64)          DEFAULT NULL COMMENT '停车费承担方',
-    `otherCost`                  decimal(10, 2)       DEFAULT NULL COMMENT '其他费用',
-    `otherCostAssume`            varchar(64)          DEFAULT NULL COMMENT '其他费用承担方',
+    `otherCost`                     decimal(10, 2)       DEFAULT NULL COMMENT '其他费用',
+    `otherCostAssume`               varchar(64)          DEFAULT NULL COMMENT '其他费用承担方',
     `otherCostAssumeKey`            varchar(64)          DEFAULT NULL COMMENT '其他费用承担方',
-    `costDescription`            text                 DEFAULT NULL COMMENT '费用说明',
-    `lossPrice`                  decimal(10, 2)       DEFAULT NULL COMMENT '预计亏损金额',
-    `debtDisposal`               text                 DEFAULT NULL COMMENT '后续欠款处置方向',
-    `files`                      text                 DEFAULT NULL COMMENT '附件',
-    `vehicleEvaluation`          text                 DEFAULT NULL COMMENT '车辆评估',
+    `costDescription`               text                 DEFAULT NULL COMMENT '费用说明',
+    `lossPrice`                     decimal(10, 2)       DEFAULT NULL COMMENT '预计亏损金额',
+    `debtDisposal`                  text                 DEFAULT NULL COMMENT '后续欠款处置方向',
+    `files`                         text                 DEFAULT NULL COMMENT '附件',
+    `vehicleEvaluation`             decimal(10, 2)       DEFAULT NULL COMMENT '车辆评估价格',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB