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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/WordController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.xlsx4j.sml.Worksheet;
 
 import java.util.concurrent.TimeUnit;
 
@@ -38,4 +39,20 @@ public class WordController {
         AjaxResult ajaxResult = WordUtil.wordFilePath(wordFilePath, image);
         return ajaxResult;
     }
+
+    /**
+     * Excel文档签名
+     *
+     * @return
+     */
+    @PostMapping("/excelFilePath")
+    @PreAuthorize("@ss.hasPermi('word:excelFilePath:excelFilePath')")
+    @RepeatSubmit(interval = 1000, message = "请求过于频繁")
+    public AjaxResult excelFilePath(@RequestBody WordVo wordVo) {
+        //excel表格位置
+        String excelFilePath = wordVo.getWordFilePath();
+        //图片
+        String image = wordVo.getImage();
+        return AjaxResult.success();
+    }
 }

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

@@ -547,10 +547,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     }
                 }
             }
-            //保存参会人员数据
+/*            //保存参会人员数据 当管理同意上会后A角色选择上会日期，系统自动选择5名评委（评委排除AB角色和风险）
             if (sysUserConferenceList != null && sysUserConferenceList.size() > 0 && auditSchedule.equals(SEV)) {
                 sysUserConferenceMapper.batchSysUserConference(sysUserConferenceList);
-            }
+            }*/
             //audit_schedule = 2,3的时候贷款申请进度处于担保初审状态
             if (auditSchedule.equals(TWO) || auditSchedule.equals(THR)) {
                 loanApplication.setLoanSchedule(THR);

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

@@ -275,6 +275,13 @@ public class LoanApplication extends BaseEntity
     @Excel(name = "B角色用户名称")
     private String bUserName;
 
+    /** 风险用户id */
+    @Excel(name = "风险用户id")
+    private Long fUserId;
+
+    /** 风险用户名称 */
+    @Excel(name = "风险用户名称")
+    private String fUserName;
     private String type;
 
     private String fileType;
@@ -309,6 +316,22 @@ public class LoanApplication extends BaseEntity
      */
     private Map<String,List<LoanApplicationFj>> otherFj;
 
+    public Long getfUserId() {
+        return fUserId;
+    }
+
+    public void setfUserId(Long fUserId) {
+        this.fUserId = fUserId;
+    }
+
+    public String getfUserName() {
+        return fUserName;
+    }
+
+    public void setfUserName(String fUserName) {
+        this.fUserName = fUserName;
+    }
+
     public String getaAuthorize() {
         return aAuthorize;
     }

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

@@ -68,6 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="aAuthorize"    column="a_authorize"    />
         <result property="bUserId"    column="b_user_id"    />
         <result property="bUserName"    column="b_user_name"    />
+        <result property="fUserId"    column="f_user_id"    />
+        <result property="fUserName"    column="f_user_name"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -76,7 +78,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, loan_schedule, audit_schedule, audit_type, loan_application_type, a_user_id, a_user_name,a_authorize, b_user_id, b_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,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, loan_schedule, audit_schedule, audit_type, loan_application_type, 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">
@@ -134,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditSchedule != null  and auditSchedule != ''"> and audit_schedule = #{auditSchedule}</if>
             <if test="auditType != null  and auditType != ''"> and audit_type = #{auditType}</if>
             <if test="loanApplicationType != null  and loanApplicationType != ''"> and loan_application_type = #{loanApplicationType}</if>
-            <if test="userId != null "> and (a_user_id = #{userId} or (b_user_id = #{userId} and audit_schedule = '3') or  user_id = #{userId})</if>
+            <if test="userId != null "> and (a_user_id = #{userId} or (b_user_id = #{userId} and audit_schedule = '3') or  user_id = #{userId} or f_user_id = #{userId})</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(create_time,'%Y') = #{params.beginTime}
             </if>
@@ -224,6 +226,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="aAuthorize != null and aAuthorize != ''">a_authorize,</if>
             <if test="bUserId != null">b_user_id,</if>
             <if test="bUserName != null">b_user_name,</if>
+            <if test="fUserId != null">f_user_id,</if>
+            <if test="fUserName != null">f_user_name,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
@@ -293,6 +297,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="aAuthorize != null and aAuthorize != ''">#{aAuthorize},</if>
             <if test="bUserId != null">#{bUserId},</if>
             <if test="bUserName != null">#{bUserName},</if>
+            <if test="fUserId != null">#{fUserId},</if>
+            <if test="fUserName != null">#{fUserName},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -366,6 +372,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="aAuthorize != null and aAuthorize != ''">a_authorize = #{aAuthorize},</if>
             <if test="bUserId != null">b_user_id = #{bUserId},</if>
             <if test="bUserName != null">b_user_name = #{bUserName},</if>
+            <if test="fUserId != null">f_user_id = #{fUserId},</if>
+            <if test="fUserName != null">f_user_name = #{fUserName},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>