暂存

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

@@ -3,6 +3,8 @@ package com.ruoyi.wisdomarbitrate.domain;
 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 +41,7 @@ public class CaseAffiliate   extends BaseEntity {
     /**
      * 被申请人出生年月日
      */
-    private String responBirth;
+    private Date responBirth;
 
     public String getCompLegalPerson() {
         return compLegalPerson;
@@ -65,11 +67,11 @@ public class CaseAffiliate   extends BaseEntity {
         this.responSex = responSex;
     }
 
-    public String getResponBirth() {
+    public Date getResponBirth() {
         return responBirth;
     }
 
-    public void setResponBirth(String responBirth) {
+    public void setResponBirth(Date responBirth) {
         this.responBirth = responBirth;
     }
 

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

@@ -84,19 +84,22 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                     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());
                     }
                 }