新增 全局审核意见，每步操作都有记录

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/LoanApplicationServiceImpl.java

@@ -891,10 +891,17 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                         sysUserConferenceMapper.deleteSysUserConferenceByTime(loanApplicationOld.getReviewTime(),loanApplicationOld.getLoanApplicationId());
                     }
                 }
+                //撤销完成后是到上会评审=评审会进度到 3：同意上会
+                if (SIX.equals(loanApplication.getLoanSchedule())){
+                    loanApplication.setReviewSchedule(THR);
+                    loanApplication.setReviewTime("");
+                    //删掉参会人员
+                    sysUserConferenceMapper.deleteSysUserConferenceByTime(loanApplicationOld.getReviewTime(),loanApplicationOld.getLoanApplicationId());
+                }
+            }else {
+                //进入待审核
+                loanApplication.setAuditType(ONE);
             }
-
-            //进入待审核
-            loanApplication.setAuditType(ONE);
             String type = "-1";
             if (auditSchedule.equals(SIX)) {
                 type = "jzdcbg";

ruoyi-system/src/main/java/com/ruoyi/system/domain/loan/LoanApplication.java

@@ -31,6 +31,9 @@ public class LoanApplication extends BaseEntity
     /** 申请额度(万元) */
     @Excel(name = "申请额度(万元)")
     private Double applicationAmount;
+    /** 实际放款金额(万元) */
+    @Excel(name = "实际放款金额(万元)")
+    private Double actuallyAmount;
 
     /** 申请银行 */
     @Excel(name = "申请银行")
@@ -324,6 +327,14 @@ public class LoanApplication extends BaseEntity
      */
     private Map<String,List<LoanApplicationFj>> otherFj;
 
+    public Double getActuallyAmount() {
+        return actuallyAmount;
+    }
+
+    public void setActuallyAmount(Double actuallyAmount) {
+        this.actuallyAmount = actuallyAmount;
+    }
+
     public Long getLoanApplicationId() {
         return loanApplicationId;
     }

ruoyi-system/src/main/resources/mapper/system/LoanApplicationMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="loanApplicationNumber"    column="loan_application_number"    />
         <result property="applicationType"    column="application_type"    />
         <result property="applicationAmount"    column="application_amount"    />
+        <result property="actuallyAmount"    column="actually_amount"    />
         <result property="applicationBank"    column="application_bank"    />
         <result property="usagePeriod"    column="usage_period"    />
         <result property="purposeFunds"    column="purpose_funds"    />
@@ -80,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectLoanApplicationVo">
-        select loan_application_id, loan_application_number, application_type,application_amount,enterprise_id,guarantee_shareholder_name,guarantee_shareholder_id_card, application_bank, usage_period, purpose_funds, repayment_source, enterprise_name, category_type, is_make, is_new, is_small, is_duty, company_introduction, customer_type, corporation_front, corporation_back, corporation_name, corporation_id_card, corporation_phone,corporation_address,corporation_expiration_date, family_population, corporation_job, is_loan, receivable_pay, business_situation, business_efficiency, corporation_marital_status, spouse_front, spouse_back, spouse_name, spouse_id_card, spouse_phone, guarantee_type, guarantee_front, guarantee_back, guarantee_name, guarantee_id_card, guarantee_phone, guarantee_marital_status, guarantee_spouse_front, guarantee_spouse_back, guarantee_spouse_name, guarantee_spouse_id_card, guarantee_spouse_phone, user_id, id_card, application_time, file_time,review_time, loan_schedule, audit_schedule, audit_type, loan_application_type,review_schedule, a_user_id, a_user_name,a_authorize, b_user_id, b_user_name,f_user_id, f_user_name, create_by, create_time, update_by, update_time, remark from loan_application
+        select loan_application_id, loan_application_number, application_type,application_amount,actually_amount,enterprise_id,guarantee_shareholder_name,guarantee_shareholder_id_card, application_bank, usage_period, purpose_funds, repayment_source, enterprise_name, category_type, is_make, is_new, is_small, is_duty, company_introduction, customer_type, corporation_front, corporation_back, corporation_name, corporation_id_card, corporation_phone,corporation_address,corporation_expiration_date, family_population, corporation_job, is_loan, receivable_pay, business_situation, business_efficiency, corporation_marital_status, spouse_front, spouse_back, spouse_name, spouse_id_card, spouse_phone, guarantee_type, guarantee_front, guarantee_back, guarantee_name, guarantee_id_card, guarantee_phone, guarantee_marital_status, guarantee_spouse_front, guarantee_spouse_back, guarantee_spouse_name, guarantee_spouse_id_card, guarantee_spouse_phone, user_id, id_card, application_time, file_time,review_time, loan_schedule, audit_schedule, audit_type, loan_application_type,review_schedule, a_user_id, a_user_name,a_authorize, b_user_id, b_user_name,f_user_id, f_user_name, create_by, create_time, update_by, update_time, remark from loan_application
     </sql>
 
     <select id="selectLoanApplicationList" parameterType="LoanApplication" resultMap="LoanApplicationResult">
@@ -88,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="loanApplicationNumber != null and loanApplicationNumber != ''"> and loan_application_number = #{loanApplicationNumber}</if>
             <if test="applicationAmount != null "> and application_amount = #{applicationAmount}</if>
+            <if test="actuallyAmount != null "> and actually_amount = #{actuallyAmount}</if>
             <if test="applicationType != null and applicationType != ''"> and application_type = #{applicationType}</if>
             <if test="applicationBank != null  and applicationBank != ''"> and application_bank = #{applicationBank}</if>
             <if test="usagePeriod != null  and usagePeriod != ''"> and usage_period = #{usagePeriod}</if>
@@ -274,6 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="loanApplicationNumber != null">loan_application_number,</if>
             <if test="applicationType  != null and applicationType != ''">application_type,</if>
             <if test="applicationAmount != null">application_amount,</if>
+            <if test="actuallyAmount != null">actually_amount,</if>
             <if test="applicationBank != null and applicationBank != ''">application_bank,</if>
             <if test="usagePeriod != null and usagePeriod != ''">usage_period,</if>
             <if test="purposeFunds != null and purposeFunds != ''">purpose_funds,</if>
@@ -347,6 +350,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="loanApplicationNumber != null">#{loanApplicationNumber},</if>
             <if test="applicationType != null and applicationType != ''">#{applicationType},</if>
             <if test="applicationAmount != null">#{applicationAmount},</if>
+            <if test="actuallyAmount != null">#{actuallyAmount},</if>
             <if test="applicationBank != null and applicationBank != ''">#{applicationBank},</if>
             <if test="usagePeriod != null and usagePeriod != ''">#{usagePeriod},</if>
             <if test="purposeFunds != null and purposeFunds != ''">#{purposeFunds},</if>
@@ -424,6 +428,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="loanApplicationNumber != null">loan_application_number = #{loanApplicationNumber},</if>
             <if test="applicationType != null and applicationType != ''">application_type = #{applicationType},</if>
             <if test="applicationAmount != null">application_amount = #{applicationAmount},</if>
+            <if test="actuallyAmount != null">actually_amount = #{actuallyAmount},</if>
             <if test="applicationBank != null and applicationBank != ''">application_bank = #{applicationBank},</if>
             <if test="usagePeriod != null and usagePeriod != ''">usage_period = #{usagePeriod},</if>
             <if test="purposeFunds != null and purposeFunds != ''">purpose_funds = #{purposeFunds},</if>