diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngApproDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngApproDto.java index 5942d78..9cc2d0f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngApproDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngApproDto.java @@ -1,5 +1,6 @@ package com.xjrsoft.module.dayPlan.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import com.pictc.annotations.datalog.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -70,6 +71,7 @@ public class UpdateLngPngApproDto implements Serializable { */ @LogField(name="计划日期",index=6) @ApiModelProperty("计划日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime datePlan; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproVo.java index 77e8629..f53b505 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproVo.java @@ -1,5 +1,6 @@ package com.xjrsoft.module.dayPlan.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -68,6 +69,7 @@ public class LngPngApproVo extends com.xjrsoft.common.model.base.BaseModel{ * 计划日期 */ @ApiModelProperty("计划日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime datePlan; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngApproMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngApproMapper.java index 5998d7e..7bad2fe 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngApproMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngApproMapper.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.dayPlan.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.github.yulichang.base.MPJBaseMapper; @@ -21,7 +22,7 @@ import java.util.List; * @Version 1.0 */ @Mapper -public interface LngPngApproMapper extends MPJBaseMapper { +public interface LngPngApproMapper extends MPJBaseMapper, BaseMapper { @Select("SELECT a.id, a.rule_user_id, a.demand_org_id, a.date_plan, " + " (CASE a.date_plan - CURRENT_DATE " +