jihs 4 years ago
parent
commit
fbd36cea0e

+ 0 - 74
src/main/java/org/jeecg/modules/prowork/entity/ProWorkLogicContent.java

@@ -1,74 +0,0 @@
-package org.jeecg.modules.prowork.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.common.dto.prowork.ProWorkLogicContentAddReqDTO;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: 日志详情(实施,开发,服务)
- * @author: jeecg-boot
- * @date2021-03-02
- * @version: V1.0
- */
-@Data
-@ApiModel(value = "日志详情(实施,开发,服务)")
-@TableName("pro_work_logic_content")
-public class ProWorkLogicContent implements Serializable {
-	private static final long serialVersionUID = -8092464265175600218L;
-	@ApiModelProperty("id")
-	@TableId(type = IdType.UUID)
-	private String id;
-	@ApiModelProperty("日志id")
-	private String logicId;
-	@ApiModelProperty("项目档案id")
-	private String proArchivesId;
-	@ApiModelProperty("项目档案里程碑")
-	private String proArchivesMilestone;
-	@ApiModelProperty("工作内容")
-	private String content;
-	@ApiModelProperty("工作时长")
-	private Double duration;
-	@ApiModelProperty("创建时间")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
-	@ApiModelProperty("创建人")
-	private String createBy;
-	@ApiModelProperty("修改时间")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date updateTime;
-	@ApiModelProperty("修改人")
-	private String updateBy;
-	@ApiModelProperty("删除状态(0,正常,1已删除)")
-	private String delFlag;
-	@ApiModelProperty("组织")
-	private String pkOrg;
-
-	public ProWorkLogicContent() {
-	}
-
-	public ProWorkLogicContent(ProWorkLogicContentAddReqDTO detail) {
-		this.logicId = detail.getLogicId();
-		this.proArchivesId = detail.getProArchivesId();
-		this.proArchivesMilestone = detail.getProArchivesMilestone();
-		this.content = detail.getContent();
-		this.duration = detail.getDuration();
-		this.delFlag = "0";
-		this.pkOrg = detail.getPkOrg();
-	}
-
-	public ProWorkLogicContent(String delFlag){
-		this.delFlag = delFlag;
-	}
-}

+ 0 - 96
src/main/java/org/jeecg/modules/prowork/entity/ProWorkMilestone.java

@@ -1,96 +0,0 @@
-package org.jeecg.modules.prowork.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.common.dto.prowork.ProWorkMilestoneAddReqDTO;
-import org.springframework.format.annotation.DateTimeFormat;
-import javax.validation.constraints.NotEmpty;
-
-@ApiModel("里程碑确认单")
-@Data
-@TableName("pro_work_milestone")
-public class ProWorkMilestone implements Serializable {
-	private static final long serialVersionUID = 3883624886849611941L;
-	@ApiModelProperty("id")
-	@TableId(type = IdType.UUID)
-	private String id;
-	@ApiModelProperty("单据编号")
-	private String billcode;
-	@ApiModelProperty("1.开发 2.实施 3.服务")
-	@NotEmpty(message = "参数type不能为空")
-	private String type;
-	@ApiModelProperty("项目档案id")
-	private String proId;
-	@ApiModelProperty("项目档案编码")
-	private String proCode;
-	@ApiModelProperty("项目档案名称")
-	private String proName;
-	@ApiModelProperty("客户档案id")
-	private String cusId;
-	@ApiModelProperty("客户编码")
-	private String cusCode;
-	@ApiModelProperty("里程碑id")
-	private String mileId;
-	@ApiModelProperty("里程碑(计划)")
-	private String mileName;
-	@ApiModelProperty("里程碑确认(0,未确认 1,确认)")
-	private Integer mileConfirm;
-	@ApiModelProperty("确认时间")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date confirmTime;
-	@ApiModelProperty("工作内容")
-	private String content;
-	@ApiModelProperty("工作时长")
-	private Double duration;
-	@ApiModelProperty("填写人(当前用户)")
-	@TableField("`current_user`")
-	private String currentUser;
-	@ApiModelProperty("创建时间")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
-	@ApiModelProperty("创建人")
-	private String createBy;
-	@ApiModelProperty("修改时间")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date updateTime;
-	@ApiModelProperty("修改人")
-	private String updateBy;
-	@ApiModelProperty("删除状态(0,正常,1已删除)")
-	private String delFlag;
-	@ApiModelProperty("组织")
-	private String pkOrg;
-
-	public ProWorkMilestone() {
-	}
-
-	public ProWorkMilestone(ProWorkMilestoneAddReqDTO reqDTO) {
-		this.id = reqDTO.getId();
-		this.billcode = reqDTO.getBillcode();
-		this.type = reqDTO.getType();
-		this.proId = reqDTO.getProId();
-		this.proCode = reqDTO.getProCode();
-		this.proName = reqDTO.getProName();
-		this.cusId = reqDTO.getCusId();
-		this.cusCode = reqDTO.getCusCode();
-		this.mileId = reqDTO.getMileId();
-		this.mileName = reqDTO.getMileName();
-		this.mileConfirm = reqDTO.getMileConfirm();
-		this.confirmTime = reqDTO.getConfirmTime();
-		this.content = reqDTO.getContent();
-		this.duration = reqDTO.getDuration();
-		this.currentUser = reqDTO.getCurrentUser();
-		this.delFlag = "0";
-		this.pkOrg = reqDTO.getPkOrg();
-	}
-}

+ 0 - 15
src/main/java/org/jeecg/modules/prowork/mapper/ProWorkLogicContentMapper.java

@@ -1,15 +0,0 @@
-package org.jeecg.modules.prowork.mapper;
-
-import org.jeecg.modules.prowork.entity.ProWorkLogicContent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 日志详情(实施,开发,服务)
- * @author: jeecg-boot
- * @date2021-03-02
- * @version: V1.0
- */
-
-public interface ProWorkLogicContentMapper extends BaseMapper<ProWorkLogicContent> {
-
-}

+ 0 - 14
src/main/java/org/jeecg/modules/prowork/service/ProWorkLogicContentService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.prowork.service;
-
-import org.jeecg.modules.prowork.entity.ProWorkLogicContent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 日志详情(实施,开发,服务)
- * @author: jeecg-boot
- * @date2021-03-02
- * @version: V1.0
- */
-public interface ProWorkLogicContentService extends IService<ProWorkLogicContent> {
-
-}

+ 0 - 17
src/main/java/org/jeecg/modules/prowork/service/impl/ProWorkLogicContentServiceImpl.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.prowork.service.impl;
-
-import org.jeecg.modules.prowork.entity.ProWorkLogicContent;
-import org.jeecg.modules.prowork.mapper.ProWorkLogicContentMapper;
-import org.jeecg.modules.prowork.service.ProWorkLogicContentService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 日志详情(实施,开发,服务)
- * @author: jeecg-boot
- * @date2021-03-02
- * @version: V1.0
- */
-@Service
-public class ProWorkLogicContentServiceImpl extends ServiceImpl<ProWorkLogicContentMapper, ProWorkLogicContent> implements ProWorkLogicContentService {
-}