From d99628f916a6a00bf8608a94ce80bc0c191b9263 Mon Sep 17 00:00:00 2001 From: fangjiakai <450850793@qq.com> Date: Tue, 10 Mar 2026 08:42:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(task):=20=E6=B7=BB=E5=8A=A0=E5=86=85?= =?UTF-8?q?=E9=83=A8=E4=BD=9C=E4=B8=9A=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在EightworkInfoCO中新增internalOperationFlag字段 - 在EightworkInfoAddCmd和EightworkInfoUpdateCmd中添加内部作业标识参数 - 在TaskLogAddCmd中增加内部作业标识字段 - 在EightworkInfoE领域模型中添加internalOperationFlag属性 - 在EightworkInfoDO数据对象中新增内部作业标识字段 - 更新EightworkInfoDO构造函数以支持内部作业标识参数传递 --- .../java/com/zcloud/eightwork/command/TaskLogAddExe.java | 1 + .../java/com/zcloud/eightwork/dto/EightworkInfoAddCmd.java | 3 +++ .../com/zcloud/eightwork/dto/EightworkInfoUpdateCmd.java | 2 ++ .../main/java/com/zcloud/eightwork/dto/TaskLogAddCmd.java | 3 +++ .../zcloud/eightwork/dto/clientobject/EightworkInfoCO.java | 3 +++ .../com/zcloud/eightwork/domain/model/EightworkInfoE.java | 2 ++ .../eightwork/persistence/dataobject/EightworkInfoDO.java | 6 +++++- 7 files changed, 19 insertions(+), 1 deletion(-) diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java index d0e92f1..326c582 100644 --- a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java +++ b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java @@ -88,6 +88,7 @@ public class TaskLogAddExe { , cmd.getWorkLevel() , cmd.getCorpinfoId() , cmd.getXgfFlag() + , cmd.getInternalOperationFlag() , cmd.getProjectId() , cmd.getXgfId() , nosb diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoAddCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoAddCmd.java index 582444b..032374f 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoAddCmd.java @@ -30,6 +30,9 @@ public class EightworkInfoAddCmd extends Command { @NotNull(message = "是否相关方1是不能为空") private Integer xgfFlag; + @ApiModelProperty(value = "是否内部作业1是2否", name = "internalOperationFlag") + private Integer internalOperationFlag; + @ApiModelProperty(value = "所属项目", name = "projectId", required = true) @NotEmpty(message = "所属项目不能为空") private String projectId; diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoUpdateCmd.java index 9c4d995..0084499 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoUpdateCmd.java @@ -34,6 +34,8 @@ public class EightworkInfoUpdateCmd extends Command { @ApiModelProperty(value = "是否相关方1是", name = "xgfFlag", required = true) @NotNull(message = "是否相关方1是不能为空") private Integer xgfFlag; + @ApiModelProperty(value = "是否内部作业1是2否", name = "internalOperationFlag") + private Integer internalOperationFlag; @ApiModelProperty(value = "所属项目", name = "projectId", required = true) @NotEmpty(message = "所属项目不能为空") private String projectId; diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogAddCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogAddCmd.java index 3b5ada5..111cac2 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogAddCmd.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogAddCmd.java @@ -35,6 +35,9 @@ public class TaskLogAddCmd extends Command { @NotNull(message = "是否相关方1是不能为空") private Integer xgfFlag; + @ApiModelProperty(value = "是否内部作业1是2否", name = "internalOperationFlag") + private Integer internalOperationFlag; + @ApiModelProperty(value = "所属项目", name = "projectId", required = true) private String projectId; diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkInfoCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkInfoCO.java index 939733f..fb2fa89 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkInfoCO.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkInfoCO.java @@ -26,6 +26,9 @@ public class EightworkInfoCO extends ClientObject { //是否相关方1是 @ApiModelProperty(value = "是否相关方1是") private Integer xgfFlag; + //是否内部作业1是2否 + @ApiModelProperty(value = "是否内部作业1是2否") + private Integer internalOperationFlag; //所属项目 @ApiModelProperty(value = "所属项目") private String projectId; diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkInfoE.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkInfoE.java index 348a2dc..dd8179f 100644 --- a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkInfoE.java +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkInfoE.java @@ -19,6 +19,8 @@ public class EightworkInfoE extends BaseE { private Long corpinfoId; //是否相关方1是 private Integer xgfFlag; + //是否内部作业1是2否 + private Integer internalOperationFlag; //所属项目 private String projectId; //相关方id diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkInfoDO.java index c2c12da..25eadfa 100644 --- a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkInfoDO.java @@ -29,6 +29,9 @@ public class EightworkInfoDO extends BaseDO { //是否相关方1是 @ApiModelProperty(value = "是否相关方1是") private Integer xgfFlag; + //是否内部作业1是2否 + @ApiModelProperty(value = "是否内部作业1是2否") + private Integer internalOperationFlag; //所属项目 @ApiModelProperty(value = "所属项目") private String projectId; @@ -61,7 +64,7 @@ public class EightworkInfoDO extends BaseDO { 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.workType = workType; this.workLevel = workLevel; @@ -71,6 +74,7 @@ public class EightworkInfoDO extends BaseDO { this.corpinfoId = AuthContext.getCompanyId(); } this.xgfFlag = xgfFlag; + this.internalOperationFlag = internalOperationFlag; this.projectId = projectId; this.xgfId = xgfId; this.checkNo = checkNo;