licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生产进度统计查询修改

Browse Source
This commit is contained in:
z 2025-01-24 19:46:44 +08:00
parent d609be3717
commit 127570e86d
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/master/MasterMapper.java
View File

@ -30,7 +30,8 @@ public interface MasterMapper extends BaseMapperX<MasterDO> {
.select("b.nickname as jyUsers,c.name as jyBms,d.name as jyMasters") .select("b.nickname as jyUsers,c.name as jyBms,d.name as jyMasters")
.leftJoin(AdminUserDO.class,"b",AdminUserDO::getId,MasterDO::getJyUser) .leftJoin(AdminUserDO.class,"b",AdminUserDO::getId,MasterDO::getJyUser)
.leftJoin(DeptDO.class,"c",DeptDO::getId,MasterDO::getJyBm) .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()) query.eq(!ObjectUtil.isEmpty(reqVO.getJyYt()), MasterDO::getJyYt, reqVO.getJyYt())
.eq(!ObjectUtil.isEmpty(reqVO.getJyType()), MasterDO::getJyType, reqVO.getJyType()) .eq(!ObjectUtil.isEmpty(reqVO.getJyType()), MasterDO::getJyType, reqVO.getJyType())
.like(!ObjectUtil.isEmpty(reqVO.getJyBm()), DeptDO::getName, reqVO.getJyBm()) .like(!ObjectUtil.isEmpty(reqVO.getJyBm()), DeptDO::getName, reqVO.getJyBm())

10
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml
View File

@ -17,7 +17,7 @@
<select id="planBbPage" resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO"> <select id="planBbPage" resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO">
SELECT d.code AS projectCode, SELECT d.code AS projectCode,
d.project_name AS projectName, 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, e.name AS projectSubName,
c.material_name AS materialName, c.material_name AS materialName,
f.name AS procdureName, f.name AS procdureName,
@ -36,6 +36,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 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 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_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 WHERE t.deleted = 0 AND t.tenant_id = 2
<if test="reqVO.projectCode != null and reqVO.projectCode != ''"> <if test="reqVO.projectCode != null and reqVO.projectCode != ''">
AND d.code = #{reqVO.projectCode} AND d.code = #{reqVO.projectCode}
@ -44,7 +45,7 @@
AND d.project_name = #{reqVO.projectName} AND d.project_name = #{reqVO.projectName}
</if> </if>
<if test="reqVO.taskNo != null and reqVO.taskNo != ''"> <if test="reqVO.taskNo != null and reqVO.taskNo != ''">
AND g.task_no = #{reqVO.taskNo} AND j.plan_no = #{reqVO.taskNo}
</if> </if>
<if test="reqVO.projectSubName != null and reqVO.projectSubName != ''"> <if test="reqVO.projectSubName != null and reqVO.projectSubName != ''">
AND e.name = #{reqVO.projectSubName} AND e.name = #{reqVO.projectSubName}
@ -61,7 +62,7 @@
<select id="planBb" resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO"> <select id="planBb" resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO">
SELECT d.code AS projectCode, SELECT d.code AS projectCode,
d.project_name AS projectName, 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, e.name AS projectSubName,
c.material_name AS materialName, c.material_name AS materialName,
f.name AS procdureName, 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 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 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_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 WHERE t.deleted = 0 AND t.tenant_id = 2
<if test="reqVO.projectCode != null and reqVO.projectCode != ''"> <if test="reqVO.projectCode != null and reqVO.projectCode != ''">
AND d.code = #{reqVO.projectCode} AND d.code = #{reqVO.projectCode}
@ -87,7 +89,7 @@
AND d.project_name = #{reqVO.projectName} AND d.project_name = #{reqVO.projectName}
</if> </if>
<if test="reqVO.taskNo != null and reqVO.taskNo != ''"> <if test="reqVO.taskNo != null and reqVO.taskNo != ''">
AND g.task_no = #{reqVO.taskNo} AND j.plan_no = #{reqVO.taskNo}
</if> </if>
<if test="reqVO.projectSubName != null and reqVO.projectSubName != ''"> <if test="reqVO.projectSubName != null and reqVO.projectSubName != ''">
AND e.name = #{reqVO.projectSubName} AND e.name = #{reqVO.projectSubName}

2
mes-ui/mes-ui-admin-vue3/src/views/heli/master/index.vue
View File

@ -93,7 +93,7 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="主键" align="center" prop="id" /> <el-table-column label="序号" align="center" prop="id" />
<el-table-column label="借用人" align="center" prop="jyUsers" > <el-table-column label="借用人" align="center" prop="jyUsers" >
<!-- <template #default="scope">--> <!-- <template #default="scope">-->
<!-- {{ userList.find((user) => user.id === scope.row.jyUser)?.nickname }}--> <!-- {{ userList.find((user) => user.id === scope.row.jyUser)?.nickname }}-->

2
mes-ui/mes-ui-admin-vue3/src/views/heli/master/indexBb.vue
View File

@ -93,7 +93,7 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" show-summary :summary-method="getSummaries"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" show-summary :summary-method="getSummaries">
<el-table-column label="主键" align="center" prop="id" /> <el-table-column label="序号" align="center" prop="id" />
<el-table-column label="借用人" align="center" prop="jyUsers" > <el-table-column label="借用人" align="center" prop="jyUsers" >
<!-- <template #default="scope">--> <!-- <template #default="scope">-->
<!-- {{ userList.find((user) => user.id === scope.row.jyUser)?.nickname }}--> <!-- {{ userList.find((user) => user.id === scope.row.jyUser)?.nickname }}-->