App上获取包装报工分页数据接口：/biz/task-report/page-assemble-app

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<T> extends MPJLambdaWrapper<T> {
         return this;
     }
 
-    public MPJLambdaWrapperX<T> betweenIfPresent(SFunction<T, ?> column, Object val1, Object val2) {
+    public MPJLambdaWrapperX<T> betweenIfPresent(boolean b, SFunction<T, ?> column, Object val1, Object val2) {
         if (val1 != null && val2 != null) {
             return (MPJLambdaWrapperX<T>) super.between(column, val1, val2);
         }
@@ -100,7 +100,7 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> {
     public MPJLambdaWrapperX<T> betweenIfPresent(SFunction<T, ?> 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);
     }
 
     // ========== 重写父类方法，方便链式调用 ==========

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<PageResult<TaskReportRespVO>> getAssembleReportPageForApp(@Valid TaskReportPageReqVO pageReqVO) {
+        PageResult<TaskReportDO> pageResult = taskReportService.getAssembleReportPageForApp(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, TaskReportRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出任务报工 Excel")
     @PreAuthorize("@ss.hasPermission('biz:task-report:export')")

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<TaskReportDO> {
 
         return selectPage(reqVO, query);
     }
+    default PageResult<TaskReportDO> selectAssembleReportPageForApp(TaskReportPageReqVO reqVO) {
+        MPJLambdaWrapperX<TaskReportDO> 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<TaskReportDO> query = new MPJLambdaWrapper<>();

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<TaskReportDO> getTaskReportPage(TaskReportPageReqVO pageReqVO);
+    PageResult<TaskReportDO> getAssembleReportPageForApp(TaskReportPageReqVO pageReqVO);
 
     List<TaskReportDO> getUserReportDetail(String userId,String yearMonth);
 

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<TaskReportDO> getAssembleReportPageForApp(TaskReportPageReqVO pageReqVO) {
+        return taskReportMapper.selectAssembleReportPageForApp(pageReqVO);
+    }
+
     @Override
     public List<TaskReportDO> getUserReportDetail(String userId,String yearMonth){
         return taskReportMapper.selectUserReportDetail(userId,yearMonth);