diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java index a1a88f0bd..e608b3865 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java @@ -122,6 +122,7 @@ public class FmProjectMilestoneEntity extends BaseEntity { private Double score; /** * 执行结果 + * -- 旧 mes 中存储执行类型,改执行类型存储字段executeType,该字段弃用 */ @Schema(description = "执行结果") private Short executeResult=0; @@ -243,21 +244,21 @@ public class FmProjectMilestoneEntity extends BaseEntity { /** * 执行类型 无 */ - public static Short EXECUTE_RESULT_NO = 0; + public static String EXECUTE_RESULT_NO = "0"; /** * 执行类型 延期 */ - public static Short EXECUTE_RESULT_YQ = 1; + public static String EXECUTE_RESULT_YQ = "1"; /** * 执行类型 终止 */ - public static Short EXECUTE_RESULT_ZZ = 2; + public static String EXECUTE_RESULT_ZZ = "2"; /** * 执行类型 完成 */ - public static Short EXECUTE_RESULT_JXSQ = 3; + public static String EXECUTE_RESULT_JXSQ = "3"; - public static Map executeResultMap = new HashMap<>(3); + public static Map executeResultMap = new HashMap<>(3); static { executeResultMap.put(EXECUTE_RESULT_NO, "无"); @@ -267,7 +268,7 @@ public class FmProjectMilestoneEntity extends BaseEntity { } public String getExecuteResultTitle() { - return executeResultMap.get(this.executeResult); + return executeResultMap.get(this.executeType); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java index 372f6df62..5a3942c4f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java @@ -63,6 +63,8 @@ import java.util.Date; import java.util.List; import java.util.Objects; +import static org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity.EXECUTE_RESULT_NO; + /** * 项目里程碑 服务实现类 * @@ -180,7 +182,7 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl userR = userClient.userInfoById(fmProjectMilestone.getNextApproverId()); if (!userR.isSuccess() || BeanUtil.isEmpty(userR.getData())) { @@ -263,20 +265,20 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl fmProjectMilestoneList = baseMapper @@ -284,7 +286,7 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl Double.parseDouble(paIndex)) { - projectMilestone.setExecuteResult(FmProjectMilestoneEntity.EXECUTE_RESULT_ZZ); + projectMilestone.setExecuteType(FmProjectMilestoneEntity.EXECUTE_RESULT_ZZ); baseMapper.updateById(projectMilestone); } } @@ -335,14 +337,13 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl