合同功能更改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/domain/WorkContractBorrow.java

@@ -1,10 +1,13 @@
 package com.jeeplus.test.workContract.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
 import liquibase.pro.packaged.S;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @TableName("work_contract_borrow")
 public class WorkContractBorrow extends BaseEntity {
@@ -22,10 +25,10 @@ public class WorkContractBorrow extends BaseEntity {
     private String clientName;
 
     private String borrowName;
-
-    private String borrowData;
-
-    private String borrowRetData;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date borrowData;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date borrowRetData;
 
     private String remarks;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/domain/WorkContractBorrowMessage.java

@@ -1,9 +1,12 @@
 package com.jeeplus.test.workContract.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @TableName("work_contract_borrow_message")
 public class WorkContractBorrowMessage extends BaseEntity {
@@ -14,12 +17,15 @@ public class WorkContractBorrowMessage extends BaseEntity {
 
     private String borrowName;
 
-    private String borrowData;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date borrowData;
 
-    private String borrowRetData;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date borrowRetData;
 
     private String borrowType;
 
-    private String retData;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date retData;
 
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/domain/WorkContractFile.java

@@ -2,10 +2,13 @@ package com.jeeplus.test.workContract.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.query.Query;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @TableName("work_contract_file")
 public class WorkContractFile extends BaseEntity {
@@ -20,7 +23,8 @@ public class WorkContractFile extends BaseEntity {
 
     private String filedType;
 
-    private String filedData;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date filedData;
 
     private String filedNo;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/domain/WorkContractInfo.java

@@ -2,10 +2,13 @@ package com.jeeplus.test.workContract.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.query.Query;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @TableName("work_contract_info")
 public class WorkContractInfo extends BaseEntity {
@@ -36,17 +39,20 @@ public class WorkContractInfo extends BaseEntity {
      * 签订日期
      */
     @Query(tableColumn = "a.contract_date")
-    private String contractDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date contractDate;
 
     /**
      * 合同生效日期
      */
-    private String effectiveDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date effectiveDate;
 
     /**
      * 合同终止日期
      */
-    private String closingDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date closingDate;
 
     /**
      * 合同类型

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/xml/WorkContractBorrowMapper.xml

@@ -41,7 +41,7 @@
 			DATE_FORMAT(borrow_data,'%Y-%m-%d') as borrow_data,
 			DATE_FORMAT(borrow_ret_data,'%Y-%m-%d') as borrow_ret_data,
 			borrow_type,
-			IFNULL(DATE_FORMAT( ret_data, '%Y-%m-%d' ),'--') AS ret_data
+			DATE_FORMAT( ret_data, '%Y-%m-%d' ) AS ret_data
 		 FROM work_contract_borrow_message WHERE del_flag = 0 AND contract_borrow_id = #{id}
 		 order by create_date desc
 	</select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/dto/WorkContractBorrowDto.java

@@ -1,8 +1,11 @@
 package com.jeeplus.test.workContract.service.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.service.dto.BaseDTO;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class WorkContractBorrowDto extends BaseDTO {
 
@@ -20,9 +23,11 @@ public class WorkContractBorrowDto extends BaseDTO {
 
     private String borrowName;
 
-    private String borrowData;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date borrowData;
 
-    private String borrowRetData;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date borrowRetData;
 
     private String remarks;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/dto/WorkContractFileDto.java

@@ -1,8 +1,10 @@
 package com.jeeplus.test.workContract.service.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.service.dto.BaseDTO;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -18,7 +20,8 @@ public class WorkContractFileDto extends BaseDTO {
 
     private String filedType;
 
-    private String filedData;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date filedData;
 
     private String filedNo;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/dto/WorkContractInfoDto.java

@@ -1,9 +1,11 @@
 package com.jeeplus.test.workContract.service.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.test.oss.domain.WorkAttachment;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -35,17 +37,20 @@ public class WorkContractInfoDto extends BaseDTO {
     /**
      * 签订日期
      */
-    private String contractDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date contractDate;
 
     /**
      * 合同生效日期
      */
-    private String effectiveDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date effectiveDate;
 
     /**
      * 合同终止日期
      */
-    private String closingDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date closingDate;
 
     /**
      * 合同类型