Commit 5da050fd authored by litengwei's avatar litengwei

安装告知列表日期处理

parent ca9cb81d
......@@ -30,7 +30,7 @@ import java.util.Objects;
*/
public class BizCustomDateSerializer extends JsonSerializer<Date> {
private List<String> customFields = Arrays.asList("acceptDate", "expiryDate","applicationDate");
private List<String> customFields = Arrays.asList("acceptDate", "expiryDate","applicationDate","noticeDate","installStartDate","handleDate");
public BizCustomDateSerializer()
{
......
......@@ -2,8 +2,10 @@ 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.baomidou.mybatisplus.annotation.TableField;
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 +88,7 @@ public class JgInstallationNoticeDto extends BaseDto {
@ApiModelProperty(value = "安装开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class)
private Date installStartDate;
@ApiModelProperty(value = "安装竣工日期")
......@@ -183,6 +186,7 @@ public class JgInstallationNoticeDto extends BaseDto {
private String isXixian;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class)
@ApiModelProperty(value = "告知日期")
private Date noticeDate;
......@@ -240,6 +244,7 @@ public class JgInstallationNoticeDto extends BaseDto {
private String equAddress;
@ApiModelProperty(value = "办理日期")
@JsonSerialize(using = BizCustomDateSerializer.class)
private Date handleDate;
......
......@@ -2,7 +2,10 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -153,6 +156,8 @@ public class JgInstallationNotice extends BaseEntity {
* 安装开始日期
*/
@TableField("install_start_date")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class)
private Date installStartDate;
/**
......@@ -333,6 +338,8 @@ public class JgInstallationNotice extends BaseEntity {
* 告知日期
*/
@TableField("notice_date")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class)
private Date noticeDate;
/**
......@@ -384,6 +391,7 @@ public class JgInstallationNotice extends BaseEntity {
private String equAddress;
@TableField("handle_date")
@JsonSerialize(using = BizCustomDateSerializer.class)
private Date handleDate;
}
......@@ -4,30 +4,30 @@
<select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice">
select
isn.sequence_nbr AS sequenceNbr,
isn.apply_no AS applyNo,
isn.supervisory_code AS supervisoryCode,
isn.notice_date AS noticeDate,
isn.use_unit_name AS useUnitName,
isn.receive_org_name AS receiveOrgName,
isn.region_no AS regionNo,
isn.install_start_date AS installStartDate,
isn.address AS address,
isn.notice_status AS noticeStatus,
isn.install_unit_name AS installUnitName,
isn.province_name AS provinceName,
isn.city_name AS cityName,
isn.county_name AS countyName,
isn.instance_id AS instanceId,
isn.promoter,
isn.next_execute_ids AS nextExecuteIds,
isn.instance_status AS instanceStatus,
isn.equ_address AS equAddress,
isn.handle_date AS handleDate,
isn.equ_list AS equList,
isn.notice_report_url AS noticeReportUrl
isn.sequence_nbr AS sequenceNbr,
isn.apply_no AS applyNo,
isn.supervisory_code AS supervisoryCode,
isn.notice_date AS noticeDate,
isn.use_unit_name AS useUnitName,
isn.receive_org_name AS receiveOrgName,
isn.region_no AS regionNo,
isn.install_start_date AS installStartDate,
isn.address AS address,
isn.notice_status AS noticeStatus,
isn.install_unit_name AS installUnitName,
isn.province_name AS provinceName,
isn.city_name AS cityName,
isn.county_name AS countyName,
isn.instance_id AS instanceId,
isn.promoter,
isn.next_execute_ids AS nextExecuteIds,
isn.instance_status AS instanceStatus,
isn.equ_address AS equAddress,
isn.handle_date AS handleDate,
isn.equ_list AS equList,
isn.notice_report_url AS noticeReportUrl
FROM
tzs_jg_installation_notice isn
tzs_jg_installation_notice isn
<where>
isn.is_delete = false
<if test="param != null ">
......@@ -118,6 +118,6 @@
LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
WHERE
isn.sequence_nbr = #{sequenceNbr}
LIMIT 1
LIMIT 1
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment