Merge remote-tracking branch 'origin/master'

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

@@ -1592,6 +1592,39 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 wordPath = WordUtil.createWord(templatePath, fileDir, fileName, params);
                 path = path + "/" + fileName + ".docx";
                 break;
+            case "16":
+                //params.put("enterpriseName", loanApplication.getEnterpriseName());
+                //path = path + "/委托担保申请书.doc";
+                templatePath = RuoYiConfig.getProfile() + "/mb/不可撤销个人连带责任信用反担保合同.docx";
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily/" + loanApplicationNumber;
+                //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("委托担保申请书");
+                fileName = loanApplication.getEnterpriseName() + "-不可撤销个人连带责任信用反担保合同";
+                fileNameHz = fileName + ".docx";
+                wordPath = WordUtil.createWord(templatePath, fileDir, fileName, params);
+                path = path + "/" + fileName + ".docx";
+                break;
+            case "17":
+                //params.put("enterpriseName", loanApplication.getEnterpriseName());
+                //path = path + "/委托担保申请书.doc";
+                templatePath = RuoYiConfig.getProfile() + "/mb/委托保证合同（工程履约）.docx";
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily/" + loanApplicationNumber;
+                //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("委托担保申请书");
+                fileName = loanApplication.getEnterpriseName() + "-委托保证合同（工程履约）";
+                fileNameHz = fileName + ".docx";
+                wordPath = WordUtil.createWord(templatePath, fileDir, fileName, params);
+                path = path + "/" + fileName + ".docx";
+                break;
+            case "18":
+                //params.put("enterpriseName", loanApplication.getEnterpriseName());
+                //path = path + "/委托担保申请书.doc";
+                templatePath = RuoYiConfig.getProfile() + "/mb/企业信用反担保合同.docx";
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily/" + loanApplicationNumber;
+                //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("委托担保申请书");
+                fileName = loanApplication.getEnterpriseName() + "-企业信用反担保合同";
+                fileNameHz = fileName + ".docx";
+                wordPath = WordUtil.createWord(templatePath, fileDir, fileName, params);
+                path = path + "/" + fileName + ".docx";
+                break;
             default:
                 break;
         }

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

@@ -178,8 +178,13 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
         List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(sysUserConference);
         Map<String,List<SysUserConference>> map = sysUserConferences.stream().collect(Collectors.groupingBy(SysUserConference::getConferenceTime));
 
+        //根据时间进行升序排序
+        Map<String, List<SysUserConference>> result = new LinkedHashMap<>();
+        map.entrySet().stream().sorted(Collections.reverseOrder(Map.Entry.comparingByKey())).forEachOrdered(x -> result.put(x.getKey(), x.getValue()));
+
+
         List<Map<String,Object>> listMap = new ArrayList<>();
-        for (Map.Entry<String, List<SysUserConference>> entry : map.entrySet()) {
+        for (Map.Entry<String, List<SysUserConference>> entry : result.entrySet()) {
             Map<String,Object> resultMap = new HashMap<>();
             resultMap.put("conferenceTime",entry.getKey());
             resultMap.put("children",entry.getValue());
@@ -245,19 +250,6 @@ 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();
@@ -279,6 +271,30 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
             return AjaxResult.success("成功");
         }
 
+
+        //判断所有人的金额是否一样
+        //最后一个投票人员
+        String je = sysUserConference.getLineGuarantee();
+        if("N".equals(sysUserConference.getVotingResult())){
+            for (SysUserConference userConference : sysUserConferences) {
+                if(StringUtils.isNotEmpty(userConference.getLineGuarantee())){
+                    je = userConference.getLineGuarantee();
+                }
+            }
+        }
+        Boolean bl = true;
+        for (SysUserConference userConference : sysUserConferences) {
+            if(!userConference.getUserId().equals(user.getUserId()) && !je.equals(userConference.getLineGuarantee())){
+                bl = false;
+                break;
+            }
+        }
+        //不一样
+        if(!bl){
+            redisCache.setCacheObject(sysUserConference.getLoanApplicationNumber()+"tp",THR);
+            return AjaxResult.success("成功,投票金额不同，请通知管理员重新发起投票");
+        }
+        redisCache.setCacheObject(sysUserConference.getLoanApplicationNumber()+"tp",TWO);
         if(bty<2){
             //修改主表信息 通过
             LoanApplication loanApplication = new LoanApplication();
@@ -296,7 +312,8 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
             reviewComments.setAuditSchedule(SEV);
             reviewComments.setAuditType(TWO);
             reviewComments.setAuditTime(DateUtils.getNowDate());
-            reviewCommentsMapper.insertReviewComments(reviewComments);reviewComments.setCreateBy(SecurityUtils.getUsername());
+            reviewComments.setCreateBy(SecurityUtils.getUsername());
+            reviewCommentsMapper.insertReviewComments(reviewComments);
             return AjaxResult.success("成功");
         }
 
@@ -315,7 +332,7 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
         SysUserConference userConference = new SysUserConference();
         userConference.setLoanApplicationId(sysUserConference.getLoanApplicationId());
         userConference.setConferenceTime(loanApplication.getReviewTime());
-        List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(sysUserConference);
+        List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(userConference);
         for (SysUserConference conference : sysUserConferences) {
             //重新赋值投票人员
             SysUserConference user = new SysUserConference();
@@ -325,7 +342,7 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
             user.setLoanApplicationName(conference.getLoanApplicationName());
             user.setLoanApplicationNumber(conference.getLoanApplicationNumber());
             user.setConferenceTime(sysUserConference.getConferenceTime());
-            sysUserConferenceMapper.insertSysUserConference(userConference);
+            sysUserConferenceMapper.insertSysUserConference(user);
         }
         //修改主表信息
         loanApplication.setReviewTime(sysUserConference.getConferenceTime());

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

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
             <if test="conferenceTime != null  and conferenceTime != ''"> and conference_time = #{conferenceTime}</if>
         </where>
-        order by create_time
+        order by create_time desc,real_name
     </select>
     
     <select id="selectSysUserConferenceByConferenceId" parameterType="Long" resultMap="SysUserConferenceResult">