9.25修复问题改动代码

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.wisdomarbitrate.service.impl;
 
 import com.deepoove.poi.config.Configure;
+import com.ruoyi.common.constant.CaseApplicationConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.WordUtil;
 import com.ruoyi.wisdomarbitrate.domain.*;
@@ -37,7 +38,6 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
     public AjaxResult createDocument(CaseApplication caseApplication) {
         try {
             Map<String, Object> datas = new HashMap<>();
-            Adjudication adjudication = new Adjudication();
             Long id = caseApplication.getId();
             if (id == null){
                 return null;
@@ -59,14 +59,12 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                     int identityType = affiliate.getIdentityType();
                     if (identityType == 1) {    //申请人
                         datas.put("appName", affiliate.getName());
-                        datas.put("appSex", null);
                         datas.put("appIDNo", affiliate.getIdentityNum());
                         datas.put("appAddress", affiliate.getContactAddress());
                         datas.put("appAgentName", affiliate.getNameAgent());
                         datas.put("appAgentIDNo",affiliate.getIdentityNumAgent());
                     }else if (identityType == 2){  //被申请人
                         datas.put("resName", affiliate.getName());
-                        datas.put("resSex", null);
                         datas.put("resIDNo", affiliate.getIdentityNum());
                         datas.put("resAddress", affiliate.getContactAddress());
                         datas.put("resAgentName", affiliate.getNameAgent());
@@ -77,35 +75,38 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
             String arbitratorName = caseApplication1.getArbitratorName();
             datas.put("caseName",caseApplication1.getCaseName());
             datas.put("arbitratorName",arbitratorName);
-            LocalDate localDate = caseApplication1.getHearDate()
-                    .toInstant()
-                    .atZone(ZoneId.systemDefault())
-                    .toLocalDate();
-            datas.put("hearYear",  localDate.getYear());
-            datas.put("hearMonths",  localDate.getMonthValue());
-            datas.put("hearDay",  localDate.getDayOfMonth());
-            datas.put("appArbitrationClaims", null);
-            datas.put("appEvidenceName", null);
-            datas.put("appProveFacts", null);
-            datas.put("resDefenseContentToApp", null);
-            datas.put("resArbitrationClaims", null);
-            datas.put("resEvidenceName", null);
-            datas.put("resProveFacts", null);
-            datas.put("appDefenseContentToRes", null);
-            datas.put("evidenDetermi", arbitrateRecord1.getEvidenDetermi());
-            datas.put("factDetermi", arbitrateRecord1.getFactDetermi());
-            datas.put("caseSketch", arbitrateRecord1.getCaseSketch());
-            datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink());
-            datas.put("legalProvisions", null);
-            datas.put("rulingFollows", arbitrateRecord1.getRulingFollows());
-            datas.put("umpire", null);
-            if (arbitratorName.contains(",")){
+            Date hearDate = caseApplication1.getHearDate();
+            if (hearDate != null) {
+                LocalDate localDate = hearDate.toInstant()
+                        .atZone(ZoneId.systemDefault())
+                        .toLocalDate();
+                datas.put("hearYear",  localDate.getYear());
+                datas.put("hearMonths",  localDate.getMonthValue());
+                datas.put("hearDay",  localDate.getDayOfMonth());
+            }else {
+                datas.put("hearYear",  null);
+                datas.put("hearMonths",  null);
+                datas.put("hearDay",  null);
+            }
+            datas.put("appArbitrationClaims",  caseApplication1.getArbitratClaims());
+            if (arbitrateRecord1!=null){
+                datas.put("evidenDetermi", arbitrateRecord1.getEvidenDetermi());
+                datas.put("factDetermi", arbitrateRecord1.getFactDetermi());
+                datas.put("caseSketch", arbitrateRecord1.getCaseSketch());
+                datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink());
+                datas.put("rulingFollows", arbitrateRecord1.getRulingFollows());
+            }
+            datas.put("legalProvisions", "仲裁法");
+            if (arbitratorName==null){
+                datas.put("arbitratorName1", null);
+                datas.put("arbitratorName2", null);
+            }else if (arbitratorName.contains(",")){
                 String[] nameArray = arbitratorName.split(",");
                 String firstName = nameArray[0];
                 String secondName = nameArray[1];
                 datas.put("arbitratorName1", firstName);
                 datas.put("arbitratorName2", secondName);
-            }else {
+            } else {
                 String secondName = "";
                 datas.put("arbitratorName1", arbitratorName);
                 datas.put("arbitratorName2", secondName);
@@ -114,19 +115,24 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
             datas.put("year", now.getYear());
             datas.put("months", now.getMonthValue());
             datas.put("day", now.getDayOfMonth());
-            datas.put("clerk", null);
             String modalFilePath = "/data/arbitrate-document/template/仲裁裁决书模板.docx";
-
-            String currentDateStr = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-            String saveFolderPath = "/data/arbitrate-document/formal/" + currentDateStr;
+            //String modalFilePath = "D:/develop/仲裁裁决书模板 (2).docx";
+            String saveFolderPath = "/data/arbitrate-document/formal/" + now.getYear() + "/" + now.getMonthValue() + "/" + now.getDayOfMonth();
+            //String saveFolderPath = "D:/data/" + now.getYear() + "/" + now.getMonthValue() + "/" + now.getDayOfMonth();
+            String fileName = UUID.randomUUID().toString().replace("-", "") + ".docx";
+            String resultFilePath = saveFolderPath + "/" + fileName;
             // 创建日期目录
             File saveFolder = new File(saveFolderPath);
             if (!saveFolder.exists()) {
                 saveFolder.mkdirs();
             }
-            String fileName = UUID.randomUUID().toString().replace("-", "") + ".docx";
-            String resultFilePath = saveFolderPath+ fileName;
-            String docFilePath = WordUtil.getDocFilePath(datas, modalFilePath, resultFilePath);
+            Path sourcePath = new File(modalFilePath).toPath();
+            Path destinationPath = new File(resultFilePath).toPath();
+            Files.copy(sourcePath, destinationPath, StandardCopyOption.REPLACE_EXISTING);
+            String docFilePath = WordUtil.getDocFilePath(datas,modalFilePath,resultFilePath);
+            //修改案件状态
+            caseApplication1.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION);
+            caseApplicationMapper.submitCaseApplication(caseApplication1);
             //将裁决书保存到附件表里
             CaseAttach caseAttach = CaseAttach.builder()
                     .caseAppliId(id)
@@ -136,12 +142,14 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                     .build();
             int i = caseAttachMapper.save(caseAttach);
             if (i>0){
-                Integer annexId = caseAttach.getAnnexId();
-                //将附件id保存到仲裁记录表里面
-                arbitrateRecord1.setAnnexId(annexId);
-                arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord1);
+                if (arbitrateRecord1!=null){
+                    Integer annexId = caseAttach.getAnnexId();
+                    //将附件id保存到仲裁记录表里面
+                    arbitrateRecord1.setAnnexId(annexId);
+                    arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord1);
+                }
             }
-            return AjaxResult.success("裁决书保存路径为" + docFilePath);
+            return AjaxResult.success("裁决书已生成");
         } catch (IOException e) {
             e.printStackTrace();
         }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java

@@ -42,12 +42,22 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
         if (opinion==0){   //拒绝
             if (arbitratMethod == 2){
                 caseApplication1.setArbitratMethod(1);  // 更改仲裁方式
+                //修改案件状态为待开庭审理
+                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
             }else {
                 caseApplication1.setArbitratMethod(2);
+                //修改案件状态为待书面审理
+                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR);
+            }
+        }else {
+            if (arbitratMethod == 2){
+                //修改案件状态为待书面审理
+                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR);
+            }else {
+                //修改案件状态为待开庭审理
+                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
             }
         }
-        //修改案件状态为待开庭
-        caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
         int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
         if (i > 0) {
             String arbitratMethodStr = caseApplication1.getArbitratMethod() == 1 ? "开庭审理" : "书面审理";
@@ -92,21 +102,42 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
         if (createBy!=null){
             arbitrateRecord.setCreateBy(createBy);
         }
-        //提交仲裁结果
-        int i =  arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord);
-        if (i>0){
-            //案件日志表里添加数据
-            CaseLogRecord caseLogRecord = new CaseLogRecord();
-            caseLogRecord.setCaseAppliId(caseApplication1.getId());
-            caseLogRecord.setCaseNode(caseApplication1.getCaseStatus());
-            if (createBy!=null){
-                caseLogRecord.setCreateBy(createBy);
+        //先判断案件是否已经提交过仲裁结果
+        ArbitrateRecord arbitrateRecord1 = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecord);
+        if (arbitrateRecord1!=null){
+            int i = arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
+            if (i>0){
+                //案件日志表里添加数据
+                CaseLogRecord caseLogRecord = new CaseLogRecord();
+                caseLogRecord.setCaseAppliId(caseApplication1.getId());
+                caseLogRecord.setCaseNode(caseApplication1.getCaseStatus());
+                if (createBy!=null){
+                    caseLogRecord.setCreateBy(createBy);
+                }
+                caseLogRecordMapper.insertCaseLogRecord(caseLogRecord);
+                //修改案件状态
+                caseApplication.setCaseStatus(CaseApplicationConstants.GENERATED_ARBITRATION);
+                caseApplicationMapper.submitCaseApplication(caseApplication);
+                return AjaxResult.success("提交成功");
+            }
+        }else {
+            //提交仲裁结果
+            int i =  arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord);
+
+            if (i>0){
+                //案件日志表里添加数据
+                CaseLogRecord caseLogRecord = new CaseLogRecord();
+                caseLogRecord.setCaseAppliId(caseApplication1.getId());
+                caseLogRecord.setCaseNode(caseApplication1.getCaseStatus());
+                if (createBy!=null){
+                    caseLogRecord.setCreateBy(createBy);
+                }
+                caseLogRecordMapper.insertCaseLogRecord(caseLogRecord);
+                //修改案件状态
+                caseApplication.setCaseStatus(CaseApplicationConstants.GENERATED_ARBITRATION);
+                caseApplicationMapper.submitCaseApplication(caseApplication);
+                return AjaxResult.success("提交成功");
             }
-            caseLogRecordMapper.insertCaseLogRecord(caseLogRecord);
-            //修改案件状态
-            caseApplication.setCaseStatus(CaseApplicationConstants.GENERATED_ARBITRATION);
-            caseApplicationMapper.submitCaseApplication(caseApplication);
-            return AjaxResult.success("提交成功");
         }
         return AjaxResult.error("暂无需要提交仲裁结果的案件");
     }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java

@@ -85,7 +85,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
         caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM);
         //修改案件状态
         caseApplicationMapper.submitCaseApplication(caseApplication1);
-        return AjaxResult.success();
+        return AjaxResult.success("支付成功");
     }
 
     @Override