Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/document/ExplainDocumentController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller.document;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.document.ExplainDocument;
+import com.ruoyi.system.service.document.IExplainDocumentService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 说明文档Controller
+ *
+ * @author boman
+ * @date 2024-04-29
+ */
+@RestController
+@RequestMapping("/document")
+public class ExplainDocumentController extends BaseController
+{
+    @Autowired
+    private IExplainDocumentService explainDocumentService;
+
+/**
+ * 查询说明文档列表
+ */
+@PreAuthorize("@ss.hasPermi('system:document:list')")
+@GetMapping("/list")
+    public TableDataInfo list(ExplainDocument explainDocument)
+    {
+        startPage();
+        List<ExplainDocument> list = explainDocumentService.selectExplainDocumentList(explainDocument);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出说明文档列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:document:export')")
+    @Log(title = "说明文档", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ExplainDocument explainDocument)
+    {
+        List<ExplainDocument> list = explainDocumentService.selectExplainDocumentList(explainDocument);
+        ExcelUtil<ExplainDocument> util = new ExcelUtil<ExplainDocument>(ExplainDocument.class);
+        util.exportExcel(response, list, "说明文档数据");
+    }
+
+    /**
+     * 获取说明文档详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:document:query')")
+    @GetMapping(value = "/{explainId}")
+    public AjaxResult getInfo(@PathVariable("explainId") Integer explainId)
+    {
+        return success(explainDocumentService.selectExplainDocumentByExplainId(explainId));
+    }
+
+    /**
+     * 新增说明文档
+     */
+    @PreAuthorize("@ss.hasPermi('system:document:add')")
+    @Log(title = "说明文档", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ExplainDocument explainDocument)
+    {
+        return toAjax(explainDocumentService.insertExplainDocument(explainDocument));
+    }
+
+    /**
+     * 修改说明文档
+     */
+    @PreAuthorize("@ss.hasPermi('system:document:edit')")
+    @Log(title = "说明文档", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ExplainDocument explainDocument)
+    {
+        return toAjax(explainDocumentService.updateExplainDocument(explainDocument));
+    }
+
+    /**
+     * 删除说明文档
+     */
+    @PreAuthorize("@ss.hasPermi('system:document:remove')")
+    @Log(title = "说明文档", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{explainIds}")
+    public AjaxResult remove(@PathVariable Integer[] explainIds)
+    {
+        return toAjax(explainDocumentService.deleteExplainDocumentByExplainIds(explainIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/remind/WaitRemindController.java

@@ -27,19 +27,17 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2024-04-29
  */
 @RestController
-@RequestMapping("/system/remind")
-public class WaitRemindController extends BaseController
-{
+@RequestMapping("/remind")
+public class WaitRemindController extends BaseController {
     @Autowired
     private IWaitRemindService waitRemindService;
 
-/**
- * 查询待办提醒列表
- */
-@PreAuthorize("@ss.hasPermi('system:remind:list')")
-@GetMapping("/list")
-    public TableDataInfo list(WaitRemind waitRemind)
-    {
+    /**
+     * 查询待办提醒列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:remind:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(WaitRemind waitRemind) {
         startPage();
         List<WaitRemind> list = waitRemindService.selectWaitRemindList(waitRemind);
         return getDataTable(list);
@@ -51,8 +49,7 @@ public class WaitRemindController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:remind:export')")
     @Log(title = "待办提醒", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, WaitRemind waitRemind)
-    {
+    public void export(HttpServletResponse response, WaitRemind waitRemind) {
         List<WaitRemind> list = waitRemindService.selectWaitRemindList(waitRemind);
         ExcelUtil<WaitRemind> util = new ExcelUtil<WaitRemind>(WaitRemind.class);
         util.exportExcel(response, list, "待办提醒数据");
@@ -63,8 +60,7 @@ public class WaitRemindController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:remind:query')")
     @GetMapping(value = "/{remindId}")
-    public AjaxResult getInfo(@PathVariable("remindId") Integer remindId)
-    {
+    public AjaxResult getInfo(@PathVariable("remindId") Integer remindId) {
         return success(waitRemindService.selectWaitRemindByRemindId(remindId));
     }
 
@@ -74,8 +70,7 @@ public class WaitRemindController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:remind:add')")
     @Log(title = "待办提醒", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody WaitRemind waitRemind)
-    {
+    public AjaxResult add(@RequestBody WaitRemind waitRemind) {
         return toAjax(waitRemindService.insertWaitRemind(waitRemind));
     }
 
@@ -85,8 +80,7 @@ public class WaitRemindController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:remind:edit')")
     @Log(title = "待办提醒", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
-    public AjaxResult edit(@RequestBody WaitRemind waitRemind)
-    {
+    public AjaxResult edit(@RequestBody WaitRemind waitRemind) {
         return toAjax(waitRemindService.updateWaitRemind(waitRemind));
     }
 
@@ -96,8 +90,7 @@ public class WaitRemindController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:remind:remove')")
     @Log(title = "待办提醒", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{remindIds}")
-    public AjaxResult remove(@PathVariable Integer[] remindIds)
-    {
+    public AjaxResult remove(@PathVariable Integer[] remindIds) {
         return toAjax(waitRemindService.deleteWaitRemindByRemindIds(remindIds));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/document/ExplainDocument.java

@@ -0,0 +1,98 @@
+package com.ruoyi.system.domain.document;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 说明文档对象 explain_document
+ * 
+ * @author boman
+ * @date 2024-04-29
+ */
+public class ExplainDocument extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 说明文档ID */
+    private Integer explainId;
+
+    /** 说明文档标题 */
+    @Excel(name = "说明文档标题")
+    private String explainTitle;
+
+    /** 说明文档类型（1:担保材料清单 2:小微企业说明） */
+    @Excel(name = "说明文档类型", readConverterExp = "1=:担保材料清单,2=:小微企业说明")
+    private String explainType;
+
+    /** 说明文档内容 */
+    @Excel(name = "说明文档内容")
+    private String explainContent;
+
+    /** 说明文档状态（0正常 1关闭） */
+    @Excel(name = "说明文档状态", readConverterExp = "0=正常,1=关闭")
+    private String status;
+
+    public void setExplainId(Integer explainId) 
+    {
+        this.explainId = explainId;
+    }
+
+    public Integer getExplainId() 
+    {
+        return explainId;
+    }
+    public void setExplainTitle(String explainTitle) 
+    {
+        this.explainTitle = explainTitle;
+    }
+
+    public String getExplainTitle() 
+    {
+        return explainTitle;
+    }
+    public void setExplainType(String explainType) 
+    {
+        this.explainType = explainType;
+    }
+
+    public String getExplainType() 
+    {
+        return explainType;
+    }
+    public void setExplainContent(String explainContent) 
+    {
+        this.explainContent = explainContent;
+    }
+
+    public String getExplainContent() 
+    {
+        return explainContent;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("explainId", getExplainId())
+            .append("explainTitle", getExplainTitle())
+            .append("explainType", getExplainType())
+            .append("explainContent", getExplainContent())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ExplainDocumentMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.document.ExplainDocument;
+
+import java.util.List;
+
+/**
+ * 说明文档Mapper接口
+ * 
+ * @author boman
+ * @date 2024-04-29
+ */
+public interface ExplainDocumentMapper 
+{
+    /**
+     * 查询说明文档
+     * 
+     * @param explainId 说明文档主键
+     * @return 说明文档
+     */
+    public ExplainDocument selectExplainDocumentByExplainId(Integer explainId);
+
+    /**
+     * 查询说明文档列表
+     * 
+     * @param explainDocument 说明文档
+     * @return 说明文档集合
+     */
+    public List<ExplainDocument> selectExplainDocumentList(ExplainDocument explainDocument);
+
+    /**
+     * 新增说明文档
+     * 
+     * @param explainDocument 说明文档
+     * @return 结果
+     */
+    public int insertExplainDocument(ExplainDocument explainDocument);
+
+    /**
+     * 修改说明文档
+     * 
+     * @param explainDocument 说明文档
+     * @return 结果
+     */
+    public int updateExplainDocument(ExplainDocument explainDocument);
+
+    /**
+     * 删除说明文档
+     * 
+     * @param explainId 说明文档主键
+     * @return 结果
+     */
+    public int deleteExplainDocumentByExplainId(Integer explainId);
+
+    /**
+     * 批量删除说明文档
+     * 
+     * @param explainIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteExplainDocumentByExplainIds(Integer[] explainIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/document/IExplainDocumentService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.document;
+
+import com.ruoyi.system.domain.document.ExplainDocument;
+
+import java.util.List;
+
+/**
+ * 说明文档Service接口
+ * 
+ * @author boman
+ * @date 2024-04-29
+ */
+public interface IExplainDocumentService 
+{
+    /**
+     * 查询说明文档
+     * 
+     * @param explainId 说明文档主键
+     * @return 说明文档
+     */
+    public ExplainDocument selectExplainDocumentByExplainId(Integer explainId);
+
+    /**
+     * 查询说明文档列表
+     * 
+     * @param explainDocument 说明文档
+     * @return 说明文档集合
+     */
+    public List<ExplainDocument> selectExplainDocumentList(ExplainDocument explainDocument);
+
+    /**
+     * 新增说明文档
+     * 
+     * @param explainDocument 说明文档
+     * @return 结果
+     */
+    public int insertExplainDocument(ExplainDocument explainDocument);
+
+    /**
+     * 修改说明文档
+     * 
+     * @param explainDocument 说明文档
+     * @return 结果
+     */
+    public int updateExplainDocument(ExplainDocument explainDocument);
+
+    /**
+     * 批量删除说明文档
+     * 
+     * @param explainIds 需要删除的说明文档主键集合
+     * @return 结果
+     */
+    public int deleteExplainDocumentByExplainIds(Integer[] explainIds);
+
+    /**
+     * 删除说明文档信息
+     * 
+     * @param explainId 说明文档主键
+     * @return 结果
+     */
+    public int deleteExplainDocumentByExplainId(Integer explainId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/document/impl/ExplainDocumentServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.document.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.document.ExplainDocument;
+import com.ruoyi.system.service.document.IExplainDocumentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.ExplainDocumentMapper;
+
+/**
+ * 说明文档Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-04-29
+ */
+@Service
+public class ExplainDocumentServiceImpl implements IExplainDocumentService
+{
+    @Autowired
+    private ExplainDocumentMapper explainDocumentMapper;
+
+    /**
+     * 查询说明文档
+     * 
+     * @param explainId 说明文档主键
+     * @return 说明文档
+     */
+    @Override
+    public ExplainDocument selectExplainDocumentByExplainId(Integer explainId)
+    {
+        return explainDocumentMapper.selectExplainDocumentByExplainId(explainId);
+    }
+
+    /**
+     * 查询说明文档列表
+     * 
+     * @param explainDocument 说明文档
+     * @return 说明文档
+     */
+    @Override
+    public List<ExplainDocument> selectExplainDocumentList(ExplainDocument explainDocument)
+    {
+        return explainDocumentMapper.selectExplainDocumentList(explainDocument);
+    }
+
+    /**
+     * 新增说明文档
+     * 
+     * @param explainDocument 说明文档
+     * @return 结果
+     */
+    @Override
+    public int insertExplainDocument(ExplainDocument explainDocument)
+    {
+        explainDocument.setCreateTime(DateUtils.getNowDate());
+        return explainDocumentMapper.insertExplainDocument(explainDocument);
+    }
+
+    /**
+     * 修改说明文档
+     * 
+     * @param explainDocument 说明文档
+     * @return 结果
+     */
+    @Override
+    public int updateExplainDocument(ExplainDocument explainDocument)
+    {
+        explainDocument.setUpdateTime(DateUtils.getNowDate());
+        return explainDocumentMapper.updateExplainDocument(explainDocument);
+    }
+
+    /**
+     * 批量删除说明文档
+     * 
+     * @param explainIds 需要删除的说明文档主键
+     * @return 结果
+     */
+    @Override
+    public int deleteExplainDocumentByExplainIds(Integer[] explainIds)
+    {
+        return explainDocumentMapper.deleteExplainDocumentByExplainIds(explainIds);
+    }
+
+    /**
+     * 删除说明文档信息
+     * 
+     * @param explainId 说明文档主键
+     * @return 结果
+     */
+    @Override
+    public int deleteExplainDocumentByExplainId(Integer explainId)
+    {
+        return explainDocumentMapper.deleteExplainDocumentByExplainId(explainId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/loan/impl/LoanApplicationServiceImpl.java

@@ -115,6 +115,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         //贷款申请进度进入申报提交
         loanApplication.setLoanSchedule(ONE);
         loanApplication.setLoanApplicationType(TWO);
+        loanApplication.setUserId(SecurityUtils.getUserId());
         int i = loanApplicationMapper.insertLoanApplication(loanApplication);
         List<LoanApplicationFj> loanApplicationFjList = loanApplication.getLoanApplicationFjList();
         if (loanApplicationFjList != null && loanApplicationFjList.size() > 0) {

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

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.ExplainDocumentMapper">
+    
+    <resultMap type="ExplainDocument" id="ExplainDocumentResult">
+        <result property="explainId"    column="explain_id"    />
+        <result property="explainTitle"    column="explain_title"    />
+        <result property="explainType"    column="explain_type"    />
+        <result property="explainContent"    column="explain_content"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectExplainDocumentVo">
+        select explain_id, explain_title, explain_type, explain_content, status, create_by, create_time, update_by, update_time, remark from explain_document
+    </sql>
+
+    <select id="selectExplainDocumentList" parameterType="ExplainDocument" resultMap="ExplainDocumentResult">
+        <include refid="selectExplainDocumentVo"/>
+        <where>  
+            <if test="explainTitle != null  and explainTitle != ''"> and explain_title = #{explainTitle}</if>
+            <if test="explainType != null  and explainType != ''"> and explain_type = #{explainType}</if>
+            <if test="explainContent != null  and explainContent != ''"> and explain_content = #{explainContent}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+        order by create_time
+    </select>
+    
+    <select id="selectExplainDocumentByExplainId" parameterType="Integer" resultMap="ExplainDocumentResult">
+        <include refid="selectExplainDocumentVo"/>
+        where explain_id = #{explainId}
+    </select>
+        
+    <insert id="insertExplainDocument" parameterType="ExplainDocument" useGeneratedKeys="true" keyProperty="explainId">
+        insert into explain_document
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="explainTitle != null and explainTitle != ''">explain_title,</if>
+            <if test="explainType != null and explainType != ''">explain_type,</if>
+            <if test="explainContent != null">explain_content,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="explainTitle != null and explainTitle != ''">#{explainTitle},</if>
+            <if test="explainType != null and explainType != ''">#{explainType},</if>
+            <if test="explainContent != null">#{explainContent},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateExplainDocument" parameterType="ExplainDocument">
+        update explain_document
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="explainTitle != null and explainTitle != ''">explain_title = #{explainTitle},</if>
+            <if test="explainType != null and explainType != ''">explain_type = #{explainType},</if>
+            <if test="explainContent != null">explain_content = #{explainContent},</if>
+            <if test="status != null">status = #{status},</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>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where explain_id = #{explainId}
+    </update>
+
+    <delete id="deleteExplainDocumentByExplainId" parameterType="Integer">
+        delete from explain_document where explain_id = #{explainId}
+    </delete>
+
+    <delete id="deleteExplainDocumentByExplainIds" parameterType="String">
+        delete from explain_document where explain_id in 
+        <foreach item="explainId" collection="array" open="(" separator="," close=")">
+            #{explainId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="batchLoanApplicationFj">
         insert into loan_application_fj(loan_application_id, loan_application_number, old_name, name, url,big_type, type, create_by, create_time, update_by, update_time, remark) values
         <foreach item="item" index="index" collection="list" separator=",">
-            (#{item.loanApplicationId},#{item.loanApplicationNumber},#{item.oldName},#{item.name},#{item.url},#{item.bigType},#{item.type},#{item.create_by},sysdate(),#{item.updateBy},#{item.updateTime},#{item.remark})
+            (#{item.loanApplicationId},#{item.loanApplicationNumber},#{item.oldName},#{item.name},#{item.url},#{item.bigType},#{item.type},#{item.createBy},sysdate(),#{item.updateBy},#{item.updateTime},#{item.remark})
         </foreach>
     </insert>
 

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

@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="batchShareholderFj">
         insert into shareholder_fj(loan_application_id, loan_application_number, shareholder_id_card, shareholder_name,shareholder_front_name, shareholder_front_url,shareholder_back_name, shareholder_back_url,shareholder_zx_name, shareholder_zx_url, create_by, create_time, update_by, update_time, remark) values
         <foreach item="item" index="index" collection="list" separator=",">
-            (#{item.loanApplicationId},#{item.loanApplicationNumber},#{item.shareholderIdCard},#{item.shareholderName},#{item.shareholderFrontName},#{item.shareholderFrontUrl},#{item.shareholderBackName},#{item.shareholderBackUrl},#{item.shareholderZxName},#{item.shareholderZxUrl},#{item.create_by},sysdate(),#{item.updateBy},#{item.updateTime},#{item.remark})
+            (#{item.loanApplicationId},#{item.loanApplicationNumber},#{item.shareholderIdCard},#{item.shareholderName},#{item.shareholderFrontName},#{item.shareholderFrontUrl},#{item.shareholderBackName},#{item.shareholderBackUrl},#{item.shareholderZxName},#{item.shareholderZxUrl},#{item.createBy},sysdate(),#{item.updateBy},#{item.updateTime},#{item.remark})
         </foreach>
     </insert>