参会人员

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/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());
@@ -169,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();
@@ -212,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();
@@ -224,6 +230,7 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
             waitRemind.setRemindContent("您有一个评审会议需参加，会议时间：" + sysUserConference.getConferenceTime() + "，会议主题：【" + loanApplication.getEnterpriseName() + "】评审会");
             waitRemindMapper.insertWaitRemind(waitRemind);
             num++;
+            px++;
             intList.add(randomNumber);
             userChList.remove(sysUser);
             //发极光推送

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">