From 0c2b1e149c6c0d9d9ec78bf4f871b3cea2cbfadc Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 04 九月 2024 04:34:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 4 ++-- ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 17 +++++++++++++++++ ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java | 9 +++++++++ ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 19 ++----------------- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java index 9ab9d15..cdd3141 100644 --- a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java +++ b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java @@ -85,4 +85,13 @@ * @return */ List<String> getDeptPointGB(@Param("tagType") Integer tagType); + + /** + * 鐐逛綅涓嬫媺 + * + * @param keyword + * @param unitId + * @return + */ + List<YwPoint> select(@Param("keyword") String keyword, @Param("unitId") Integer unitId); } diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java index 019a3c1..3de5f4e 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java @@ -200,23 +200,8 @@ @Override public Result select(String keyword) { - Long userId = SecurityUtils.getUserId(); - // 鑾峰彇褰撳墠杩愮淮浜哄憳鐨勮繍缁村崟浣� - YwPeople people = new LambdaQueryChainWrapper<>(ywPeopleMapper) - .eq(YwPeople::getUserId, userId) - .one(); - Integer unitId = null; - if (Objects.nonNull(people)) { - unitId = people.getBelongUnit(); - } - - List<YwPoint> list = new LambdaQueryChainWrapper<>(baseMapper) - .eq(YwPoint::getUnitId, unitId) - .like(YwPoint::getPointName, keyword) - .or() - .eq(YwPoint::getUnitId, unitId) - .like(YwPoint::getSerialNumber, keyword) - .list(); + Integer unitId = SecurityUtils.getUnitId(); + List<YwPoint> list = baseMapper.select(keyword, unitId); List data = list.stream().map(item -> { Map map = new HashMap<String, Object>(); map.put("id", item.getSerialNumber()); diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml index fd1eae9..9cbbbda 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml @@ -196,8 +196,8 @@ <select id="workOrderTotal" resultType="com.ycl.platform.domain.vo.screen.WorkOrderTotalVO"> SELECT COUNT(*) AS totalNum, - COUNT(IF(w.status = 'DISTRIBUTED', 1, NULL)) + COUNT(IF(w.status = 'AUDITING_FAIL', 1, NULL)) + COUNT(IF(w.status = 'WAIT_DISTRIBUTE', 1, NULL)) AS todoNum, - COUNT(IF(w.status = 'YW_HANDLE', 1, NULL)) + COUNT(IF(w.status = 'AUDITING_SUCCESS', 1, NULL)) + COUNT(IF(w.status = 'AUDITING', 1, NULL)) AS doneNum + COUNT(IF(w.status != 'AUDITING_SUCCESS' and w.status != 'WAIT_DISTRIBUTED', 1, NULL)) AS todoNum, + COUNT(IF(w.status = 'AUDITING_SUCCESS', 1, NULL)) AS doneNum FROM t_work_order w LEFT JOIN t_yw_point p ON w.serial_number = p.serial_number AND p.deleted = 0 WHERE w.deleted = 0 diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml index 5be7391..881ef95 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml @@ -181,4 +181,21 @@ AND deleted = 0 </select> + <select id="select" resultType="com.ycl.platform.domain.entity.YwPoint"> + SELECT + * + FROM + t_yw_point + <where> + <if test="keyword != null and keyword != ''"> + AND (serial_number like concat('%', #{keyword}, '%') or point_name like concat('%', #{keyword}, '%')) + </if> + <if test="unitId != null"> + AND unit_id = #{unitId} + </if> + AND deleted = 0 + </where> + + </select> + </mapper> -- Gitblit v1.8.0