合并

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java

@@ -1,8 +1,11 @@
 package com.ruoyi.wisdomarbitrate.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 public class CaseAffiliate   extends BaseEntity {
     private static final long serialVersionUID = 1L;
     /** ID */
@@ -39,7 +42,17 @@ 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() {
         return compLegalPerson;
@@ -65,13 +78,8 @@ public class CaseAffiliate   extends BaseEntity {
         this.responSex = responSex;
     }
 
-    public String getResponBirth() {
-        return responBirth;
-    }
 
-    public void setResponBirth(String responBirth) {
-        this.responBirth = responBirth;
-    }
+
 
     /** 身份证号 */
     @Excel(name = "身份证号")

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

@@ -624,9 +624,19 @@ public class CaseApplication  extends BaseEntity {
     /** 被申请人主体信息-性别 */
     @Excel(name = "被申请人主体信息-性别",width = 26)
     private String responSex;
+
+    public Date getResponBirth() {
+        return responBirth;
+    }
+
+    public void setResponBirth(Date responBirth) {
+        this.responBirth = responBirth;
+    }
+
     /** 被申请人主体信息-出生年月日 */
     @Excel(name = "被申请人主体信息-出生年月日",width = 26)
-    private String responBirth;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date responBirth;
 
     public String getCompLegalPerson() {
         return compLegalPerson;
@@ -652,13 +662,7 @@ public class CaseApplication  extends BaseEntity {
         this.responSex = responSex;
     }
 
-    public String getResponBirth() {
-        return responBirth;
-    }
 
-    public void setResponBirth(String responBirth) {
-        this.responBirth = responBirth;
-    }
 
     /** 联系电话 */
     @Excel(name = "被申请人主体信息-联系电话",width = 26)

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.constant.CaseApplicationConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.wisdomarbitrate.mapper.*;
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
 import com.ruoyi.common.utils.EmailOutUtil;
@@ -77,24 +78,30 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
             CaseAffiliate caseAffiliate = new CaseAffiliate();
             caseAffiliate.setCaseAppliId(id);
             List<CaseAffiliate> caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);
+            List<String> nameAgentList = new ArrayList<>();
             if (caseAffiliates != null && caseAffiliates.size() > 0) {
                 for (CaseAffiliate affiliate : caseAffiliates) {
                     //获取身份类型
                     int identityType = affiliate.getIdentityType();
                     if (identityType == 1) {    //申请人
                         datas.put("appName", affiliate.getName());
-                        datas.put("appAddress", affiliate.getContactAddress());
-                        datas.put("appContactAddress", null);
+                        datas.put("appAddress", affiliate.getResidenAffili());
+                        datas.put("appContactAddress", affiliate.getContactAddress());
                         datas.put("appLegalPerson", affiliate.getCompLegalPerson());
                         datas.put("appLegalPersonTitle", affiliate.getCompLegalperPost());
                         datas.put("appAgentName", affiliate.getNameAgent());
-                        datas.put("appAgentTitle", null);
+                        datas.put("appAgentTitle", affiliate.getAppliAgentTitle());
+                        nameAgentList.add(affiliate.getNameAgent());
                     } else if (identityType == 2) {  //被申请人
                         datas.put("resName", affiliate.getName());
-                        datas.put("resAddress", affiliate.getContactAddress());
+                        datas.put("resAddress", affiliate.getResidenAffili());
                         datas.put("resSex", affiliate.getResponSex());
-                        datas.put("resDateOfBirth", affiliate.getResponBirth());
-                        datas.put("resContactAddress", null);
+                        Date responBirth = affiliate.getResponBirth();
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        String responBirthStr = sdf.format(responBirth);
+                        datas.put("resDateOfBirth",responBirthStr);
+                        datas.put("resContactAddress", affiliate.getContactAddress());
+                        nameAgentList.add(affiliate.getNameAgent());
                     }
                 }
             }
@@ -163,7 +170,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
             }
             Integer isAbsence = caseApplication1.getIsAbsence();
             if (isAbsence==null){
-                datas.put("onLine1", null);
+                datas.put("absent1", null);
                 datas.put("absent2", null);
                 datas.put("absent3", null);
                 datas.put("absent4", null);
@@ -175,7 +182,9 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                 datas.put("attend5", null);
                 datas.put("attend6", null);
                 datas.put("attend7", null);
-                datas.put("responCrossOpin", null);
+                datas.put("appAgentName1", null);
+                datas.put("appAgentName2", null);
+                datas.put("resAgentName", null);
             }
            else if (isAbsence == 1) {
                 //缺席审理
@@ -188,11 +197,12 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                         "申请人为证明其主张的事实和理由，向仲裁庭提交了如下证据材料：";
                 String absent5 = "综上，仲裁庭依据《上海仲裁委员会仲裁规则》（2022年7月1日起施行的版本）" +
                         "第四十条第（二）项、第五十一条的规定，缺席裁决如下：";
-                datas.put("onLine1", absent1);
+                datas.put("absent1", absent1);
                 datas.put("absent2", absent2);
                 datas.put("absent3", absent3);
                 datas.put("absent4", absent4);
                 datas.put("absent5", absent5);
+                datas.put("appAgentName1", nameAgentList.get(0));
             } else {
                 //出席审理
                 String attend1 = "申请人的特别授权委托代理人";
@@ -214,6 +224,8 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                 datas.put("attend6", attend6);
                 datas.put("attend7", attend7);
                 datas.put("responCrossOpin", caseApplication1.getResponCrossOpin());
+                datas.put("appAgentName2", nameAgentList.get(0));
+                datas.put("resAgentName", nameAgentList.get(1));
                 if (arbitratMethod == 1) {
                     //被申出席+开庭
                     String attend8 = "综上，仲裁庭依据《上海仲裁委员会仲裁规则》（2022年7月1日起施行的版本）" +
@@ -243,7 +255,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
             datas.put("year", year);
             String month = String.format("%02d", now.getMonthValue());
             String day = String.format("%02d", now.getDayOfMonth());
-             String modalFilePath = "/data/arbitrate-document/template/新裁决书模板.docx";
+            String modalFilePath = "/data/arbitrate-document/template/新裁决书模板.docx";
             //String modalFilePath = "D:/develop/新裁决书模板.docx";
             String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day;
             //String saveFolderPath = "D:/data/" + year + "/" + month + "/" + day;

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

@@ -127,25 +127,25 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             ){
                 return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication);
             }
-            if(role.getRoleName().equals("仲裁委")
-                    ||role.getRoleName().equals("部门长")){
-                List<Integer> caseStatusList=new ArrayList<>();
-                caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
-                caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION);
-                caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
-                caseApplication.setDeptHeadStatus(caseStatusList);
-            }
-            if(role.getRoleName().equals("仲裁员")){
-                caseApplication.setUserId(String.valueOf(userId));
-            }
+//            if(role.getRoleName().equals("仲裁委")
+//                    ||role.getRoleName().equals("部门长")){
+//                List<Integer> caseStatusList=new ArrayList<>();
+//                caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
+//                caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION);
+//                caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
+//                caseApplication.setDeptHeadStatus(caseStatusList);
+//            }
+//            if(role.getRoleName().equals("仲裁员")){
+//                caseApplication.setUserId(String.valueOf(userId));
+//            }
             if(role.getRoleName().equals("财务")){
                 caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM);
             }
-            if(role.getRoleName().equals("法律顾问")){
-                // 查询角色有关的用户部门
-                List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
-                caseApplication.setDeptIds(deptIds);
-            }
+//            if(role.getRoleName().equals("法律顾问")){
+//                // 查询角色有关的用户部门
+//                List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
+//                caseApplication.setDeptIds(deptIds);
+//            }
             if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){
                 // 查询角色有关的用户部门
                 caseApplication.setNameId(String.valueOf(sysUser.getDeptId()));

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java

@@ -6,10 +6,12 @@ import com.google.gson.JsonObject;
 import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
 import com.ruoyi.common.enums.EsignRequestType;
 import com.ruoyi.common.exception.EsignDemoException;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.EsignApplicaConfig;
 import com.ruoyi.common.utils.EsignHttpHelper;
 import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
 
+import java.util.Date;
 import java.util.Map;
 
 public class SignAward {
@@ -62,32 +64,32 @@ public class SignAward {
 //        System.out.println("签署短链接:"+sealUrl);
 
         //查询签署流程详情
-        EsignHttpResponse signFlowDetail = signFlowDetail(sealSignRecord);
-        JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
-        JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
-        JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
-        for (int i = 0; i < signersArray.size(); i++) {
-            JsonObject signerObject = (JsonObject)signersArray.get(i);
-            Integer psnsignStatus ;
-            Integer orgsignStatus ;
-            if(!(signerObject.get("psnSigner").toString()).equals("null")){
-                JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner");
-                if(psnSignerData!=null){
-                    psnsignStatus = signerObject.get("signStatus").getAsInt();
-                    sealSignRecord.setPsnsignStatus(psnsignStatus);
-                }
-            }
-            if(!(signerObject.get("orgSigner").toString()).equals("null")){
-                JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner");
-                if(orgSignerData!=null){
-                    orgsignStatus = signerObject.get("signStatus").getAsInt();
-                    sealSignRecord.setOrgsignStatus(orgsignStatus);
-                }
-
-            }
-        }
-
-        System.out.println(signFlowDetailJsonObject);
+//        EsignHttpResponse signFlowDetail = signFlowDetail(sealSignRecord);
+//        JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
+//        JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
+//        JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
+//        for (int i = 0; i < signersArray.size(); i++) {
+//            JsonObject signerObject = (JsonObject)signersArray.get(i);
+//            Integer psnsignStatus ;
+//            Integer orgsignStatus ;
+//            if(!(signerObject.get("psnSigner").toString()).equals("null")){
+//                JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner");
+//                if(psnSignerData!=null){
+//                    psnsignStatus = signerObject.get("signStatus").getAsInt();
+//                    sealSignRecord.setPsnsignStatus(psnsignStatus);
+//                }
+//            }
+//            if(!(signerObject.get("orgSigner").toString()).equals("null")){
+//                JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner");
+//                if(orgSignerData!=null){
+//                    orgsignStatus = signerObject.get("signStatus").getAsInt();
+//                    sealSignRecord.setOrgsignStatus(orgsignStatus);
+//                }
+//
+//            }
+//        }
+
+//        System.out.println(signFlowDetailJsonObject);
 
 
     }

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -128,7 +128,8 @@
             </if>
             <!--财务-->
             <if test="financeStatus != null and financeStatus != ''">
-                (t.identity_type=1 and t.case_status =#{financeStatus})
+                or  (t.identity_type=1 and t.case_status =#{financeStatus})
+
 
             </if>
         </where>
@@ -220,7 +221,7 @@
             </if>
             <!--财务-->
             <if test="financeStatus != null and financeStatus != ''">
-                ( t.identity_type=1 and t.case_status =#{financeStatus})
+             or   ( t.identity_type=1 and t.case_status =#{financeStatus})
 
             </if>
         </where>