ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

@@ -680,7 +680,7 @@ public class CaseApplication  extends BaseEntity {
     @Excel(name = "被申请人主体信息-身份证号",width = 26)
     private String debtorIdentityNum;
     /** 被申请人主体信息-性别 */
-    @Excel(name = "被申请人主体信息-性别",width = 26,combo= {"男","女"},readConverterExp = "0=男,女=1")
+    @Excel(name = "被申请人主体信息-性别",width = 26,combo= {"男","女"},readConverterExp = "0=男,1=女")
     private String responSex;
 
     public Date getResponBirth() {

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

@@ -115,6 +115,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         Long userId = user.getUserId();
         // 查询登录人身份证号
         SysUser sysUser = sysUserMapper.selectUserById(userId);
+        startPage();
         // 已办案件
         if(caseApplication.getSelectCaseStatus().equals("1")){
             caseApplication.setLoginUserName(sysUser.getUserName());
@@ -125,7 +126,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             if (CollectionUtil.isEmpty(roles)) {
                 throw new ServiceException("该用户没有角色权限");
             }
-            startPage();
+
             for (SysRole role : roles) {
                 // 超级管理员和仲裁委（部门长）案件，可查看所有案件 √
                 if (role.getRoleName().equals("超级管理员")
@@ -258,7 +259,13 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 //        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
         caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
         int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
+       //1975139	修改开庭时间通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已改为{3}，请知晓，如非本人操作，请忽略本短信
+        //发送短信通知
+        SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
+        request.setTemplateId("1975139");
 
+        // 发送开庭日期通知短信
+        sendHearDateMessage(caseApplication,request,"1975139");
         // 新增日志
         CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CHECK_ARBITRATION_METHOD,"");
         return rows;
@@ -2136,16 +2143,30 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             }
         }
 
-        //发送短信通知
+        //发送短信通知 1947342 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
         request.setTemplateId("1947342");
+        // 发送开庭日期通知短信
+        sendHearDateMessage(caseApplication,request,"1947342");
+        // 新增日志
+        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.MODIFY_HEARDATE,"");
 
+        return rows;
+
+    }
+
+    /**
+     * 发送开庭日期通知短信
+     * @param caseApplication
+     * @param request
+     */
+    private void sendHearDateMessage(CaseApplication caseApplication, SmsUtils.SendSmsRequest request,String templateId) {
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
+
         String caseNum = caseApplicationselect.getCaseNum();
         Date hearDate = caseApplicationselect.getHearDate();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String hearDatestr = dateFormat.format(hearDate);
-
         String arbitratorId = caseApplicationselect.getArbitratorId();
 //        List<Arbitrator> arbitratorList = new ArrayList<>();
         if(StringUtils.isNotEmpty(arbitratorId)){
@@ -2170,7 +2191,13 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                         smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
                         smsSendRecord.setPhone(request.getPhone());
                         smsSendRecord.setSendTime(new Date());
-                        String content="尊敬的"+name+"用户，您的"+caseNum+"仲裁案件，开庭日期已确定为"+hearDatestr+"，请知晓，如非本人操作，请忽略本短信。";
+                        String content="";
+                        if(templateId.equals("1947342")) {
+                             content = "尊敬的" + name + "用户，您的" + caseNum + "仲裁案件，开庭日期已确定为" + hearDatestr + "，请知晓，如非本人操作，请忽略本短信。";
+                        }
+                        if(templateId.equals("1975139")) {
+                            content = "尊敬的" + name + "用户，您的" + caseNum + "仲裁案件，开庭日期已改为" + hearDatestr + "，请知晓，如非本人操作，请忽略本短信。";
+                        }
                         smsSendRecord.setSendContent(content);
                         smsSendRecord.setCreateBy(getUsername());
                         smsRecordMapper.saveSmsSendRecord(smsSendRecord);
@@ -2212,15 +2239,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                 }
             }
         }
-        // 新增日志
-        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.MODIFY_HEARDATE,"");
-
-        return rows;
-
     }
 
 
-
     @Override
     @Transactional
     public int pendingAppointArbotrar(CaseApplication caseApplication) {

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -82,12 +82,7 @@
             <if test="loginUserName != null and loginUserName != ''">
                 AND r.create_by=#{loginUserName}  AND ca.identity_type=1
             </if>
-            <if test="caseStatusList != null and caseStatusList.size() > 0">
-                and r.case_node in
-                <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
-                    #{caseStatus}
-                </foreach>
-            </if>
+
         </where>
         order by c.create_time desc,c.case_num desc
     </select>