优化工作

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -17,21 +17,21 @@
         WHEN bv.manPurOrderTypeValue = "外采"
         THEN 0
         WHEN bv.solidDate IS NOT NULL
-        THEN DATEDIFF(bv.priceDate, bv.solidDate)
+        THEN DATEDIFF(bv.solidDate,bv.priceDate)
         WHEN bv.solidDate IS NULL
-        THEN DATEDIFF(bv.priceDate, NOW())
+        THEN DATEDIFF(NOW(),bv.priceDate)
         END AS libraryAge,
         CASE
         WHEN bv.salesDate IS NOT NULL
-        THEN DATEDIFF(bv.departureDate, bv.salesDate)
+        THEN DATEDIFF(bv.salesDate,bv.departureDate)
         WHEN bv.salesDate IS NULL
-        THEN DATEDIFF(bv.departureDate, NOW())
+        THEN DATEDIFF(NOW(),bv.departureDate)
         END AS orgLibraryAge,
         CASE
         WHEN bv.salesDate IS NOT NULL
-        THEN DATEDIFF(bv.solidDate, bv.salesDate)
+        THEN DATEDIFF(bv.salesDate,bv.solidDate)
         WHEN bv.salesDate IS NULL
-        THEN DATEDIFF(bv.solidDate, NOW())
+        THEN DATEDIFF(NOW(),bv.solidDate)
         END AS settlementLibraryAge,
         bv.sid,
         bv.modelSid,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java

@@ -449,6 +449,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
         ResultBean<List<LoanCreditApplyNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<LoanCreditApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCreditApplyNodeVo.class)).collect(Collectors.toList());
@@ -459,6 +460,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
         ResultBean<List<LoanCreditApplyNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<LoanCreditApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCreditApplyNodeVo.class)).collect(Collectors.toList());