From c8df02a7b07086e17bacda6cdc015d76ac1f82fe Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 17:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 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 a0b9e9d..f95bd46 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,10 @@
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.ReportAuditingRecordVO;
import com.ycl.platform.domain.vo.YwPointVO;
import com.ycl.platform.domain.excel.PointExport;
import org.apache.ibatis.annotations.Mapper;
@@ -40,7 +42,10 @@
/**
* 閫氳繃鏍囩鏌ラ噸鐐圭偣浣嶆垨鐪佸巺鐐逛綅鎴栭噸鐐规寚鎸ュ浘鍍�
*/
- List<YwPoint> selectByTag(@Param("important")Boolean important, @Param("province")Boolean province, @Param("commandImage")Boolean commandImage);
+ List<YwPoint> selectByTag(@Param("important")Boolean important,
+ @Param("province")Boolean province,
+ @Param("commandImage")Boolean commandImage,
+ @Param("deptTag") Boolean deptTag);
/**
* 瀵煎嚭鏁版嵁
@@ -58,4 +63,45 @@
* @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);
}
--
Gitblit v1.8.0