Skip to content

O
operation-control-platform
Commit 88f49968 authored by 王锦盛's avatar 王锦盛
Browse files
Options

需求修改test4

parent 907e3256
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 60 deletions
src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java
View file @ 88f49968
...@@ -79,6 +79,7 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn ...@@ -79,6 +79,7 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
modelBaseVersion.setOwnerCompanyCode(modelVersionRequirementDTO.getCompanyCode()); modelBaseVersion.setOwnerCompanyCode(modelVersionRequirementDTO.getCompanyCode());
modelBaseVersion.setModelUserId(modelVersionRequirementDTO.getUserId()); modelBaseVersion.setModelUserId(modelVersionRequirementDTO.getUserId());
modelBaseVersion.setModelUserName(modelVersionRequirementDTO.getUserName()); modelBaseVersion.setModelUserName(modelVersionRequirementDTO.getUserName());
modelBaseVersion.setModelVersion((modelVersionRequirementDTO.getModelVersion() == null) ? "1" : String.valueOf(((Integer.valueOf(modelVersionRequirementDTO.getModelVersion()).intValue()) + 1)));
modelRequirementService.createModelRequirement(modelRequirement); modelRequirementService.createModelRequirement(modelRequirement);
...@@ -97,6 +98,10 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn ...@@ -97,6 +98,10 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelPropertyVersion); BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelPropertyVersion);
modelPropertyVersion.setRequirementCode(modelPropertyVersionRequirementDTO.getRequirementCode()); modelPropertyVersion.setRequirementCode(modelPropertyVersionRequirementDTO.getRequirementCode());
modelPropertyVersion.setModelCode(modelPropertyVersionRequirementDTO.getModelCode()); modelPropertyVersion.setModelCode(modelPropertyVersionRequirementDTO.getModelCode());
modelPropertyVersion.setPropUserId(modelPropertyVersionRequirementDTO.getUserId());
modelPropertyVersion.setPropUserName(modelPropertyVersionRequirementDTO.getUserName());
modelPropertyVersion.setPropCtime(LocalDateTime.now()); modelPropertyVersion.setPropCtime(LocalDateTime.now());
modelPropertyVersionService.createModelPropertyVersion(modelPropertyVersion); modelPropertyVersionService.createModelPropertyVersion(modelPropertyVersion);
...@@ -110,13 +115,14 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn ...@@ -110,13 +115,14 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
ModelRequirement modelRequirement = new ModelRequirement(); ModelRequirement modelRequirement = new ModelRequirement();
BeanUtils.copyProperties(modelVersionRequirementDTO, modelRequirement); BeanUtils.copyProperties(modelVersionRequirementDTO, modelRequirement);
// DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// modelRequirement.setCtime(LocalDateTime.parse(modelVersionRequirementDTO.getCtime().toString(), df));
modelRequirement.setMtime(LocalDateTime.now()); modelRequirement.setMtime(LocalDateTime.now());
ModelBaseVersion modelBaseVersion = new ModelBaseVersion(); ModelBaseVersion modelBaseVersion = new ModelBaseVersion();
BeanUtils.copyProperties(modelVersionRequirementDTO, modelBaseVersion); BeanUtils.copyProperties(modelVersionRequirementDTO, modelBaseVersion);
modelBaseVersion.setOwnerCompanyCode(modelVersionRequirementDTO.getCompanyCode());
modelBaseVersion.setModelUserId(modelVersionRequirementDTO.getUserId());
modelBaseVersion.setModelUserName(modelVersionRequirementDTO.getUserName());
modelBaseVersion.setModelVersion((modelVersionRequirementDTO.getModelVersion() == null) ? "1" : String.valueOf(((Integer.valueOf(modelVersionRequirementDTO.getModelVersion()).intValue()) + 1)));
modelRequirementService.updateModelRequirement(modelRequirement); modelRequirementService.updateModelRequirement(modelRequirement);
...@@ -136,6 +142,11 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn ...@@ -136,6 +142,11 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
ModelPropertyVersion modelPropertyVersion = new ModelPropertyVersion(); ModelPropertyVersion modelPropertyVersion = new ModelPropertyVersion();
BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelPropertyVersion); BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelPropertyVersion);
modelPropertyVersion.setPropMtime(LocalDateTime.now()); modelPropertyVersion.setPropMtime(LocalDateTime.now());
modelPropertyVersion.setPropUserId(modelPropertyVersionRequirementDTO.getUserId());
modelPropertyVersion.setPropUserName(modelPropertyVersionRequirementDTO.getUserName());
modelPropertyVersion.setPropMtime(LocalDateTime.now());
modelPropertyVersionService.updateModelPropertyVersion(modelPropertyVersion); modelPropertyVersionService.updateModelPropertyVersion(modelPropertyVersion);
......
src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java
View file @ 88f49968
...@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.OcpApiModelRel; import com.pms.ocp.model.entity.OcpApiModelRel;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper @Mapper
public interface OcpApiModelRelMapper extends BaseMapper<OcpApiModelRel> { public interface OcpApiModelRelMapper extends BaseMapper<OcpApiModelRel> {
......
src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionRequirementDTO.java
View file @ 88f49968
package com.pms.ocp.model.dto; package com.pms.ocp.model.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/** /**
* @Auther: wangjian * @Auther: wangjian
...@@ -25,9 +19,8 @@ public class ModelPropertyVersionRequirementDTO { ...@@ -25,9 +19,8 @@ public class ModelPropertyVersionRequirementDTO {
/** /**
* 主键 * 主键
*/ */
@ApiModelProperty(value = "主键") // @ApiModelProperty(value = "主键")
@TableId(value = "obj_id", type = IdType.ASSIGN_ID) // private String objId;
private String objId;
/** /**
* 模型编码 * 模型编码
...@@ -112,18 +105,18 @@ public class ModelPropertyVersionRequirementDTO { ...@@ -112,18 +105,18 @@ public class ModelPropertyVersionRequirementDTO {
/** /**
* 创建时间 * 创建时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间") // @ApiModelProperty(value = "创建时间")
private LocalDateTime propCtime; // private LocalDateTime propCtime;
/** /**
* 修改时间 * 修改时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "修改时间") // @ApiModelProperty(value = "修改时间")
private LocalDateTime propMtime; // private LocalDateTime propMtime;
/** /**
* 需求编码 * 需求编码
...@@ -134,8 +127,8 @@ public class ModelPropertyVersionRequirementDTO { ...@@ -134,8 +127,8 @@ public class ModelPropertyVersionRequirementDTO {
/** /**
* 需求简述 * 需求简述
*/ */
@ApiModelProperty(value = "需求简述") // @ApiModelProperty(value = "需求简述")
private String requirementDesc; // private String requirementDesc;
/** /**
* 需求提报公司 * 需求提报公司
...@@ -158,24 +151,24 @@ public class ModelPropertyVersionRequirementDTO { ...@@ -158,24 +151,24 @@ public class ModelPropertyVersionRequirementDTO {
/** /**
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间") // @ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime ctime; // private LocalDateTime ctime;
/** /**
* 修改时间 * 修改时间
*/ */
@ApiModelProperty(value = "修改时间") // @ApiModelProperty(value = "修改时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime mtime; // private LocalDateTime mtime;
/** /**
* 需求审核状态0:未通过1:通过 * 需求审核状态0:未通过1:通过
*/ */
@ApiModelProperty(value = "需求审核状态0:未通过1:通过") // @ApiModelProperty(value = "需求审核状态0:未通过1:通过")
private Integer requirementStatus; // private Integer requirementStatus;
/** /**
* 推广类型 0:统推, 1：自建 * 推广类型 0:统推, 1：自建
......
src/main/java/com/pms/ocp/model/dto/ModelVersionRequirementDTO.java
View file @ 88f49968
...@@ -3,13 +3,10 @@ package com.pms.ocp.model.dto; ...@@ -3,13 +3,10 @@ package com.pms.ocp.model.dto;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/** /**
* @Auther: wangjian * @Auther: wangjian
...@@ -73,42 +70,43 @@ public class ModelVersionRequirementDTO { ...@@ -73,42 +70,43 @@ public class ModelVersionRequirementDTO {
/** /**
* 公司编码 * 公司编码
*/ */
@ApiModelProperty(value = "公司编码") // @ApiModelProperty(value = "公司编码")
private String ownerCompanyCode; // private String ownerCompanyCode;
/** /**
* 排列顺序 * 提交人id
*/ */
@ApiModelProperty(value = "排列顺序") // @ApiModelProperty(value = "提交人id")
private Integer modelOrderNo; // private String modelUserId;
/** /**
* 提交人id * 提交人姓名
*/ */
@ApiModelProperty(value = "提交人id") // @ApiModelProperty(value = "提交人姓名")
private String modelUserId; // private String modelUserName;
/** /**
* 提交人姓名 * 排列顺序
*/ */
@ApiModelProperty(value = "提交人姓名") @ApiModelProperty(value = "排列顺序")
private String modelUserName; private Integer modelOrderNo;
/** /**
* 创建时间 * 创建时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间") // @ApiModelProperty(value = "创建时间")
private LocalDateTime modelCtime; // private LocalDateTime modelCtime;
/** /**
* 修改时间 * 修改时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "修改时间") // @ApiModelProperty(value = "修改时间")
private LocalDateTime modelMtime; // private LocalDateTime modelMtime;
/** /**
* 所属区域 1:生成控制大区 2:信息关联大区3:互联网大区 * 所属区域 1:生成控制大区 2:信息关联大区3:互联网大区
...@@ -180,14 +178,14 @@ public class ModelVersionRequirementDTO { ...@@ -180,14 +178,14 @@ public class ModelVersionRequirementDTO {
/** /**
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间") // @ApiModelProperty(value = "创建时间")
private LocalDateTime ctime; // private LocalDateTime ctime;
/** /**
* 修改时间 * 修改时间
*/ */
@ApiModelProperty(value = "修改时间") // @ApiModelProperty(value = "修改时间")
private LocalDateTime mtime; // private LocalDateTime mtime;
/** /**
* 需求审核状态0:未通过1:通过 * 需求审核状态0:未通过1:通过
......
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