diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/AppEquipmentReqMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/AppEquipmentReqMapper.xml index a07a883..1bebc5f 100644 --- a/bonus-modules/bonus-app/src/main/resources/mapper/AppEquipmentReqMapper.xml +++ b/bonus-modules/bonus-app/src/main/resources/mapper/AppEquipmentReqMapper.xml @@ -79,7 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" twt.leader_phone AS leaderPhone, tpp.power_name AS powerName, tp.pro_name AS proName, - tpd.depart_name AS departName + tpd.depart_name AS departName, + tp.depart_id AS departId FROM tb_dev_use tdu LEFT JOIN t_work_team twt ON tdu.team_id = twt.team_id AND twt.del_flag = 0 LEFT JOIN tb_project_power tpp ON tpp.id = tdu.gt_id AND tpp.del_flag = 0 @@ -107,7 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" twt.leader_phone AS leaderPhone, tpp.power_name AS powerName, tp.pro_name AS proName, - tpd.depart_name AS departName + tpd.depart_name AS departName, + tp.depart_id AS departId FROM tb_dev_use tdu LEFT JOIN t_work_team twt ON tdu.team_id = twt.team_id AND twt.del_flag = 0 LEFT JOIN tb_project_power tpp ON tpp.id = tdu.gt_id AND tpp.del_flag = 0 @@ -150,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.departId = #{departId} + ORDER BY a.ghTime ASC,a.lyTime DESC diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml index 5e38e1f..da7105a 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml @@ -153,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.departId = #{departId} + ORDER BY a.ghTime ASC,a.lyTime DESC