Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue

@@ -178,12 +178,12 @@
             </el-table-column>
             <el-table-column v-if="formobj.paymentMethodKey == '2'" label="放款资料是否齐全" align="center" width="170">
               <template slot-scope="scope">
-                <span>{{ scope.row.realBuyer.zlStateValue }}</span>
+                <span>{{ scope.row.zlStateValue }}</span>
               </template>
             </el-table-column>
             <el-table-column v-if="formobj.paymentMethodKey == '2'" label="资方放款审核结果" align="center" width="170">
               <template slot-scope="scope">
-                <span>{{ scope.row.realBuyer.bankStateValue }}</span>
+                <span>{{ scope.row.bankStateValue }}</span>
               </template>
             </el-table-column>
           </el-table>

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue

@@ -148,12 +148,12 @@
             </el-table-column>
             <el-table-column v-if="formobj.paymentMethodKey == '2'" label="放款资料是否齐全" align="center" width="170">
               <template slot-scope="scope">
-                <span>{{ scope.row.realBuyer.zlStateValue }}</span>
+                <span>{{ scope.row.zlStateValue }}</span>
               </template>
             </el-table-column>
             <el-table-column v-if="formobj.paymentMethodKey == '2'" label="资方放款审核结果" align="center" width="170">
               <template slot-scope="scope">
-                <span>{{ scope.row.realBuyer.bankStateValue }}</span>
+                <span>{{ scope.row.bankStateValue }}</span>
               </template>
             </el-table-column>
           </el-table>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue

@@ -153,12 +153,12 @@
             </el-table-column>
             <el-table-column v-if="formobj.paymentMethodKey == '2'" label="放款资料是否齐全" align="center" width="170">
               <template slot-scope="scope">
-                <span>{{ scope.row.realBuyer.zlStateValue }}</span>
+                <span>{{ scope.row.zlStateValue }}</span>
               </template>
             </el-table-column>
             <el-table-column v-if="formobj.paymentMethodKey == '2'" label="资方放款审核结果" align="center" width="170">
               <template slot-scope="scope">
-                <span>{{ scope.row.realBuyer.bankStateValue }}</span>
+                <span>{{ scope.row.bankStateValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="款、票情况" align="center" width="200">

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue

@@ -177,12 +177,12 @@
             </el-table-column>
             <el-table-column v-if="formobj.paymentMethodKey == '2'" label="放款资料是否齐全" align="center" width="170">
               <template slot-scope="scope">
-                <span>{{ scope.row.realBuyer.zlStateValue }}</span>
+                <span>{{ scope.row.zlStateValue }}</span>
               </template>
             </el-table-column>
             <el-table-column v-if="formobj.paymentMethodKey == '2'" label="资方放款审核结果" align="center" width="170">
               <template slot-scope="scope">
-                <span>{{ scope.row.realBuyer.bankStateValue }}</span>
+                <span>{{ scope.row.bankStateValue }}</span>
               </template>
             </el-table-column>
           </el-table>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue

@@ -151,12 +151,12 @@
             </el-table-column>
             <el-table-column v-if="formobj.paymentMethodKey == '2'" label="放款资料是否齐全" align="center" width="170">
               <template slot-scope="scope">
-                <span>{{ scope.row.realBuyer.zlStateValue }}</span>
+                <span>{{ scope.row.zlStateValue }}</span>
               </template>
             </el-table-column>
             <el-table-column v-if="formobj.paymentMethodKey == '2'" label="资方放款审核结果" align="center" width="170">
               <template slot-scope="scope">
-                <span>{{ scope.row.realBuyer.bankStateValue }}</span>
+                <span>{{ scope.row.bankStateValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="款、票情况" align="center" width="200">

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -1713,6 +1713,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
 
                         } else {
                             taskService.setAssignee(id_, assignee_);
+                            log.info("设置任务[{}]的assignee为[{}]", id_, assignee_);
                             taskService.setVariablesLocal(id_, flowTaskVo.getValues());
                         }
 

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java

@@ -0,0 +1,28 @@
+/*
+package com.yxt.anrui.flowable.config;
+
+import org.flowable.common.engine.impl.persistence.StrongUuidGenerator;
+import org.flowable.spring.SpringProcessEngineConfiguration;
+import org.flowable.spring.boot.EngineConfigurationConfigurer;
+import org.flowable.spring.boot.ProcessEngineConfigurationConfigurer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+*/
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/4/21
+ **//*
+
+@Configuration
+@Profile("test")
+public class FlowableUuidConfig {
+
+    @Bean
+    public EngineConfigurationConfigurer<SpringProcessEngineConfiguration> idGeneratorConfigurer() {
+        return configuration -> configuration.setIdGenerator(new StrongUuidGenerator());
+    }
+}
+*/

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@@ -90,7 +90,7 @@
         WHERE lbca.collMeasure LIKE '%远程控制%'
         AND lbca.nodeState = '已办结'
         ) lbcv ON lbcv.saleVehSid = lrpd.busVinSid AND lbcv.rn = 1
-        WHERE lrpd.dueDate < CURDATE()  -- 移除DATE_FORMAT函数
+        WHERE lrpd.dueDate <= lrpd.updateTime -- 移除DATE_FORMAT函数
         GROUP BY lrpd.sid
         (lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))) > 0
         HAVING (lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) > 0
@@ -109,7 +109,7 @@
         FROM loan_fund_day lfd
         JOIN loan_repayment_plan_details lrpd
         ON lrpd.sid = lfd.busSid
-        WHERE lrpd.dueDate < CURDATE()
+        WHERE lrpd.dueDate <= lrpd.updateTime
         GROUP BY lrpd.busVinSid
         ) lfd_sum ON lfd_sum.busVinSid = a1.busVinSid
         <where>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiffdetails/LoanDiffDetailsMapper.xml

@@ -11,7 +11,7 @@
         select vinNo vin,
         bankName zf,
         borrowName loanName,
-        makeLoan fk1,
+       <!-- makeLoan fk1,
         realityLoan fk2,
         diffLoan diffFk,
         makeDiscount mainTx1,
@@ -25,7 +25,22 @@
         diffOtherDiscount diffOtherTx,
         receivedPremium ywx1,
         realityPremium ywx2,
-        diffPremium diffYwx
+        diffPremium diffYwx-->
+        IFNULL(makeLoan, 0) AS fk1,
+        IFNULL(realityLoan, 0) AS fk2,
+        IFNULL(diffLoan, 0) AS diffFk,
+        IFNULL(makeDiscount, 0) AS mainTx1,
+        IFNULL(realityDiscount, 0) AS mainTx2,
+        IFNULL(diffDiscount, 0) AS diffMainTx,
+        IFNULL(makeLoanMargin, 0) AS dkbzj1,
+        IFNULL(realityLoanMargin, 0) AS dkbzj2,
+        IFNULL(diffLoanMargin, 0) AS diffDkbzj,
+        IFNULL(makeOtherDiscount, 0) AS otherTx1,
+        IFNULL(realityOtherDiscount, 0) AS otherTx2,
+        IFNULL(diffOtherDiscount, 0) AS diffOtherTx,
+        IFNULL(receivedPremium, 0) AS ywx1,
+        IFNULL(realityPremium, 0) AS ywx2,
+        IFNULL(diffPremium, 0) AS diffYwx
         from anrui_riskcenter.loan_diff_details
         where mainSid = #{sid}
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml

@@ -266,13 +266,37 @@
 		GROUP BY saleVehSid
 		) lbpv_sum ON lbpv_sum.saleVehSid = ss.busVinSid
 		LEFT JOIN (
-		SELECT
+			SELECT
-		lrpd.busVinSid,
+				a.busVinSid,
-		SUM(lfd.fund) AS fund_sum
+				sum( a.fund ) AS fund_sum
-		FROM loan_fund_day lfd
+			FROM
-		JOIN loan_repayment_plan_details lrpd ON lrpd.sid = lfd.busSid
+				(
-		WHERE lrpd.dueDate <= lrpd.updateTime
+					SELECT
-		GROUP BY lrpd.busVinSid
+						( fjj.reveivableMoney - fjj.m ) AS fund,
+						lp.busVinSid
+					FROM
+						(
+							SELECT
+								IFNULL((
+										   SELECT
+											   SUM( subscriptionMoney )
+										   FROM
+											   anrui_fin.fin_selected_receivables_detailed AS s
+										   WHERE
+											   s.auditState = '3'
+											 AND s.receivablesSid = fj.sid
+									   ),
+									   0
+									) AS m,
+								fj.*
+							FROM
+								( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
+						) AS fjj
+							LEFT JOIN loan_repayment_plan_details lp ON lp.sid = fjj.busSid
+						where  lp.dueDate <= lp.updateTime
+					GROUP BY
+						lp.busVinSid
+				) a
 		) lfd_sum ON lfd_sum.busVinSid = ss.busVinSid
 		GROUP BY ss.busVinSid
 
@@ -309,13 +333,37 @@
 		GROUP BY saleVehSid
 		) lbpv_sum ON lbpv_sum.saleVehSid = ss.busVinSid
 		LEFT JOIN (
-		SELECT
+			SELECT
-		lrpd.busVinSid,
+				a.busVinSid,
-		SUM(lfd.fund) AS fund_sum
+				sum( a.fund ) AS fund_sum
-		FROM loan_fund_day lfd
+			FROM
-		JOIN loan_repayment_plan_details lrpd ON lrpd.sid = lfd.busSid
+				(
-		WHERE lrpd.dueDate <= lrpd.updateTime
+					SELECT
-		GROUP BY lrpd.busVinSid
+						( fjj.reveivableMoney - fjj.m ) AS fund,
+						lp.busVinSid
+					FROM
+						(
+							SELECT
+								IFNULL((
+										   SELECT
+											   SUM( subscriptionMoney )
+										   FROM
+											   anrui_fin.fin_selected_receivables_detailed AS s
+										   WHERE
+											   s.auditState = '3'
+											 AND s.receivablesSid = fj.sid
+									   ),
+									   0
+									) AS m,
+								fj.*
+							FROM
+								( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
+						) AS fjj
+							LEFT JOIN loan_repayment_plan_details lp ON lp.sid = fjj.busSid
+					where  lp.dueDate <= lp.updateTime
+					GROUP BY
+						lp.busVinSid
+				) a
 		) lfd_sum ON lfd_sum.busVinSid = ss.busVinSid
 		GROUP BY ss.busVinSid
 	</select>