【员工工资明细】 查询

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskreport/TaskReportController.java

@@ -155,7 +155,13 @@ public class TaskReportController {
     @Operation(summary = "获得员工报工明细列表")
     @PreAuthorize("@ss.hasPermission('biz:task-report:query')")
     public CommonResult<List<TaskReportDO>> getUserReportDetail(@RequestParam("userid") String userid,@RequestParam("yearMonth") String yearMonth) {
-        return success(taskReportService.getUserReportDetail(userid,yearMonth));
+
+        List<TaskReportDO> result= taskReportService.getUserReportDetail(userid,yearMonth);
+        List<TaskReportDO> assembleResult = taskReportService.getUserReportDetailAssemble(userid,yearMonth);
+        assembleResult.forEach(vo->{
+            result.add(vo);
+        });
+        return success(result);
     }
 
     @GetMapping("/export-salary-detail-excel")

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java

@@ -160,14 +160,31 @@ public interface TaskReportMapper extends BaseMapperX<TaskReportDO> {
                 .leftJoin("base_material as e on e.id=c.material_id")
                 .leftJoin("system_users as f on f.id=t.owner")
                 .leftJoin("base_procedure as g on g.id=t.procedure_id")
-                .leftJoin("system_dept as h on h.id=f.dept_id")
+                .leftJoin("system_dept as h on h.id=d.business_dept_id")
                 .groupBy("d.code,h.name,e.code,e.name,e.spec,t.owner,DATE_FORMAT(t.report_time,'%Y-%m-%d'),t.procedure_id")
                 .eq(TaskReportDO::getOwner,userId)
                 .eq("DATE_FORMAT(t.report_time,'%Y%m')",yearMonth)
+                .eq("isnull(t.dispatch_id)",0)
                 .disableSubLogicDel()
                 ;
-
-
+        return selectList(query);
+    }
+    default List<TaskReportDO> selectUserReportAssembleDetail(String userId,String yearMonth) {
+        MPJLambdaWrapperX<TaskReportDO> query = new MPJLambdaWrapperX<>();
+        query.distinct()
+                .select("d.code project_code,h.name dept_name,e.code material_code,e.name material_name,e.spec,f.nickname as ownerName,DATE_FORMAT(t.report_time,'%Y-%m-%d') as report_time")
+                .select("g.name procedure_name,sum(t.work_time) work_time,sum(t.amount) amount")
+                .leftJoin("project_sale_order as d on d.id=SUBSTRING_INDEX(t.assemble_code,'-',1)")
+                .leftJoin("base_material as e on e.id=t.material_id")
+                .leftJoin("system_users as f on f.id=t.owner")
+                .leftJoin("base_procedure as g on g.id=t.procedure_id")
+                .leftJoin("system_dept as h on h.id=d.business_dept_id")
+                .groupBy("d.code,h.name,e.code,e.name,e.spec,t.owner,DATE_FORMAT(t.report_time,'%Y-%m-%d'),t.procedure_id")
+                .eq(TaskReportDO::getOwner,userId)
+                .eq("DATE_FORMAT(t.report_time,'%Y%m')",yearMonth)
+                .eq("isnull(t.dispatch_id)",1)
+                .disableSubLogicDel()
+        ;
         return selectList(query);
     }
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportService.java

@@ -57,6 +57,7 @@ public interface TaskReportService {
     PageResult<TaskReportDO> getAssembleReportPageForApp(TaskReportPageReqVO pageReqVO);
 
     List<TaskReportDO> getUserReportDetail(String userId,String yearMonth);
+    List<TaskReportDO> getUserReportDetailAssemble(String userId,String yearMonth);
 
     TaskReportAssembleVO generateAssembleReportByCode(String assembleCode);
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportServiceImpl.java

@@ -130,6 +130,11 @@ public class TaskReportServiceImpl implements TaskReportService {
         return taskReportMapper.selectUserReportDetail(userId,yearMonth);
     }
 
+    @Override
+    public List<TaskReportDO> getUserReportDetailAssemble(String userId,String yearMonth){
+        return taskReportMapper.selectUserReportAssembleDetail(userId,yearMonth);
+    }
+
     @Override
     public TaskReportAssembleVO generateAssembleReportByCode(String assembleCode) {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();