jihs 4 tahun lalu
induk
melakukan
83c57856ae

+ 3 - 0
src/main/java/org/jeecg/common/dto/prowork/ProWorkLogicRespDTO.java

@@ -37,6 +37,8 @@ public class ProWorkLogicRespDTO {
     private String reporter;
     @ApiModelProperty("填写人(当前用户)")
     private String currentUser;
+     @ApiModelProperty("创建时间")
+    private Date createTime;
     @ApiModelProperty("组织")
     private String pkOrg;
 
@@ -55,6 +57,7 @@ public class ProWorkLogicRespDTO {
          this.reporterId = proWorkLogic.getReporterId();
          this.reporter = proWorkLogic.getReporter();
          this.currentUser = proWorkLogic.getCurrentUser();
+         this.createTime = proWorkLogic.getCreateTime();
          this.pkOrg = proWorkLogic.getPkOrg();
      }
  }

+ 1 - 1
src/main/java/org/jeecg/modules/archives/controller/ProjectManageArchivesController.java

@@ -337,7 +337,7 @@ public class ProjectManageArchivesController {
 	/**
 	 * @desc 将计划列表转成树状结构
 	 */
-	private List<ProPlanListRespDTO> getTreeList( List<ProjectManageBusinessOther> list) {
+	private List<ProPlanListRespDTO> getTreeList(List<ProjectManageBusinessOther> list) {
 		List<ProPlanListRespDTO> resp = Lists.newArrayList();
 		//根据parentId分组
 		Map<String, List<ProjectManageBusinessOther>> postMap = list.stream().collect(Collectors.groupingBy(ProjectManageBusinessOther :: getParentId));

+ 1 - 1
src/main/java/org/jeecg/modules/prowork/controller/ProWorkLogicController.java

@@ -3,7 +3,6 @@ package org.jeecg.modules.prowork.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
@@ -82,6 +81,7 @@ public class ProWorkLogicController {
 			}
 
 			queryWrapper.eq("del_flag", CommonConstant.STATUS_NORMAL.toString());
+			queryWrapper.orderByDesc("create_time");
 			IPage<ProWorkLogic> pageList = proWorkLogicService.page(page, queryWrapper);
 			result.setSuccess(true);
 			result.setResult(pageList);