SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
18792927508
2024-02-20 09:06:43 +08:00
parent b8ad0dfc8c
commit 0b96d4351d
18 changed files with 233 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseApplicationService.java
+12
View File
@@ -2,6 +2,7 @@ package com.ruoyi.wisdomarbitrate.service.mscase;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.EsignDemoException;
import com.ruoyi.system.domain.entity.flow.MsCaseFlow;
import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate;
@@ -125,6 +126,12 @@ public interface MsCaseApplicationService {
* @return
*/
AjaxResult submit(MsCaseApplication req);
/**
* 删除案件
* @param req
* @return
*/
AjaxResult delete(MsCaseApplication req);
/**
* 查询调解员
@@ -208,4 +215,9 @@ public interface MsCaseApplicationService {
* @param caseId
*/
void notAccept(String caseId,String reason);
/**
* 根据登录人返回用户信息
*/
SysUser getUserInfo();
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
+126 -26
View File
@@ -35,10 +35,7 @@ import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord;
import com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule;
import com.ruoyi.wisdomarbitrate.domain.dto.template.TemplateManage;
import com.ruoyi.wisdomarbitrate.domain.entity.dept.MsSealSignRecord;
import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate;
import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication;
import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAttach;
import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseMediator;
import com.ruoyi.wisdomarbitrate.domain.entity.mscase.*;
import com.ruoyi.wisdomarbitrate.domain.vo.mscase.*;
import com.ruoyi.wisdomarbitrate.mapper.dept.DeptIdentifyMapper;
import com.ruoyi.wisdomarbitrate.mapper.dept.MsSealSignRecordMapper;
@@ -54,6 +51,7 @@ import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -85,6 +83,11 @@ import static com.ruoyi.common.utils.SecurityUtils.getUsername;
*/
@Service
public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
/**
* 调解机构代码
*/
@Value("${organizeConfig.creditCode}")
private long creditCode;
@Autowired
MsCaseApplicationService caseApplicationService;
@Autowired
@@ -177,12 +180,24 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
if (CollectionUtil.isEmpty(caseFlows)) {
throw new ServiceException("该角色为绑定案件流程");
}
Map<String, MsCaseFlow> flowMap = caseFlows.stream().collect(Collectors.toMap(MsCaseFlow::getButtonAuthFlag, Function.identity()));
// Map<String, MsCaseFlow> flowMap = caseFlows.stream().collect(Collectors.toMap(MsCaseFlow::getButtonAuthFlag, Function.identity()));
List<String> caseStatusNames = caseFlows.stream().map(MsCaseFlow::getCaseStatusName).collect(Collectors.toList());
// 如果是申请人，可以看见申请人为自己（即自然人）或者委托代理人为自己的案件（即机构）
for (SysRole role : roles) {
if(StrUtil.isNotEmpty(role.getRoleName())){
if(StrUtil.equals(role.getRoleName(),"申请人")) {
List<Long> applicationOrganIds=new ArrayList<>();
applicationOrganIds.add(sysUser.getUserId());
caseStatusNames.add("待调解");
req.setApplicantFlag(1);
// 根据用户查询部门ids
List<SysDept> deptList = sysDeptMapper.selectDeptByUserId(loginUser.getUserId());
if(CollectionUtil.isNotEmpty(deptList)) {
List<Long> deptIds = deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList());
applicationOrganIds.addAll(deptIds);
}
req.setApplicationOrganIds(applicationOrganIds);
break;
}
if(StrUtil.equals(role.getRoleName(),"被申请人")){
@@ -232,11 +247,16 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
if (CollectionUtil.isEmpty(caseFlows)) {
throw new ServiceException("该角色为绑定案件流程");
}
// 设置模板id，根据机构代码查询模板
Long templateId = templateManageMapper.selectByCreditCode(creditCode);
caseApplication.setTemplateId(templateId);
MsCaseFlow caseFlow = caseFlows.get(0);
caseApplication.setCaseStatusName(caseFlow.getCaseStatusName());
caseApplication.setCaseFlowId(caseFlow.getId());
caseApplication.setCreateTime(new Date());
// 计算仲裁费用
// todo 暂时写死，费用300元
caseApplication.setCaseSubjectAmount(new BigDecimal("30000"));
setFeePayableMethod(caseApplication);
// 设置批号
if (StrUtil.isEmpty(caseApplication.getBatchNumber())) {
@@ -260,7 +280,6 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
// 新增申请机构和代理人
caseApplicationService.insertAgentUser(affiliate);
}else if(StrUtil.isNotEmpty(affiliate.getApplicationName())&&affiliate.getOrganizeFlag()==0){
// todo 申请人为自然人,如果系统不存在申请人和代理人用户，分别新增用户，新增完用户需要发送短信
// 查询申请人角色id
Long roleId = roleMapper.selectRoleIdByName("申请人");
caseApplicationService.insertApplicantUser(affiliate,false,roleId);
@@ -306,8 +325,8 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
req.setBatchNumber(caseApplication.getBatchNumber());
}
// 生成调解申请书
req.setTemplateType(TemplateTypeEnum.MEDIATION_APPLICATION.getCode());
// todo 部署放开
req.setTemplateType(TemplateTypeEnum.MEDIATION_APPLICATION.getCode());
caseApplicationService.generateApplication(req);
// 保存案件附件
if (CollectionUtil.isNotEmpty(caseAttachList)) {
@@ -329,7 +348,6 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
}
columnValueMapper.batchSave(columnValueList);
}
// todo 发送短信
CaseLogUtils.insertCaseLog(caseApplication.getId(), 0, "新增案件", "");
return 1;
}
@@ -359,7 +377,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
}
if(StrUtil.isNotEmpty(phone) && StrUtil.isNotEmpty(name)){
// 查询用户是否存在
SysUser sysUser = sysUserMapper.selectUserByUserName(name);
SysUser sysUser = sysUserMapper.selectUserByPhone(phone);
if(sysUser==null){
// 新增用户
sysUser = new SysUser();
@@ -446,6 +464,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
@Override
public AjaxResult update(MsCaseApplicationVO caseApplication) {
// 计算仲裁费用
caseApplication.setCaseSubjectAmount(new BigDecimal("30000"));
setFeePayableMethod(caseApplication);
caseApplication.setUpdateBy(SecurityUtils.getUsername());
caseApplication.setUpdateTime(new Date());
@@ -461,7 +480,6 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
// 新增申请机构代理人
caseApplicationService.insertAgentUser(affiliate);
}else if(StrUtil.isNotEmpty(affiliate.getApplicationName())&&affiliate.getOrganizeFlag()==0){
// todo 申请人为自然人,如果系统不存在申请人和代理人用户，分别新增用户，新增完用户需要发送短信
// 查询申请人角色id
Long roleId = roleMapper.selectRoleIdByName("申请人");
caseApplicationService.insertApplicantUser(affiliate,false,roleId);
@@ -873,10 +891,10 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
MsCaseAffiliate affiliate = affiliateMap.get(application.getId());
if (StrUtil.isNotEmpty(affiliate.getContactTelphoneAgent())) {
String sendContent = "尊敬的" + affiliate.getNameAgent() + "用户，您的" + application.getCaseNum() + "仲裁案件，已成功受理，请知晓，如非本人操作，请忽略本短信";
String sendContent = "尊敬的" + affiliate.getNameAgent() + "用户，您的" + application.getCaseNum() + "案件，已成功受理，请知晓，如非本人操作，请忽略本短信";
// 给申请人发送案件受理短信 尊敬的{1}用户，您的{2}仲裁案件，已成功受理，请知晓，如非本人操作，请忽略本短信
Boolean smsFlag = SmsUtils.sendSms(application.getId(), "2049503", affiliate.getContactTelphoneAgent(), new String[]{affiliate.getNameAgent(), application.getCaseNum()});
CaseLogUtils.insertCaseLog(application.getId(), caseFlow.getNodeId(), caseFlow.getNodeName(), "向申请人发送短信," + sendContent);
Boolean smsFlag = SmsUtils.sendSms(application.getId(), "2073601", affiliate.getContactTelphoneAgent(), new String[]{affiliate.getNameAgent(), application.getCaseNum()});
// CaseLogUtils.insertCaseLog(application.getId(), caseFlow.getNodeId(), caseFlow.getNodeName(), "向申请人发送短信," + sendContent);
SmsSendRecord smsSendRecord = new SmsSendRecord(application.getId(), application.getCaseNum(), affiliate.getContactTelphoneAgent(), new Date(), sendContent);
if (smsFlag) {
// 发送成功
@@ -891,7 +909,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
String sendContent = "尊敬的用户，您的" + application.getCaseNum() + "的案件已经受理，请登录调解系统进行缴费处理。请知晓，如非本人操作，请忽略本短信";
// 给被申请人发送案件受理短信 2068468 待缴费通知 尊敬的用户，您编号为{1}的案件已经受理，请登录调解系统进行缴费处理。请知晓，如非本人操作，请忽略本短信
Boolean smsFlag = SmsUtils.sendSms(application.getId(), "2068468", affiliate.getRespondentPhone(), new String[]{ application.getCaseNum()});
CaseLogUtils.insertCaseLog(application.getId(), caseFlow.getNodeId(), caseFlow.getNodeName(), "向被申请人发送短信，" + sendContent);
// CaseLogUtils.insertCaseLog(application.getId(), caseFlow.getNodeId(), caseFlow.getNodeName(), "向被申请人发送短信，" + sendContent);
SmsSendRecord smsSendRecord = new SmsSendRecord(application.getId(), application.getCaseNum(), affiliate.getRespondentPhone(), new Date(), sendContent);
if (smsFlag) {
// 发送成功
@@ -918,17 +936,74 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
}
for (MsCaseApplication application : list) {
MsCaseFlow caseFlow = caseApplicationService.nextFlow(application.getId(), req.getCaseFlowId(), YesOrNoEnum.NO.getCode());
// todo 发送短信
// CaseLogUtils.insertCaseLog(application.getId(), caseFlow.getNodeId(), caseFlow.getCaseStatusName(), "提交成功");
CaseLogUtils.insertCaseLog(application.getId(), caseFlow.getNodeId(), caseFlow.getCaseStatusName(), "提交成功");
}
}else {
MsCaseFlow caseFlow = caseApplicationService.nextFlow(req.getId(), req.getCaseFlowId(), YesOrNoEnum.NO.getCode());
// todo 发送短信
// CaseLogUtils.insertCaseLog(req.getId(), caseFlow.getNodeId(), caseFlow.getCaseStatusName(), "提交成功");
CaseLogUtils.insertCaseLog(req.getId(), caseFlow.getNodeId(), caseFlow.getCaseStatusName(), "提交成功");
}
return AjaxResult.success("提交成功");
}
@Transactional
@Override
public AjaxResult delete(MsCaseApplication req) {
if(req.getCaseFlowId()>1){
return AjaxResult.error("已提交的案件无法删除！");
}
if(StrUtil.isNotEmpty(req.getBatchNumber())){
// 批量删除
List<MsCaseApplication> list = listByBatchNumber(req.getBatchNumber(), req.getCaseFlowId());
if(CollectionUtil.isEmpty(list)){
return AjaxResult.error("该批次号下未找到案件");
}
List<Long> ids = list.stream().map(MsCaseApplication::getId).collect(Collectors.toList());
// 删除主表
Example caseExample = new Example(MsCaseApplication.class);
Example.Criteria caseCriteria = caseExample.createCriteria();
caseCriteria.andIn("id", ids);
msCaseApplicationMapper.deleteByExample(caseExample);
// 删除相关人员表
Example affiliateExample = new Example(MsCaseAffiliate.class);
Example.Criteria affiliateCriteria = affiliateExample.createCriteria();
affiliateCriteria.andIn("caseAppliId", ids);
msCaseAffiliateMapper.deleteByExample(affiliateExample);
// 删除附件表
msCaseAttachMapper.batchDelete(ids);
// 删除预约调解员表
Example reservationExample = new Example(MsCaseMediator.class);
Example.Criteria reservationCriteria = reservationExample.createCriteria();
reservationCriteria.andIn("caseAppliId", ids);
msCaseMediatorMapper.deleteByExample(reservationExample);
// 删除日志表
Example caseLogExample = new Example(MsCaseLogRecord.class);
Example.Criteria caseLogCriteria = caseLogExample.createCriteria();
caseLogCriteria.andIn("caseAppliId", ids);
caseLogRecordMapper.deleteByExample(reservationExample);
}else {
// 删除主表
msCaseApplicationMapper.deleteByPrimaryKey(req.getId());
// 删除相关人员表
msCaseAffiliateMapper.deleteByPrimaryKey(req.getId());
// 删除附件表
msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(req.getId(),null);
// 删除预约调解员表
Example reservationExample = new Example(MsCaseMediator.class);
Example.Criteria reservationCriteria = reservationExample.createCriteria();
reservationCriteria.andEqualTo("caseAppliId", req.getId());
msCaseMediatorMapper.deleteByExample(reservationExample);
// 删除日志表
Example caseLogExample = new Example(MsCaseLogRecord.class);
Example.Criteria caseLogCriteria = caseLogExample.createCriteria();
caseLogCriteria.andEqualTo("caseAppliId", req.getId());
caseLogRecordMapper.deleteByExample(reservationExample);
}
return AjaxResult.success("删除成功");
}
/**
* 查询调解员
@@ -1024,9 +1099,9 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
// 被申请人预约
// 新增日志
CaseLogUtils.insertCaseLog(vo.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "被申请人选择调解员");
if (StrUtil.isEmpty(msCaseAffiliate.getContactTelphoneAgent())|| StrUtil.isEmpty(msCaseAffiliate.getApplicationPhone())) {
return AjaxResult.error("申请代理人手机号为空");
}
// if (StrUtil.isEmpty(msCaseAffiliate.getContactTelphoneAgent())|| StrUtil.isEmpty(msCaseAffiliate.getApplicationPhone())) {
// return AjaxResult.error("申请代理人手机号为空");
// }
// 判断申请人是否预约
caseApplicationService. isReservation( vo,userIds);
@@ -1115,7 +1190,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
CaseLogUtils.insertCaseLog(vo.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(), "被申请人选择调解员");
}
// todo 发送短信
}
}
@@ -1207,7 +1282,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
// 发送短信 2065809 案件不予受理通知 尊敬的用户，您编号为{1}的案件由于{2}所以不予受理，请知晓，如非本人操作，请忽略本短信。
Boolean smsFlag = SmsUtils.sendSms(id, "2065809", phone, new String[]{application.getCaseNum(),reason});
String sendContent = "尊敬的用户，您编号为" + application.getCaseNum() + "的案件由于"+reason+"所以不予受理，请知晓，如非本人操作，请忽略本短信。";
CaseLogUtils.insertCaseLog(application.getId(), application.getCaseFlowId(), application.getCaseStatusName(), sendContent);
// CaseLogUtils.insertCaseLog(application.getId(), application.getCaseFlowId(), application.getCaseStatusName(), sendContent);
// 新增短信记录
SmsSendRecord smsSendRecord = new SmsSendRecord(application.getId(), application.getCaseNum(), phone, new Date(), sendContent);
@@ -1229,6 +1304,17 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
}
}
@Override
public SysUser getUserInfo() {
SysUser sysUser =new SysUser();
if(StrUtil.isNotEmpty(SecurityUtils.getUsername())){
sysUser = sysUserMapper.selectUserByUserName(getUsername());
}
return sysUser;
}
/**
* 查询预约信息
* @param id
@@ -1252,7 +1338,6 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
return AjaxResult.success(result);
}
Map<Integer, List<MsCaseMediator>> mediatorMap = msCaseMediators.stream().collect(Collectors.groupingBy(MsCaseMediator::getType));
// todo 申请人
result.setMediatorList(mediatorMap.get(MediatorTypeEnum.PC.getCode()));
result.setResMediatorList(mediatorMap.get(MediatorTypeEnum.MI_NI_PROGRESS.getCode()));
return AjaxResult.success(result);
@@ -1274,6 +1359,11 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
if (StrUtil.isEmpty(application.getMediationMethod())) {
return AjaxResult.error("未选择调解方式");
}
// 查询当前流程节点
MsCaseFlow currentFlow = caseFlowMapper.selectByPrimaryKey(req.getCaseFlowId());
if (currentFlow == null) {
throw new ServiceException("未找到当前流程节点");
}
MsCaseAffiliate caseAffiliate = msCaseAffiliateMapper.selectByPrimaryKey(req.getId());
if (application.getMediationMethod().equals("1")) {
// 线上调解
@@ -1559,6 +1649,9 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
if(caseFlow != null){
application.setCaseFlowId(caseFlow.getId());
application.setCaseStatusName(caseFlow.getCaseStatusName());
msCaseApplicationMapper.updateByPrimaryKey(application);
// 新增日志
CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"");
}
application.setMediaResult(mediaResult);
@@ -1597,6 +1690,8 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
flowExample.createCriteria().andEqualTo("caseStatusName", "结束");
MsCaseFlow caseFlow = caseFlowMapper.selectOneByExample(flowExample);
if(caseFlow != null){
// 新增日志
CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"");
application.setCaseFlowId(caseFlow.getId());
application.setCaseStatusName(caseFlow.getCaseStatusName());
msCaseApplicationMapper.updateByPrimaryKey(application);
@@ -1615,6 +1710,9 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
application.setCaseFlowId(caseFlow.getId());
application.setCaseStatusName(caseFlow.getCaseStatusName());
msCaseApplicationMapper.updateByPrimaryKey(application);
// 新增日志
CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"");
}
application.setMediaResult(mediaResult);
@@ -1886,6 +1984,8 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
application.setCaseFlowId(caseFlow.getId());
application.setCaseStatusName(caseFlow.getCaseStatusName());
msCaseApplicationMapper.updateByPrimaryKey(application);
// 新增日志
CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"");
}
return AjaxResult.success();
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCasePaymentServiceImpl.java
+1 -1
View File
@@ -354,7 +354,7 @@ public class MsCasePaymentServiceImpl implements MsCasePaymentService {
if(StrUtil.isNotEmpty(phone)) {
// 发送短信 2051914 调解缴费成功通知 尊敬的{1},您的调解申请费用已缴费成功。
Boolean smsFlag = SmsUtils.sendSms(affiliate.getCaseAppliId(), "2051914", phone, new String[]{userName});
CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "申请人调解缴费成功通知短信，尊敬的" + userName + ",您的调解申请费用已缴费成功。");
// CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "申请人调解缴费成功通知短信，尊敬的" + userName + ",您的调解申请费用已缴费成功。");
// 新增短信记录
SmsSendRecord smsSendRecord = new SmsSendRecord(application.getId(), caseAppllication.getCaseNum(), phone, new Date(), "尊敬的" + userName + ",您的调解申请费用已缴费成功。");