Merge remote-tracking branch 'origin/master'

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

@@ -2266,7 +2266,38 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             case "15":
                 //查询评审人员信息
                 //查询所有人员的投票结果
-                SysUserConference sysUserConference = new SysUserConference();
+                //查询所有与当前项目同一时间的项目
+
+                LoanApplication aplication = new LoanApplication();
+                aplication.setReviewTime(loanApplication.getReviewTime());
+                List<LoanApplication> loanApplicationList = loanApplicationMapper.selectLoanApplicationList(aplication);
+                //拼接所有项目名称
+                StringBuilder sbxmname = new StringBuilder();
+                int num = 1;
+                for (LoanApplication application : loanApplicationList) {
+                    if(sbxmname.length()>0){
+                        sbxmname.append("、").append(application.getEnterpriseName());
+                    }else{
+                        sbxmname.append(application.getEnterpriseName());
+                    }
+                    SysUserConference sysUserConference = new SysUserConference();
+                    sysUserConference.setLoanApplicationId(application.getLoanApplicationId());
+                    sysUserConference.setConferenceTime(application.getReviewTime());
+                    List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(sysUserConference);
+                    //凭借参会信息
+                    //拼接姓名
+                    StringBuilder sb = new StringBuilder();
+                    sb.append(application.getEnterpriseName()).append("的评委是:");
+                    for (SysUserConference userConference1 : sysUserConferences) {
+                        sb.append(" ").append(userConference1.getRealName());
+                    }
+                    params.put("user"+num, sb.toString());
+                    num++;
+                }
+                //评审会公司
+                params.put("enterpriseName", sbxmname.toString());
+
+                /*SysUserConference sysUserConference = new SysUserConference();
                 sysUserConference.setLoanApplicationId(loanApplication.getLoanApplicationId());
                 sysUserConference.setConferenceTime(loanApplication.getReviewTime());
                 List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(sysUserConference);
@@ -2279,13 +2310,13 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                         sb.append(userConference1.getRealName());
                     }
 
-                }
+                }*/
                 //评审会时间
                 params.put("time", loanApplication.getReviewTime());
                 //评审会公司
-                params.put("enterpriseName", loanApplication.getEnterpriseName());
+                //params.put("enterpriseName", loanApplication.getEnterpriseName());
                 //评审会人员
-                params.put("user", sb.toString());
+                //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/mapper/WaitRemindMapper.java

@@ -71,4 +71,6 @@ public interface WaitRemindMapper
      * @return 结果
      */
     public int deleteWaitRemindByRemindIds(Integer[] remindIds);
+
+    void updateWaitRemindIsReadUserId(WaitRemind waitRemind1);
 }

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

@@ -130,7 +130,8 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
     @Override
     @Transactional
     public AjaxResult randomAdd(SysUserConference sysUserConference) {
-
+        //排序 1:徐春生，2：左秀
+        int px = 3;
         int num = 0;
         //查询贷款信息
         LoanApplication loanApplication = loanApplicationMapper.selectLoanApplicationByLoanApplicationId(sysUserConference.getLoanApplicationId());
@@ -147,7 +148,8 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
         Set<String> strlist = data.stream().map(SysDictData::getDictValue).collect(Collectors.toSet());
         //查询人员
         List<SysUser> userList = userMapper.selectUserManageList(strlist);
-        //去掉项目本身的A,B,风险
+        //去掉项目本身的A,B,风险,董事长徐春生和左秀
+        List<SysUser> userChList = new ArrayList<>();
         for (SysUser sysUser : userList) {
             //A
             boolean b1 = sysUser.getUserId().equals(loanApplication.getaUserId());
@@ -156,7 +158,7 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
             //风险
             boolean b3 = sysUser.getUserId().equals(loanApplication.getfUserId());
             if (b1 || b2 || b3) {
-                userList.remove(sysUser);
+                continue;
             }
             //固定董事长徐春生和左秀参会
             if("左秀".equals(sysUser.getNickName()) || "徐春生".equals(sysUser.getNickName())){
@@ -168,6 +170,10 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
                 userConference.setLoanApplicationName(loanApplication.getEnterpriseName());
                 userConference.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
                 userConference.setConferenceTime(sysUserConference.getConferenceTime());
+                userConference.setRemark("1");
+                if("左秀".equals(sysUser.getNickName())){
+                    userConference.setRemark("2");
+                }
                 sysUserConferenceMapper.insertSysUserConference(userConference);
                 //给人员发生代办信息
                 WaitRemind waitRemind = new WaitRemind();
@@ -179,8 +185,6 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
                 waitRemind.setReadUserId(sysUser.getUserId().toString());
                 waitRemind.setRemindContent("您有一个评审会议需参加，会议时间：" + sysUserConference.getConferenceTime() + "，会议主题：【" + loanApplication.getEnterpriseName() + "】评审会");
                 waitRemindMapper.insertWaitRemind(waitRemind);
-                num++;
-                userList.remove(sysUser);
                 //发极光推送
                 SysUser user = sysUserService.selectUserById(sysUser.getUserId());
                 if (StringUtils.isNotEmpty(user.getJgId())) {
@@ -190,18 +194,20 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
                     String jPushVO = "";
                     JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, user.getJgId());
                 }
+                continue;
             }
+            userChList.add(sysUser);
         }
 
         //生成0-n的随机数
         List<Integer> intList = new ArrayList<>();
         Random random = new Random();
-        if (userList.size() < 3) {
+        if (userChList.size() < 3) {
             throw new ServiceException("符合参会人员数量不足，无法开启会议");
         }
         while (num < 3) {
-            int randomNumber = random.nextInt(userList.size() - 1);
-            SysUser sysUser = userList.get(randomNumber);
+            int randomNumber = random.nextInt(userChList.size() - 1);
+            SysUser sysUser = userChList.get(randomNumber);
 
             //将信息存入库
             SysUserConference userConference = new SysUserConference();
@@ -211,6 +217,7 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
             userConference.setLoanApplicationName(loanApplication.getEnterpriseName());
             userConference.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
             userConference.setConferenceTime(sysUserConference.getConferenceTime());
+            userConference.setRemark(String.valueOf(px));
             sysUserConferenceMapper.insertSysUserConference(userConference);
             //给人员发生代办信息
             WaitRemind waitRemind = new WaitRemind();
@@ -223,8 +230,9 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
             waitRemind.setRemindContent("您有一个评审会议需参加，会议时间：" + sysUserConference.getConferenceTime() + "，会议主题：【" + loanApplication.getEnterpriseName() + "】评审会");
             waitRemindMapper.insertWaitRemind(waitRemind);
             num++;
+            px++;
             intList.add(randomNumber);
-            userList.remove(sysUser);
+            userChList.remove(sysUser);
             //发极光推送
             SysUser user = sysUserService.selectUserById(sysUser.getUserId());
             if (StringUtils.isNotEmpty(user.getJgId())) {
@@ -299,6 +307,15 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
         sysUserConference.setUserId(user.getUserId());
         sysUserConference.setUpdateTime(DateUtils.getNowDate());
         sysUserConferenceMapper.updateSysUserConferenceByUserId(sysUserConference);
+
+        //把当前阶段本人的待办都设置为已读
+        WaitRemind waitRemind1 = new WaitRemind();
+        waitRemind1.setLoanApplicationId(sysUserConference.getLoanApplicationId());
+        waitRemind1.setLoanApplicationNumber(sysUserConference.getLoanApplicationNumber());
+        waitRemind1.setRemindType(TWE);
+        waitRemind1.setReadUserId(String.valueOf(user.getUserId()));
+        waitRemindMapper.updateWaitRemindIsReadUserId(waitRemind1);
+
         //除了本人外是否全部投票
         //不同意人数
         int bty = 0;
@@ -402,10 +419,11 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
 
             //把上一阶段的待办都设置为已读
             WaitRemind waitRemindIsRead = new WaitRemind();
-            waitRemindIsRead.setLoanApplicationId(loanApplication.getLoanApplicationId());
-            waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+            waitRemindIsRead.setLoanApplicationId(loanApplicationOld.getLoanApplicationId());
+            waitRemindIsRead.setLoanApplicationNumber(loanApplicationOld.getLoanApplicationNumber());
             waitRemindIsRead.setRemindType(String.valueOf(Integer.parseInt(loanApplication.getAuditSchedule()) - 1));
             waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
+
             //发极光推送id
             List<SysUser> sysUsers = sysUserService.selectUserListByIdList(userIdList);
             if (sysUsers != null && sysUsers.size() > 0) {

ruoyi-system/src/main/java/com/ruoyi/system/service/webOfficeImpl/MultiPhaseFileStorageServiceImpl.java

@@ -76,8 +76,8 @@ public class MultiPhaseFileStorageServiceImpl implements MultiPhaseFileStorageSe
         // 然后在调用 正真的 upload 方法的时候，需要确认当前的文件后缀
         // ***************************************************************
         // ***************************************************************
-
         // 这里简单的放内存
+        request.setManual(false);
         String suffix = FileUtils.suffix(request.getName());
         redisCache.setCacheObject(request.getFileId(), suffix, 2, TimeUnit.HOURS);
         SysUser user = SecurityUtils.getLoginUser().getUser();

ruoyi-system/src/main/java/com/ruoyi/system/service/webOfficeImpl/PreviewServiceImpl.java

@@ -59,7 +59,7 @@ public class PreviewServiceImpl implements PreviewService {
         // 然后这里就会获取最后一个版本的文件并返回
         // 这里为了方便，所以设计成了一张表
         LoanApplicationFj cacheObject = redisCache.getCacheObject(fileId + "info");
-        String url = "https://rzdb.qs163.cn/prod-api/"+cacheObject.getUrl();
+        String url = "https://rzdb.qs163.cn/prod-api"+cacheObject.getUrl();
         DownloadInfo downloadInfo = new DownloadInfo();
         downloadInfo.setUrl(url);
         return downloadInfo;
@@ -79,6 +79,7 @@ public class PreviewServiceImpl implements PreviewService {
         webofficeFjServiceImpl.fetchFile(fileId);
         // 获取user信息，这个方法点进去看看把！！！
         SysUser user = SecurityUtils.getLoginUser().getUser();
+        System.out.println("rrrrrrrrrrrrrr"+user.getUserId());
         // 构建user对应的文件权限
         return UserPermission.builder()
                 .userId(String.valueOf(user.getUserId()))

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 desc,real_name
+        order by remark
     </select>
     
     <select id="selectSysUserConferenceByConferenceId" parameterType="Long" resultMap="SysUserConferenceResult">

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

@@ -119,6 +119,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update wait_remind set is_read = 'Y'
         where loan_application_id = #{loanApplicationId} and loan_application_number = #{loanApplicationNumber} and remind_type = #{remindType}
     </update>
+    <update id="updateWaitRemindIsReadUserId" parameterType="WaitRemind">
+        update wait_remind set is_read = 'Y'
+        where loan_application_id = #{loanApplicationId} and loan_application_number = #{loanApplicationNumber} and remind_type = #{remindType} and read_user_id = #{readUserId}
+    </update>
     <delete id="deleteWaitRemindByRemindId" parameterType="Integer">
         delete from wait_remind where remind_id = #{remindId}
     </delete>