feat(task): 添加内部作业标识字段支持
- 在EightworkInfoCO中新增internalOperationFlag字段 - 在EightworkInfoAddCmd和EightworkInfoUpdateCmd中添加内部作业标识参数 - 在TaskLogAddCmd中增加内部作业标识字段 - 在EightworkInfoE领域模型中添加internalOperationFlag属性 - 在EightworkInfoDO数据对象中新增内部作业标识字段 - 更新EightworkInfoDO构造函数以支持内部作业标识参数传递master
parent
72a0bd747f
commit
d99628f916
|
|
@ -88,6 +88,7 @@ public class TaskLogAddExe {
|
||||||
, cmd.getWorkLevel()
|
, cmd.getWorkLevel()
|
||||||
, cmd.getCorpinfoId()
|
, cmd.getCorpinfoId()
|
||||||
, cmd.getXgfFlag()
|
, cmd.getXgfFlag()
|
||||||
|
, cmd.getInternalOperationFlag()
|
||||||
, cmd.getProjectId()
|
, cmd.getProjectId()
|
||||||
, cmd.getXgfId()
|
, cmd.getXgfId()
|
||||||
, nosb
|
, nosb
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,9 @@ public class EightworkInfoAddCmd extends Command {
|
||||||
@NotNull(message = "是否相关方1是不能为空")
|
@NotNull(message = "是否相关方1是不能为空")
|
||||||
private Integer xgfFlag;
|
private Integer xgfFlag;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "是否内部作业1是2否", name = "internalOperationFlag")
|
||||||
|
private Integer internalOperationFlag;
|
||||||
|
|
||||||
@ApiModelProperty(value = "所属项目", name = "projectId", required = true)
|
@ApiModelProperty(value = "所属项目", name = "projectId", required = true)
|
||||||
@NotEmpty(message = "所属项目不能为空")
|
@NotEmpty(message = "所属项目不能为空")
|
||||||
private String projectId;
|
private String projectId;
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,8 @@ public class EightworkInfoUpdateCmd extends Command {
|
||||||
@ApiModelProperty(value = "是否相关方1是", name = "xgfFlag", required = true)
|
@ApiModelProperty(value = "是否相关方1是", name = "xgfFlag", required = true)
|
||||||
@NotNull(message = "是否相关方1是不能为空")
|
@NotNull(message = "是否相关方1是不能为空")
|
||||||
private Integer xgfFlag;
|
private Integer xgfFlag;
|
||||||
|
@ApiModelProperty(value = "是否内部作业1是2否", name = "internalOperationFlag")
|
||||||
|
private Integer internalOperationFlag;
|
||||||
@ApiModelProperty(value = "所属项目", name = "projectId", required = true)
|
@ApiModelProperty(value = "所属项目", name = "projectId", required = true)
|
||||||
@NotEmpty(message = "所属项目不能为空")
|
@NotEmpty(message = "所属项目不能为空")
|
||||||
private String projectId;
|
private String projectId;
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,9 @@ public class TaskLogAddCmd extends Command {
|
||||||
@NotNull(message = "是否相关方1是不能为空")
|
@NotNull(message = "是否相关方1是不能为空")
|
||||||
private Integer xgfFlag;
|
private Integer xgfFlag;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "是否内部作业1是2否", name = "internalOperationFlag")
|
||||||
|
private Integer internalOperationFlag;
|
||||||
|
|
||||||
@ApiModelProperty(value = "所属项目", name = "projectId", required = true)
|
@ApiModelProperty(value = "所属项目", name = "projectId", required = true)
|
||||||
private String projectId;
|
private String projectId;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,9 @@ public class EightworkInfoCO extends ClientObject {
|
||||||
//是否相关方1是
|
//是否相关方1是
|
||||||
@ApiModelProperty(value = "是否相关方1是")
|
@ApiModelProperty(value = "是否相关方1是")
|
||||||
private Integer xgfFlag;
|
private Integer xgfFlag;
|
||||||
|
//是否内部作业1是2否
|
||||||
|
@ApiModelProperty(value = "是否内部作业1是2否")
|
||||||
|
private Integer internalOperationFlag;
|
||||||
//所属项目
|
//所属项目
|
||||||
@ApiModelProperty(value = "所属项目")
|
@ApiModelProperty(value = "所属项目")
|
||||||
private String projectId;
|
private String projectId;
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,8 @@ public class EightworkInfoE extends BaseE {
|
||||||
private Long corpinfoId;
|
private Long corpinfoId;
|
||||||
//是否相关方1是
|
//是否相关方1是
|
||||||
private Integer xgfFlag;
|
private Integer xgfFlag;
|
||||||
|
//是否内部作业1是2否
|
||||||
|
private Integer internalOperationFlag;
|
||||||
//所属项目
|
//所属项目
|
||||||
private String projectId;
|
private String projectId;
|
||||||
//相关方id
|
//相关方id
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,9 @@ public class EightworkInfoDO extends BaseDO {
|
||||||
//是否相关方1是
|
//是否相关方1是
|
||||||
@ApiModelProperty(value = "是否相关方1是")
|
@ApiModelProperty(value = "是否相关方1是")
|
||||||
private Integer xgfFlag;
|
private Integer xgfFlag;
|
||||||
|
//是否内部作业1是2否
|
||||||
|
@ApiModelProperty(value = "是否内部作业1是2否")
|
||||||
|
private Integer internalOperationFlag;
|
||||||
//所属项目
|
//所属项目
|
||||||
@ApiModelProperty(value = "所属项目")
|
@ApiModelProperty(value = "所属项目")
|
||||||
private String projectId;
|
private String projectId;
|
||||||
|
|
@ -61,7 +64,7 @@ public class EightworkInfoDO extends BaseDO {
|
||||||
this.workId = workId;
|
this.workId = workId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public EightworkInfoDO(String uuid, String workType, String workLevel, Long corpinfoId, Integer xgfFlag, String projectId, Long xgfId, String checkNo, Integer status, JSONObject info,Long departmentId) {
|
public EightworkInfoDO(String uuid, String workType, String workLevel, Long corpinfoId, Integer xgfFlag, Integer internalOperationFlag, String projectId, Long xgfId, String checkNo, Integer status, JSONObject info,Long departmentId) {
|
||||||
this.workId = uuid;
|
this.workId = uuid;
|
||||||
this.workType = workType;
|
this.workType = workType;
|
||||||
this.workLevel = workLevel;
|
this.workLevel = workLevel;
|
||||||
|
|
@ -71,6 +74,7 @@ public class EightworkInfoDO extends BaseDO {
|
||||||
this.corpinfoId = AuthContext.getCompanyId();
|
this.corpinfoId = AuthContext.getCompanyId();
|
||||||
}
|
}
|
||||||
this.xgfFlag = xgfFlag;
|
this.xgfFlag = xgfFlag;
|
||||||
|
this.internalOperationFlag = internalOperationFlag;
|
||||||
this.projectId = projectId;
|
this.projectId = projectId;
|
||||||
this.xgfId = xgfId;
|
this.xgfId = xgfId;
|
||||||
this.checkNo = checkNo;
|
this.checkNo = checkNo;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue