From 3f42f95b410a454965333b86c5139d404a2fd9f7 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 5 Feb 2026 14:27:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/index/IndexHomeDetailsMapper.xml | 74 +-- resources/mybatis/index/IndexHomeMapper.xml | 451 +++++++++--------- 2 files changed, 272 insertions(+), 253 deletions(-) diff --git a/resources/mybatis/index/IndexHomeDetailsMapper.xml b/resources/mybatis/index/IndexHomeDetailsMapper.xml index 5c496c9..0c000da 100644 --- a/resources/mybatis/index/IndexHomeDetailsMapper.xml +++ b/resources/mybatis/index/IndexHomeDetailsMapper.xml @@ -635,6 +635,7 @@ LEFT JOIN v_mtp_status vs on mm.ID = vs.maId WHERE 30> to_days(ifnull(mm.NEXT_CHECK_TIME,now())) - to_days(now()) + group by mm.ID @@ -691,20 +692,24 @@ SELECT - '车辆需求计划' as type, - cpd.id, - bp.`NAME` as projectName, - cpd.model_id modelId, - cpd.need_num needNum, - cpd.need_day needDay, - cpa.need_time backDate, - cpd.remark, - cmti.type maType, - cmti.`NAME` maName, - cmti.model maModel, - cmti.unit maUnit + '车辆需求计划' as type, + cpd.id, + bp.`NAME` as projectName, + cpd.model_id modelId, + cpd.need_num needNum, + cpd.need_day needDay, + cpa.need_time backDate, + cpd.remark, + cmti.type maType, + cmti.`NAME` maName, + cmti.model maModel, + cmti.unit maUnit FROM - car_plan_details cpd - LEFT JOIN car_plan_apply cpa ON cpd.apply_id = cpa.id - LEFT JOIN bm_project bp ON cpa.pro_id = bp.ID - LEFT JOIN car_ma_type_info cmti ON cpd.model_id = cmti.id + car_plan_details cpd + LEFT JOIN car_plan_apply cpa ON cpd.apply_id = cpa.id + LEFT JOIN bm_project bp ON cpa.pro_id = bp.ID + LEFT JOIN car_ma_type_info cmti ON cpd.model_id = cmti.id WHERE bp.`NAME` IS NOT NULL - and cpa.status = 1 + and cpa.status = 2 + and cpa.dispatch_num = 0 + and cpa.status_type = 1 and bp.`NAME` like concat('%', #{projectName}, '%') @@ -1414,7 +1421,9 @@ LEFT JOIN st_plan_apply spa ON spd.apply_id = spa.id LEFT JOIN bm_project bp ON spa.project_id = bp.ID WHERE bp.`NAME` IS NOT NULL - and spa.status = 1 + and spa.status = 2 + and spa.ck_num = 0 + and spa.status_type = 1 and bp.`NAME` like concat('%', #{projectName}, '%') @@ -1442,7 +1451,8 @@ LEFT JOIN t_plan_apply tpa on tpa.id=tpd.apply_id LEFT JOIN bm_project pro on tpa.project_id=pro.ID WHERE pro.`NAME` is not null - and tpa.status = 1 + and tpa.status = 2 + and tpa.status_type = 1 and tpd.`NAME` like concat('%', #{maName}, '%') diff --git a/resources/mybatis/index/IndexHomeMapper.xml b/resources/mybatis/index/IndexHomeMapper.xml index 0b8fc04..48bcd53 100644 --- a/resources/mybatis/index/IndexHomeMapper.xml +++ b/resources/mybatis/index/IndexHomeMapper.xml @@ -3,14 +3,14 @@ - - - - - - - - + + + + + + + + @@ -27,18 +27,18 @@ - - - - + + + + - - - + + + - - - + + + @@ -51,40 +51,40 @@ - + - - + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - + - + - + - + - + - - + + - - - + ) rs + + + + + insert into index_part_one(projectNum,maTypeNum,maTotalNum,maStorageNum,maUseNum,maRepairNum,maScrapNum,time) values (#{projectCount},#{equipmentTypes},#{totalCount},#{stockCount},#{inUseCount},#{repairCount},#{scrappedCount},#{time}) - - - - + + + + - + - - + + insert into index_part_two(newInputNum,repairInputNum,bdInputNum,backInputNum,total,slInputNum,bmInputNum,totalNum,time) values (#{newStorage.value},#{repairStorage.value},#{inventoryStorage.value},#{returnStorage.value},#{newStorage.total},#{equipmentCount.value},#{deviceCount.value},#{equipmentCount.total},#{time}) - - + + - - + + - - + + DELETE FROM pm_user_resourse - + where user_id = #{userId} - - + + insert into pm_user_resourse (user_id,resourse_id) values (#{userId},#{rsId}) - + - - \ No newline at end of file + +