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

Merge branch 'wq1' of SH-Arbitrate/Mediation-Backend into dev

Browse Source
This commit was merged in pull request #134.
This commit is contained in:
wangqiong123
2024-04-08 15:48:02 +08:00
committed by Gitea
parent 36b5925786 6314a583b9
commit 4daceeb105
4 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-common/src/main/java/com/ruoyi/common/utils/SmsUtils.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class SmsUtils {
} }
public static JSONObject sendSms(Long caseId,String templateId,String phone,String[] templateParamSet) { public static JSONObject sendSms(Long caseId,String templateId,String phone,String[] templateParamSet) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
SmsUtils1.SendSmsRequest request = new SmsUtils1.SendSmsRequest(phone,templateId,templateParamSet,caseId); SendSmsRequest request = new SendSmsRequest(phone,templateId,templateParamSet,caseId);
Credential cred = new Credential(SECRET_ID, SECRET_KEY ); Credential cred = new Credential(SECRET_ID, SECRET_KEY );
SmsClient client = new SmsClient(cred, "ap-guangzhou"); SmsClient client = new SmsClient(cred, "ap-guangzhou");
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsCaseApplicationReq.java
+1 -1
View File
@@ -124,5 +124,5 @@ public class MsCaseApplicationReq {
* 是否需要用印，0-不需要，1-需要 * 是否需要用印，0-不需要，1-需要
*/ */
// todo 等会放开 // todo 等会放开
private Integer sealFlag=0; private Integer sealFlag=1;
} }
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
+31 -19
View File
@@ -280,50 +280,62 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
StringBuilder applicantName = new StringBuilder(); StringBuilder applicantName = new StringBuilder();
StringBuilder respondentName = new StringBuilder(); StringBuilder respondentName = new StringBuilder();
for (MsCaseAffiliate affiliate : affiliates) { for (MsCaseAffiliate affiliate : affiliates) {
// 当前用户是操作人
if(affiliate.getUserId()!=null && affiliate.getUserId().equals(loginUserId)
&& affiliate.getRoleType()!=null && affiliate.getOperatorFlag()!=null && affiliate.getOperatorFlag()==1) {
if (vo.getAppOperatorFlag() == null && (affiliate.getRoleType()==1 || affiliate.getRoleType()==2)) {
// 设置申请操作人标记
vo.setAppOperatorFlag(1);
} // 当前用户是操作人
if (vo.getResOperatorFlag() == null && (affiliate.getRoleType()==3 || affiliate.getRoleType()==4)) { if (affiliate.getUserId()!=null && affiliate.getRoleType() != null && affiliate.getOperatorFlag() != null && affiliate.getOperatorFlag() == 1) {
// 设置被申请操作人标记 if (vo.getAppOperatorFlag() == null && (affiliate.getRoleType() == 1 || affiliate.getRoleType() == 2)) {
vo.setResOperatorFlag(1); // 申请人操作人
if(affiliate.getUserId().equals(loginUserId) &&!vo.getCaseStatusName().equals("待签名")){
vo.setAppOperatorFlag(1);
}else if(vo.getCaseStatusName().equals("待签名")) {
if(affiliate.getUserId().equals(loginUserId)){
vo.setAppOperatorFlag(1);
}else {
vo.setAppOperatorFlag(0);
}
}
}
if (vo.getResOperatorFlag() == null && (affiliate.getRoleType() == 3 || affiliate.getRoleType() == 4)) {
// 申请人操作人
if(Objects.equals(affiliate.getUserId(), loginUserId) &&!vo.getCaseStatusName().equals("待签名")){
vo.setResOperatorFlag(1);
}else if(vo.getCaseStatusName().equals("待签名")) {
if(Objects.equals(affiliate.getUserId(), loginUserId)){
vo.setResOperatorFlag(1);
}else {
vo.setResOperatorFlag(0);
}
}
}
} }
}
if(vo.getOrganizeFlag()==null || vo.getOrganizeFlag()!=1) { if(vo.getOrganizeFlag()==null || vo.getOrganizeFlag()!=1) {
if (StrUtil.isNotEmpty(affiliate.getRoleName()) && affiliate.getRoleName().equals("申请人") if (StrUtil.isNotEmpty(affiliate.getRoleName()) && affiliate.getRoleName().equals("申请人")
&& affiliate.getRoleType() != null && affiliate.getRoleType() == 1&&StrUtil.isNotEmpty(affiliate.getName()) && affiliate.getRoleType() != null && affiliate.getRoleType() == 1&&StrUtil.isNotEmpty(affiliate.getName())
&& !applicantName.toString().contains(affiliate.getName())) { && !applicantName.toString().contains(affiliate.getName()+Constants.CN_SPLIT_COMMA)) {
applicantName.append(affiliate.getName()).append(Constants.CN_SPLIT_COMMA); applicantName.append(affiliate.getName()).append(Constants.CN_SPLIT_COMMA);
} }
}else { }else {
// 组织机构 // 组织机构
if ( affiliate.getRoleType() != null && affiliate.getRoleType() == 1&&StrUtil.isNotEmpty(affiliate.getApplicantOrgName()) if ( affiliate.getRoleType() != null && affiliate.getRoleType() == 1&&StrUtil.isNotEmpty(affiliate.getApplicantOrgName())
&& !applicantName.toString().contains(affiliate.getApplicantOrgName())) { && !applicantName.toString().contains(affiliate.getApplicantOrgName()+Constants.CN_SPLIT_COMMA)) {
applicantName.append(affiliate.getApplicantOrgName()).append(Constants.CN_SPLIT_COMMA); applicantName.append(affiliate.getApplicantOrgName()).append(Constants.CN_SPLIT_COMMA);
} }
} }
if(vo.getOrganizeFlag()==null || vo.getOrganizeFlag()!=1) { if(vo.getOrganizeFlag()==null || vo.getOrganizeFlag()!=1) {
if (StrUtil.isNotEmpty(affiliate.getRoleName()) && affiliate.getRoleName().equals("被申请人") if (StrUtil.isNotEmpty(affiliate.getRoleName()) && affiliate.getRoleName().equals("被申请人")
&& affiliate.getRoleType() != null && affiliate.getRoleType() == 3&&StrUtil.isNotEmpty(affiliate.getName()) && affiliate.getRoleType() != null && affiliate.getRoleType() == 3&&StrUtil.isNotEmpty(affiliate.getName())
&& !respondentName.toString().contains(affiliate.getName())) { && !respondentName.toString().contains(affiliate.getName()+Constants.CN_SPLIT_COMMA)) {
respondentName.append(affiliate.getName()).append(Constants.CN_SPLIT_COMMA); respondentName.append(affiliate.getName()).append(Constants.CN_SPLIT_COMMA);
} }
}else { }else {
// 组织机构 // 组织机构
if ( affiliate.getRoleType() != null && affiliate.getRoleType() == 3&&StrUtil.isNotEmpty(affiliate.getApplicantOrgName())&& !respondentName.toString().contains(affiliate.getApplicantOrgName())) { if ( affiliate.getRoleType() != null && affiliate.getRoleType() == 3&&StrUtil.isNotEmpty(affiliate.getApplicantOrgName())&& !respondentName.toString().contains(affiliate.getApplicantOrgName()+Constants.CN_SPLIT_COMMA)) {
respondentName.append(affiliate.getApplicantOrgName()).append(Constants.CN_SPLIT_COMMA); respondentName.append(affiliate.getApplicantOrgName()).append(Constants.CN_SPLIT_COMMA);
} }
} }
// if(StrUtil.isNotEmpty(affiliate.getRoleName()) && affiliate.getRoleName().equals("被申请人")
// && affiliate.getRoleType()!=null && affiliate.getRoleType()==3&&StrUtil.isNotEmpty(affiliate.getName())){
// respondentName.append(affiliate.getName()).append(Constants.CN_SPLIT_COMMA);
// }
} }
vo.setApplicationName(removeLastComma(applicantName.toString(),Constants.CN_SPLIT_COMMA)); vo.setApplicationName(removeLastComma(applicantName.toString(),Constants.CN_SPLIT_COMMA));
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java
+18 -2
View File
@@ -767,7 +767,15 @@ public class MsSignSealServiceImpl implements MsSignSealService {
if(signStatusApply!=null&&signStatusApply.intValue()==1&& if(signStatusApply!=null&&signStatusApply.intValue()==1&&
signStatusMediator!=null&&signStatusMediator.intValue()==1){ signStatusMediator!=null&&signStatusMediator.intValue()==1){
// 根据流程id查找下一个流程节点 // 根据流程id查找下一个流程节点
MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId().intValue()); // 根据流程id查找下一个流程节点
MsCaseFlow nextFlow=null;
if(caseApplicationselect.getSealFlag()!=null&&caseApplicationselect.getSealFlag()==1) {
// 需要用印
nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId().intValue());
}else {
// 不需要用印
nextFlow = caseFlowMapper.nextFlow1(caseApplicationselect.getCaseFlowId().intValue());
}
MsCaseApplication application = new MsCaseApplication(); MsCaseApplication application = new MsCaseApplication();
application.setId(caseApplicationselect.getId()); application.setId(caseApplicationselect.getId());
application.setCaseFlowId(nextFlow.getId()); application.setCaseFlowId(nextFlow.getId());
@@ -801,7 +809,15 @@ public class MsSignSealServiceImpl implements MsSignSealService {
if(signStatusApply!=null&&signStatusApply.intValue()==1&& if(signStatusApply!=null&&signStatusApply.intValue()==1&&
signStatusResponse!=null&&signStatusResponse.intValue()==1){ signStatusResponse!=null&&signStatusResponse.intValue()==1){
// 根据流程id查找下一个流程节点 // 根据流程id查找下一个流程节点
MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId().intValue()); // 根据流程id查找下一个流程节点
MsCaseFlow nextFlow=null;
if(caseApplicationselect.getSealFlag()!=null&&caseApplicationselect.getSealFlag()==1) {
// 需要用印
nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId().intValue());
}else {
// 不需要用印
nextFlow = caseFlowMapper.nextFlow1(caseApplicationselect.getCaseFlowId().intValue());
}
MsCaseApplication application = new MsCaseApplication(); MsCaseApplication application = new MsCaseApplication();
application.setId(caseApplicationselect.getId()); application.setId(caseApplicationselect.getId());
application.setCaseFlowId(nextFlow.getId()); application.setCaseFlowId(nextFlow.getId());