From 5e58bec31d853bd15f68ce643f19690c724d1717 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 14 Sep 2023 10:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/flowable/api/flow2/FlowFeign.java   |  4 ++++
 .../yxt/anrui/flowable/biz/flow2/FlowMapper.java  |  4 ++++
 .../yxt/anrui/flowable/biz/flow2/FlowMapper.xml   | 15 ++++++++++++++-
 .../yxt/anrui/flowable/biz/flow2/FlowRest.java    |  5 +++++
 .../yxt/anrui/flowable/biz/flow2/FlowService.java |  6 ++++++
 .../biz/loanfinbank/LoanFinBankMapper.xml         |  2 +-
 .../biz/loansolutions/LoanSolutionsService.java   |  4 +++-
 7 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java
index af9e01bd59..b866707dc7 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java
@@ -37,4 +37,8 @@ public interface FlowFeign {
     @ResponseBody
     ResultBean<List<FlowableMessageVo>> getMessageList(@RequestParam("minutes") int minutes);
 
+    @ApiOperation(value = "人工催办")
+    @GetMapping(value = "/getMessageReminder")
+    @ResponseBody
+    ResultBean<FlowableMessageVo> getMessageReminder(@RequestParam("proDefId") String proDefId, @RequestParam("proInstId") String proInstId);
 }
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java
index 58c8b8da84..8a95a5e2c0 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.flowable.api.flow.Flowable;
 import com.yxt.anrui.flowable.api.flow2.FlowableMessageVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
 
 import java.util.List;
 
@@ -15,4 +17,6 @@ import java.util.List;
 @Mapper
 public interface FlowMapper extends BaseMapper<Flowable> {
     List<FlowableMessageVo> getMessageList(int minutes);
+
+    FlowableMessageVo getMessageReminder(@Param("proDefId") String proDefId, @Param("proInstId") String proInstId);
 }
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml
index fde1d5adb0..04b2ae8a63 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml
@@ -9,8 +9,21 @@
                NAME_                                      as nodeName,
                ASSIGNEE_                                  as assignee,
                CREATE_TIME_                               as createTime,
-               ID_                                           taskId,
+               ID_                                           taskId
         from act_ru_task
         HAVING yuTime > (#{minutes} * 60)
     </select>
+
+    <select id="getMessageReminder" resultType="com.yxt.anrui.flowable.api.flow2.FlowableMessageVo">
+        select TIMESTAMPDIFF(SECOND, CREATE_TIME_, NOW()) as yuTime,
+               PROC_DEF_ID_                               as proDefId,
+               PROC_INST_ID_                              as procInstId,
+               TASK_DEF_KEY_                              as taskDefKey,
+               NAME_                                      as nodeName,
+               ASSIGNEE_                                  as assignee,
+               CREATE_TIME_                               as createTime,
+               ID_                                           taskId
+        from act_ru_task
+        where PROC_DEF_ID_ = #{proDefId} and PROC_INST_ID_ = #{proInstId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java
index 1d706431a9..958f97cd0b 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java
@@ -106,5 +106,10 @@ public class FlowRest implements FlowFeign {
         return flowService.getMessageList(minutes);
     }
 
+    @Override
+    public ResultBean<FlowableMessageVo> getMessageReminder(String proDefId, String proInstId) {
+        return flowService.getMessageReminder(proDefId,proInstId);
+    }
+
 
 }
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
index ed33f11634..71339ad349 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
@@ -755,4 +755,10 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
 
         return rb.success().setData(list);
     }
+
+    public ResultBean<FlowableMessageVo> getMessageReminder(String proDefId, String proInstId) {
+        ResultBean<FlowableMessageVo> rb = ResultBean.fireFail();
+        FlowableMessageVo flowableMessageVo = baseMapper.getMessageReminder(proDefId,proInstId);
+        return rb.success().setData(flowableMessageVo);
+    }
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml
index f74fd503b5..d51326afd2 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml
@@ -78,6 +78,6 @@
     <select id="selectListByOrgSid" resultType="com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBanksVo">
         select sid, bankShortName name, bankName
         from loan_fin_bank
-        where createOrgSid = #{orgSid}
+        where createOrgSid = #{orgSid} and isDelete = 0
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
index 0b5aa8906f..0afc00ed22 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
@@ -1658,7 +1658,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             solutionssVo.setSzPrice(busSalesOrdersVo.getSzPrice());
             solutionssVo.setFinalPrice(busSalesOrdersVo.getFinalPrice());
             BusSalesOrderModel busSalesOrderModel = busSalesOrdersVo.getBusSalesOrderModel();
-            solutionssVo.setModelSid(busSalesOrderModel.getModelSid());
+            if(busSalesOrderModel != null){
+                solutionssVo.setModelSid(busSalesOrderModel.getModelSid());
+            }
             if (busSalesOrdersVo.getBusSalesOrder() != null) {
                 BusSalesOrder busSalesOrder = busSalesOrdersVo.getBusSalesOrder();
                 //全款且为三方金融