diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index 17ffec2..6f5d47e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -1858,7 +1858,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { String annexPath = caseAttach.getAnnexPath(); String path = "/home/ruoyi" + annexPath; // System.out.println("这是查询到的裁决书路径" + path); - //String path = "D:\\home\\仲裁裁决书模板.docx"; + // String path = "D:\\home\\新裁决书模板.docx"; //获取文件上传地址 EsignHttpResponse response = SaaSAPIFileUtils.getUploadUrl(path); String body = response.getBody(); @@ -1984,7 +1984,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { if (selectSealList != null && selectSealList.size() > 0) { for (SealManage manage : selectSealList) { Integer sealStatus = manage.getSealStatus(); - if (sealStatus == 1) { + Integer isUse = manage.getIsUse(); + if (sealStatus == 1 && isUse ==1) { sealIdList.add(manage.getSealId()); } } @@ -2846,14 +2847,14 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } UUID uuid = UUID.randomUUID(); String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile/"+uuid+ "/"; - // String targetPath = "D:/home/unzip/" + uuid + "/"; + //String targetPath = "D:/home/unzip/" + uuid + "/"; File zipFile = null; InputStream ins = null; try { ins = file.getInputStream(); //上传的压缩包保存的路径 String savePath = "/home/ruoyi/uploadPath/upload/zipFile/"; - // String savePath = "D:/home/zipFile/"; + //String savePath = "D:/home/zipFile/"; String saveName = uuid + "_" + file.getOriginalFilename(); zipFile = new File(savePath + saveName); inputChangeToFile(ins, zipFile); @@ -2913,18 +2914,20 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { //默认案件标的 caseApplication.setCaseSubjectAmount(new BigDecimal(1)); caseApplication.setApplicationOrganId(map.get("统一社会信用代码").get(0)); - caseApplication.setCompLegalPerson(map.get("负责人").get(0)); - caseApplication.setNameAgent(map.get("委托代理人").get(0)); caseApplication.setArbitratClaims(map.get("仲裁请求").get(0)); List caseAffiliates = new ArrayList<>(); CaseAffiliate caseAffiliate = new CaseAffiliate(); caseAffiliate.setIdentityType(1); caseAffiliate.setName(map.get("申请人").get(0)); caseAffiliate.setIdentityNum(map.get("统一社会信用代码").get(0)); + caseAffiliate.setCompLegalPerson(map.get("负责人").get(0)); + caseAffiliate.setNameAgent(map.get("委托代理人").get(0)); caseAffiliate.setContactTelphone(map.get("联系电话").get(0)); caseAffiliate.setResidenAffili(map.get("住所").get(0)); caseAffiliate.setContactAddress(map.get("联系地址").get(0)); - caseAffiliate.setSendEmail(map.get("电子邮件").get(0)); + caseAffiliate.setEmail(map.get("电子邮件").get(0)); + //设置默认代理人的身份证号码,暂时写死 要不然新增方法报错 + caseAffiliate.setIdentityNumAgent("610528199901013612"); caseAffiliates.add(caseAffiliate); CaseAffiliate caseAffiliate1 = new CaseAffiliate(); caseAffiliate1.setIdentityType(2); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java index f4892e1..10aaac4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java @@ -314,7 +314,7 @@ public class FixSelectFlowDetailUtils { String month = String.format("%02d", now.getMonthValue()); String day = String.format("%02d", now.getDayOfMonth()); String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day; - String fileName = UUID.randomUUID().toString().replace("-", "") + ".pdf"; + String fileName = UUID.randomUUID().toString().replace("-", "") + ".jpg"; String saveName = "/profile/upload/" + year + "/" + month + "/" + day + "/" + fileName; String savePath = "/home/ruoyi/uploadPath/upload/"; // 创建日期目录