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

优化生成裁决书功能

Browse Source
This commit is contained in:
qitz
2023-10-17 22:20:38 +08:00
parent 5d2fdedfcf
commit 5b46ee97b1
3 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java
+18 -8
View File
@@ -3,6 +3,8 @@ package com.ruoyi.wisdomarbitrate.domain;
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 +41,15 @@ public class CaseAffiliate extends BaseEntity {
/** /**
* 被申请人出生年月日 * 被申请人出生年月日
*/ */
private String responBirth; 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 +75,13 @@ public class CaseAffiliate extends BaseEntity {
this.responSex = responSex; this.responSex = responSex;
} }
public String getResponBirth() { // public String getResponBirth() {
return responBirth; // return responBirth;
} // }
//
public void setResponBirth(String responBirth) { // public void setResponBirth(String responBirth) {
this.responBirth = responBirth; // this.responBirth = responBirth;
} // }
/** 身份证号 */ /** 身份证号 */
@Excel(name = "身份证号") @Excel(name = "身份证号")
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+3 -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;
@@ -93,7 +94,8 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
datas.put("resName", affiliate.getName()); datas.put("resName", affiliate.getName());
datas.put("resAddress", affiliate.getContactAddress()); datas.put("resAddress", affiliate.getContactAddress());
datas.put("resSex", affiliate.getResponSex()); datas.put("resSex", affiliate.getResponSex());
datas.put("resDateOfBirth", affiliate.getResponBirth()); // datas.put("resDateOfBirth", responBirthdatestr);
datas.put("resDateOfBirth", "1987-03-05");
datas.put("resContactAddress", null); datas.put("resContactAddress", null);
} }
} }
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java
+33 -26
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,34 +64,39 @@ 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);
// String responBirth = "Wed Feb 03 00:00:00 CST 1988";
String responBirth = "2023-10-10 05:49:36";
Date responBirthdate= DateUtils.parseDate(responBirth);
// String responBirthdatestr= DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,responBirthdate);
String responBirthdatestr= DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,responBirthdate);
System.out.println(responBirthdatestr);
} }