diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/master/MasterMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/master/MasterMapper.java index 3c29ee2..5d7db21 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/master/MasterMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/master/MasterMapper.java @@ -30,7 +30,8 @@ public interface MasterMapper extends BaseMapperX { .select("b.nickname as jyUsers,c.name as jyBms,d.name as jyMasters") .leftJoin(AdminUserDO.class,"b",AdminUserDO::getId,MasterDO::getJyUser) .leftJoin(DeptDO.class,"c",DeptDO::getId,MasterDO::getJyBm) - .leftJoin(MaterialDO.class,"d",MaterialDO::getId,MasterDO::getJyMaster); + .leftJoin(MaterialDO.class,"d",MaterialDO::getId,MasterDO::getJyMaster) + .orderByDesc(MasterDO::getId); query.eq(!ObjectUtil.isEmpty(reqVO.getJyYt()), MasterDO::getJyYt, reqVO.getJyYt()) .eq(!ObjectUtil.isEmpty(reqVO.getJyType()), MasterDO::getJyType, reqVO.getJyType()) .like(!ObjectUtil.isEmpty(reqVO.getJyBm()), DeptDO::getName, reqVO.getJyBm()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml index f01164f..1edeb57 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml @@ -17,7 +17,7 @@ SELECT d.code AS projectCode, d.project_name AS projectName, - g.task_no AS taskNo, 0 AS planType, + j.plan_no AS taskNo, 0 AS planType, e.name AS projectSubName, c.material_name AS materialName, f.name AS procdureName, @@ -79,6 +80,7 @@ LEFT JOIN project_sale_order_sub e ON (e.id = b.project_sub_id AND e.tenant_id = 2 AND e.deleted = 0) LEFT JOIN base_procedure f ON (f.id = t.procedure_id AND f.tenant_id = 2 AND f.deleted = 0) LEFT JOIN project_plan_task g ON (g.id = b.task_id AND g.tenant_id = 2 AND g.deleted = 0) + LEFT JOIN project_plan j ON (j.id = b.plan_id AND j.tenant_id = 2 AND j.deleted = 0) WHERE t.deleted = 0 AND t.tenant_id = 2 AND d.code = #{reqVO.projectCode} @@ -87,7 +89,7 @@ AND d.project_name = #{reqVO.projectName} - AND g.task_no = #{reqVO.taskNo} + AND j.plan_no = #{reqVO.taskNo} AND e.name = #{reqVO.projectSubName} diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/master/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/master/index.vue index 1080bcb..21e6cd5 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/master/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/master/index.vue @@ -93,7 +93,7 @@ - + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/master/indexBb.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/master/indexBb.vue index 7b994d9..7d255f6 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/master/indexBb.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/master/indexBb.vue @@ -93,7 +93,7 @@ - +