Преглед изворни кода

Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

wangqiong123 пре 2 година
родитељ
комит
178ff2a675

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Прегледај датотеку

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

+ 31
- 10
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Прегледај датотеку

115
         Long userId = user.getUserId();
115
         Long userId = user.getUserId();
116
         // 查询登录人身份证号
116
         // 查询登录人身份证号
117
         SysUser sysUser = sysUserMapper.selectUserById(userId);
117
         SysUser sysUser = sysUserMapper.selectUserById(userId);
118
+        startPage();
118
         // 已办案件
119
         // 已办案件
119
         if(caseApplication.getSelectCaseStatus().equals("1")){
120
         if(caseApplication.getSelectCaseStatus().equals("1")){
120
             caseApplication.setLoginUserName(sysUser.getUserName());
121
             caseApplication.setLoginUserName(sysUser.getUserName());
125
             if (CollectionUtil.isEmpty(roles)) {
126
             if (CollectionUtil.isEmpty(roles)) {
126
                 throw new ServiceException("该用户没有角色权限");
127
                 throw new ServiceException("该用户没有角色权限");
127
             }
128
             }
128
-            startPage();
129
+
129
             for (SysRole role : roles) {
130
             for (SysRole role : roles) {
130
                 // 超级管理员和仲裁委(部门长)案件,可查看所有案件 √
131
                 // 超级管理员和仲裁委(部门长)案件,可查看所有案件 √
131
                 if (role.getRoleName().equals("超级管理员")
132
                 if (role.getRoleName().equals("超级管理员")
258
 //        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
259
 //        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
259
         caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
260
         caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
260
         int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
261
         int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
262
+       //1975139	修改开庭时间通知 尊敬的{1}用户,您的{2}仲裁案件,开庭日期已改为{3},请知晓,如非本人操作,请忽略本短信
263
+        //发送短信通知
264
+        SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
265
+        request.setTemplateId("1975139");
261
 
266
 
267
+        // 发送开庭日期通知短信
268
+        sendHearDateMessage(caseApplication,request,"1975139");
262
         // 新增日志
269
         // 新增日志
263
         CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CHECK_ARBITRATION_METHOD,"");
270
         CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CHECK_ARBITRATION_METHOD,"");
264
         return rows;
271
         return rows;
2136
             }
2143
             }
2137
         }
2144
         }
2138
 
2145
 
2139
-        //发送短信通知
2146
+        //发送短信通知 1947342 尊敬的{1}用户,您的{2}仲裁案件,开庭日期已确定为{3},请知晓,如非本人操作,请忽略本短信。
2140
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
2147
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
2141
         request.setTemplateId("1947342");
2148
         request.setTemplateId("1947342");
2149
+        // 发送开庭日期通知短信
2150
+        sendHearDateMessage(caseApplication,request,"1947342");
2151
+        // 新增日志
2152
+        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.MODIFY_HEARDATE,"");
2142
 
2153
 
2154
+        return rows;
2155
+
2156
+    }
2157
+
2158
+    /**
2159
+     * 发送开庭日期通知短信
2160
+     * @param caseApplication
2161
+     * @param request
2162
+     */
2163
+    private void sendHearDateMessage(CaseApplication caseApplication, SmsUtils.SendSmsRequest request,String templateId) {
2143
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
2164
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
2165
+
2144
         String caseNum = caseApplicationselect.getCaseNum();
2166
         String caseNum = caseApplicationselect.getCaseNum();
2145
         Date hearDate = caseApplicationselect.getHearDate();
2167
         Date hearDate = caseApplicationselect.getHearDate();
2146
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
2168
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
2147
         String hearDatestr = dateFormat.format(hearDate);
2169
         String hearDatestr = dateFormat.format(hearDate);
2148
-
2149
         String arbitratorId = caseApplicationselect.getArbitratorId();
2170
         String arbitratorId = caseApplicationselect.getArbitratorId();
2150
 //        List<Arbitrator> arbitratorList = new ArrayList<>();
2171
 //        List<Arbitrator> arbitratorList = new ArrayList<>();
2151
         if(StringUtils.isNotEmpty(arbitratorId)){
2172
         if(StringUtils.isNotEmpty(arbitratorId)){
2170
                         smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
2191
                         smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
2171
                         smsSendRecord.setPhone(request.getPhone());
2192
                         smsSendRecord.setPhone(request.getPhone());
2172
                         smsSendRecord.setSendTime(new Date());
2193
                         smsSendRecord.setSendTime(new Date());
2173
-                        String content="尊敬的"+name+"用户,您的"+caseNum+"仲裁案件,开庭日期已确定为"+hearDatestr+",请知晓,如非本人操作,请忽略本短信。";
2194
+                        String content="";
2195
+                        if(templateId.equals("1947342")) {
2196
+                             content = "尊敬的" + name + "用户,您的" + caseNum + "仲裁案件,开庭日期已确定为" + hearDatestr + ",请知晓,如非本人操作,请忽略本短信。";
2197
+                        }
2198
+                        if(templateId.equals("1975139")) {
2199
+                            content = "尊敬的" + name + "用户,您的" + caseNum + "仲裁案件,开庭日期已改为" + hearDatestr + ",请知晓,如非本人操作,请忽略本短信。";
2200
+                        }
2174
                         smsSendRecord.setSendContent(content);
2201
                         smsSendRecord.setSendContent(content);
2175
                         smsSendRecord.setCreateBy(getUsername());
2202
                         smsSendRecord.setCreateBy(getUsername());
2176
                         smsRecordMapper.saveSmsSendRecord(smsSendRecord);
2203
                         smsRecordMapper.saveSmsSendRecord(smsSendRecord);
2212
                 }
2239
                 }
2213
             }
2240
             }
2214
         }
2241
         }
2215
-        // 新增日志
2216
-        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.MODIFY_HEARDATE,"");
2217
-
2218
-        return rows;
2219
-
2220
     }
2242
     }
2221
 
2243
 
2222
 
2244
 
2223
-
2224
     @Override
2245
     @Override
2225
     @Transactional
2246
     @Transactional
2226
     public int pendingAppointArbotrar(CaseApplication caseApplication) {
2247
     public int pendingAppointArbotrar(CaseApplication caseApplication) {

+ 1
- 6
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Прегледај датотеку

82
             <if test="loginUserName != null and loginUserName != ''">
82
             <if test="loginUserName != null and loginUserName != ''">
83
                 AND r.create_by=#{loginUserName}  AND ca.identity_type=1
83
                 AND r.create_by=#{loginUserName}  AND ca.identity_type=1
84
             </if>
84
             </if>
85
-            <if test="caseStatusList != null and caseStatusList.size() > 0">
86
-                and r.case_node in
87
-                <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
88
-                    #{caseStatus}
89
-                </foreach>
90
-            </if>
85
+
91
         </where>
86
         </where>
92
         order by c.create_time desc,c.case_num desc
87
         order by c.create_time desc,c.case_num desc
93
     </select>
88
     </select>