From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 05 九月 2024 21:55:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java | 68 +++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 2 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 c6b12d9..9ec669c 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 @@ -3,8 +3,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ycl.platform.base.BaseSelect; +import com.ycl.platform.domain.entity.ReportAuditingRecord; import com.ycl.platform.domain.entity.YwPoint; import com.ycl.platform.domain.query.YwPointQuery; +import com.ycl.platform.domain.vo.CheckTagVO; +import com.ycl.platform.domain.vo.ReportAuditingRecordVO; import com.ycl.platform.domain.vo.YwPointVO; import com.ycl.platform.domain.excel.PointExport; import org.apache.ibatis.annotations.Mapper; @@ -38,9 +41,12 @@ List<YwPoint> home(); /** - * 閫氳繃鏍囩鏌ラ噸鐐圭偣浣嶆垨鐪佸巺鐐逛綅 + * 閫氳繃鏍囩鏌ラ噸鐐圭偣浣嶆垨鐪佸巺鐐逛綅鎴栭噸鐐规寚鎸ュ浘鍍� */ - List<YwPoint> selectByTag(@Param("important")String important, @Param("province")String province); + List<YwPoint> selectByTag(@Param("important")Boolean important, + @Param("province")Boolean province, + @Param("commandImage")Boolean commandImage, + @Param("deptTag") Boolean deptTag); /** * 瀵煎嚭鏁版嵁 @@ -49,4 +55,62 @@ * @return */ List<PointExport> export(@Param("query") YwPointQuery query); + + void deleteAll(); + + /** + * 鏇存柊鐐逛綅淇℃伅 + * + * @param pointList + */ + int updatePoint(List<YwPoint> pointList); + + /** + * 缁熻鏌愮偣浣嶅搴旂殑鏈畬鎴愬伐鍗曟暟閲忥紝鐞嗚涓婃渶澶у�间负1涓伐鍗� + * + * @param pointId + * @return + */ + YwPointVO countNotFinishedWorkOrderByPointId(@Param("pointId") Integer pointId); + + /** + * 缁熻鏌愮偣浣嶅搴旂殑鏈畬鎴愬伐鍗曟暟閲忥紝鐞嗚涓婃渶澶у�间负1涓伐鍗� + * + * @param serialNumber + * @return + */ + YwPointVO countNotFinishedWorkOrderByGb(@Param("serialNumber") String serialNumber); + + /** + * 鏌ヨ鏈夐儴绾ф爣绛剧殑鐐逛綅鐨勫浗鏍囩爜 + * + * @param tagType 0 閮ㄧ骇 1 閲嶇偣 2 閲嶇偣鎸囨尌鍥惧儚 + * @return + */ + List<String> getDeptPointGB(@Param("tagType") Integer tagType); + + /** + * 鐐逛綅涓嬫媺 + * + * @param keyword + * @param unitId + * @return + */ + List<YwPoint> select(@Param("keyword") String keyword, @Param("unitId") Integer unitId); + + /** + * 鑾峰彇鏈�鏂颁竴鏉℃姤澶囩粨鏋� + * @param serialNumber + * @param reportType + * @return + */ + ReportAuditingRecordVO getReportResult(@Param("serialNumber") String serialNumber, @Param("reportType") String reportType); + + /** + * 閫氳繃鍥芥爣鑾峰彇鏍囩淇℃伅 + * + * @param gbList + * @return + */ + List<CheckTagVO> getTagsByGB(@Param("gbList") List<String> gbList); } -- Gitblit v1.8.0