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

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

Browse Source
This commit was merged in pull request #116.
This commit is contained in:
qtz
2023-10-18 10:47:31 +08:00
committed by Gitea
parent 96a0983441 3c5d45f4cf
commit e39b2ce087
6 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java
+13 -7
View File
@@ -1,8 +1,11 @@
package com.ruoyi.wisdomarbitrate.domain; package com.ruoyi.wisdomarbitrate.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
public class CaseAffiliate extends BaseEntity { public class CaseAffiliate extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** ID */ /** ID */
@@ -39,7 +42,16 @@ public class CaseAffiliate extends BaseEntity {
/** /**
* 被申请人出生年月日 * 被申请人出生年月日
*/ */
private String responBirth; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date responBirth;
public Date getResponBirth() {
return responBirth;
}
public void setResponBirth(Date responBirth) {
this.responBirth = responBirth;
}
public String getCompLegalPerson() { public String getCompLegalPerson() {
return compLegalPerson; return compLegalPerson;
@@ -65,13 +77,7 @@ public class CaseAffiliate extends BaseEntity {
this.responSex = responSex; this.responSex = responSex;
} }
public String getResponBirth() {
return responBirth;
}
public void setResponBirth(String responBirth) {
this.responBirth = responBirth;
}
/** 身份证号 */ /** 身份证号 */
@Excel(name = "身份证号") @Excel(name = "身份证号")
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+11 -7
View File
@@ -624,9 +624,19 @@ public class CaseApplication extends BaseEntity {
/** 被申请人主体信息-性别 */ /** 被申请人主体信息-性别 */
@Excel(name = "被申请人主体信息-性别",width = 26) @Excel(name = "被申请人主体信息-性别",width = 26)
private String responSex; private String responSex;
public Date getResponBirth() {
return responBirth;
}
public void setResponBirth(Date responBirth) {
this.responBirth = responBirth;
}
/** 被申请人主体信息-出生年月日 */ /** 被申请人主体信息-出生年月日 */
@Excel(name = "被申请人主体信息-出生年月日",width = 26) @Excel(name = "被申请人主体信息-出生年月日",width = 26)
private String responBirth; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date responBirth;
public String getCompLegalPerson() { public String getCompLegalPerson() {
return compLegalPerson; return compLegalPerson;
@@ -652,13 +662,7 @@ public class CaseApplication extends BaseEntity {
this.responSex = responSex; this.responSex = responSex;
} }
public String getResponBirth() {
return responBirth;
}
public void setResponBirth(String responBirth) {
this.responBirth = responBirth;
}
/** 联系电话 */ /** 联系电话 */
@Excel(name = "被申请人主体信息-联系电话",width = 26) @Excel(name = "被申请人主体信息-联系电话",width = 26)
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+1
View File
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.constant.CaseApplicationConstants; import com.ruoyi.common.constant.CaseApplicationConstants;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.wisdomarbitrate.mapper.*; import com.ruoyi.wisdomarbitrate.mapper.*;
import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils; import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
import com.ruoyi.common.utils.EmailOutUtil; import com.ruoyi.common.utils.EmailOutUtil;
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+16 -16
View File
@@ -127,25 +127,25 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
){ ){
return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication); return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication);
} }
if(role.getRoleName().equals("仲裁委") // if(role.getRoleName().equals("仲裁委")
||role.getRoleName().equals("部门长")){ // ||role.getRoleName().equals("部门长")){
List<Integer> caseStatusList=new ArrayList<>(); // List<Integer> caseStatusList=new ArrayList<>();
caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); // caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION); // caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION);
caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); // caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
caseApplication.setDeptHeadStatus(caseStatusList); // caseApplication.setDeptHeadStatus(caseStatusList);
} // }
if(role.getRoleName().equals("仲裁员")){ // if(role.getRoleName().equals("仲裁员")){
caseApplication.setUserId(String.valueOf(userId)); // caseApplication.setUserId(String.valueOf(userId));
} // }
if(role.getRoleName().equals("财务")){ if(role.getRoleName().equals("财务")){
caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM); caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM);
} }
if(role.getRoleName().equals("法律顾问")){ // if(role.getRoleName().equals("法律顾问")){
// 查询角色有关的用户部门 // // 查询角色有关的用户部门
List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId()); // List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
caseApplication.setDeptIds(deptIds); // caseApplication.setDeptIds(deptIds);
} // }
if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){ if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){
// 查询角色有关的用户部门 // 查询角色有关的用户部门
caseApplication.setNameId(String.valueOf(sysUser.getDeptId())); caseApplication.setNameId(String.valueOf(sysUser.getDeptId()));
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java
+27 -25
View File
@@ -6,10 +6,12 @@ import com.google.gson.JsonObject;
import com.ruoyi.common.core.domain.entity.EsignHttpResponse; import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
import com.ruoyi.common.enums.EsignRequestType; import com.ruoyi.common.enums.EsignRequestType;
import com.ruoyi.common.exception.EsignDemoException; import com.ruoyi.common.exception.EsignDemoException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.EsignApplicaConfig; import com.ruoyi.common.utils.EsignApplicaConfig;
import com.ruoyi.common.utils.EsignHttpHelper; import com.ruoyi.common.utils.EsignHttpHelper;
import com.ruoyi.wisdomarbitrate.domain.SealSignRecord; import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
import java.util.Date;
import java.util.Map; import java.util.Map;
public class SignAward { public class SignAward {
@@ -62,32 +64,32 @@ public class SignAward {
// System.out.println("签署短链接:"+sealUrl); // System.out.println("签署短链接:"+sealUrl);
//查询签署流程详情 //查询签署流程详情
EsignHttpResponse signFlowDetail = signFlowDetail(sealSignRecord); // EsignHttpResponse signFlowDetail = signFlowDetail(sealSignRecord);
JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class); // JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data"); // JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray(); // JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
for (int i = 0; i < signersArray.size(); i++) { // for (int i = 0; i < signersArray.size(); i++) {
JsonObject signerObject = (JsonObject)signersArray.get(i); // JsonObject signerObject = (JsonObject)signersArray.get(i);
Integer psnsignStatus ; // Integer psnsignStatus ;
Integer orgsignStatus ; // Integer orgsignStatus ;
if(!(signerObject.get("psnSigner").toString()).equals("null")){ // if(!(signerObject.get("psnSigner").toString()).equals("null")){
JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner"); // JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner");
if(psnSignerData!=null){ // if(psnSignerData!=null){
psnsignStatus = signerObject.get("signStatus").getAsInt(); // psnsignStatus = signerObject.get("signStatus").getAsInt();
sealSignRecord.setPsnsignStatus(psnsignStatus); // sealSignRecord.setPsnsignStatus(psnsignStatus);
} // }
} // }
if(!(signerObject.get("orgSigner").toString()).equals("null")){ // if(!(signerObject.get("orgSigner").toString()).equals("null")){
JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner"); // JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner");
if(orgSignerData!=null){ // if(orgSignerData!=null){
orgsignStatus = signerObject.get("signStatus").getAsInt(); // orgsignStatus = signerObject.get("signStatus").getAsInt();
sealSignRecord.setOrgsignStatus(orgsignStatus); // sealSignRecord.setOrgsignStatus(orgsignStatus);
} // }
//
// }
// }
} // System.out.println(signFlowDetailJsonObject);
}
System.out.println(signFlowDetailJsonObject);
} }
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+2 -2
View File
@@ -128,7 +128,7 @@
</if> </if>
<!--财务--> <!--财务-->
<if test="financeStatus != null and financeStatus != ''"> <if test="financeStatus != null and financeStatus != ''">
or(t.identity_type=1 and t.case_status =#{financeStatus}) (t.identity_type=1 and t.case_status =#{financeStatus})
</if> </if>
</where> </where>
@@ -220,7 +220,7 @@
</if> </if>
<!--财务--> <!--财务-->
<if test="financeStatus != null and financeStatus != ''"> <if test="financeStatus != null and financeStatus != ''">
or( t.identity_type=1 and t.case_status =#{financeStatus}) ( t.identity_type=1 and t.case_status =#{financeStatus})
</if> </if>
</where> </where>