增加时间格式化，以及时间过滤条件

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersContract.java

@@ -2,6 +2,9 @@ package com.yeejoin.amos.boot.module.jcs.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -42,8 +45,9 @@ public class FirefightersContract extends BaseEntity {
     private String partyB;
 
     @ApiModelProperty(value = "签订日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date signedTime;
-
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "到期时间")
     private Date expireTime;
 
@@ -60,7 +64,6 @@ public class FirefightersContract extends BaseEntity {
     
     @ApiModelProperty(value = "人员id")
     private Long firefightersId;
-
     @ApiModelProperty(value = "更新时间")
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersJacket.java

@@ -2,6 +2,9 @@ package com.yeejoin.amos.boot.module.jcs.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -51,6 +54,7 @@ public class FirefightersJacket extends BaseEntity {
     private String equipmentTypeName;
 
     @ApiModelProperty(value = "配发日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date allotmentTime;
 
     @ApiModelProperty(value = "更新时间")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersThought.java

@@ -2,6 +2,9 @@ package com.yeejoin.amos.boot.module.jcs.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,7 +37,7 @@ public class FirefightersThought extends BaseEntity {
 
     @ApiModelProperty(value = "消防救援人员")
     private Long firefightersId;
-
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "谈话时间")
     private Date talkingTime;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersContractController.java

@@ -25,6 +25,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import java.util.Arrays;
+import java.util.Date;
 
 
 /**
@@ -139,6 +140,9 @@ public class FirefightersContractController extends BaseController {
                     } else if (type.equals(String.class)) {
                         String fileValue = (String) field.get(firefightersContract);
                         firefightersContractQueryWrapper.eq(name, fileValue);
+                    }else if (type.equals(Date.class)) {
+                    	Date fileValue = (Date) field.get(firefightersContract);
+                        firefightersContractQueryWrapper.eq(name, fileValue);
                     } else {
                         String fileValue = (String) field.get(firefightersContract);
                         firefightersContractQueryWrapper.eq(name, fileValue);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersJacketController.java

@@ -23,6 +23,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import java.util.Arrays;
+import java.util.Date;
 
 /**
  * 消防人员配装记录
@@ -128,7 +129,10 @@ public class FirefightersJacketController extends BaseController {
 					} else if (type.equals(String.class)) {
 						String fileValue = (String) field.get(firefightersJacket);
 						firefightersJacketQueryWrapper.eq(name, fileValue);
-					} else {
+					} else if (type.equals(Date.class)) {
+                    	Date fileValue = (Date) field.get(firefightersJacket);
+                    	firefightersJacketQueryWrapper.eq(name, fileValue);
+                    }else {
 						String fileValue = (String) field.get(firefightersJacket);
 						firefightersJacketQueryWrapper.eq(name, fileValue);
 					}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersThoughtController.java

@@ -24,6 +24,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import java.util.Arrays;
+import java.util.Date;
 
 
 /**
@@ -132,6 +133,9 @@ public class FirefightersThoughtController extends BaseController {
                     } else if (type.equals(String.class)) {
                         String fileValue = (String) field.get(firefightersThought);
                         firefightersThoughtQueryWrapper.eq(name, fileValue);
+                    }else if (type.equals(Date.class)) {
+                    	Date fileValue = (Date) field.get(firefightersThought);
+                    	firefightersThoughtQueryWrapper.eq(name, fileValue);
                     } else {
                         String fileValue = (String) field.get(firefightersThought);
                         firefightersThoughtQueryWrapper.eq(name, fileValue);