geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
张秉卓
2026-01-16 12:23:55 +08:00
parent 4af0260643
commit 1d2149a4f6
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngApproDto.java
View File

@ -1,5 +1,6 @@
package com.xjrsoft.module.dayPlan.dto; package com.xjrsoft.module.dayPlan.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pictc.annotations.datalog.*; import com.pictc.annotations.datalog.*;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -70,6 +71,7 @@ public class UpdateLngPngApproDto implements Serializable {
*/ */
@LogField(name="计划日期",index=6) @LogField(name="计划日期",index=6)
@ApiModelProperty("计划日期") @ApiModelProperty("计划日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime datePlan; private LocalDateTime datePlan;
/** /**

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproVo.java
View File

@ -1,5 +1,6 @@
package com.xjrsoft.module.dayPlan.vo; package com.xjrsoft.module.dayPlan.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -68,6 +69,7 @@ public class LngPngApproVo extends com.xjrsoft.common.model.base.BaseModel{
* 计划日期 * 计划日期
*/ */
@ApiModelProperty("计划日期") @ApiModelProperty("计划日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime datePlan; private LocalDateTime datePlan;

3
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngApproMapper.java
View File

@ -1,6 +1,7 @@
package com.xjrsoft.module.dayPlan.mapper; package com.xjrsoft.module.dayPlan.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.base.MPJBaseMapper;
@ -21,7 +22,7 @@ import java.util.List;
* @Version 1.0 * @Version 1.0
*/ */
@Mapper @Mapper
public interface LngPngApproMapper extends MPJBaseMapper<LngPngAppro> { public interface LngPngApproMapper extends MPJBaseMapper<LngPngAppro>, BaseMapper<LngPngAppro> {
@Select("SELECT a.id, a.rule_user_id, a.demand_org_id, a.date_plan, " + @Select("SELECT a.id, a.rule_user_id, a.demand_org_id, a.date_plan, " +
" (CASE a.date_plan - CURRENT_DATE " + " (CASE a.date_plan - CURRENT_DATE " +