Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -5,13 +5,13 @@
         insert into
         loan_repayment_plan_details(createBySid,sid,createTime,isEnable,salesOrderSid,loanContractSid,loanContractNo,
         policyName,bankContractNo,customer,customerSid,borrowerSid,borrowerName,`period`,scheduleSid,bankName,deptSid,dept,useOrgSid,useOrgName,
-        orgSidPath,busVinSid,vinNo,vehMark,policyOrOther,dueMoney,dueDate,updateTime)
+        orgSidPath,busVinSid,vinNo,vehMark,policyOrOther,dueMoney,dueDate,updateTime,oweState)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.createBySid},#{item.sid},#{item.createTime},#{item.isEnable},#{item.salesOrderSid},#{item.loanContractSid},#{item.loanContractNo},
             #{item.policyName},#{item.bankContractNo},#{item.customer},#{item.customerSid},#{item.borrowerSid},#{item.borrowerName},
             #{item.period},#{item.scheduleSid},#{item.bankName},#{item.deptSid},#{item.dept},#{item.useOrgSid},#{item.useOrgName},#{item.orgSidPath},
-            #{item.busVinSid},#{item.vinNo},#{item.vehMark},#{item.policyOrOther},#{item.dueMoney},#{item.dueDate},#{item.updateTime})
+            #{item.busVinSid},#{item.vinNo},#{item.vehMark},#{item.policyOrOther},#{item.dueMoney},#{item.dueDate},#{item.updateTime},#{item.oweState})
         </foreach>
     </insert>
     <update id="updateTime">
@@ -602,7 +602,7 @@
                                  SUM(j.reveivableMoney) as reveivableMoney
                           FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j
                                    LEFT JOIN loan_repayment_plan_details AS p ON j.busSid = p.sid
-                          WHERE j.payCostTitleKey = '006'
+                          WHERE j.payCostTitleKey = '006' AND j.isEnable != 3
                           GROUP BY p.busVinSid
                          ) as a) as b
               WHERE b.reveivableMoney - b.fund > 0
@@ -714,7 +714,7 @@
                                    SELECT IFNULL(SUM(jr.reveivableMoney), 0) AS reveivableMoney
                                    FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS jr
                                             LEFT JOIN loan_repayment_plan_details AS p ON p.sid = jr.busSid
-                                   WHERE jr.payCostTitleKey = '006'
+                                   WHERE jr.payCostTitleKey = '006' AND jr.isEnable != 3
                                      AND p.busVinSid = #{busVinSid}
                                ) AS a
                       ) AS b

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -5337,7 +5337,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     for (int i = 0; i < mainPeriod; i++) {
                         LoanRepaymentPlanDetails mainDto = new LoanRepaymentPlanDetails();
                         mainDto.setIsEnable(3);
-
+                        mainDto.setOweState(0);
                         mainDto.setCreateBySid(userSid);
                         mainDto.setSalesOrderSid(salesOrderSid);
                         mainDto.setLoanContractNo(loanContractNo);
@@ -5378,6 +5378,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         for (int i = 0; i < Integer.parseInt(oPeriod); i++) {
                             LoanRepaymentPlanDetails otherDto = new LoanRepaymentPlanDetails();
                             otherDto.setIsEnable(3);
+                            otherDto.setOweState(0);
                             otherDto.setCreateBySid(userSid);
                             otherDto.setSalesOrderSid(salesOrderSid);
                             otherDto.setLoanContractNo(loanContractNo);
@@ -5430,6 +5431,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     for (int i = 0; i < mainPeriod; i++) {
                         LoanRepaymentPlanDetails mainDto = new LoanRepaymentPlanDetails();
                         mainDto.setIsEnable(3);
+                        mainDto.setOweState(0);
                         mainDto.setCreateBySid(userSid);
                         mainDto.setSalesOrderSid(salesOrderSid);
                         mainDto.setLoanContractNo(loanContractNo);
@@ -5792,6 +5794,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 BeanUtil.copyProperties(importSleepData, p, "id", "sid");
                 p.setCreateBySid(userSid);
                 p.setIsEnable(3);
+                p.setOweState(0);
                 p.setUpdateTime(new Date());
                 planDetails.add(p);
             }