Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb
This commit is contained in:
hejinbo
+92
-42
@@ -44,6 +44,7 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.*;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
@@ -905,8 +906,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
public int editCaseApplication(CaseApplication caseApplication) {
|
||||
//根据仲裁费用计费规则计算应缴费用
|
||||
//暂时设置计费比率为0.01
|
||||
BigDecimal feeRate = new BigDecimal(0.01);
|
||||
BigDecimal feePayable = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2,BigDecimal.ROUND_HALF_UP);
|
||||
BigDecimal feeRate = new BigDecimal("0.01");
|
||||
BigDecimal feePayable = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2, RoundingMode.HALF_UP);
|
||||
caseApplication.setFeePayable(feePayable);
|
||||
caseApplication.setUpdateBy(getUsername());
|
||||
|
||||
@@ -969,6 +970,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
return rows;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 组装申请代理人信息
|
||||
* @param caseAffiliate
|
||||
@@ -1176,34 +1178,21 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
CaseApplication caseApplication = caseApplicationList.get(i);
|
||||
|
||||
// 导入校验
|
||||
importValid(caseApplication);
|
||||
importValid(caseApplication,deptMap);
|
||||
// 校验成功的数据
|
||||
if(StrUtil.isEmpty(caseApplication.getErrorMsg())) {
|
||||
//根据仲裁费用计费规则计算应缴费用
|
||||
//暂时设置计费比率为0.01
|
||||
BigDecimal feeRate = new BigDecimal(0.01);
|
||||
BigDecimal feePayable = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2, BigDecimal.ROUND_HALF_UP);
|
||||
BigDecimal feeRate = new BigDecimal("0.01");
|
||||
BigDecimal feePayable = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2, RoundingMode.HALF_UP);
|
||||
caseApplication.setFeePayable(feePayable);
|
||||
|
||||
//赋值CaseApplication的案件关联人信息
|
||||
List<CaseAffiliate> caseAffiliatesnew = new ArrayList<>();
|
||||
// 组装案件关联人信息
|
||||
assignmentCaseAffiliates(caseApplication, caseAffiliatesnew, deptMap,roleId);
|
||||
|
||||
// int caseApplicationCount = selectCaseApplicationCount(caseApplication);
|
||||
// if(caseApplicationCount>0){
|
||||
// failureNum++;
|
||||
// failureMsg.append("<br/>" + failureNum + "、立案编号 " + caseApplication.getCaseNum() + " 已存在");
|
||||
// }else {
|
||||
// caseApplicationListinsert.add(caseApplication);
|
||||
// }
|
||||
if(StrUtil.isEmpty(caseApplication.getErrorMsg())) {
|
||||
caseApplicationListinsert.add(caseApplication);
|
||||
}else {
|
||||
// 拼接错误信息
|
||||
failureMsg.append("<br/>").append("第").append(i+2).append("行：").append(caseApplication.getErrorMsg().toString());
|
||||
|
||||
}
|
||||
caseApplication.setImportFlag(1);
|
||||
caseApplicationListinsert.add(caseApplication);
|
||||
}else {
|
||||
// 拼接错误信息
|
||||
failureMsg.append("<br/>").append("第").append(i+2).append("行：").append(caseApplication.getErrorMsg().toString());
|
||||
@@ -1283,7 +1272,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
* @param caseApplication
|
||||
* @param
|
||||
*/
|
||||
private void importValid(CaseApplication caseApplication) {
|
||||
private void importValid(CaseApplication caseApplication,Map<String, Long> deptMap) {
|
||||
StringBuilder failureMsg=new StringBuilder();
|
||||
caseApplication.setErrorMsg(failureMsg);
|
||||
// 校验基本字段
|
||||
@@ -1291,7 +1280,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
// 校验申请人信息
|
||||
validApplicationColumn(caseApplication,failureMsg);
|
||||
// 校验申请人代理信息
|
||||
validApplicationAgentColumn(caseApplication,failureMsg);
|
||||
validApplicationAgentColumn(caseApplication,failureMsg,deptMap);
|
||||
// 校验被申请人信息
|
||||
validDebtorApplicationColumn(caseApplication,failureMsg);
|
||||
// 校验被申请人代理信息
|
||||
@@ -1382,7 +1371,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
* @param caseApplication
|
||||
* @param failureMsg
|
||||
*/
|
||||
private void validApplicationAgentColumn(CaseApplication caseApplication, StringBuilder failureMsg) {
|
||||
private void validApplicationAgentColumn(CaseApplication caseApplication, StringBuilder failureMsg,Map<String, Long> deptMap) {
|
||||
if( StrUtil.isEmpty(caseApplication.getNameAgent())){
|
||||
failureMsg.append("【申请人主体信息-代理人姓名】字段不能为空；");
|
||||
}else if(caseApplication.getNameAgent().length()>50){
|
||||
@@ -1393,6 +1382,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
}else if(caseApplication.getIdentityNumAgent().length()>50){
|
||||
failureMsg.append("【申请人主体信息-代理人身份证号】字段超出指定长度，最大长度为50；");
|
||||
}
|
||||
validAgentInfo(caseApplication,failureMsg,deptMap);
|
||||
String contactTelphoneAgent = caseApplication.getContactTelphoneAgent();
|
||||
if( StrUtil.isEmpty(contactTelphoneAgent)){
|
||||
failureMsg.append("【申请人主体信息-代理人联系电话】字段不能为空；");
|
||||
@@ -1405,7 +1395,34 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
failureMsg.append("【申请人主体信息-代理人联系地址】字段超出指定长度，最大长度为50；");
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 校验代理人与组织机构关系
|
||||
* @param caseApplication
|
||||
* @param failureMsg
|
||||
* @return
|
||||
*/
|
||||
private void validAgentInfo(CaseApplication caseApplication, StringBuilder failureMsg,Map<String, Long> deptMap) {
|
||||
// 申请机构与代理人都不为空，校验代理人与组织机构关系（代理人必须在该部门下）
|
||||
if (StrUtil.isNotEmpty(caseApplication.getName())&&StrUtil.isNotEmpty(caseApplication.getNameAgent())) {
|
||||
String applicationOrganId="";
|
||||
// 申请机构已经存在
|
||||
if(deptMap.containsKey(caseApplication.getName())){
|
||||
applicationOrganId=String.valueOf(deptMap.get(caseApplication.getName()));
|
||||
}
|
||||
// 根据代理人身份证去用户表查询
|
||||
SysUser agentUser = sysUserMapper.selectUserByIdCard(caseApplication.getIdentityNumAgent());
|
||||
// 代理人的部门和申请机构不匹配
|
||||
if (null != agentUser.getDeptId() && !String.valueOf(agentUser.getDeptId()).equals(applicationOrganId)) {
|
||||
// return "该申请代理人已在"+agentUser.getDeptName()+"申请机构下存在，请检查填写信息是否正确";
|
||||
if (null != agentUser.getDept() && StrUtil.isNotEmpty(agentUser.getDept().getDeptName())) {
|
||||
failureMsg.append("该申请代理人已在【").append(agentUser.getDept().getDeptName()).append("】申请机构下存在，请检查填写信息是否正确");
|
||||
} else {
|
||||
failureMsg.append( "该申请代理人已存在，与申请机构不匹配，请检查填写信息是否正确");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 校验申请人主题信息
|
||||
* @param caseApplication
|
||||
@@ -1806,33 +1823,47 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
*/
|
||||
@Override
|
||||
public String sendRoomNoMessage(SendRoomNoMessageVO messageVO) {
|
||||
CaseAffiliate caseAffiliate = caseAffiliateMapper.selectCaseAffiliateByIdentityType(messageVO.getId(), 2);
|
||||
if(null==caseAffiliate){
|
||||
return "被申请人不存在";
|
||||
CaseAffiliate caseAffiliateSelect=new CaseAffiliate();
|
||||
caseAffiliateSelect.setCaseAppliId(messageVO.getId());
|
||||
List<CaseAffiliate> caseAffiliates= caseAffiliateMapper.selectCaseAffiliate(caseAffiliateSelect);
|
||||
if(CollectionUtil.isEmpty(caseAffiliates)){
|
||||
return "申请人、被申请人不存在";
|
||||
}
|
||||
CaseApplication caseApplication = new CaseApplication();
|
||||
caseApplication.setId(messageVO.getId());
|
||||
CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
|
||||
String returnResult="短信发送成功";
|
||||
|
||||
//发送短信通知
|
||||
SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
|
||||
request.setTemplateId("1952136");
|
||||
// 1948332 普通短信 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。
|
||||
request.setPhone(caseAffiliate.getContactTelphone());
|
||||
request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()});
|
||||
if (SmsUtils.sendSms(request)){
|
||||
//保存短信发送记录
|
||||
SmsSendRecord smsSendRecord = new SmsSendRecord();
|
||||
smsSendRecord.setCaseId(messageVO.getId());
|
||||
smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
|
||||
smsSendRecord.setPhone(request.getPhone());
|
||||
smsSendRecord.setSendTime(new Date());
|
||||
String content="尊敬的"+caseAffiliate.getName()+"用户，您的"+ caseApplicationselect.getCaseNum()+"仲裁案件，开庭审理房间号为"+ messageVO.getRoomNo()+"，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。";
|
||||
smsSendRecord.setSendContent(content);
|
||||
smsSendRecord.setCreateBy(getUsername());
|
||||
smsRecordMapper.saveSmsSendRecord(smsSendRecord);
|
||||
for (CaseAffiliate caseAffiliate : caseAffiliates) {
|
||||
request.setPhone(caseAffiliate.getContactTelphone());
|
||||
request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()});
|
||||
// 1948332 普通短信 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。
|
||||
if (SmsUtils.sendSms(request)){
|
||||
//保存短信发送记录
|
||||
SmsSendRecord smsSendRecord = new SmsSendRecord();
|
||||
smsSendRecord.setCaseId(messageVO.getId());
|
||||
smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
|
||||
smsSendRecord.setPhone(request.getPhone());
|
||||
smsSendRecord.setSendTime(new Date());
|
||||
String content="尊敬的"+caseAffiliate.getName()+"用户，您的"+ caseApplicationselect.getCaseNum()+"仲裁案件，开庭审理房间号为"+ messageVO.getRoomNo()+"，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。";
|
||||
smsSendRecord.setSendContent(content);
|
||||
String userName;
|
||||
try {
|
||||
userName= getUsername();
|
||||
} catch (Exception e) {
|
||||
userName="admin";
|
||||
}
|
||||
smsSendRecord.setCreateBy(userName);
|
||||
smsRecordMapper.saveSmsSendRecord(smsSendRecord);
|
||||
}else {
|
||||
returnResult= "短信发送失败";
|
||||
}
|
||||
}
|
||||
return "短信发送成功";
|
||||
return returnResult;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -2074,6 +2105,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
caseApplication.setFilearbitraUrl(filearbitraUrl);
|
||||
}
|
||||
}
|
||||
|
||||
return caseApplication;
|
||||
}
|
||||
|
||||
@@ -2083,8 +2115,26 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
@Transactional
|
||||
public int pendTralSure(CaseApplication caseApplication) {
|
||||
// caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
|
||||
|
||||
caseApplication.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
|
||||
int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
|
||||
Integer isAgreePendTral = caseApplication.getIsAgreePendTral();
|
||||
int rows = 0;
|
||||
//同意组庭
|
||||
if(isAgreePendTral!=null&&isAgreePendTral==1){
|
||||
rows = caseApplicationMapper.submitCaseApplication(caseApplication);
|
||||
}else {
|
||||
List<Arbitrator> arbitrators = caseApplication.getArbitrators();
|
||||
// 仲裁员信息
|
||||
if(arbitrators!=null&&arbitrators.size()>0){
|
||||
List<Long> ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList());
|
||||
List<String> arbitratorNames = arbitrators.stream().map(Arbitrator::getArbitratorName).collect(Collectors.toList());
|
||||
String idstr = ids.stream().map(Object::toString).collect(Collectors.joining(","));
|
||||
String arbitratorNamestr = arbitratorNames.stream().map(Object::toString).collect(Collectors.joining(","));
|
||||
caseApplication.setArbitratorId(idstr);
|
||||
caseApplication.setArbitratorName(arbitratorNamestr);
|
||||
rows = caseApplicationMapper.submitCaseApplication(caseApplication);
|
||||
}
|
||||
}
|
||||
|
||||
//发送短信通知
|
||||
SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
|
||||
|
||||
Reference in New Issue
Block a user