Merge remote-tracking branch 'origin/master'

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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/conference/SysUserConferenceController.java

@@ -126,6 +126,26 @@ public class SysUserConferenceController extends BaseController {
         return sysUserConferenceService.vote(sysUserConference);
     }
 
+    /**
+     * 管理员发起重新投票（最新一次的投票人员不变）
+     */
+    @PreAuthorize("@ss.hasPermi('c:conference:again')")
+    @Log(title = "参会人员", businessType = BusinessType.UPDATE)
+    @PostMapping("/again")
+    public AjaxResult again(@RequestBody SysUserConference sysUserConference) {
+        return sysUserConferenceService.again(sysUserConference);
+    }
+
+    /**
+     * 董事长一票否决
+     */
+    @PreAuthorize("@ss.hasPermi('c:conference:finish')")
+    @Log(title = "参会人员", businessType = BusinessType.UPDATE)
+    @PostMapping("/finish")
+    public AjaxResult finish(@RequestBody SysUserConference sysUserConference) {
+        return sysUserConferenceService.finish(sysUserConference);
+    }
+
     /**
      * 删除参会人员
      */

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

@@ -118,6 +118,11 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         if (shareholderFjs != null && shareholderFjs.size() > 0) {
             loanApplication.setShareholderFjList(shareholderFjs);
         }
+        //会议状态
+        loanApplication.setVotingResult(FOR);
+        if(redisCache.getCacheObject(loanApplication.getLoanApplicationNumber()+"tp")!=null){
+            loanApplication.setVotingResult(redisCache.getCacheObject(loanApplication.getLoanApplicationNumber()+"tp"));
+        }
         return loanApplication;
     }
 
@@ -148,11 +153,11 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
     public List<LoanApplication> conferenceList(LoanApplication loanApplication) {
         //查询人员id
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        //判断当前角色是否是管理员和admin
+        //判断当前角色是否是管理员和admin,董事长
         List<SysRole> roles = user.getRoles();
         Boolean bl = false;
         for (SysRole role : roles) {
-            if (role.getRoleKey().equals("admin") || role.getRoleKey().equals("manager")) {
+            if (role.getRoleKey().equals("admin") || role.getRoleKey().equals("manager")|| role.getRoleKey().equals("sensible")) {
                 bl = true;
                 break;
             }
@@ -161,6 +166,12 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             loanApplication.setUserId(user.getUserId());
         }
         List<LoanApplication> loanApplications = loanApplicationMapper.conferenceList(loanApplication);
+        for (LoanApplication application : loanApplications) {
+            application.setVotingResult(FOR);
+            if(redisCache.getCacheObject(application.getLoanApplicationNumber()+"tp")!=null){
+                application.setVotingResult(redisCache.getCacheObject(application.getLoanApplicationNumber()+"tp"));
+            }
+        }
         return loanApplications;
     }
 
@@ -689,7 +700,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             loanSchedule.setLoanScheduleTime(DateUtils.getNowDate());
             loanScheduleMapper.insertLoanSchedule(loanSchedule);
             //插入审核通过的待办提醒
-            waitRemindMapper.batchWaitRemind(waitRemindList);
+            if(waitRemindList.size()>0){
+                waitRemindMapper.batchWaitRemind(waitRemindList);
+            }
+
         }
         return AjaxResult.success();
     }
@@ -707,74 +721,74 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         Long userId = SecurityUtils.getUserId();
         Long aLong = loanApplication.getaUserId();
         Long bLong = loanApplication.getbUserId();
-        if (!Objects.equals(userId, aLong) || !Objects.equals(userId, bLong)) {
-            return AjaxResult.error("当前您无权限申诉，请联系管理员");
-        }
-        //判断当前项目是否是在申诉状态
-        String auditType = loanApplication.getAuditType();
-        if (!FOR.equals(auditType)) {
-            return AjaxResult.error("当前项目无需申诉或状态异常");
-        }
-        //判断是否是放弃申诉 如果AB角色都放弃申诉则项目结束 = 放到回收站
-        String ssType = loanApplication.getSsType();
-        if (ONE.equals(ssType)) {
-            //申诉中判断评审会进度不是1等待上会，则重置为1
-            loanApplication.setReviewSchedule(ONE);
-            //进入待审核
-            loanApplication.setAuditType(ONE);
-            loanApplicationMapper.updateLoanApplication(loanApplication);
-            //删除基础附件外的所有附件
-            //loanApplicationFjMapper.deleteLoanApplicationFjByLoanApplicationIdAndBigType(loanApplication.getLoanApplicationId());
-
-            //业务审核意见
-            ReviewComments reviewComments = new ReviewComments();
-            reviewComments.setLoanApplicationId(loanApplicationId);
-            reviewComments.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
-            reviewComments.setAuditSchedule(TWO);
-            reviewComments.setAuditType(FOR);
-            reviewComments.setAuditTime(DateUtils.getNowDate());
-            reviewComments.setCreateBy(SecurityUtils.getUsername());
-            reviewCommentsMapper.insertReviewComments(reviewComments);
-        } else if (TWO.equals(ssType)) {
-            //放弃申诉需要AB角色都要放弃
-            //先判断是A还是B角色
-            String key = loanApplicationId + ":ss:";
-            if (Objects.equals(userId, aLong)) {
-                Object cacheObjectA = redisCache.getCacheObject(key + A);
-                if (ObjectUtils.isNotEmpty(cacheObjectA)) {
-                    //
-                    return AjaxResult.error("请勿重复放弃");
-                } else {
-                    //A是空则查询B
-                    Object cacheObjectB = redisCache.getCacheObject(key + B);
-                    if (ObjectUtils.isNotEmpty(cacheObjectB)) {
-                        //修改项目状态到回收站
-                        loanApplication.setLoanApplicationType(THR);
-                        loanApplicationMapper.updateLoanApplication(loanApplication);
-                    } else {
-                        redisCache.setCacheObject(key + A, aLong);
-                    }
-                }
+        if (Objects.equals(userId, aLong) || Objects.equals(userId, bLong)) {
+            //判断当前项目是否是在申诉状态
+            String auditType = loanApplication.getAuditType();
+            if (!FOR.equals(auditType)) {
+                return AjaxResult.error("当前项目无需申诉或状态异常");
             }
-            if (Objects.equals(userId, bLong)) {
-                Object cacheObjectB = redisCache.getCacheObject(key + B);
-                if (ObjectUtils.isNotEmpty(cacheObjectB)) {
-                    //
-                    return AjaxResult.error("请勿重复放弃");
-                } else {
-                    //B是空则查询A
+            //判断是否是放弃申诉 如果AB角色都放弃申诉则项目结束 = 放到回收站
+            String ssType = loanApplication.getSsType();
+            if (ONE.equals(ssType)) {
+                //申诉中判断评审会进度不是1等待上会，则重置为1
+                loanApplication.setReviewSchedule(ONE);
+                //进入待审核
+                loanApplication.setAuditType(ONE);
+                loanApplicationMapper.updateLoanApplication(loanApplication);
+                //删除基础附件外的所有附件
+                //loanApplicationFjMapper.deleteLoanApplicationFjByLoanApplicationIdAndBigType(loanApplication.getLoanApplicationId());
+
+                //业务审核意见
+                ReviewComments reviewComments = new ReviewComments();
+                reviewComments.setLoanApplicationId(loanApplicationId);
+                reviewComments.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                reviewComments.setAuditSchedule(TWO);
+                reviewComments.setAuditType(FOR);
+                reviewComments.setAuditTime(DateUtils.getNowDate());
+                reviewComments.setCreateBy(SecurityUtils.getUsername());
+                reviewCommentsMapper.insertReviewComments(reviewComments);
+            } else if (TWO.equals(ssType)) {
+                //放弃申诉需要AB角色都要放弃
+                //先判断是A还是B角色
+                String key = loanApplicationId + ":ss:";
+                if (Objects.equals(userId, aLong)) {
                     Object cacheObjectA = redisCache.getCacheObject(key + A);
                     if (ObjectUtils.isNotEmpty(cacheObjectA)) {
-                        //修改项目状态到回收站
-                        loanApplication.setLoanApplicationType(THR);
-                        loanApplicationMapper.updateLoanApplication(loanApplication);
+                        //
+                        return AjaxResult.error("请勿重复放弃");
                     } else {
-                        redisCache.setCacheObject(key + B, aLong);
+                        //A是空则查询B
+                        Object cacheObjectB = redisCache.getCacheObject(key + B);
+                        if (ObjectUtils.isNotEmpty(cacheObjectB)) {
+                            //修改项目状态到回收站
+                            loanApplication.setLoanApplicationType(THR);
+                            loanApplicationMapper.updateLoanApplication(loanApplication);
+                        } else {
+                            redisCache.setCacheObject(key + A, aLong);
+                        }
+                    }
+                }
+                if (Objects.equals(userId, bLong)) {
+                    Object cacheObjectB = redisCache.getCacheObject(key + B);
+                    if (ObjectUtils.isNotEmpty(cacheObjectB)) {
+                        //
+                        return AjaxResult.error("请勿重复放弃");
+                    } else {
+                        //B是空则查询A
+                        Object cacheObjectA = redisCache.getCacheObject(key + A);
+                        if (ObjectUtils.isNotEmpty(cacheObjectA)) {
+                            //修改项目状态到回收站
+                            loanApplication.setLoanApplicationType(THR);
+                            loanApplicationMapper.updateLoanApplication(loanApplication);
+                        } else {
+                            redisCache.setCacheObject(key + B, aLong);
+                        }
                     }
                 }
             }
+            return AjaxResult.success();
         }
-        return AjaxResult.success();
+        return AjaxResult.error("当前您无权限申诉，请联系管理员");
     }
 
     /**
@@ -932,7 +946,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     //删掉参会人员
                     sysUserConferenceMapper.deleteSysUserConferenceByTime(loanApplicationOld.getReviewTime(), loanApplicationOld.getLoanApplicationId());
                 }
-            } else {
+            }else {
                 //进入待审核
                 loanApplication.setAuditType(ONE);
             }
@@ -1264,8 +1278,11 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
     @Override
     public AjaxResult exportMb(LoanApplication loanApplication) {
         Map<String, Object> map = new HashMap<>();
+        //导出的附件
         String type = loanApplication.getType();
+        //附件小类
         String fileType = loanApplication.getFileType();
+        //附件大类
         String bigType = loanApplication.getBigType();
         if (loanApplication.getLoanApplicationId() != null && loanApplication.getLoanApplicationId() != 0L) {
             loanApplication = loanApplicationMapper.selectLoanApplicationByLoanApplicationId(loanApplication.getLoanApplicationId());
@@ -1291,6 +1308,9 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         String year = DateUtils.getDate();
         String month = DateUtils.getMonth();
         String day = DateUtils.getDay();
+        params.put("year", year);
+        params.put("month", month);
+        params.put("day", day);
 
         String path = "/profile/mb/temporarily/" + loanApplicationNumber;
         //查询公司信息
@@ -1306,8 +1326,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             chineseNum = StringUtils.convert(Integer.parseInt(loanApplication.getLoanApplicationNumber()));
         }
         params.put("chineseNum", chineseNum);
-        //获取当前年、月、日
-
 
         String templatePath = RuoYiConfig.getProfile();
         String fileDir = RuoYiConfig.getProfile();
@@ -1508,8 +1526,28 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 path = path + "/" + fileNameHz;
                 break;
             case "15":
+                //查询评审人员信息
+                //查询所有人员的投票结果
+                SysUserConference sysUserConference = new SysUserConference();
+                sysUserConference.setLoanApplicationId(loanApplication.getLoanApplicationId());
+                sysUserConference.setConferenceTime(loanApplication.getReviewTime());
+                List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(sysUserConference);
+                //拼接姓名
+                StringBuilder sb = new StringBuilder();
+                for (SysUserConference userConference : sysUserConferences) {
+                    if(sb.length()>0){
+                        sb.append("  ").append(userConference.getRealName());
+                    }else{
+                        sb.append(userConference.getRealName());
+                    }
+
+                }
                 //评审会时间
+                params.put("time", loanApplication.getReviewTime());
+                //评审会公司
                 params.put("enterpriseName", loanApplication.getEnterpriseName());
+                //评审会人员
+                params.put("user", sb.toString());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = templatePath + "/mb/评审会通知.docx";
                 fileDir = fileDir + "/mb/temporarily/" + loanApplicationNumber;

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

@@ -299,6 +299,11 @@ public class LoanApplication extends BaseEntity
      */
     private String ssType;
 
+    /**
+     * 不在数据库的字段，判断投票结果 1：投票中 2：投票完成，3：重新投票，4：待投票
+     */
+    private String votingResult;
+
     /**
      * 全体股东信息附件
      */
@@ -990,4 +995,12 @@ public class LoanApplication extends BaseEntity
     public void setOtherFj(Map<String, List<LoanApplicationFj>> otherFj) {
         this.otherFj = otherFj;
     }
+
+    public String getVotingResult() {
+        return votingResult;
+    }
+
+    public void setVotingResult(String votingResult) {
+        this.votingResult = votingResult;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/conference/ISysUserConferenceService.java

@@ -68,4 +68,8 @@ public interface ISysUserConferenceService
     AjaxResult pcTimeTist(SysUserConference sysUserConference);
 
     AjaxResult vote(SysUserConference sysUserConference);
+
+    AjaxResult again(SysUserConference sysUserConference);
+
+    AjaxResult finish(SysUserConference sysUserConference);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/conference/impl/SysUserConferenceServiceImpl.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -50,6 +51,9 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
     @Autowired
     private ReviewCommentsMapper reviewCommentsMapper;
 
+    @Autowired
+    private RedisCache redisCache;
+
     /**
      * 查询参会人员
      *
@@ -129,6 +133,7 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
         loanApplication.setReviewTime(sysUserConference.getConferenceTime());
         loanApplication.setReviewSchedule(FOR);
         loanApplicationMapper.updateLoanApplication(loanApplication);
+        redisCache.setCacheObject(sysUserConference.getLoanApplicationNumber()+"tp",FOR);
 
         //查询参会人员的字典值
         List<SysDictData> data = dictTypeService.selectDictDataByType("conference_role");
@@ -138,7 +143,7 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
         //生成0-n的随机数
         List<Integer> intList = new ArrayList<>();
         Random random = new Random();
-        while (num <= 5) {
+        while (num < 5) {
             int randomNumber = random.nextInt(userList.size() - 1);
             if(intList.size()>0 && intList.contains(randomNumber)){
                 continue;
@@ -193,15 +198,21 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
     @Override
     @Transactional
     public AjaxResult vote(SysUserConference sysUserConference) {
-
+        //将状态改为投票中
+        redisCache.setCacheObject(sysUserConference.getLoanApplicationNumber()+"tp",ONE);
         SysUser user = SecurityUtils.getLoginUser().getUser();
         //查询所有人员的投票结果
         List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(sysUserConference);
         //如果投票人员不在参会人员中，投票失败
         Boolean bo = false;
+        //是否重复投票
+        Boolean bn = false;
         for (SysUserConference userConference : sysUserConferences) {
             if(user.getUserId().equals(userConference.getUserId())){
                 bo = true;
+                if(StringUtils.isNotEmpty(userConference.getVotingResult())){
+                    bn = true;
+                }
                 break;
             }
         }
@@ -209,41 +220,14 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
         if(!bo){
             return AjaxResult.error("不是当前项目投票人员，投票失败");
         }
+        if(bn){
+            return AjaxResult.error("请勿重复投票");
+        }
 
         sysUserConference.setUserId(user.getUserId());
         sysUserConference.setUpdateTime(DateUtils.getNowDate());
         sysUserConferenceMapper.updateSysUserConferenceByUserId(sysUserConference);
-        //判断当前角色是否是董事长
-        List<SysRole> roles = user.getRoles();
-        Boolean bl = false;
-        for (SysRole role : roles) {
-            if(role.getRoleKey().equals("sensible")){
-                bl = true;
-                break;
-            }
-        }
-        //董事长是否一票否决
-        if(bl && sysUserConference.getVotingResult().equals("N")){
-            //修改主表信息 未通过
-            LoanApplication loanApplication = new LoanApplication();
-            loanApplication.setAuditType(FOR);
-            loanApplication.setReviewSchedule(SIX);
-            loanApplication.setLoanApplicationId(sysUserConference.getLoanApplicationId());
-            loanApplicationMapper.updateLoanApplication(loanApplication);
-            // todo 未通过 业务流程表插入数据
-            //业务审核意见
-            ReviewComments reviewComments = new ReviewComments();
-            reviewComments.setLoanApplicationId(loanApplication.getLoanApplicationId());
-            reviewComments.setLoanApplicationNumber(sysUserConference.getLoanApplicationNumber());
-            reviewComments.setAuditSchedule(SEV);
-            reviewComments.setAuditType(FOR);
-            reviewComments.setAuditTime(DateUtils.getNowDate());
-            reviewComments.setCreateBy(SecurityUtils.getUsername());
-            reviewCommentsMapper.insertReviewComments(reviewComments);
-            return AjaxResult.success("成功");
-        }
         //除了本人外是否全部投票
-        Boolean b = true;
         //不同意人数
         int bty = 0;
         if("N".equals(sysUserConference.getVotingResult())){
@@ -252,7 +236,8 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
         for (SysUserConference userConference : sysUserConferences) {
             //是否有人未投票
             if(!userConference.getUserId().equals(user.getUserId()) && StringUtils.isEmpty(userConference.getVotingResult())){
-                b = false;
+                //有人未投票就直接返回结果
+                return AjaxResult.success("成功");
             }
             //排除掉本人
             if(!userConference.getUserId().equals(user.getUserId()) && StringUtils.isNotEmpty(userConference.getVotingResult()) && "N".equals(userConference.getVotingResult())){
@@ -260,7 +245,19 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
             }
 
         }
-
+        //判断所有人的金额是否一样
+        Boolean bl = true;
+        for (SysUserConference userConference : sysUserConferences) {
+            if(!userConference.getUserId().equals(user.getUserId()) &&!sysUserConference.getLineGuarantee().equals(userConference.getIsConference())){
+                bl = false;
+            }
+        }
+        //不一样
+        if(bl){
+            redisCache.setCacheObject(sysUserConference.getLoanApplicationNumber()+"tp",THR);
+            return AjaxResult.success("成功,投票金额不同，请通知管理员重新发起投票");
+        }
+        redisCache.setCacheObject(sysUserConference.getLoanApplicationNumber()+"tp",TWO);
         if(bty>=2){
             //修改主表信息 未通过
             LoanApplication loanApplication = new LoanApplication();
@@ -282,7 +279,7 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
             return AjaxResult.success("成功");
         }
 
-        if(b && bty<2){
+        if(bty<2){
             //修改主表信息 通过
             LoanApplication loanApplication = new LoanApplication();
             loanApplication.setAuditType(ONE);
@@ -299,11 +296,52 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
             reviewComments.setAuditSchedule(SEV);
             reviewComments.setAuditType(TWO);
             reviewComments.setAuditTime(DateUtils.getNowDate());
-            reviewComments.setCreateBy(SecurityUtils.getUsername());
-            reviewCommentsMapper.insertReviewComments(reviewComments);
+            reviewCommentsMapper.insertReviewComments(reviewComments);reviewComments.setCreateBy(SecurityUtils.getUsername());
             return AjaxResult.success("成功");
         }
 
         return AjaxResult.success("成功");
     }
+
+    @Override
+    @Transactional
+    public AjaxResult again(SysUserConference sysUserConference) {
+        //删除投票状态
+        redisCache.deleteObject(sysUserConference.getLoanApplicationNumber()+"tp");
+        //查询最新的投票人员
+        //查询贷款表信息
+        LoanApplication loanApplication = loanApplicationMapper.selectLoanApplicationByLoanApplicationId(sysUserConference.getLoanApplicationId());
+        //查询所有人员的投票结果 必须有时间和贷款id
+        SysUserConference userConference = new SysUserConference();
+        userConference.setLoanApplicationId(sysUserConference.getLoanApplicationId());
+        userConference.setConferenceTime(loanApplication.getReviewTime());
+        List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(sysUserConference);
+        for (SysUserConference conference : sysUserConferences) {
+            //重新赋值投票人员
+            SysUserConference user = new SysUserConference();
+            user.setUserId(conference.getUserId());
+            user.setRealName(conference.getRealName());
+            user.setLoanApplicationId(conference.getLoanApplicationId());
+            user.setLoanApplicationName(conference.getLoanApplicationName());
+            user.setLoanApplicationNumber(conference.getLoanApplicationNumber());
+            user.setConferenceTime(sysUserConference.getConferenceTime());
+            sysUserConferenceMapper.insertSysUserConference(userConference);
+        }
+        //修改主表信息
+        loanApplication.setReviewTime(sysUserConference.getConferenceTime());
+        loanApplication.setReviewSchedule(FOR);
+        loanApplicationMapper.updateLoanApplication(loanApplication);
+        return AjaxResult.success("成功");
+    }
+
+    @Override
+    public AjaxResult finish(SysUserConference sysUserConference) {
+        //将项目放入回收站
+        LoanApplication loanApplication = new LoanApplication();
+        loanApplication.setLoanApplicationId(sysUserConference.getLoanApplicationId());
+        loanApplication.setLoanApplicationType(THR);
+        loanApplicationMapper.updateLoanApplication(loanApplication);
+        return AjaxResult.success("成功");
+    }
+
 }

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

@@ -262,7 +262,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_user_conference s
         LEFT JOIN loan_application l on l.loan_application_id = s.loan_application_id
         where  l.loan_application_id is not null
-        <if test="userId != null "> and s.user_id = #{userId} = #{userId}</if>
+        <if test="userId != null "> and s.user_id = #{userId}</if>
         <if test="enterpriseName != null  and enterpriseName != ''"> and l.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
         <if test="applicationAmount != null "> and l.application_amount = #{applicationAmount}</if>
         <if test="reviewTime != null "> and l.review_time = #{reviewTime}</if>

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

@@ -41,12 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="loanApplicationName != null "> and loan_application_name = #{loanApplicationName}</if>
             <if test="isConference != null  and isConference != ''"> and is_conference = #{isConference}</if>
             <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
-
             <if test="conferenceTime != null  and conferenceTime != ''"> and conference_time = #{conferenceTime}</if>
-            <if test="votingResult != null  and votingResult != ''"> and voting_result = #{votingResult}</if>
-            <if test="lineGuarantee != null  and lineGuarantee != ''"> and line_guarantee = #{lineGuarantee}</if>
-            <if test="guaranteePeriod != null  and guaranteePeriod != ''"> and guarantee_period = #{guaranteePeriod}</if>
-            <if test="argument != null  and argument != ''"> and argument = #{argument}</if>
         </where>
         order by create_time
     </select>