diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java index d075255..ebf2c52 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java @@ -12,6 +12,8 @@ import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.LogTable; import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; import com.xjrsoft.common.model.base.BaseModel; import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; @@ -178,6 +180,8 @@ public class UpdateLngContractPurDto extends BaseModel implements Serializable { @LogField(name="备注",index=20) @ApiModelProperty("备注") private String note; + + /** * lngContractPurPng diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java index 3502a57..afae93c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java @@ -45,7 +45,7 @@ public class UpdateLngContractPurPngDto extends BaseModel implements Serializabl * */ @LogField(name="",index=1) - @ApiModelProperty("") + @ApiModelProperty("合同主键") private Long kId; /** @@ -66,13 +66,17 @@ public class UpdateLngContractPurPngDto extends BaseModel implements Serializabl * */ @LogField(name="",index=4) - @ApiModelProperty("") + @ApiModelProperty("计量单位") private String uomCode; /** * */ @LogField(name="",index=5) - @ApiModelProperty("") + @ApiModelProperty("备注") private String note; + + @LogField(name="长协/现货/年度合同",index=20) + @ApiModelProperty("长协/现货/年度合同") + private String longSpotCode; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java index 6700ee0..52c429d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java @@ -184,6 +184,9 @@ public class UpdateLngContractSalesDto extends BaseModel implements Serializable @LogField(name="备注",index=20) @ApiModelProperty("备注") private String note; + + + /** * lngContractSalesLng diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDto.java index ee8956d..4f262c1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDto.java @@ -71,4 +71,8 @@ public class UpdateLngContractSalesLngDto extends BaseModel implements Serializa @LogField(name="备注",index=6) @ApiModelProperty("备注") private String note; + + @LogField(name="长协/现货/年度合同",index=21) + @ApiModelProperty("长协/现货/年度合同") + private String longSpotCode; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java index a6fee74..460d1a0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java @@ -2,6 +2,9 @@ package com.xjrsoft.module.contract.vo; import java.time.LocalDateTime; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -104,6 +107,12 @@ public class LngContractPurPngVo extends com.xjrsoft.common.model.base.BaseModel @ApiModelProperty("数据权限id") private Long ruleUserId; + @ApiModelProperty("长协/现货/年度合同") + @Trans(type = TransType.DIC, id = "2028679301643411457",transToFieldName = "longSpotName") + private String longSpotCode; + + private String longSpotName; + diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java index eb84a27..d37cb03 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java @@ -167,6 +167,7 @@ public class LngContractPurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") private String approCode; + /** * 备注 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java index ed2ff70..1e2cfa0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java @@ -123,7 +123,12 @@ public class LngContractSalesLngVo extends com.xjrsoft.common.model.base.BaseMod private Long ruleUserId; - + + @ApiModelProperty("长协/现货/年度合同") + @Trans(type = TransType.DIC, id = "2028679301643411457",transToFieldName = "longSpotName") + private String longSpotCode; + + private String longSpotName; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java index 02c085b..701cdd0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java @@ -172,7 +172,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{ */ @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") private String approCode; - + /** * 备注 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandVo.java index 2c8881f..c9aafcf 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandVo.java @@ -4,6 +4,9 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -215,7 +218,7 @@ public class LngPngDemandVo extends com.xjrsoft.common.model.base.BaseModel{ * 审批状态(待提交/审批中/已审批/已驳回) */ @ApiModelProperty("审批状态(待提交/审批中/已审批/已驳回)") - //@Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") private String approCode; private String approName; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationLngPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationLngPageVo.java index 73d6ce3..a7865fb 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationLngPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationLngPageVo.java @@ -1,14 +1,10 @@ package com.xjrsoft.module.mdm.vo; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import com.xjrsoft.common.annotation.Trans; import com.xjrsoft.common.enums.TransType; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * @title: 分页列表出参 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow001PageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow001PageVo.java deleted file mode 100644 index 9bde6fb..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow001PageVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.xjrsoft.module.mdm.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import com.xjrsoft.common.annotation.Trans; -import com.xjrsoft.common.enums.TransType; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; - -/** -* @title: 分页列表出参 -* @Author 管理员 -* @Date: 2025-11-26 -* @Version 1.0 -*/ -@Data -public class Testflow001PageVo { - - /** - * - */ - @ApiModelProperty("") - private String id; - /** - * 客户 - */ - @ApiModelProperty("客户") - private String customer; - /** - * 客户编码 - */ - @ApiModelProperty("客户编码") - private String customerCode; - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - /** - * 备注 - */ - @ApiModelProperty("备注") - private String note; - -} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow001Vo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow001Vo.java deleted file mode 100644 index 1698a6f..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow001Vo.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.xjrsoft.module.mdm.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; - -/** -* @title: 表单出参 -* @Author 管理员 -* @Date: 2025-11-26 -* @Version 1.0 -*/ -@Data -public class Testflow001Vo { - - /** - * - */ - @ApiModelProperty("") - private Long id; - - - /** - * 客户 - */ - @ApiModelProperty("客户") - private String customer; - - - /** - * 客户编码 - */ - @ApiModelProperty("客户编码") - private String customerCode; - - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String note; - - - /** - * - */ - @ApiModelProperty("") - private Long createUserId; - - - /** - * - */ - @ApiModelProperty("") - private LocalDateTime createDate; - - - /** - * - */ - @ApiModelProperty("") - private Long modifyUserId; - - - /** - * - */ - @ApiModelProperty("") - private LocalDateTime modifyDate; - - - /** - * - */ - @ApiModelProperty("") - private Integer enabledMark; - - - /** - * - */ - @ApiModelProperty("") - private Long tenantId; - - - - - -} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow003PageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow003PageVo.java deleted file mode 100644 index de48373..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow003PageVo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.xjrsoft.module.mdm.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import com.xjrsoft.common.annotation.Trans; -import com.xjrsoft.common.enums.TransType; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; - -/** -* @title: 分页列表出参 -* @Author 管理员 -* @Date: 2025-11-26 -* @Version 1.0 -*/ -@Data -public class Testflow003PageVo { - - /** - * - */ - @ApiModelProperty("") - private String id; - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - /** - * 编码 - */ - @ApiModelProperty("编码") - private String code; - /** - * 备注 - */ - @ApiModelProperty("备注") - private String note; - -} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow003Vo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow003Vo.java deleted file mode 100644 index c39e8fd..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow003Vo.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.xjrsoft.module.mdm.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; - -/** -* @title: 表单出参 -* @Author 管理员 -* @Date: 2025-11-26 -* @Version 1.0 -*/ -@Data -public class Testflow003Vo { - - /** - * - */ - @ApiModelProperty("") - private Long id; - - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - - /** - * 编码 - */ - @ApiModelProperty("编码") - private String code; - - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String note; - - - /** - * - */ - @ApiModelProperty("") - private Long createUserId; - - - /** - * - */ - @ApiModelProperty("") - private LocalDateTime createDate; - - - /** - * - */ - @ApiModelProperty("") - private Long modifyUserId; - - - /** - * - */ - @ApiModelProperty("") - private LocalDateTime modifyDate; - - - /** - * - */ - @ApiModelProperty("") - private Integer enabledMark; - - - /** - * - */ - @ApiModelProperty("") - private Long tenantId; - - - - - -} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java index 7b34632..1f6548d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPur.java @@ -13,6 +13,8 @@ import com.pictc.annotations.datalog.JoinType; import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -173,6 +175,8 @@ public class LngContractPur implements Serializable { @ApiModelProperty("备注") private String note; + + /** * 创建人id */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPng.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPng.java index 1030435..7e06620 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPng.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractPurPng.java @@ -1,21 +1,17 @@ package com.xjrsoft.module.contract.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; /** @@ -158,6 +154,11 @@ public class LngContractPurPng implements Serializable { @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) private Long ruleUserId; + + + @ApiModelProperty("长协/现货/年度合同") + private String longSpotCode; + } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLng.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLng.java index 33e3f9b..9d40c4c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLng.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLng.java @@ -75,7 +75,9 @@ public class LngContractSalesLng implements Serializable { */ @ApiModelProperty("备注") private String note; - + + @ApiModelProperty("长协/现货/年度合同") + private String longSpotCode; /** * 创建人id */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesPng.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesPng.java index fbaad78..dfdc8eb 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesPng.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesPng.java @@ -59,6 +59,7 @@ public class LngContractSalesPng implements Serializable { */ @ApiModelProperty("备注") private String note; + /** * 创建人id diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/Testflow001Controller.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/Testflow001Controller.java deleted file mode 100644 index 24df4d2..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/Testflow001Controller.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.xjrsoft.module.mdm.controller; - -import java.util.List; - -import javax.validation.Valid; - -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.xjrsoft.common.model.result.R; -import com.xjrsoft.common.page.ConventPage; -import com.xjrsoft.common.page.PageOutput; -import com.xjrsoft.common.utils.VoToColumnUtil; -import com.xjrsoft.module.datalog.service.DatalogService; -import com.xjrsoft.module.datalog.vo.DataChangeLogVo; -import com.xjrsoft.module.mdm.dto.Testflow001PageDto; -import com.xjrsoft.module.mdm.dto.UpdateTestflow001Dto; -import com.xjrsoft.module.mdm.entity.Testflow001; -import com.xjrsoft.module.mdm.service.ITestflow001Service; -import com.xjrsoft.module.mdm.vo.Testflow001PageVo; -import com.xjrsoft.module.mdm.vo.Testflow001Vo; -import com.xjrsoft.module.system.client.ICodeRuleClient; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; - -/** -* @title: 测试流程 -* @Author 管理员 -* @Date: 2025-11-25 -* @Version 1.0 -*/ -@RestController -@RequestMapping("/mdm" + "/testflow001") -@Api(value = "/mdm" + "/testflow001",tags = "测试流程代码") -@AllArgsConstructor -public class Testflow001Controller { - - - private final ITestflow001Service testflow001Service; - private final ICodeRuleClient codeRuleClient; - private final DatalogService dataService; - - @GetMapping(value = "/page") - @ApiOperation(value="Testflow001列表(分页)") - @SaCheckPermission("testflow001:list") - public R page(@Valid Testflow001PageDto dto){ - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper - .like(StrUtil.isNotBlank(dto.getCustomer()),Testflow001::getCustomer,dto.getCustomer()) - .like(StrUtil.isNotBlank(dto.getCustomerCode()),Testflow001::getCustomerCode,dto.getCustomerCode()) - .like(StrUtil.isNotBlank(dto.getName()),Testflow001::getName,dto.getName()) - .like(StrUtil.isNotBlank(dto.getNote()),Testflow001::getNote,dto.getNote()) - .orderByDesc(Testflow001::getId) - .select(Testflow001.class,x -> VoToColumnUtil.fieldsToColumns(Testflow001PageVo.class).contains(x.getProperty())); - IPage page = testflow001Service.page(ConventPage.getPage(dto), queryWrapper); - PageOutput pageOutput = ConventPage.getPageOutput(page, Testflow001PageVo.class); - return R.ok(pageOutput); - } - - @GetMapping(value = "/info") - @ApiOperation(value="根据id查询Testflow001信息") - @SaCheckPermission("testflow001:detail") - public R info(@RequestParam Long id){ - Testflow001 testflow001 = testflow001Service.getById(id); - if (testflow001 == null) { - return R.error("找不到此数据！"); - } - return R.ok(BeanUtil.toBean(testflow001, Testflow001Vo.class)); - } - - @GetMapping(value = "/datalog") - @ApiOperation(value="根据id查询Testflow001数据详细日志") - @SaCheckPermission("testflow001:datalog") - public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateTestflow001Dto.class,id); - return R.ok(logs); - } - - - @PostMapping - @ApiOperation(value = "新增Testflow001") - @SaCheckPermission("testflow001:add") - public R add(@Valid @RequestBody UpdateTestflow001Dto dto){ - codeRuleClient.useEncode("TestCode"); - UpdateTestflow001Dto res = dataService.insert(dto); - return R.ok(res.getId()); - } - - @PutMapping - @ApiOperation(value = "修改Testflow001") - @SaCheckPermission("testflow001:edit") - public R update(@Valid @RequestBody UpdateTestflow001Dto dto){ - return R.ok(dataService.updateById(dto)); - } - - @DeleteMapping - @ApiOperation(value = "删除") - @SaCheckPermission("testflow001:delete") - public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateTestflow001Dto.class, ids)); - - } - - -} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/Testflow003Controller.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/Testflow003Controller.java deleted file mode 100644 index ae4e2c6..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/Testflow003Controller.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.xjrsoft.module.mdm.controller; - -import java.util.List; - -import javax.validation.Valid; - -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.xjrsoft.common.model.result.R; -import com.xjrsoft.common.page.ConventPage; -import com.xjrsoft.common.page.PageOutput; -import com.xjrsoft.common.utils.VoToColumnUtil; -import com.xjrsoft.module.datalog.service.DatalogService; -import com.xjrsoft.module.datalog.vo.DataChangeLogVo; -import com.xjrsoft.module.mdm.dto.Testflow003PageDto; -import com.xjrsoft.module.mdm.dto.UpdateTestflow003Dto; -import com.xjrsoft.module.mdm.entity.Testflow003; -import com.xjrsoft.module.mdm.service.ITestflow003Service; -import com.xjrsoft.module.mdm.vo.Testflow003PageVo; -import com.xjrsoft.module.mdm.vo.Testflow003Vo; -import com.xjrsoft.module.system.client.ICodeRuleClient; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; - -/** -* @title: 测试流程3 -* @Author 管理员 -* @Date: 2025-11-26 -* @Version 1.0 -*/ -@RestController -@RequestMapping("/mdm" + "/testflow003") -@Api(value = "/mdm" + "/testflow003",tags = "测试流程3代码") -@AllArgsConstructor -public class Testflow003Controller { - - - private final ITestflow003Service testflow003Service; - private final ICodeRuleClient codeRuleService; - private final DatalogService dataService; - - @GetMapping(value = "/page") - @ApiOperation(value="Testflow003列表(分页)") - @SaCheckPermission("testflow003:list") - public R page(@Valid Testflow003PageDto dto){ - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper - .like(StrUtil.isNotBlank(dto.getName()),Testflow003::getName,dto.getName()) - .like(StrUtil.isNotBlank(dto.getCode()),Testflow003::getCode,dto.getCode()) - .like(StrUtil.isNotBlank(dto.getNote()),Testflow003::getNote,dto.getNote()) - .orderByDesc(Testflow003::getId) - .select(Testflow003.class,x -> VoToColumnUtil.fieldsToColumns(Testflow003PageVo.class).contains(x.getProperty())); - IPage page = testflow003Service.page(ConventPage.getPage(dto), queryWrapper); - PageOutput pageOutput = ConventPage.getPageOutput(page, Testflow003PageVo.class); - return R.ok(pageOutput); - } - - @GetMapping(value = "/info") - @ApiOperation(value="根据id查询Testflow003信息") - @SaCheckPermission("testflow003:detail") - public R info(@RequestParam Long id){ - Testflow003 testflow003 = testflow003Service.getById(id); - if (testflow003 == null) { - return R.error("找不到此数据！"); - } - return R.ok(BeanUtil.toBean(testflow003, Testflow003Vo.class)); - } - - @GetMapping(value = "/datalog") - @ApiOperation(value="根据id查询Testflow003数据详细日志") - @SaCheckPermission("testflow003:datalog") - public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateTestflow003Dto.class,id); - return R.ok(logs); - } - - - @PostMapping - @ApiOperation(value = "新增Testflow003") - @SaCheckPermission("testflow003:add") - public R add(@Valid @RequestBody UpdateTestflow003Dto dto){ - codeRuleService.useEncode("TestCode"); - UpdateTestflow003Dto res = dataService.insert(dto,null); - return R.ok(res.getId()); - } - - @PutMapping - @ApiOperation(value = "修改Testflow003") - @SaCheckPermission("testflow003:edit") - public R update(@Valid @RequestBody UpdateTestflow003Dto dto){ - return R.ok(dataService.updateById(dto)); - } - - @DeleteMapping - @ApiOperation(value = "删除") - @SaCheckPermission("testflow003:delete") - public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateTestflow003Dto.class, ids)); - - } - - -} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/ShipScheduleController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/ShipScheduleController.java index 067209b..2b50c06 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/ShipScheduleController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/ShipScheduleController.java @@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.collect.Lists; import com.pictc.datalog.DataOperationContent; import com.pictc.datalog.DataOperationListener; -import com.pictc.enums.ApproveCodeEnum; import com.pictc.enums.BusinessCode; import com.pictc.enums.ExceptionCommonCode; import com.pictc.jdbc.JdbcTools; @@ -32,7 +31,6 @@ import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.common.utils.VoToColumnUtil; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; -import com.xjrsoft.module.dayPlan.entity.LngPngDemand; import com.xjrsoft.module.ship.dto.LngShipSchedulePageDto; import com.xjrsoft.module.ship.dto.UpdateLngShipScheduleDto; import com.xjrsoft.module.ship.entity.LngShipSchedule; @@ -54,7 +52,7 @@ import lombok.AllArgsConstructor; * @Version 1.0 */ @RestController -@RequestMapping("/ship" + "/shipSchedule") +@RequestMapping("/ship/shipSchedule") @Api(value = "/ship" + "/shipSchedule",tags = "船期计划排布代码") @AllArgsConstructor public class ShipScheduleController { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsPurInt.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsPurInt.java index d5d0ef1..1276020 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsPurInt.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsPurInt.java @@ -1,21 +1,18 @@ package com.xjrsoft.module.ship.entity; +import java.io.Serializable; +import java.math.BigDecimal; +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; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsSalesInt.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsSalesInt.java index e8b4cc0..52eeab4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsSalesInt.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsSalesInt.java @@ -1,21 +1,18 @@ package com.xjrsoft.module.ship.entity; +import java.io.Serializable; +import java.math.BigDecimal; +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; /**