hejinbo hace 2 años
padre
commit
953410c5df

+ 5
- 3
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java Ver fichero

3
 import com.ruoyi.common.annotation.Excel;
3
 import com.ruoyi.common.annotation.Excel;
4
 import com.ruoyi.common.core.domain.BaseEntity;
4
 import com.ruoyi.common.core.domain.BaseEntity;
5
 
5
 
6
+import java.util.Date;
7
+
6
 public class CaseAffiliate   extends BaseEntity {
8
 public class CaseAffiliate   extends BaseEntity {
7
     private static final long serialVersionUID = 1L;
9
     private static final long serialVersionUID = 1L;
8
     /** ID */
10
     /** ID */
39
     /**
41
     /**
40
      * 被申请人出生年月日
42
      * 被申请人出生年月日
41
      */
43
      */
42
-    private String responBirth;
44
+    private Date responBirth;
43
 
45
 
44
     public String getCompLegalPerson() {
46
     public String getCompLegalPerson() {
45
         return compLegalPerson;
47
         return compLegalPerson;
65
         this.responSex = responSex;
67
         this.responSex = responSex;
66
     }
68
     }
67
 
69
 
68
-    public String getResponBirth() {
70
+    public Date getResponBirth() {
69
         return responBirth;
71
         return responBirth;
70
     }
72
     }
71
 
73
 
72
-    public void setResponBirth(String responBirth) {
74
+    public void setResponBirth(Date responBirth) {
73
         this.responBirth = responBirth;
75
         this.responBirth = responBirth;
74
     }
76
     }
75
 
77
 

+ 9
- 6
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java Ver fichero

84
                     int identityType = affiliate.getIdentityType();
84
                     int identityType = affiliate.getIdentityType();
85
                     if (identityType == 1) {    //申请人
85
                     if (identityType == 1) {    //申请人
86
                         datas.put("appName", affiliate.getName());
86
                         datas.put("appName", affiliate.getName());
87
-                        datas.put("appAddress", affiliate.getContactAddress());
88
-                        datas.put("appContactAddress", null);
87
+                        datas.put("appAddress", affiliate.getResidenAffili());
88
+                        datas.put("appContactAddress", affiliate.getContactAddress());
89
                         datas.put("appLegalPerson", affiliate.getCompLegalPerson());
89
                         datas.put("appLegalPerson", affiliate.getCompLegalPerson());
90
                         datas.put("appLegalPersonTitle", affiliate.getCompLegalperPost());
90
                         datas.put("appLegalPersonTitle", affiliate.getCompLegalperPost());
91
                         datas.put("appAgentName", affiliate.getNameAgent());
91
                         datas.put("appAgentName", affiliate.getNameAgent());
92
-                        datas.put("appAgentTitle", null);
92
+                        datas.put("appAgentTitle", affiliate.getAppliAgentTitle());
93
                         nameAgentList.add(affiliate.getNameAgent());
93
                         nameAgentList.add(affiliate.getNameAgent());
94
                     } else if (identityType == 2) {  //被申请人
94
                     } else if (identityType == 2) {  //被申请人
95
                         datas.put("resName", affiliate.getName());
95
                         datas.put("resName", affiliate.getName());
96
-                        datas.put("resAddress", affiliate.getContactAddress());
96
+                        datas.put("resAddress", affiliate.getResidenAffili());
97
                         datas.put("resSex", affiliate.getResponSex());
97
                         datas.put("resSex", affiliate.getResponSex());
98
-                        datas.put("resDateOfBirth", affiliate.getResponBirth());
99
-                        datas.put("resContactAddress", null);
98
+                        Date responBirth = affiliate.getResponBirth();
99
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
100
+                        String responBirthStr = sdf.format(responBirth);
101
+                        datas.put("resDateOfBirth",responBirthStr);
102
+                        datas.put("resContactAddress", affiliate.getContactAddress());
100
                         nameAgentList.add(affiliate.getNameAgent());
103
                         nameAgentList.add(affiliate.getNameAgent());
101
                     }
104
                     }
102
                 }
105
                 }