新增 轮播图

ruoyi-admin/src/main/java/com/ruoyi/web/controller/banner/BannerController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.web.controller.banner;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.banner.Banner;
+import com.ruoyi.system.service.banner.IBannerService;
+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.core.page.TableDataInfo;
+
+/**
+ * 轮播图Controller
+ * 
+ * @author boman
+ * @date 2024-01-22
+ */
+@RestController
+@RequestMapping("/banner")
+public class BannerController extends BaseController
+{
+    @Autowired
+    private IBannerService bannerService;
+
+    /**
+     * 查询轮播图列表
+     */
+    @PreAuthorize("@ss.hasPermi('banner:banner:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Banner banner)
+    {
+        startPage();
+        List<Banner> list = bannerService.selectBannerList(banner);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询轮播图列表不分页
+     */
+    @GetMapping("/listNoPage")
+    public TableDataInfo listNoPage(Banner banner)
+    {
+        List<Banner> list = bannerService.selectBannerList(banner);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出轮播图列表
+     */
+    @PreAuthorize("@ss.hasPermi('banner:banner:export')")
+    @Log(title = "轮播图", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Banner banner)
+    {
+        List<Banner> list = bannerService.selectBannerList(banner);
+        ExcelUtil<Banner> util = new ExcelUtil<Banner>(Banner.class);
+        util.exportExcel(response, list, "轮播图数据");
+    }
+
+    /**
+     * 获取轮播图详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('banner:banner:query')")
+    @GetMapping(value = "/{bannerId}")
+    public AjaxResult getInfo(@PathVariable("bannerId") Long bannerId)
+    {
+        return success(bannerService.selectBannerByBannerId(bannerId));
+    }
+
+    /**
+     * 新增轮播图
+     */
+    @PreAuthorize("@ss.hasPermi('banner:banner:add')")
+    @Log(title = "轮播图", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Banner banner)
+    {
+        return toAjax(bannerService.insertBanner(banner));
+    }
+
+    /**
+     * 修改轮播图
+     */
+    @PreAuthorize("@ss.hasPermi('banner:banner:edit')")
+    @Log(title = "轮播图", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody Banner banner)
+    {
+        return toAjax(bannerService.updateBanner(banner));
+    }
+
+    /**
+     * 删除轮播图
+     */
+    @PreAuthorize("@ss.hasPermi('banner:banner:remove')")
+    @Log(title = "轮播图", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{bannerIds}")
+    public AjaxResult remove(@PathVariable Long[] bannerIds)
+    {
+        return toAjax(bannerService.deleteBannerByBannerIds(bannerIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/loan/LoanApplicationController.java

@@ -116,6 +116,15 @@ public class LoanApplicationController extends BaseController {
     public AjaxResult temporary(@RequestBody LoanApplication loanApplication) {
         return toAjax(loanApplicationService.temporary(loanApplication));
     }
+
+    /**
+     * 7：合同签约 8：放款合规风险审核 9：放款通知 进度条
+     */
+    @PreAuthorize("@ss.hasPermi('system:application:schedule')")
+    @PostMapping("/schedule")
+    public AjaxResult schedule(@RequestBody LoanApplication loanApplication) {
+        return loanApplicationService.schedule(loanApplication);
+    }
     /**
      * 审核
      */

ruoyi-system/src/main/java/com/ruoyi/system/domain/banner/Banner.java

@@ -0,0 +1,154 @@
+package com.ruoyi.system.domain.banner;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 轮播图对象 banner
+ * 
+ * @author boman
+ * @date 2024-01-22
+ */
+public class Banner extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long bannerId;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Integer sort;
+
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private String isDel;
+
+    /** 图片地址 */
+    @Excel(name = "图片地址")
+    private String imgUrl;
+
+    /** 三方链接 */
+    @Excel(name = "三方链接")
+    private String linkUrl;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String content;
+
+    /** 类型  */
+    @Excel(name = "类型 ")
+    private Integer type;
+
+    /** 状态 1:启用 2:不启用 */
+    @Excel(name = "状态 1:启用 2:不启用")
+    private String status;
+
+    public void setBannerId(Long bannerId) 
+    {
+        this.bannerId = bannerId;
+    }
+
+    public Long getBannerId() 
+    {
+        return bannerId;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setSort(Integer sort) 
+    {
+        this.sort = sort;
+    }
+
+    public Integer getSort() 
+    {
+        return sort;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setImgUrl(String imgUrl) 
+    {
+        this.imgUrl = imgUrl;
+    }
+
+    public String getImgUrl() 
+    {
+        return imgUrl;
+    }
+    public void setLinkUrl(String linkUrl) 
+    {
+        this.linkUrl = linkUrl;
+    }
+
+    public String getLinkUrl() 
+    {
+        return linkUrl;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setType(Integer type) 
+    {
+        this.type = type;
+    }
+
+    public Integer getType() 
+    {
+        return type;
+    }
+    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("bannerId", getBannerId())
+            .append("title", getTitle())
+            .append("sort", getSort())
+            .append("isDel", getIsDel())
+            .append("imgUrl", getImgUrl())
+            .append("linkUrl", getLinkUrl())
+            .append("content", getContent())
+            .append("type", getType())
+            .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/BannerMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+
+import com.ruoyi.system.domain.banner.Banner;
+
+import java.util.List;
+
+/**
+ * 轮播图Mapper接口
+ * 
+ * @author boman
+ * @date 2024-01-22
+ */
+public interface BannerMapper 
+{
+    /**
+     * 查询轮播图
+     * 
+     * @param bannerId 轮播图主键
+     * @return 轮播图
+     */
+    public Banner selectBannerByBannerId(Long bannerId);
+
+    /**
+     * 查询轮播图列表
+     * 
+     * @param banner 轮播图
+     * @return 轮播图集合
+     */
+    public List<Banner> selectBannerList(Banner banner);
+
+    /**
+     * 新增轮播图
+     * 
+     * @param banner 轮播图
+     * @return 结果
+     */
+    public int insertBanner(Banner banner);
+
+    /**
+     * 修改轮播图
+     * 
+     * @param banner 轮播图
+     * @return 结果
+     */
+    public int updateBanner(Banner banner);
+
+    /**
+     * 删除轮播图
+     * 
+     * @param bannerId 轮播图主键
+     * @return 结果
+     */
+    public int deleteBannerByBannerId(Long bannerId);
+
+    /**
+     * 批量删除轮播图
+     * 
+     * @param bannerIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBannerByBannerIds(Long[] bannerIds);
+}

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

@@ -1,6 +1,7 @@
 package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.domain.loan.LoanSchedule;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -52,6 +53,7 @@ public interface LoanScheduleMapper
      * @return 结果
      */
     public int deleteLoanScheduleByLoanScheduleId(Long loanScheduleId);
+    public int deleteLoanScheduleByLoanApplicationIdAndValue(@Param("loanApplicationId")Long loanApplicationId,@Param("value")String Value);
 
     /**
      * 批量删除业务进度

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

@@ -1,6 +1,7 @@
 package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.domain.review.ReviewComments;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -52,6 +53,7 @@ public interface ReviewCommentsMapper
      * @return 结果
      */
     public int deleteReviewCommentsByReviewCommentsId(Long reviewCommentsId);
+    public int deleteReviewCommentsByLoanApplicationIdAndAuditSchedule(@Param("loanApplicationId")Long loanApplicationId, @Param("auditSchedule")String auditSchedule);
 
     /**
      * 批量删除业务审核意见

ruoyi-system/src/main/java/com/ruoyi/system/service/banner/IBannerService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service.banner;
+
+
+import com.ruoyi.system.domain.banner.Banner;
+
+import java.util.List;
+
+/**
+ * 轮播图Service接口
+ * 
+ * @author boman
+ * @date 2024-01-22
+ */
+public interface IBannerService 
+{
+    /**
+     * 查询轮播图
+     * 
+     * @param bannerId 轮播图主键
+     * @return 轮播图
+     */
+    public Banner selectBannerByBannerId(Long bannerId);
+
+    /**
+     * 查询轮播图列表
+     * 
+     * @param banner 轮播图
+     * @return 轮播图集合
+     */
+    public List<Banner> selectBannerList(Banner banner);
+
+    /**
+     * 新增轮播图
+     * 
+     * @param banner 轮播图
+     * @return 结果
+     */
+    public int insertBanner(Banner banner);
+
+    /**
+     * 修改轮播图
+     * 
+     * @param banner 轮播图
+     * @return 结果
+     */
+    public int updateBanner(Banner banner);
+
+    /**
+     * 批量删除轮播图
+     * 
+     * @param bannerIds 需要删除的轮播图主键集合
+     * @return 结果
+     */
+    public int deleteBannerByBannerIds(Long[] bannerIds);
+
+    /**
+     * 删除轮播图信息
+     * 
+     * @param bannerId 轮播图主键
+     * @return 结果
+     */
+    public int deleteBannerByBannerId(Long bannerId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/banner/impl/BannerServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.system.service.banner.impl;
+
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.banner.Banner;
+import com.ruoyi.system.mapper.BannerMapper;
+import com.ruoyi.system.service.banner.IBannerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+/**
+ * 轮播图Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-01-22
+ */
+@Service
+public class BannerServiceImpl implements IBannerService
+{
+    @Autowired
+    private BannerMapper bannerMapper;
+
+    /**
+     * 查询轮播图
+     * 
+     * @param bannerId 轮播图主键
+     * @return 轮播图
+     */
+    @Override
+    public Banner selectBannerByBannerId(Long bannerId)
+    {
+        return bannerMapper.selectBannerByBannerId(bannerId);
+    }
+
+    /**
+     * 查询轮播图列表
+     * 
+     * @param banner 轮播图
+     * @return 轮播图
+     */
+    @Override
+    public List<Banner> selectBannerList(Banner banner)
+    {
+        return bannerMapper.selectBannerList(banner);
+    }
+
+    /**
+     * 新增轮播图
+     * 
+     * @param banner 轮播图
+     * @return 结果
+     */
+    @Override
+    public int insertBanner(Banner banner)
+    {
+        banner.setCreateTime(DateUtils.getNowDate());
+        return bannerMapper.insertBanner(banner);
+    }
+
+    /**
+     * 修改轮播图
+     * 
+     * @param banner 轮播图
+     * @return 结果
+     */
+    @Override
+    public int updateBanner(Banner banner)
+    {
+        banner.setUpdateTime(DateUtils.getNowDate());
+        return bannerMapper.updateBanner(banner);
+    }
+
+    /**
+     * 批量删除轮播图
+     * 
+     * @param bannerIds 需要删除的轮播图主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBannerByBannerIds(Long[] bannerIds)
+    {
+        return bannerMapper.deleteBannerByBannerIds(bannerIds);
+    }
+
+    /**
+     * 删除轮播图信息
+     * 
+     * @param bannerId 轮播图主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBannerByBannerId(Long bannerId)
+    {
+        return bannerMapper.deleteBannerByBannerId(bannerId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/loan/ILoanApplicationService.java

@@ -83,6 +83,7 @@ public interface ILoanApplicationService
      * @return
      */
     public AjaxResult ss(LoanApplication loanApplication);
+    public AjaxResult schedule(LoanApplication loanApplication);
 
     /**
      * 撤销

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

@@ -129,15 +129,17 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
      */
     @Override
     public List<LoanApplication> listOss(LoanApplication loanApplication) {
+        loanApplication.setLoanSchedule(TEN);
+        loanApplication.setLoanApplicationType(FOR);
         List<LoanApplication> loanApplications = loanApplicationMapper.selectLoanApplicationList(loanApplication);
-        if (loanApplications != null && loanApplications.size() > 0){
+        if (loanApplications != null && loanApplications.size() > 0) {
             for (LoanApplication application : loanApplications) {
                 //去查询压缩包
                 LoanApplicationFj loanApplicationFj = new LoanApplicationFj();
                 loanApplicationFj.setLoanApplicationId(application.getLoanApplicationId());
                 loanApplicationFj.setBigType("e");
                 List<LoanApplicationFj> loanApplicationFjList = loanApplicationFjMapper.selectLoanApplicationFjList(loanApplicationFj);
-                loanApplication.setLoanApplicationFjList(loanApplicationFjList);
+                application.setLoanApplicationFjList(loanApplicationFjList);
             }
         }
         return loanApplications;
@@ -363,12 +365,21 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         //业务审核意见
         reviewCommentsMapper.insertReviewComments(reviewComments);
         //A角色进度之前审核不通过，直接放入回收站,之后的进入到申诉状态
-        if (THR.equals(auditType) && Integer.parseInt(auditSchedule) < 3) {
+        if (THR.equals(auditType) && ONE.equals(auditSchedule)) {
             loanApplication.setAuditType(auditType);
             loanApplication.setAuditSchedule(auditSchedule);
             loanApplication.setLoanApplicationType(THR);
             loanApplicationMapper.updateLoanApplication(loanApplication);
             return AjaxResult.success();
+            //A角色审核不通过 audit_schedule = 2的时候贷款申请进度处于担保初审状态
+        } else if (THR.equals(auditType) && auditSchedule.equals(TWO)) {
+            loanApplication.setLoanSchedule(THR);
+            loanApplication.setAuditType(auditType);
+            loanApplication.setAuditSchedule(auditSchedule);
+            loanApplication.setLoanApplicationType(TWO);
+            loanApplicationMapper.updateLoanApplication(loanApplication);
+            return AjaxResult.success();
+            //审核流程结束
         } else if (THR.equals(auditType) && Integer.parseInt(auditSchedule) > 2) {
             //进入到A角色申诉状态
             loanApplication.setLoanSchedule(TWO);
@@ -393,6 +404,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             //audit_schedule = 2,3的时候贷款申请进度处于担保初审状态
             if (auditSchedule.equals(TWO) || auditSchedule.equals(THR)) {
                 loanApplication.setLoanSchedule(THR);
+                loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
+                loanApplication.setAuditType(ONE);
                 //审核流程结束
             } else if (auditSchedule.equals(SEV)) {
                 loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanScheduleOld) + 1));
@@ -441,6 +454,31 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         return AjaxResult.success();
     }
 
+    /**
+     * 7：合同签约 8：放款合规风险审核 9：放款通知
+     *
+     * @param loanApplication
+     * @return
+     */
+    @Override
+    public AjaxResult schedule(LoanApplication loanApplication) {
+        String loanSchedule = loanApplication.getLoanSchedule();
+        if (!SEV.equals(loanSchedule) && !EIG.equals(loanSchedule) && !NIN.equals(loanSchedule)) {
+            return AjaxResult.error("当前项目进度错误。");
+        }
+        LoanApplication application = new LoanApplication();
+        application.setLoanApplicationId(loanApplication.getLoanApplicationId());
+        if (NIN.equals(loanSchedule)) {
+            application.setLoanSchedule(NIN);
+            application.setAuditType(TWO);
+        } else {
+            application.setLoanSchedule(String.valueOf(Integer.parseInt(loanSchedule) + 1));
+            application.setAuditType(ONE);
+        }
+        loanApplicationMapper.updateLoanApplication(application);
+        return AjaxResult.success();
+    }
+
     /**
      * 撤销返回到上一步
      *
@@ -449,23 +487,24 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
      */
     @Override
     public AjaxResult cx(LoanApplication loanApplication) {
+        Long loanApplicationId = loanApplication.getLoanApplicationId();
         //获取当前状态
         String loanSchedule = loanApplication.getLoanSchedule();
         String auditSchedule = loanApplication.getAuditSchedule();
         String loanApplicationType = loanApplication.getLoanApplicationType();
+        String auditType = loanApplication.getAuditType();
+        reviewCommentsMapper.deleteReviewCommentsByLoanApplicationIdAndAuditSchedule(loanApplicationId,auditSchedule);
         if (Integer.parseInt(loanSchedule) < 2 || Integer.parseInt(auditSchedule) < 1 || Integer.parseInt(loanApplicationType) != 2) {
             return AjaxResult.error("当前项目不可撤销");
         }
-        if (auditSchedule.equals(FOR) || auditSchedule.equals(THR)) {
-            loanApplication.setLoanSchedule(THR);
-        } else {
+        //如果是待审核的撤销就退一步否则就是改为待审核
+        if (ONE.equals(auditType)) {
+            loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) - 1));
             loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanSchedule) - 1));
         }
-        loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) - 1));
         //进入待审核
         loanApplication.setAuditType(ONE);
         loanApplicationMapper.updateLoanApplication(loanApplication);
-
         String type = "-1";
         if (auditSchedule.equals(FIV)) {
             type = "jzdcbg";
@@ -476,6 +515,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         }
         //还需要删除附件
         loanApplicationFjMapper.deleteLoanApplicationFjByLoanApplicationIdAndType(loanApplication.getLoanApplicationId(), type.split(","));
+
         return AjaxResult.success();
     }
 
@@ -490,7 +530,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         //判断项目是否能归档
         String loanSchedule = loanApplication.getLoanSchedule();
         String loanApplicationType = loanApplication.getLoanApplicationType();
-        if (!NIN.equals(loanSchedule) && !TWO.equals(loanApplicationType)) {
+        String auditType = loanApplication.getAuditType();
+        if (!NIN.equals(loanSchedule) && !TWO.equals(loanApplicationType) && !TWO.equals(auditType)) {
             return AjaxResult.error("当前项目进度不能归档");
         }
         loanApplication.setLoanSchedule(TEN);

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

@@ -0,0 +1,112 @@
+<?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.BannerMapper">
+    
+    <resultMap type="Banner" id="BannerResult">
+        <result property="bannerId"    column="banner_id"    />
+        <result property="title"    column="title"    />
+        <result property="sort"    column="sort"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="imgUrl"    column="img_url"    />
+        <result property="linkUrl"    column="link_url"    />
+        <result property="content"    column="content"    />
+        <result property="type"    column="type"    />
+        <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="selectBannerVo">
+        select banner_id, title, sort, is_del, img_url, link_url, content, type, status, create_by, create_time, update_by, update_time, remark from banner
+    </sql>
+
+    <select id="selectBannerList" parameterType="Banner" resultMap="BannerResult">
+        <include refid="selectBannerVo"/>
+        <where>  
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="imgUrl != null  and imgUrl != ''"> and img_url = #{imgUrl}</if>
+            <if test="linkUrl != null  and linkUrl != ''"> and link_url = #{linkUrl}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+        order by create_time DESC
+    </select>
+    
+    <select id="selectBannerByBannerId" parameterType="Long" resultMap="BannerResult">
+        <include refid="selectBannerVo"/>
+        where banner_id = #{bannerId}
+    </select>
+        
+    <insert id="insertBanner" parameterType="Banner" useGeneratedKeys="true" keyProperty="bannerId">
+        insert into banner
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="title != null">title,</if>
+            <if test="sort != null">sort,</if>
+            <if test="isDel != null and isDel != ''">is_del,</if>
+            <if test="imgUrl != null">img_url,</if>
+            <if test="linkUrl != null">link_url,</if>
+            <if test="content != null">content,</if>
+            <if test="type != null">type,</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="title != null">#{title},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="isDel != null and isDel != ''">#{isDel},</if>
+            <if test="imgUrl != null">#{imgUrl},</if>
+            <if test="linkUrl != null">#{linkUrl},</if>
+            <if test="content != null">#{content},</if>
+            <if test="type != null">#{type},</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="updateBanner" parameterType="Banner">
+        update banner
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null">title = #{title},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="isDel != null and isDel != ''">is_del = #{isDel},</if>
+            <if test="imgUrl != null">img_url = #{imgUrl},</if>
+            <if test="linkUrl != null">link_url = #{linkUrl},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="type != null">type = #{type},</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 banner_id = #{bannerId}
+    </update>
+
+    <delete id="deleteBannerByBannerId" parameterType="Long">
+        delete from banner where banner_id = #{bannerId}
+    </delete>
+
+    <delete id="deleteBannerByBannerIds" parameterType="String">
+        delete from banner where banner_id in 
+        <foreach item="bannerId" collection="array" open="(" separator="," close=")">
+            #{bannerId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -122,7 +122,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="guaranteeSpouseName != null  and guaranteeSpouseName != ''"> and guarantee_spouse_name like concat('%', #{guaranteeSpouseName}, '%')</if>
             <if test="guaranteeSpouseIdCard != null  and guaranteeSpouseIdCard != ''"> and guarantee_spouse_id_card = #{guaranteeSpouseIdCard}</if>
             <if test="guaranteeSpousePhone != null  and guaranteeSpousePhone != ''"> and guarantee_spouse_phone = #{guaranteeSpousePhone}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
             <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
             <if test="applicationTime != null ">AND date_format(application_time,'%Y%m%d') &gt;= date_format(#{applicationTime},'%Y%m%d')</if>
             <if test="fileTime != null "> and file_time = #{fileTime}</if>
@@ -130,7 +129,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'))</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="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(create_time,'%Y') = date_format(#{params.beginTime},'%Y')
             </if>

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

@@ -100,4 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{loanScheduleId}
         </foreach>
     </delete>
+    <delete id="deleteLoanScheduleByLoanApplicationIdAndValue" parameterType="LoanSchedule">
+        delete from loan_schedule where loan_application_id = #{loanApplicationId} and loan_schedule_value = #{value}
+    </delete>
 </mapper>

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

@@ -109,4 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{reviewCommentsId}
         </foreach>
     </delete>
+    <delete id="deleteReviewCommentsByLoanApplicationIdAndAuditSchedule" parameterType="ReviewComments">
+        delete from review_comments where loan_application_id = #{loanApplicationId} and audit_schedule = #{auditSchedule}
+    </delete>
 </mapper>