diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java index c8c2f7328..67e9dfd93 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java @@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class FeedbackHistoryController extends JeroController { @Autowired private IFeedbackHistoryService feedbackHistoryService; - + /** * 分页列表查询 * @@ -54,6 +54,7 @@ public class FeedbackHistoryController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(feedbackHistory, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + queryWrapper.orderByDesc("create_time"); IPage pageList = feedbackHistoryService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java index 5d5087d44..a7d172da4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java @@ -104,4 +104,7 @@ public class ProjectTaskInventoryFeedbackEO implements Serializable { /**待办、已办标识**/ @TableField(exist = false) private String status; + + @ApiModelProperty(value = "序号") + private String serialNumber; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java index b73956bf6..27013944a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java @@ -65,4 +65,6 @@ public interface IProjectTaskInventoryFeedbackEOService extends IService projectTaskInventoryFeedbackEOList = new ArrayList<>(); + String serialNumber = projectTaskInventoryFeedbackEOService.createSerialNumber(); for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) { QueryWrapper sysUserQueryWrapper = new QueryWrapper<>(); sysUserQueryWrapper.lambda().eq(SysUser::getId,projectTaskInventoryDetailEO.getUserId()); @@ -94,9 +95,13 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().like(ProjectTaskInventoryFeedbackEO::getSerialNumber,currentDay); + Integer feedbackCount = this.baseMapper.selectCount(queryWrapper); + + int serialNumberSize = 3; + if(feedbackCount > 0){ + serialNumber = currentDay + String.format("%0" + serialNumberSize + "d", (Integer.parseInt(serialNumber) + feedbackCount)); + }else { + serialNumber = currentDay + serialNumber; + } + return serialNumber; + } }