From d947baf00eebce4ad3077a3488a388cd73ee0c98 Mon Sep 17 00:00:00 2001 From: siontion Date: Fri, 12 Jul 2024 14:10:11 +0800 Subject: [PATCH] =?UTF-8?q?App=E4=B8=8A=E8=8E=B7=E5=8F=96=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E6=8A=A5=E5=B7=A5=E5=88=86=E9=A1=B5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9A/biz/task-report/page-assemble-app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/core/query/MPJLambdaWrapperX.java | 4 ++-- .../taskreport/TaskReportController.java | 8 +++++++ .../mysql/taskreport/TaskReportMapper.java | 23 +++++++++++++++++++ .../service/taskreport/TaskReportService.java | 1 + .../taskreport/TaskReportServiceImpl.java | 5 ++++ 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/mes-framework/mes-spring-boot-starter-mybatis/src/main/java/com/chanko/yunxi/mes/framework/mybatis/core/query/MPJLambdaWrapperX.java b/mes-framework/mes-spring-boot-starter-mybatis/src/main/java/com/chanko/yunxi/mes/framework/mybatis/core/query/MPJLambdaWrapperX.java index d552ad68..2c14bd6d 100644 --- a/mes-framework/mes-spring-boot-starter-mybatis/src/main/java/com/chanko/yunxi/mes/framework/mybatis/core/query/MPJLambdaWrapperX.java +++ b/mes-framework/mes-spring-boot-starter-mybatis/src/main/java/com/chanko/yunxi/mes/framework/mybatis/core/query/MPJLambdaWrapperX.java @@ -84,7 +84,7 @@ public class MPJLambdaWrapperX extends MPJLambdaWrapper { return this; } - public MPJLambdaWrapperX betweenIfPresent(SFunction column, Object val1, Object val2) { + public MPJLambdaWrapperX betweenIfPresent(boolean b, SFunction column, Object val1, Object val2) { if (val1 != null && val2 != null) { return (MPJLambdaWrapperX) super.between(column, val1, val2); } @@ -100,7 +100,7 @@ public class MPJLambdaWrapperX extends MPJLambdaWrapper { public MPJLambdaWrapperX betweenIfPresent(SFunction column, Object[] values) { Object val1 = ArrayUtils.get(values, 0); Object val2 = ArrayUtils.get(values, 1); - return betweenIfPresent(column, val1, val2); + return betweenIfPresent(true, column, val1, val2); } // ========== 重写父类方法，方便链式调用 ========== diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskreport/TaskReportController.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskreport/TaskReportController.java index c4b71003..ddf564f8 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskreport/TaskReportController.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskreport/TaskReportController.java @@ -109,6 +109,14 @@ public class TaskReportController { return success(BeanUtils.toBean(pageResult, TaskReportRespVO.class)); } + @GetMapping("/page-assemble-app") + @Operation(summary = "获得包装报工分页") + @PreAuthorize("@ss.hasPermission('biz:task-report:query')") + public CommonResult> getAssembleReportPageForApp(@Valid TaskReportPageReqVO pageReqVO) { + PageResult pageResult = taskReportService.getAssembleReportPageForApp(pageReqVO); + return success(BeanUtils.toBean(pageResult, TaskReportRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出任务报工 Excel") @PreAuthorize("@ss.hasPermission('biz:task-report:export')") diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java index bb270649..085d9df9 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java @@ -19,6 +19,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import org.springframework.util.StringUtils; +import java.time.LocalDateTime; import java.util.List; /** @@ -64,6 +65,28 @@ public interface TaskReportMapper extends BaseMapperX { return selectPage(reqVO, query); } + default PageResult selectAssembleReportPageForApp(TaskReportPageReqVO reqVO) { + MPJLambdaWrapperX query = new MPJLambdaWrapperX<>(); + query.selectAll(TaskReportDO.class) + .distinct() + .select("e.name as projectSubName", "e.code as projectSubCode") + .select("e.spec") + .select("u.nickname as ownerName") + .select("a.name as procedureName") + .leftJoin(MaterialDO.class, "e", MaterialDO::getId, TaskReportDO::getMaterialId) + .leftJoin(AdminUserDO.class, "u", AdminUserDO::getId, TaskReportDO::getOwner) + .leftJoin(ProcedureDO.class,"a",ProcedureDO::getId,TaskReportDO::getProcedureId) + .orderByDesc(TaskReportDO::getId) + .disableSubLogicDel(); + + query.eqIfPresent(TaskReportDO::getType, "ASSEMBLE") + .eq(reqVO.getOwner() != null, TaskReportDO::getOwner, reqVO.getOwner()) + .betweenIfPresent(true, TaskReportDO::getCreateTime, LocalDateTime.now(),LocalDateTime.now().plusDays(-7)) + + ; + + return selectPage(reqVO, query); + } default TaskReportDO selectOne(Long id) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportService.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportService.java index 9125f4f5..70f32701 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportService.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportService.java @@ -54,6 +54,7 @@ public interface TaskReportService { * @return 任务报工分页 */ PageResult getTaskReportPage(TaskReportPageReqVO pageReqVO); + PageResult getAssembleReportPageForApp(TaskReportPageReqVO pageReqVO); List getUserReportDetail(String userId,String yearMonth); diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportServiceImpl.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportServiceImpl.java index 30fe1e6c..d5d96cbc 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportServiceImpl.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportServiceImpl.java @@ -120,6 +120,11 @@ public class TaskReportServiceImpl implements TaskReportService { return taskReportMapper.selectPage(pageReqVO); } + @Override + public PageResult getAssembleReportPageForApp(TaskReportPageReqVO pageReqVO) { + return taskReportMapper.selectAssembleReportPageForApp(pageReqVO); + } + @Override public List getUserReportDetail(String userId,String yearMonth){ return taskReportMapper.selectUserReportDetail(userId,yearMonth);