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:
shunyi.kuang
2026-04-14 11:10:18 +08:00
parent 8b7541449a
commit bf9dace0d8
11 changed files with 757 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrController.java
View File

@ -64,7 +64,7 @@ public class PlanYearDemandHdrController {
//.like(StrUtil.isNotBlank(dto.getPlanYear()),LngPlanYearDemandHdr::getPlanYear,dto.getPlanYear())
//.like(StrUtil.isNotBlank(dto.getDemandVerNo()),LngPlanYearDemandHdr::getDemandVerNo,dto.getDemandVerNo())
.like(StrUtil.isNotBlank(dto.getCuCode()),LngPlanYearDemandHdr::getCuCode,dto.getCuCode())
.like(StrUtil.isNotBlank(dto.getNote()),LngPlanYearDemandHdr::getNote,dto.getNote())
// .like(StrUtil.isNotBlank(dto.getNote()),LngPlanYearDemandHdr::getNote,dto.getNote())
.like(StrUtil.isNotBlank(dto.getReply()),LngPlanYearDemandHdr::getReply,dto.getReply())
.like(StrUtil.isNotBlank(dto.getApproCode()),LngPlanYearDemandHdr::getApproCode,dto.getApproCode())
.orderByDesc(LngPlanYearDemandHdr::getId)

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrEcController.java
View File

@ -71,7 +71,7 @@ public class PlanYearDemandHdrEcController {
.eq(ObjectUtil.isNotNull(dto.getId()),LngPlanYearDemandHdrEc::getId,dto.getId())
//.like(StrUtil.isNotBlank(dto.getPlanYear()),LngPlanYearDemandHdrEc::getPlanYear,dto.getPlanYear())
//.like(StrUtil.isNotBlank(dto.getDemandVerNo()),LngPlanYearDemandHdrEc::getDemandVerNo,dto.getDemandVerNo())
.like(StrUtil.isNotBlank(dto.getNote()),LngPlanYearDemandHdrEc::getNote,dto.getNote())
// .like(StrUtil.isNotBlank(dto.getNote()),LngPlanYearDemandHdrEc::getNote,dto.getNote())
.like(StrUtil.isNotBlank(dto.getReply()),LngPlanYearDemandHdrEc::getReply,dto.getReply())
.like(StrUtil.isNotBlank(dto.getApproCode()),LngPlanYearDemandHdrEc::getApproCode,dto.getApproCode())
.orderByDesc(LngPlanYearDemandHdrEc::getId)

7
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemand.java
View File

@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.pictc.annotations.datalog.LogTable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -161,11 +160,7 @@ public class LngPlanYearDemand implements Serializable {
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtyN3;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
* 创建人id

6
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandEc.java
View File

@ -160,11 +160,7 @@ public class LngPlanYearDemandEc implements Serializable {
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtyN3;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
* 创建人id

125
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdr.java
View File

@ -58,7 +58,7 @@ public class LngPlanYearDemandHdr implements Serializable {
* 版本(自动生成，每客户每年从1开始)
*/
@ApiModelProperty("版本(自动生成，每客户每年从1开始)")
@LogField(name="版本(自动生成，每客户每年从1开始)",index=3)
@LogField(name="版本",index=3)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Byte demandVerNo;
@ -66,7 +66,7 @@ public class LngPlanYearDemandHdr implements Serializable {
* 最新版(Y-是，N-否；每客户每年只有一个Y)
*/
@ApiModelProperty("最新版(Y-是，N-否；每客户每年只有一个Y)")
@LogField(name="最新版(Y-是，N-否；每客户每年只有一个Y)",index=4)
@LogField(name="最新版",index=4)
private String lastSign;
/**
@ -126,6 +126,127 @@ public class LngPlanYearDemandHdr implements Serializable {
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long tenantId;
/**
* 1月备注
*/
@ApiModelProperty("1月备注")
@LogField(name="1月备注",index=9)
@TableField(value="note_01")
private String note01;
/**
* 2月备注
*/
@ApiModelProperty("2月备注")
@LogField(name="2月备注",index=10)
@TableField(value="note_02")
private String note02;
/**
* 3月备注
*/
@ApiModelProperty("3月备注")
@LogField(name="3月备注",index=11)
@TableField(value="note_03")
private String note03;
/**
* 4月备注
*/
@ApiModelProperty("4月备注")
@LogField(name="4月备注",index=12)
@TableField(value="note_04")
private String note04;
/**
* 5月备注
*/
@ApiModelProperty("5月备注")
@LogField(name="5月备注",index=13)
@TableField(value="note_05")
private String note05;
/**
* 6月备注
*/
@ApiModelProperty("6月备注")
@LogField(name="6月备注",index=14)
@TableField(value="note_06")
private String note06;
/**
* 7月备注
*/
@ApiModelProperty("7月备注")
@LogField(name="7月备注",index=15)
@TableField(value="note_07")
private String note07;
/**
* 8月备注
*/
@ApiModelProperty("8月备注")
@LogField(name="8月备注",index=16)
@TableField(value="note_08")
private String note08;
/**
* 9月备注
*/
@ApiModelProperty("9月备注")
@LogField(name="9月备注",index=17)
@TableField(value="note_09")
private String note09;
/**
* 10月备注
*/
@ApiModelProperty("10月备注")
@LogField(name="10月备注",index=18)
@TableField(value="note_10")
private String note10;
/**
* 11月备注
*/
@ApiModelProperty("11月备注")
@LogField(name="11月备注",index=19)
@TableField(value="note_11")
private String note11;
/**
* 12月备注
*/
@ApiModelProperty("12月备注")
@LogField(name="12月备注",index=20)
@TableField(value="note_12")
private String note12;
/**
* 次年1月备注
*/
@ApiModelProperty("次年1月备注")
@LogField(name="次年1月备注",index=21)
@TableField(value="note_n1")
private String noteN1;
/**
* 次年2月备注
*/
@ApiModelProperty("次年2月备注")
@LogField(name="次年2月备注",index=22)
@TableField(value="note_n2")
private String noteN2;
/**
* 次年3月备注
*/
@ApiModelProperty("次年3月备注")
@LogField(name="次年3月备注",index=23)
@TableField(value="note_n3")
private String noteN3;
/**
* 部门id
*/

120
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdrEc.java
View File

@ -1,21 +1,17 @@
package com.xjrsoft.module.plan.entity;
import java.io.Serializable;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.Version;
import com.github.yulichang.annotation.EntityMapping;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
/**
@ -132,6 +128,110 @@ public class LngPlanYearDemandHdrEc implements Serializable {
@TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
private Long ruleUserId;
/**
* 1月备注
*/
@ApiModelProperty("1月备注")
@TableField(value="note_01")
private String note01;
/**
* 2月备注
*/
@ApiModelProperty("2月备注")
@TableField(value="note_02")
private String note02;
/**
* 3月备注
*/
@ApiModelProperty("3月备注")
@TableField(value="note_03")
private String note03;
/**
* 4月备注
*/
@ApiModelProperty("4月备注")
@TableField(value="note_04")
private String note04;
/**
* 5月备注
*/
@ApiModelProperty("5月备注")
@TableField(value="note_05")
private String note05;
/**
* 6月备注
*/
@ApiModelProperty("6月备注")
@TableField(value="note_06")
private String note06;
/**
* 7月备注
*/
@ApiModelProperty("7月备注")
@TableField(value="note_07")
private String note07;
/**
* 8月备注
*/
@ApiModelProperty("8月备注")
@TableField(value="note_08")
private String note08;
/**
* 9月备注
*/
@ApiModelProperty("9月备注")
@TableField(value="note_09")
private String note09;
/**
* 10月备注
*/
@ApiModelProperty("10月备注")
@TableField(value="note_10")
private String note10;
/**
* 11月备注
*/
@ApiModelProperty("11月备注")
@TableField(value="note_11")
private String note11;
/**
* 12月备注
*/
@ApiModelProperty("12月备注")
@TableField(value="note_12")
private String note12;
/**
* 次年1月备注
*/
@ApiModelProperty("次年1月备注")
@TableField(value="note_n1")
private String noteN1;
/**
* 次年2月备注
*/
@ApiModelProperty("次年2月备注")
@TableField(value="note_n2")
private String noteN2;
/**
* 次年3月备注
*/
@ApiModelProperty("次年3月备注")
@TableField(value="note_n3")
private String noteN3;
}