功能修改-sjx

blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml

@@ -76,6 +76,7 @@
                 AND a.milestone_node <![CDATA[ <= ]]> to_date(concat(#{fmProjectMilestone.milestoneNodeEnd},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')
             </if>
         </where>
+        order by a.update_time desc
     </select>
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java

@@ -141,7 +141,7 @@ public class FmProjectMilestoneEntity extends BaseEntity {
 	 * 核查结果
 	 */
 	@Schema(description = "核查结果")
-	private Short checkResult=0;
+	private Short checkResult;
 	/**
 	 * 核查人
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java

@@ -53,7 +53,7 @@ public class FmProjectMilestoneVO extends FmProjectMilestoneEntity {
 
 	private String projectHead;
 
-	private String approveStatus;
+	private String approvalStatus;
 
 	@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
 	@JsonFormat(pattern = DateUtil.PATTERN_DATETIME)