Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/common/BizCustomDateSerializer.java

@@ -5,35 +5,28 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import org.apache.commons.lang3.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.DateTimeUtil;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
+ * @author yangyang
+ * @version v1.0
  * @JsonComponent 会覆盖JsonFormat, 这里解析字段提升JsonFormat优先级
  * <p>
  * ProjectName: amos-boot-biz
  * PackageName: com.yeejoin.amos.boot.module.jg.biz.config
- *
- * @author yangyang
- * @version v1.0
  * @date 2023/12/18 17:35
  */
 public class BizCustomDateSerializer extends JsonSerializer<Date> {
 
-    private List<String> customFields = Arrays.asList("acceptDate", "expiryDate","applicationDate","noticeDate","installStartDate","handleDate","auditPassDate","applyDate");
+    private List<String> customFields = Arrays.asList("createDate", "acceptDate", "expiryDate", "applicationDate", "noticeDate", "installStartDate", "handleDate", "auditPassDate", "applyDate");
 
-    public BizCustomDateSerializer()
-    {
+    public BizCustomDateSerializer() {
     }
 
     @Override

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationNameDto.java

@@ -2,7 +2,9 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -58,6 +60,7 @@ public class JgChangeRegistrationNameDto extends BaseDto {
 
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "创建人")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationReformDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -78,6 +81,8 @@ public class JgChangeRegistrationReformDto extends BaseDto {
     private String createUserId;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "录入单位统一信用代码")
@@ -129,25 +134,25 @@ public class JgChangeRegistrationReformDto extends BaseDto {
 
     private String nextExecuteUserIds;
 
-    @ApiModelProperty (value = "其他附件")
+    @ApiModelProperty(value = "其他附件")
     private String otherAccessories;
 
-    @ApiModelProperty (value = "设备种类")
+    @ApiModelProperty(value = "设备种类")
     private String equList;
 
-    @ApiModelProperty (value = "设备类别")
+    @ApiModelProperty(value = "设备类别")
     private String equCategory;
 
-    @ApiModelProperty (value = "设备品种")
+    @ApiModelProperty(value = "设备品种")
     private String equDefine;
 
-    @ApiModelProperty (value = "设备代码")
+    @ApiModelProperty(value = "设备代码")
     private String equCode;
 
-    @ApiModelProperty (value = "code96333")
+    @ApiModelProperty(value = "code96333")
     private String code96333;
 
-    @ApiModelProperty (value = "设备地址")
+    @ApiModelProperty(value = "设备地址")
     private String equAddress;
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationTransferDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -75,6 +78,8 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
     private String createUserId;
 
     @ApiModelProperty (value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty (value = "录入单位统一信用代码")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationUnitDto.java

@@ -69,6 +69,8 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
     private String createUserId;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "创建人")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeVehicleRegistrationUnitDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,10 +20,10 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgChangeVehicleRegistrationUnitDto", description="单位变更登记")
+@ApiModel(value = "JgChangeVehicleRegistrationUnitDto", description = "单位变更登记")
 public class JgChangeVehicleRegistrationUnitDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "变更类型（0区内，1区外）")
@@ -52,6 +54,8 @@ public class JgChangeVehicleRegistrationUnitDto extends BaseDto {
     private String createUserId;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "创建人")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEnableDisableDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -49,6 +52,8 @@ public class JgEnableDisableDto extends BaseDto {
     private String createUserId;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "申请日期，接收查询参数")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEquipTransferDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -62,6 +64,8 @@ public class JgEquipTransferDto extends BaseDto {
     private String executeSequence;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "创建人id ")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgInstallationNoticeDto.java

@@ -166,6 +166,8 @@ public class JgInstallationNoticeDto extends BaseDto {
     private String createUserId;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "录入单位ID")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgReformNoticeDto.java

@@ -64,6 +64,8 @@ public class JgReformNoticeDto extends BaseDto {
     private String executeSequence;
 
     @ApiModelProperty (value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty (value = "创建人id ")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -86,6 +89,8 @@ public class JgUseRegistrationDto extends BaseDto {
     private String createUserId;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "录入单位ID")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgVehicleInformationDto.java

@@ -84,6 +84,8 @@ public class JgVehicleInformationDto extends BaseDto {
     private String createUserName;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "录入单位ID")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationNameMapper.xml

@@ -53,8 +53,8 @@
             <if test="dto.applyNo != null and dto.applyNo != ''">
                 and ur.apply_no like concat('%',#{dto.applyNo},'%')
             </if>
-            <if test="dto.applicationDate != null">
-                AND ur.create_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
+            <if test="dto.createDate != null">
+                AND ur.create_date like concat('%',DATE_FORMAT(#{dto.createDate},'%Y-%m-%d'),'%')
             </if>
             <if test="dto.receiveOrgCode != null and dto.receiveOrgCode != ''">
                 AND ur.receive_org_code = #{dto.receiveOrgCode}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml

@@ -16,6 +16,7 @@
         ur.receive_org_name as receiveOrgName,
         DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
         DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
+        DATE_FORMAT(ur.create_date,'%Y-%m-%d') as createDate,
         (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
@@ -77,6 +78,9 @@
             <if test="dto.code96333 != null and dto.code96333 != ''">
                 AND oi.CODE96333 like concat('%',#{dto.code96333},'%')
             </if>
+            <if test="dto.createDate != null">
+                AND ur.create_date LIKE concat(DATE_FORMAT(#{dto.createDate},'%Y-%m-%d'),'%')
+            </if>
             <if test="dto.equAddress != null and dto.equAddress != ''">
                 AND (
                 use."PROVINCE_NAME" LIKE CONCAT('%', #{dto.equAddress}, '%')

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationTransferMapper.xml

@@ -18,6 +18,7 @@
         crt.sequence_nbr as sequenceNbr,
         crt.audit_status as auditStatus,
         DATE_FORMAT(crt.reg_date,'%Y-%m-%d') as regDate,
+        DATE_FORMAT(crt.create_date,'%Y-%m-%d') as createDate,
         crt.status,
         crt.receive_org_name as receiveOrgName,
         crt.apply_no as applyNo,
@@ -49,8 +50,8 @@
             <if test="dto.auditStatus != null and dto.auditStatus != ''">
                 and crt.audit_status like concat('%', #{dto.auditStatus},'%')
             </if>
-            <if test="dto.applicationDate != null and dto.applicationDate != ''">
-                and crt.reg_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
+            <if test="dto.createDate != null">
+                and crt.create_date like concat('%',DATE_FORMAT(#{dto.createDate},'%Y-%m-%d'),'%')
             </if>
             <if test="dto.equCode != null and dto.equCode != ''">
                 and jri.EQU_CODE like concat('%',#{dto.equCode},'%')

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationUnitMapper.xml

@@ -46,6 +46,9 @@
                 <if test="param.equListCode != null and param.equListCode != ''">
                     AND isn.equ_list_code like concat('%',#{param.equListCode},'%')
                 </if>
+                <if test="param.createDate != null">
+                    AND isn.create_date LIKE concat(DATE_FORMAT(#{param.createDate},'%Y-%m-%d'),'%')
+                </if>
             </if>
             <if test="type == 'supervision'">
                 AND (isn.receive_org_code = #{orgCode} or isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeVehicleRegistrationUnitMapper.xml

@@ -44,6 +44,7 @@
         cru.change_type as changeType,
         cru.apply_no as applyNo,
         date_format(cru.apply_date,'%Y-%m-%d')  as applyDate,
+        date_format(cru.create_date,'%Y-%m-%d')  as createDate,
         date_format(cru.audit_pass_date,'%Y-%m-%d')  as auditPassDate,
         cru.receive_org_name as receiveOrgName,
         cru.receive_org_code as receiveOrgCode,
@@ -80,6 +81,9 @@
             <if test="dto.useUnitCreditCode != null and dto.useUnitCreditCode != ''">
                 and cru.use_unit_credit_code = #{dto.useUnitCreditCode}
             </if>
+            <if test="dto.createDate != null">
+.                AND cru.create_date LIKE concat(DATE_FORMAT(#{dto.createDate},'%Y-%m-%d'),'%')
+            </if>
             <if test="type == 'supervision'">
                 AND (cru.receive_org_code = #{orgCode} or cru.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
                 AND cru.instance_id <![CDATA[<>]]>  ''

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEnableDisableMapper.xml

@@ -12,6 +12,7 @@
         jed.equ_list_code as equListCode,
         jed.equ_list_name as equListName,
         date_format(jed.apply_date, '%Y-%m-%d') as applyDate,
+        date_format(jed.create_date, '%Y-%m-%d') as createDate,
         date_format(jed.audit_pass_date, '%Y-%m-%d') as auditPassDate,
         jed.receive_org_name as receiveOrgName,
         jed.use_registration_code as useRegistrationCode,
@@ -54,6 +55,9 @@
             <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
                 AND jed."use_registration_code" like concat('%',#{dto.useRegistrationCode},'%')
             </if>
+            <if test="dto.createDate != null">
+                AND jed.create_date LIKE concat(DATE_FORMAT(#{dto.createDate},'%Y-%m-%d'),'%')
+            </if>
         </where>
         order by
         <if test="sort != null">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml

@@ -10,6 +10,7 @@
             jet.apply_status AS applyStatus,
             date_format(jet.apply_date,'%Y-%m-%d') as applyDate,
             date_format(jet.accept_date,'%Y-%m-%d') AS acceptDate,
+            date_format(jet.create_date,'%Y-%m-%d') AS createDate,
             jet.install_unit_credit_code AS installUnitCreditCode,
             jet.equip_num AS equipNum,
             jet.install_unit_name AS installUnitName,
@@ -115,6 +116,9 @@
                     OR ui."STREET_NAME" LIKE CONCAT('%', #{param.equAddress}, '%')
                     )
                 </if>
+                <if test="param.createDate != null">
+                    AND jet.create_date LIKE concat(DATE_FORMAT(#{param.createDate},'%Y-%m-%d'),'%')
+                </if>
             </if>
             <choose>
                 <when test="param.useUnitCodeFilter != '' and param.useUnitCodeFilter != null and

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml

@@ -12,6 +12,7 @@
         isn.receive_org_name AS receiveOrgName,
         isn.region_no AS regionNo,
         DATE_FORMAT(isn.install_start_date,'%Y-%m-%d') AS installStartDate,
+        DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate,
         isn.address AS address,
         isn.notice_status AS noticeStatus,
         isn.install_unit_name AS installUnitName,
@@ -50,6 +51,9 @@
                 <if test="param.noticeDate != null">
                     AND isn."notice_date" LIKE concat('%',DATE_FORMAT(#{param.noticeDate},'%Y-%m-%d'),'%')
                 </if>
+                <if test="param.createDate != null">
+                    AND isn.create_date LIKE concat(DATE_FORMAT(#{param.createDate},'%Y-%m-%d'),'%')
+                </if>
                 <if test="param.informNumber != null and param.informNumber != ''">
                     AND isn."inform_number" LIKE concat('%',#{param.informNumber},'%')
                 </if>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintainNoticeMapper.xml

@@ -68,6 +68,7 @@
         isn.next_execute_user_ids AS nextExecuteUserIds,
         isn.transfer_to_user_ids AS transferToUserIds,
         (SELECT name from tz_equipment_category ec WHERE ec.code = isn.equ_list_code) AS equListName,
+        DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate,
         (select name from tz_equipment_category ec WHERE ec.code = isn.equ_category) AS equCategoryName
         FROM tzs_jg_maintain_notice isn
         <where>
@@ -109,6 +110,9 @@
                 <if test="param.equCategory != null and param.equCategory != ''">
                     AND isn."equ_category" = #{param.equCategory}
                 </if>
+                <if test="param.createDate != null">
+                    AND isn.create_date LIKE concat(DATE_FORMAT(#{param.createDate},'%Y-%m-%d'),'%')
+                </if>
             </if>
             <if test="type != 'company'">
                 AND isn.instance_id <![CDATA[<>]]>  ''

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml

@@ -39,6 +39,7 @@
         tjmc.next_execute_user_ids,
         tjmc.next_task_id,
         tjmc.cancel_reason,
+        date_format(tjmc.create_date,'%Y-%m-%d') AS createDate,
         concat(date_format(IFNULL(inform_start, null),'%Y-%m-%d'),'  ~  ',date_format(IFNULL(inform_end, null),'%Y-%m-%d')) as  informStartAndEnd
 
 <!--        ri."EQU_CODE" as equCode,-->
@@ -80,6 +81,9 @@
             <if test="contractDto.receiveOrgCode != '' and contractDto.receiveOrgCode != null">
                 and tjmc.receive_org_code = #{contractDto.receiveOrgCode}
             </if>
+            <if test="contractDto.createDate != null">
+                AND tjmc.create_date LIKE concat(DATE_FORMAT(#{contractDto.createDate},'%Y-%m-%d'),'%')
+            </if>
 <!--            <if test="contractDto.equList != null and contractDto.equList != ''">-->
 <!--                AND ri."EQU_LIST" = #{contractDto.equList}-->
 <!--            </if>-->

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgReformNoticeMapper.xml

@@ -36,7 +36,8 @@
         isn.next_task_id as nextTaskId,
         DATE_FORMAT(isn.plan_date,'%Y-%m-%d') AS planDate,
         DATE_FORMAT(isn.notice_date,'%Y-%m-%d') AS noticeDate,
-        DATE_FORMAT(isn.accept_date,'%Y-%m-%d') AS acceptDate
+        DATE_FORMAT(isn.accept_date,'%Y-%m-%d') AS acceptDate,
+        DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate
         FROM
         tzs_jg_reform_notice isn
         <where>
@@ -78,6 +79,9 @@
                 <if test="param.equCategoryCode != null and param.equCategoryCode != ''">
                     AND isn.equ_category_code = #{param.equCategoryCode}
                 </if>
+                <if test="param.createDate != null">
+                    AND isn.create_date LIKE concat(DATE_FORMAT(#{param.createDate},'%Y-%m-%d'),'%')
+                </if>
             </if>
             <if test="type == 'supervision'">
                 AND (isn.notice_status in ('6612', '6613', '6614', '6616') )

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgScrapCancelMapper.xml

@@ -51,8 +51,8 @@
             <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
                 and tjsc.receive_company_code = #{dto.receiveCompanyCode}
             </if>
-            <if test="dto.applicationDate != null and dto.applicationDate != ''">
-                and tjsc.create_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
+            <if test="dto.createDate != null">
+                and tjsc.create_date like concat('%',DATE_FORMAT(#{dto.createDate},'%Y-%m-%d'),'%')
             </if>
             <if test="dto.equListCode != null and dto.equListCode != ''">
                 AND tjsc."equ_list_code" = #{dto.equListCode}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgTransferNoticeMapper.xml

@@ -29,7 +29,8 @@
         tjtn.equ_list AS equList,
         DATE_FORMAT(tjtn.notice_date,'%Y-%m-%d') AS noticeDate,
         DATE_FORMAT(tjtn.handle_date,'%Y-%m-%d') AS handleDate,
-        DATE_FORMAT(tjtn.plan_date,'%Y-%m-%d') AS planDate
+        DATE_FORMAT(tjtn.plan_date,'%Y-%m-%d') AS planDate,
+        DATE_FORMAT(tjtn.create_date,'%Y-%m-%d') AS createDate
         FROM    tzs_jg_transfer_notice tjtn
         <where>
             tjtn.is_delete = false
@@ -70,6 +71,9 @@
                 <if test="param.receiveCompanyCode != null and param.receiveCompanyCode != ''">
                     AND tjtn.receive_company_code = #{param.receiveCompanyCode}
                 </if>
+                <if test="param.createDate != null">
+                    AND tjtn.create_date LIKE concat(DATE_FORMAT(#{param.createDate},'%Y-%m-%d'),'%')
+                </if>
             </if>
             <if test="param.roleIds != null and type == 'supervision'">
                 <foreach collection='param.roleIds' item='role' open='and (' close=')' separator='or'>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -20,6 +20,7 @@
         GROUP_CONCAT(DISTINCT other.supervisory_code)  as supervisoryCode,
         ur.use_registration_code  as useRegistrationCode,
         date_format(ur.audit_pass_date,'%Y-%m-%d')  as auditPassDate,
+        date_format(ur.create_date,'%Y-%m-%d')  as createDate,
         ur.receive_org_name as receiveOrgName,
         ur.next_execute_user_ids as nextExecuteUserIds,
         ur.next_task_id as nextTaskId,
@@ -101,6 +102,9 @@
             <if test="dto.useUnitCode != null and dto.useUnitCode != ''">
                 and ur.use_unit_credit_code = #{dto.useUnitCode}
             </if>
+            <if test="dto.createDate != null">
+                AND ur.create_date LIKE concat(DATE_FORMAT(#{dto.createDate},'%Y-%m-%d'),'%')
+            </if>
             <if test="roleIds != null and dto.dataType == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml

@@ -18,6 +18,9 @@
             <if test="dto.regDate != null and dto.regDate != ''">
                 and tjvi.reg_date like concat('%',DATE_FORMAT(#{dto.regDate},'%Y-%m-%d'),'%')
             </if>
+            <if test="dto.createDate != null">
+                and tjvi.create_date like concat('%',DATE_FORMAT(#{dto.createDate},'%Y-%m-%d'),'%')
+            </if>
             <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
                 and tjvi.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
             </if>
@@ -68,7 +71,7 @@
                date_format(tjvi.installation_data,'%Y-%m-%d')  as installationData,
                tjvi.vehicle_attribute as vehicleAttribute,
                tjvi.gas_num as gasNum,
-               tjvi.create_date as createDate,
+               date_format(tjvi.create_date,'%Y-%m-%d')  as createDate,
                tjvi.cancel_reason as cancelReason,
                tjvi.reg_type as regType
         from tzs_jg_vehicle_information tjvi