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

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

Browse Source
This commit was merged in pull request #253.
This commit is contained in:
hejinbo
2023-11-29 16:05:44 +08:00
committed by Gitea
parent 8a48dbbab0 7bcb28cdac
commit 0996ce4008
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+3 -1
View File
@@ -112,8 +112,10 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
String responSex = affiliate.getResponSex(); String responSex = affiliate.getResponSex();
if (responSex.equals("0")) { if (responSex.equals("0")) {
datas.put("resSex", "男"); datas.put("resSex", "男");
} else { } else if (responSex.equals("1")){
datas.put("resSex", "女"); datas.put("resSex", "女");
}else {
datas.put("resSex", "未知");
} }
Date responBirth = affiliate.getResponBirth(); Date responBirth = affiliate.getResponBirth();
if (responBirth != null) { if (responBirth != null) {
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+7 -5
View File
@@ -2001,7 +2001,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
sealSignRecord.setSignFlowStatus(1);//待签名 sealSignRecord.setSignFlowStatus(1);//待签名
sealSignRecordMapper.insertSealSignRecord(sealSignRecord); sealSignRecordMapper.insertSealSignRecord(sealSignRecord);
} else { } else {
throw new ServiceException("发起签署流程失败,请检查参数是否有误"); throw new ServiceException(jsonObject3.getString("message"));
} }
} else { } else {
return AjaxResult.error(); return AjaxResult.error();
@@ -2844,15 +2844,15 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
return AjaxResult.error("请选择要上传的文件"); return AjaxResult.error("请选择要上传的文件");
} }
UUID uuid = UUID.randomUUID(); UUID uuid = UUID.randomUUID();
String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile/"+uuid+ "/"; //String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile/"+uuid+ "/";
//String targetPath = "D:/home/unzip/" + uuid + "/"; String targetPath = "D:/home/unzip/" + uuid + "/";
File zipFile = null; File zipFile = null;
InputStream ins = null; InputStream ins = null;
try { try {
ins = file.getInputStream(); ins = file.getInputStream();
//上传的压缩包保存的路径 //上传的压缩包保存的路径
String savePath = "/home/ruoyi/uploadPath/upload/zipFile/"; //String savePath = "/home/ruoyi/uploadPath/upload/zipFile/";
//String savePath = "D:/home/zipFile/"; String savePath = "D:/home/zipFile/";
String saveName = uuid + "_" + file.getOriginalFilename(); String saveName = uuid + "_" + file.getOriginalFilename();
zipFile = new File(savePath + saveName); zipFile = new File(savePath + saveName);
inputChangeToFile(ins, zipFile); inputChangeToFile(ins, zipFile);
@@ -2931,6 +2931,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseAffiliate1.setIdentityNum(map.get("居民身份证号码").get(0)); caseAffiliate1.setIdentityNum(map.get("居民身份证号码").get(0));
caseAffiliate1.setContactTelphone(map.get("联系电话").get(1)); caseAffiliate1.setContactTelphone(map.get("联系电话").get(1));
caseAffiliate1.setResidenAffili(map.get("住所").get(1)); caseAffiliate1.setResidenAffili(map.get("住所").get(1));
//设置默认的性别 2代表未知
caseAffiliate1.setResponSex("2");
caseAffiliates.add(caseAffiliate1); caseAffiliates.add(caseAffiliate1);
caseApplication.setCaseAffiliates(caseAffiliates); caseApplication.setCaseAffiliates(caseAffiliates);
this.insertcaseApplication(caseApplication); this.insertcaseApplication(caseApplication);
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java
+3 -1
View File
@@ -242,8 +242,10 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
String responSex = affiliate.getResponSex(); String responSex = affiliate.getResponSex();
if (responSex.equals("0")) { if (responSex.equals("0")) {
datas.put("resSex", "男"); datas.put("resSex", "男");
} else { } else if (responSex.equals("1")){
datas.put("resSex", "女"); datas.put("resSex", "女");
}else {
datas.put("resSex", "未知");
} }
Date responBirth = affiliate.getResponBirth(); Date responBirth = affiliate.getResponBirth();
if (responBirth != null) { if (responBirth != null) {
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java
+1 -2
View File
@@ -30,7 +30,6 @@ public class SignAward {
public static void main(String[] args) throws EsignDemoException { public static void main(String[] args) throws EsignDemoException {
Gson gson = new Gson(); Gson gson = new Gson();
SealSignRecord sealSignRecord = new SealSignRecord();
/* 发起签署*/ /* 发起签署*/
@@ -121,7 +120,7 @@ public class SignAward {
// System.out.println(signFlowDetailJsonObject); // System.out.println(signFlowDetailJsonObject);
DeptIdentify deptIdentify = new DeptIdentify(); DeptIdentify deptIdentify = new DeptIdentify();
deptIdentify.setAuthFlowId("OF-2b4e8f043408003c"); deptIdentify.setAuthFlowId("OF-2b5883bf4508000c");
EsignHttpResponse deptIdentifyInfo = getDeptIdentifyInfo(deptIdentify); EsignHttpResponse deptIdentifyInfo = getDeptIdentifyInfo(deptIdentify);
System.out.println(deptIdentifyInfo); System.out.println(deptIdentifyInfo);