Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java

@@ -195,12 +195,12 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
 
     default PageResult<TaskDispatchDetailDO> selectOrderSchedulePage(PlanPageReqVO reqVO){
         MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
-        query.selectAll(TaskDispatchDetailDO.class)
+        query.distinct()
                 .select("d.code as projectCode,d.external_code as externalCode,b.plan_no as planNo,b.status as planStatus")
                 .select("m.name as projectSubName,m.code as projectSubCode,m.spec,m.unit,c.amount as orderAmount")
                 .select("d.project_start_time,d.project_end_time")
-                .select("e.name as workshopName,f.name as procedureName,h.nickname as reportUserName,t.amount as deliverAmount")
-                .select("(case when t.procedure_status = 2 then 1 else 0 end) as isCompleted")
+                .select("e.name as workshopName,f.name as procedureName,h.nickname as reportUserName,sum(t.amount) as deliverAmount")
+                .select("(CASE WHEN sum(case when t.procedure_status = 2 then 1 else 0 end)=count(t.id) THEN 1 ELSE 0 END) as isCompleted")
                 .select("sum(g.work_time) as reportTime,sum(g.amount) reportAmount")
                 .leftJoin("pro_task_dispatch as a on a.id=t.dispatch_id")
                 .leftJoin("project_plan as b on b.id=a.plan_id")
@@ -211,7 +211,8 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
                 .leftJoin("base_procedure as f on f.id=t.procedure_id")
                 .leftJoin("pro_task_report as g on g.dispatch_detail_id=t.id")
                 .leftJoin("system_users as h on h.id=g.owner")
-                .groupBy("t.id,t.dispatch_id,t.procedure_id,t.owner,a.project_sub_id,b.id,a.project_id,a.workshop_id,m.id,f.id")
+                .groupBy("a.project_id,a.project_sub_id,m.id,t.owner,t.procedure_id")
+//                .groupBy("t.id,t.dispatch_id,t.procedure_id,t.owner,a.project_sub_id,b.id,a.project_id,a.workshop_id,m.id,f.id")
                 .orderByDesc("d.code desc,e.name desc,m.code")
                 .disableSubLogicDel()
         ;