diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index ba27cbb..355ee58 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/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() { diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index f44dd8d..cad7a7e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/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("超级管理员") @@ -136,7 +137,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { || role.getRoleName().equals("部门长")) { List caseStatusList = new ArrayList<>(); caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); - caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION); caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); caseApplication.setDeptHeadStatus(caseStatusList); } @@ -196,7 +196,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { ||role.getRoleName().equals("部门长")){ caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); - caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION); caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); caseApplication.setDeptHeadStatus(caseStatusList); } @@ -258,7 +257,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; @@ -1699,8 +1704,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { JSONObject coordinateObj = coordinatesArray.getJSONObject(0); double positionX = coordinateObj.getDoubleValue("positionX"); double positionY = coordinateObj.getDoubleValue("positionY"); -// sealSignRecord.setPositionXorg(positionX+60); - sealSignRecord.setPositionXorg(positionX); + sealSignRecord.setPositionXorg(positionX+90); sealSignRecord.setPositionYorg(positionY); } } @@ -2137,16 +2141,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 arbitratorList = new ArrayList<>(); if(StringUtils.isNotEmpty(arbitratorId)){ @@ -2171,7 +2189,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); @@ -2213,15 +2237,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } } } - // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.MODIFY_HEARDATE,""); - - return rows; - } - @Override @Transactional public int pendingAppointArbotrar(CaseApplication caseApplication) { diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index b5a65b5..7bd95db 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -82,12 +82,7 @@ AND r.create_by=#{loginUserName} AND ca.identity_type=1 - - and r.case_node in - - #{caseStatus} - - + order by c.create_time desc,c.case_num desc @@ -150,7 +145,7 @@ or ( t.identity_type=1 and - t.case_status in (7,8,9,12,13,14,17) + t.case_status in (7,8,9,12,13,17) and instr (t.arbitrator_id,#{userId})>0) @@ -238,7 +233,7 @@ or ( t.identity_type=1 and - t.case_status in (7,8,9,12,13,14,17) + t.case_status in (7,8,9,12,13,17) and instr (t.arbitrator_id,#{userId})>0) @@ -600,7 +595,7 @@ order by c.create_time desc limit 1 CASE c.pay_type when 0 then '线上支付' when 0 then '线下支付' else '' end payTypeName from case_application c left join case_payment_record p on c.id = p.case_id where c.case_status = 3 - AND c.id = #{id} + AND c.id = #{id} and p.payment_status=1