From 81ba6f3ea498c43010f47c7ed6d6c0f121bb1f09 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 14:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 8
ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java | 4
ycl-server/src/main/java/com/ycl/task/ContractResultTask.java | 4
ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java | 5
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java | 380 ++++++------------------------------------
ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml | 11 +
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 3
ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java | 2
ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java | 3
ycl-pojo/src/main/java/com/ycl/platform/domain/query/DashboardQuery.java | 2
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java | 9
ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml | 65 +-----
ycl-common/src/main/java/enumeration/ErrorType.java | 4
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 24 +-
14 files changed, 113 insertions(+), 411 deletions(-)
diff --git a/ycl-common/src/main/java/enumeration/ErrorType.java b/ycl-common/src/main/java/enumeration/ErrorType.java
index a1500f6..91b3cf1 100644
--- a/ycl-common/src/main/java/enumeration/ErrorType.java
+++ b/ycl-common/src/main/java/enumeration/ErrorType.java
@@ -15,7 +15,6 @@
DEVICE_OFFLINE("DEVICEOFFLINE", "璁惧绂荤嚎"),
VIDEO_LOSS("VIDEOMISS", "褰曞儚缂哄け"),
VIDEO_NONE("NOVIDEO", "鏃犲綍鍍�"),
- PIC_URLABNORMAL("PICURLABNORMAL","鍥剧墖璁块棶寮傚父"),
POINT_INFO_ERROR("POINTINFOERRO", "鐐逛綅淇℃伅閿欒"),
POINT_INFO_MISS("POINTINFOMISS", "鐐逛綅淇℃伅涓嶅叏"),
SIGNAL_LOSS("SIGNALMISS", "淇″彿缂哄け"),
@@ -28,9 +27,10 @@
UNKNOWN("UNKNOWN", "鏈煡"),
CLOCK_SKEW("CLOCKSKEW", "鏃堕挓鍋忓樊"),
OSD_ERROR("OSD", "osd寮傚父"),
+ PIC_URLABNORMAL("PICURLABNORMAL","鍥剧墖璁块棶寮傚父"),
MONITOR_UNQUALIFY("MONITORUNQUALIFY", "涓�鏈轰竴妗ｄ笉鍚堟牸"),
- VIDEO_ORPIC_UNNORMAL("VIDEOORPICUNNORMAL", "瑙嗛鎷夋祦銆佸浘鐗囪幏鍙栧紓甯�"),
PIC_UNUSEFUL("PICUNUSEFUL", "澶у浘涓嶅彲鐢�"),
+ VIDEO_ORPIC_UNNORMAL("VIDEOORPICUNNORMAL", "瑙嗛鎷夋祦銆佸浘鐗囪幏鍙栧紓甯�"),
;
private String value;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
index 777d77e..90f71f6 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.platform.base.CheckIndex;
+import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@@ -17,383 +18,110 @@
* @date 2024-04-29
*/
@TableName("t_check_index_video")
-public class CheckIndexVideo extends CheckIndex
-{
+@Data
+public class CheckIndexVideo extends CheckIndex {
private static final long serialVersionUID = 1L;
- /** 骞冲彴鍦ㄧ嚎鐜� */
+ /**
+ * 骞冲彴鍦ㄧ嚎鐜�
+ */
@Excel(name = "骞冲彴鍦ㄧ嚎鐜�")
@TableField("platform_online")
private BigDecimal platformOnline;
- /** 涓�鏈轰竴妗ｅ悎鏍肩巼 */
+ /**
+ * 涓�鏈轰竴妗ｅ悎鏍肩巼
+ */
@Excel(name = "涓�鏈轰竴妗ｅ悎鏍肩巼")
@TableField("monitor_qualification")
private BigDecimal monitorQualification;
- /** 妗ｆ鑰冩牳姣� */
+ /**
+ * 妗ｆ鑰冩牳姣�
+ */
@Excel(name = "涓�鏈轰竴妗ｆ敞鍐岀巼")
@TableField("monitor_registration")
private BigDecimal monitorRegistration;
- /** 妗ｆ鑰冩牳姣� */
+ /**
+ * 妗ｆ鑰冩牳姣�
+ */
@Excel(name = "妗ｆ鑰冩牳姣�")
@TableField("archives_rate")
private BigDecimal archivesRate;
- /** 鐐逛綅鍦ㄧ嚎鐜� */
+ /**
+ * 鐐逛綅鍦ㄧ嚎鐜�
+ */
@Excel(name = "鐐逛綅鍦ㄧ嚎鐜�")
@TableField("site_online")
private BigDecimal siteOnline;
- /** 褰曡薄鍙敤鐜� */
+ /**
+ * 褰曡薄鍙敤鐜�
+ */
@Excel(name = "褰曡薄鍙敤鐜�")
@TableField("video_available")
private BigDecimal videoAvailable;
- /** 鏍囨敞姝ｇ‘鐜� */
+ /**
+ * 鏍囨敞姝ｇ‘鐜�
+ */
@Excel(name = "鏍囨敞姝ｇ‘鐜�")
@TableField("annotation_accuracy")
private BigDecimal annotationAccuracy;
- /** 鏍℃椂鍑嗙‘鐜� */
+ /**
+ * 鏍℃椂鍑嗙‘鐜�
+ */
@Excel(name = "鏍℃椂鍑嗙‘鐜�")
@TableField("timing_accuracy")
private BigDecimal timingAccuracy;
- /** 閲嶇偣鐐逛綅鍦ㄧ嚎鐜� */
+ /**
+ * 閲嶇偣鐐逛綅鍦ㄧ嚎鐜�
+ */
@Excel(name = "閲嶇偣鐐逛綅鍦ㄧ嚎鐜�")
@TableField("key_site_online")
private BigDecimal keySiteOnline;
- /** 閲嶇偣鐐逛綅褰曡薄鍙敤鐜� */
- @Excel(name = "閲嶇偣鐐逛綅褰曡薄鍙敤鐜�",width = 25)
+ /**
+ * 閲嶇偣鐐逛綅褰曡薄鍙敤鐜�
+ */
+ @Excel(name = "閲嶇偣鐐逛綅褰曡薄鍙敤鐜�", width = 25)
@TableField("key_video_available")
private BigDecimal keyVideoAvailable;
- /** 閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜� */
- @Excel(name = "閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�",width = 25)
+ /**
+ * 閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�
+ */
+ @Excel(name = "閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�", width = 25)
@TableField("key_annotation_accuracy")
private BigDecimal keyAnnotationAccuracy;
- /** 閲嶇偣鐐逛綅鎸夋椂姝ｇ‘鐜� */
- @Excel(name = "閲嶇偣鐐逛綅鎸夋椂姝ｇ‘鐜�",width = 25)
+ /**
+ * 閲嶇偣鐐逛綅鎸夋椂姝ｇ‘鐜�
+ */
+ @Excel(name = "閲嶇偣鐐逛綅鎸夋椂姝ｇ‘鐜�", width = 25)
@TableField("key_timing_accuracy")
private BigDecimal keyTimingAccuracy;
- /** 閲嶇偣鎸囨尌鍥惧儚鍏畨閮ㄥ贰妫�缁撴灉 */
- @Excel(name = "閲嶇偣鎸囨尌鍥惧儚鍏畨閮ㄥ贰妫�缁撴灉",width = 25)
- @TableField("key_command_image_inspection")
- private BigDecimal keyCommandImageInspection;
-
- /** 閲嶇偣鎸囨尌鍥惧儚鐩綍鏍� */
- @Excel(name = "閲嶇偣鎸囨尌鍥惧儚鐩綍鏍�",width = 25)
- @TableField("key_command_image_directory_tree")
- private BigDecimal keyCommandImageDirectoryTree;
-
- /** 鍦ㄧ嚎妫�鏌ュ钩鍙伴儴缃插強杩愯鐜� */
- @Excel(name = "鍦ㄧ嚎妫�鏌ュ钩鍙伴儴缃插強杩愯鐜�",width = 25)
- @TableField("online_inspection_platform")
- private BigDecimal onlineInspectionPlatform;
-
- /** 瑙嗛浼犺緭缃戣祫浜у噯纭巼 */
- @Excel(name = "瑙嗛浼犺緭缃戣祫浜у噯纭巼",width = 25)
- @TableField("video_transmission_assets_accuracy")
- private BigDecimal videoTransmissionAssetsAccuracy;
-
- /** 瑙嗛浼犺緭缃戣祫浜у急鍙ｄ护寰楀垎姣旂巼 */
- @Excel(name = "瑙嗛浼犺緭缃戣祫浜у急鍙ｄ护寰楀垎姣旂巼",width = 25)
- @TableField("video_transmission_assets_weak_password_score")
- private BigDecimal videoTransmissionAssetsWeakPasswordScore;
-
- /** 瑙嗛浼犺緭缃戝嵄闄╄祫浜у緱鍒嗘瘮閲� */
- @Excel(name = "瑙嗛浼犺緭缃戝嵄闄╄祫浜у緱鍒嗘瘮閲�",width = 25)
- @TableField("video_transmission_dangerous_assets_score")
- private BigDecimal videoTransmissionDangerousAssetsScore;
-
- /** 瑙嗛浼犺緭缃戣竟鐣屽畬鏁存�ф娴嬫墸鍒嗛」 */
- @Excel(name = "瑙嗛浼犺緭缃戣竟鐣屽畬鏁存�ф娴嬫墸鍒嗛」",width = 25)
- @TableField("video_transmission_boundary_integrity_detection")
- private BigDecimal videoTransmissionBoundaryIntegrityDetection;
-
- /** 瑙嗛浼犺緭缃戣竟鐣屽畬鏁存�ф娴嬫墸鍒嗛」 */
- @Excel(name = "閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�",width = 25)
+ /**
+ * 閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�
+ */
+ @Excel(name = "閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�", width = 25)
@TableField("key_command_image_online")
private BigDecimal keyCommandImageOnline;
- /** 鏈堣繍琛岀巼 */
- @Excel(name = "鏈堣繍琛岀巼")
- @TableField("operating_rate")
- private BigDecimal operatingRate;
+
+ /**
+ * 瑙嗛鍥惧儚璧勬簮瀹夊叏绠＄悊
+ */
+ @Excel(name = "瑙嗛鍥惧儚璧勬簮瀹夊叏绠＄悊", width = 25)
+ @TableField("image_resource_security")
+ private BigDecimal imageResourceSecurity;
+
@ExcelIgnore
@TableField(exist = false)
private List<String> quarter;
-
- public List<String> getQuarter() {
- return quarter;
- }
-
- public void setQuarter(List<String> quarter) {
- this.quarter = quarter;
- }
-
- public BigDecimal getPlatformOnline() {
- return platformOnline;
- }
-
- public void setPlatformOnline(BigDecimal platformOnline) {
- this.platformOnline = platformOnline;
- }
-
- public BigDecimal getMonitorQualification() {
- return monitorQualification;
- }
-
- public void setMonitorQualification(BigDecimal monitorQualification) {
- this.monitorQualification = monitorQualification;
- }
-
- public BigDecimal getMonitorRegistration() {
- return monitorRegistration;
- }
-
- public void setMonitorRegistration(BigDecimal monitorRegistration) {
- this.monitorRegistration = monitorRegistration;
- }
-
- public BigDecimal getArchivesRate() {
- return archivesRate;
- }
-
- public void setArchivesRate(BigDecimal archivesRate) {
- this.archivesRate = archivesRate;
- }
-
- public BigDecimal getSiteOnline() {
- return siteOnline;
- }
-
- public void setSiteOnline(BigDecimal siteOnline) {
- this.siteOnline = siteOnline;
- }
-
- public BigDecimal getVideoAvailable() {
- return videoAvailable;
- }
-
- public void setVideoAvailable(BigDecimal videoAvailable) {
- this.videoAvailable = videoAvailable;
- }
-
- public BigDecimal getAnnotationAccuracy() {
- return annotationAccuracy;
- }
-
- public void setAnnotationAccuracy(BigDecimal annotationAccuracy) {
- this.annotationAccuracy = annotationAccuracy;
- }
-
- public BigDecimal getTimingAccuracy() {
- return timingAccuracy;
- }
-
- public void setTimingAccuracy(BigDecimal timingAccuracy) {
- this.timingAccuracy = timingAccuracy;
- }
-
- public BigDecimal getKeySiteOnline() {
- return keySiteOnline;
- }
-
- public void setKeySiteOnline(BigDecimal keySiteOnline) {
- this.keySiteOnline = keySiteOnline;
- }
-
- public BigDecimal getKeyVideoAvailable() {
- return keyVideoAvailable;
- }
-
- public void setKeyVideoAvailable(BigDecimal keyVideoAvailable) {
- this.keyVideoAvailable = keyVideoAvailable;
- }
-
- public BigDecimal getKeyAnnotationAccuracy() {
- return keyAnnotationAccuracy;
- }
-
- public void setKeyAnnotationAccuracy(BigDecimal keyAnnotationAccuracy) {
- this.keyAnnotationAccuracy = keyAnnotationAccuracy;
- }
-
- public BigDecimal getKeyCommandImageOnline() {
- return keyCommandImageOnline;
- }
-
- public void setKeyCommandImageOnline(BigDecimal keyCommandImageOnline) {
- this.keyCommandImageOnline = keyCommandImageOnline;
- }
-
- public BigDecimal getKeyTimingAccuracy() {
- return keyTimingAccuracy;
- }
-
- public void setKeyTimingAccuracy(BigDecimal keyTimingAccuracy) {
- this.keyTimingAccuracy = keyTimingAccuracy;
- }
-
- public BigDecimal getKeyCommandImageInspection() {
- return keyCommandImageInspection;
- }
-
- public void setKeyCommandImageInspection(BigDecimal keyCommandImageInspection) {
- this.keyCommandImageInspection = keyCommandImageInspection;
- }
-
- public BigDecimal getKeyCommandImageDirectoryTree() {
- return keyCommandImageDirectoryTree;
- }
-
- public void setKeyCommandImageDirectoryTree(BigDecimal keyCommandImageDirectoryTree) {
- this.keyCommandImageDirectoryTree = keyCommandImageDirectoryTree;
- }
-
- public BigDecimal getOnlineInspectionPlatform() {
- return onlineInspectionPlatform;
- }
-
- public void setOnlineInspectionPlatform(BigDecimal onlineInspectionPlatform) {
- this.onlineInspectionPlatform = onlineInspectionPlatform;
- }
-
- public BigDecimal getVideoTransmissionAssetsAccuracy() {
- return videoTransmissionAssetsAccuracy;
- }
-
- public void setVideoTransmissionAssetsAccuracy(BigDecimal videoTransmissionAssetsAccuracy) {
- this.videoTransmissionAssetsAccuracy = videoTransmissionAssetsAccuracy;
- }
-
- public BigDecimal getVideoTransmissionAssetsWeakPasswordScore() {
- return videoTransmissionAssetsWeakPasswordScore;
- }
-
- public void setVideoTransmissionAssetsWeakPasswordScore(BigDecimal videoTransmissionAssetsWeakPasswordScore) {
- this.videoTransmissionAssetsWeakPasswordScore = videoTransmissionAssetsWeakPasswordScore;
- }
-
- public BigDecimal getVideoTransmissionDangerousAssetsScore() {
- return videoTransmissionDangerousAssetsScore;
- }
-
- public void setVideoTransmissionDangerousAssetsScore(BigDecimal videoTransmissionDangerousAssetsScore) {
- this.videoTransmissionDangerousAssetsScore = videoTransmissionDangerousAssetsScore;
- }
-
- public BigDecimal getVideoTransmissionBoundaryIntegrityDetection() {
- return videoTransmissionBoundaryIntegrityDetection;
- }
-
- public void setVideoTransmissionBoundaryIntegrityDetection(BigDecimal videoTransmissionBoundaryIntegrityDetection) {
- this.videoTransmissionBoundaryIntegrityDetection = videoTransmissionBoundaryIntegrityDetection;
- }
-
- public BigDecimal getOperatingRate() {
- return operatingRate;
- }
-
- public void setOperatingRate(BigDecimal operatingRate) {
- this.operatingRate = operatingRate;
- }
-
- @Override
- public Long getId() {
- return super.getId();
- }
-
- @Override
- public void setId(Long id) {
- super.setId(id);
- }
-
- @Override
- public String getDate() {
- return super.getDate();
- }
-
- @Override
- public void setDate(String date) {
- super.setDate(date);
- }
-
- @Override
- public Date getCreateTime() {
- return super.getCreateTime();
- }
-
- @Override
- public void setCreateTime(Date createTime) {
- super.setCreateTime(createTime);
- }
-
- @Override
- public Long getDeptId() {
- return super.getDeptId();
- }
-
- @Override
- public void setDeptId(Long deptId) {
- super.setDeptId(deptId);
- }
-
- @Override
- public String getDeptName() {
- return super.getDeptName();
- }
-
- @Override
- public void setDeptName(String deptName) {
- super.setDeptName(deptName);
- }
-
- @Override
- public Short getExamineTag() {
- return super.getExamineTag();
- }
-
- @Override
- public void setExamineTag(Short examineTag) {
- super.setExamineTag(examineTag);
- }
-
- @Override
- public String toString() {
- return "CheckIndexVideo{" +
- "id=" + id +
- ", date='" + date + '\'' +
- ", createTime=" + createTime +
- ", deptId=" + deptId +
- ", deptName='" + deptName + '\'' +
- ", examineTag=" + examineTag +
- ", platformOnline=" + platformOnline +
- ", monitorQualification=" + monitorQualification +
- ", monitorRegistration=" + monitorRegistration +
- ", archivesRate=" + archivesRate +
- ", siteOnline=" + siteOnline +
- ", videoAvailable=" + videoAvailable +
- ", annotationAccuracy=" + annotationAccuracy +
- ", timingAccuracy=" + timingAccuracy +
- ", keySiteOnline=" + keySiteOnline +
- ", keyVideoAvailable=" + keyVideoAvailable +
- ", keyAnnotationAccuracy=" + keyAnnotationAccuracy +
- ", keyTimingAccuracy=" + keyTimingAccuracy +
- ", keyCommandImageInspection=" + keyCommandImageInspection +
- ", keyCommandImageDirectoryTree=" + keyCommandImageDirectoryTree +
- ", onlineInspectionPlatform=" + onlineInspectionPlatform +
- ", videoTransmissionAssetsAccuracy=" + videoTransmissionAssetsAccuracy +
- ", videoTransmissionAssetsWeakPasswordScore=" + videoTransmissionAssetsWeakPasswordScore +
- ", videoTransmissionDangerousAssetsScore=" + videoTransmissionDangerousAssetsScore +
- ", videoTransmissionBoundaryIntegrityDetection=" + videoTransmissionBoundaryIntegrityDetection +
- ", operatingRate=" + operatingRate +
- '}';
- }
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
index 7f7e84e..7a6cb83 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
@@ -27,7 +27,7 @@
* 瑙勫垯鍚嶇О
*/
@ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "瑙勫垯鍚嶇О"})
- @ColumnWidth(40)
+ @ColumnWidth(130)
private String ruleName;
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DashboardQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DashboardQuery.java
index 4cbcd38..17086a8 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DashboardQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DashboardQuery.java
@@ -10,7 +10,7 @@
public class DashboardQuery {
/**
- * 鏁版嵁鏉冮檺锛�1鐪佸巺锛�2甯傚眬锛�3鍏朵粬
+ * 鏁版嵁鏉冮檺锛�1鐪佸巺锛�2甯傚眬锛�3鍏畨閮ㄦ暟鎹�
*/
private Integer dataScope;
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
index de16ea7..ce6af88 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
@@ -45,8 +45,8 @@
*/
@PreAuthorize("@ss.hasPermi('system:result:query')")
@GetMapping("/record/list")
- public TableDataInfo recordList(Long resultId) {
- List<ContractResultRecord> list = checkResultService.selectCheckResultRecordList(resultId);
+ public TableDataInfo recordList(Long resultId, Long contractId) {
+ List<ContractResultRecord> list = checkResultService.selectCheckResultRecordList(resultId, contractId);
return getDataTable(list);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java
index 77b69c4..791adda 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.entity.ContractResult;
+import com.ycl.platform.domain.entity.ContractResultRecord;
import com.ycl.platform.domain.vo.ContractResultVO;
import java.util.List;
@@ -13,5 +14,9 @@
* @date 2024-04-01
*/
public interface ContractResultMapper extends BaseMapper<ContractResult> {
+
List<ContractResultVO> selectCheckResultList(ContractResultVO checkResult);
+
+ List<ContractResultRecord> selectCheckResultRecordList(Long resultId, Long contractId);
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java b/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java
index 3faed01..3c4fde3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java
@@ -72,9 +72,10 @@
/**
* 鏍规嵁鑰冩牳缁撴灉鏌ヨ璁板綍
* @param resultId 鑰冩牳缁撴灉id
+ * @param contractId 鍚堝悓id
* @return 鑰冩牳缁撴灉璁板綍
*/
- List<ContractResultRecord> selectCheckResultRecordList(Long resultId);
+ List<ContractResultRecord> selectCheckResultRecordList(Long resultId, Long contractId);
Boolean publish(Long id);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
index 4a77bd9..17c9481 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
@@ -1,6 +1,5 @@
package com.ycl.platform.service.impl;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.ContractResult;
@@ -9,8 +8,6 @@
import com.ycl.platform.mapper.ContractResultMapper;
import com.ycl.platform.mapper.ContractResultRecordMapper;
import com.ycl.platform.service.IContractResultService;
-import com.ycl.platform.service.ITContractService;
-import com.ycl.platform.service.YwUnitService;
import com.ycl.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -108,10 +105,8 @@
}
@Override
- public List<ContractResultRecord> selectCheckResultRecordList(Long resultId) {
- return new LambdaQueryChainWrapper<>(contractResultRecordMapper)
- .eq(ContractResultRecord::getResultId, resultId)
- .list();
+ public List<ContractResultRecord> selectCheckResultRecordList(Long resultId, Long contractId) {
+ return checkResultMapper.selectCheckResultRecordList(resultId, contractId);
}
@Override
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index b91b2b4..e03649d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -222,8 +222,7 @@
@Override
public List<MonitorTotalVO> monitorTotal(DashboardQuery dashboardQuery) {
- List<MonitorTotalVO> list = baseMapper.monitorTotal(dashboardQuery);
- return list;
+ return baseMapper.monitorTotal(dashboardQuery);
}
@Override
diff --git a/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java b/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
index e15e890..339f924 100644
--- a/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
@@ -10,7 +10,6 @@
import com.ycl.utils.DateUtils;
import com.ycl.utils.bean.BeanUtils;
import lombok.Data;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -24,8 +23,8 @@
* @since 2024/4/28 涓嬪崍 4:14
*/
-@Component
@Data
+@Component("contractResultTask")
public class ContractResultTask {
private final ITContractService contractService;
@@ -38,7 +37,6 @@
/**
* 姣忎釜鏈�1鍙锋墽琛岋紝缁熻鑰冩牳缁撴灉
*/
- @Scheduled(cron = "0 0 0 1 * ?")
@Transactional
// @PostConstruct //鍚姩鏃舵墽琛屼竴娆�
public void contractResultTask() {
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
index 6f11cfc..ce044f0 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
@@ -21,18 +21,12 @@
<result property="keyVideoAvailable" column="key_video_available" />
<result property="keyAnnotationAccuracy" column="key_annotation_accuracy" />
<result property="keyTimingAccuracy" column="key_timing_accuracy" />
- <result property="keyCommandImageInspection" column="key_command_image_inspection" />
- <result property="keyCommandImageDirectoryTree" column="key_command_image_directory_tree" />
- <result property="onlineInspectionPlatform" column="online_inspection_platform" />
- <result property="videoTransmissionAssetsAccuracy" column="video_transmission_assets_accuracy" />
- <result property="videoTransmissionAssetsWeakPasswordScore" column="video_transmission_assets_weak_password_score" />
- <result property="videoTransmissionDangerousAssetsScore" column="video_transmission_dangerous_assets_score" />
- <result property="videoTransmissionBoundaryIntegrityDetection" column="video_transmission_boundary_integrity_detection" />
- <result property="operatingRate" column="operating_rate" />
+ <result property="keyCommandImageOnline" column="key_command_image_online" />
+ <result property="imageResourceSecurity" column="image_resource_security" />
</resultMap>
<sql id="selectCheckIndexVideoVo">
- select id, dept_id, create_time, examine_tag, platform_online, monitor_qualification, monitor_registration, archives_rate, site_online, video_available, annotation_accuracy, timing_accuracy, key_site_online, key_video_available, key_annotation_accuracy, key_timing_accuracy, key_command_image_inspection, key_command_image_directory_tree, online_inspection_platform, video_transmission_assets_accuracy, video_transmission_assets_weak_password_score, video_transmission_dangerous_assets_score, video_transmission_boundary_integrity_detection, operating_rate from t_check_index_video
+ select id, dept_id, create_time, examine_tag, platform_online, monitor_qualification, monitor_registration, archives_rate, site_online, video_available, annotation_accuracy, timing_accuracy, key_site_online, key_video_available, key_annotation_accuracy, key_timing_accuracy, key_command_image_online,image_resource_security from t_check_index_video
</sql>
<select id="selectCheckIndexVideoList" parameterType="CheckIndexVideo" resultMap="CheckIndexVideoResult">
@@ -56,14 +50,8 @@
<if test="keyVideoAvailable != null "> and key_video_available = #{keyVideoAvailable}</if>
<if test="keyAnnotationAccuracy != null "> and key_annotation_accuracy = #{keyAnnotationAccuracy}</if>
<if test="keyTimingAccuracy != null "> and key_timing_accuracy = #{keyTimingAccuracy}</if>
- <if test="keyCommandImageInspection != null "> and key_command_image_inspection = #{keyCommandImageInspection}</if>
- <if test="keyCommandImageDirectoryTree != null "> and key_command_image_directory_tree = #{keyCommandImageDirectoryTree}</if>
- <if test="onlineInspectionPlatform != null "> and online_inspection_platform = #{onlineInspectionPlatform}</if>
- <if test="videoTransmissionAssetsAccuracy != null "> and video_transmission_assets_accuracy = #{videoTransmissionAssetsAccuracy}</if>
- <if test="videoTransmissionAssetsWeakPasswordScore != null "> and video_transmission_assets_weak_password_score = #{videoTransmissionAssetsWeakPasswordScore}</if>
- <if test="videoTransmissionDangerousAssetsScore != null "> and video_transmission_dangerous_assets_score = #{videoTransmissionDangerousAssetsScore}</if>
- <if test="videoTransmissionBoundaryIntegrityDetection != null "> and video_transmission_boundary_integrity_detection = #{videoTransmissionBoundaryIntegrityDetection}</if>
- <if test="operatingRate != null "> and operating_rate = #{operatingRate}</if>
+ <if test="keyCommandImageOnline != null "> and key_command_image_online = #{keyCommandImageOnline}</if>
+ <if test="imageResourceSecurity != null "> and image_resource_security = #{imageResourceSecurity}</if>
<if test="deptIds != null ">and tciv.dept_id in
<foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
#{deptId}
@@ -95,15 +83,9 @@
<if test="keyVideoAvailable != null">key_video_available,</if>
<if test="keyAnnotationAccuracy != null">key_annotation_accuracy,</if>
<if test="keyTimingAccuracy != null">key_timing_accuracy,</if>
- <if test="keyCommandImageInspection != null">key_command_image_inspection,</if>
- <if test="keyCommandImageDirectoryTree != null">key_command_image_directory_tree,</if>
- <if test="onlineInspectionPlatform != null">online_inspection_platform,</if>
- <if test="videoTransmissionAssetsAccuracy != null">video_transmission_assets_accuracy,</if>
- <if test="videoTransmissionAssetsWeakPasswordScore != null">video_transmission_assets_weak_password_score,</if>
- <if test="videoTransmissionDangerousAssetsScore != null">video_transmission_dangerous_assets_score,</if>
- <if test="videoTransmissionBoundaryIntegrityDetection != null">video_transmission_boundary_integrity_detection,</if>
- <if test="operatingRate != null">operating_rate,</if>
- </trim>
+ <if test="keyCommandImageOnline != null">key_command_image_online,</if>
+ <if test="imageResourceSecurity != null">image_resource_security,</if>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deptId != null">#{deptId},</if>
<if test="createTime != null">#{createTime},</if>
@@ -120,14 +102,8 @@
<if test="keyVideoAvailable != null">#{keyVideoAvailable},</if>
<if test="keyAnnotationAccuracy != null">#{keyAnnotationAccuracy},</if>
<if test="keyTimingAccuracy != null">#{keyTimingAccuracy},</if>
- <if test="keyCommandImageInspection != null">#{keyCommandImageInspection},</if>
- <if test="keyCommandImageDirectoryTree != null">#{keyCommandImageDirectoryTree},</if>
- <if test="onlineInspectionPlatform != null">#{onlineInspectionPlatform},</if>
- <if test="videoTransmissionAssetsAccuracy != null">#{videoTransmissionAssetsAccuracy},</if>
- <if test="videoTransmissionAssetsWeakPasswordScore != null">#{videoTransmissionAssetsWeakPasswordScore},</if>
- <if test="videoTransmissionDangerousAssetsScore != null">#{videoTransmissionDangerousAssetsScore},</if>
- <if test="videoTransmissionBoundaryIntegrityDetection != null">#{videoTransmissionBoundaryIntegrityDetection},</if>
- <if test="operatingRate != null">#{operatingRate},</if>
+ <if test="keyCommandImageOnline != null">#{keyCommandImageOnline},</if>
+ <if test="imageResourceSecurity != null">#{imageResourceSecurity},</if>
</trim>
</insert>
@@ -149,14 +125,8 @@
<if test="keyVideoAvailable != null">key_video_available = #{keyVideoAvailable},</if>
<if test="keyAnnotationAccuracy != null">key_annotation_accuracy = #{keyAnnotationAccuracy},</if>
<if test="keyTimingAccuracy != null">key_timing_accuracy = #{keyTimingAccuracy},</if>
- <if test="keyCommandImageInspection != null">key_command_image_inspection = #{keyCommandImageInspection},</if>
- <if test="keyCommandImageDirectoryTree != null">key_command_image_directory_tree = #{keyCommandImageDirectoryTree},</if>
- <if test="onlineInspectionPlatform != null">online_inspection_platform = #{onlineInspectionPlatform},</if>
- <if test="videoTransmissionAssetsAccuracy != null">video_transmission_assets_accuracy = #{videoTransmissionAssetsAccuracy},</if>
- <if test="videoTransmissionAssetsWeakPasswordScore != null">video_transmission_assets_weak_password_score = #{videoTransmissionAssetsWeakPasswordScore},</if>
- <if test="videoTransmissionDangerousAssetsScore != null">video_transmission_dangerous_assets_score = #{videoTransmissionDangerousAssetsScore},</if>
- <if test="videoTransmissionBoundaryIntegrityDetection != null">video_transmission_boundary_integrity_detection = #{videoTransmissionBoundaryIntegrityDetection},</if>
- <if test="operatingRate != null">operating_rate = #{operatingRate},</if>
+ <if test="keyCommandImageOnline != null">key_command_image_online = #{keyCommandImageOnline},</if>
+ <if test="imageResourceSecurity != null">image_resource_security = #{imageResourceSecurity},</if>
</trim>
where id = #{id}
</update>
@@ -190,15 +160,8 @@
IFNULL(ROUND(AVG(key_video_available * 100), 0), 0) AS key_video_available,
IFNULL(ROUND(AVG(key_annotation_accuracy * 100), 0), 0) AS key_annotation_accuracy,
IFNULL(ROUND(AVG(key_timing_accuracy * 100), 0), 0) AS key_timing_accuracy,
- IFNULL(ROUND(AVG(key_command_image_inspection * 100), 0), 0) AS key_command_image_inspection,
- IFNULL(ROUND(AVG(key_command_image_directory_tree * 100), 0), 0) AS key_command_image_directory_tree,
- IFNULL(ROUND(AVG(online_inspection_platform * 100), 0), 0) AS online_inspection_platform,
- IFNULL(ROUND(AVG(video_transmission_assets_accuracy * 100), 0), 0) AS video_transmission_assets_accuracy,
- IFNULL(ROUND(AVG(video_transmission_assets_weak_password_score * 100), 0), 0) AS video_transmission_assets_weak_password_score,
- IFNULL(ROUND(AVG(video_transmission_dangerous_assets_score * 100), 0), 0) AS video_transmission_dangerous_assets_score,
- IFNULL(ROUND(AVG(video_transmission_boundary_integrity_detection * 100), 0), 0) AS video_transmission_boundary_integrity_detection,
- IFNULL(ROUND(AVG(operating_rate * 100), 0), 0) AS operating_rate,
- IFNULL(ROUND(AVG(key_command_image_online * 100), 0), 0) AS key_command_image_online
+ IFNULL(ROUND(AVG(key_command_image_online * 100), 0), 0) AS key_command_image_online,
+ IFNULL(ROUND(AVG(image_resource_security * 100), 0), 0) AS image_resource_security
FROM
t_check_index_video
<where>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
index 5d46ac7..2206157 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
@@ -24,4 +24,15 @@
AND c.publish = #{publish}
</if>
</select>
+
+ <select id="selectCheckResultRecordList" resultType="com.ycl.platform.domain.entity.ContractResultRecord">
+ SELECT
+ a.rule_name,
+ COUNT(b.id) AS num,
+ IFNULL(-SUM(score), 0) AS score
+ FROM t_calculate_rule a
+ LEFT JOIN t_contract_result_record b ON SUBSTRING_INDEX(b.rule_ids, ',', -1) = a.id AND b.deleted = 0 AND b.result_id = #{resultId}
+ WHERE a.contract_id = #{contractId} AND a.deleted = 0
+ GROUP BY a.rule_name
+ </select>
</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 1dd8412..14b8c34 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -367,8 +367,8 @@
COUNT(p2.id) AS errorNum,
COUNT(p1.id) - COUNT(p2.id) AS normalNum
FROM t_monitor
- LEFT JOIN t_yw_point p1 ON t_monitor.serial_number = p1.serial_number <if test="dataScope == 1"> AND p1.province_tag = 'province' </if><if test="deptId != null"> AND p1.dept_id = #{deptId} </if>
- LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 AND p1.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 'province' </if><if test="deptId != null"> AND p2.dept_id = #{deptId} </if>
+ LEFT JOIN t_yw_point p1 ON t_monitor.serial_number = p1.serial_number <if test="dataScope == 1"> AND p1.province_tag = 1 </if><if test="dataScope == 3"> AND p1.important_tag = 1 </if><if test="deptId != null"> AND p1.dept_id = #{deptId} </if>
+ LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 AND p1.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if><if test="deptId != null"> AND p2.dept_id = #{deptId} </if>
WHERE INSTR(camera_fun_type, 1)
UNION ALL
SELECT
@@ -377,8 +377,8 @@
COUNT(p2.id) AS errorNum,
COUNT(p1.id) - COUNT(p2.id) AS normalNum
FROM t_monitor
- LEFT JOIN t_yw_point p1 ON t_monitor.serial_number = p1.serial_number <if test="dataScope == 1"> AND p1.province_tag = 'province' </if><if test="deptId != null"> AND p1.dept_id = #{deptId} </if>
- LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 AND p1.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 'province' </if><if test="deptId != null"> AND p2.dept_id = #{deptId} </if>
+ LEFT JOIN t_yw_point p1 ON t_monitor.serial_number = p1.serial_number <if test="dataScope == 1"> AND p1.province_tag = 1 </if><if test="dataScope == 3"> AND p1.important_tag = 1 </if><if test="deptId != null"> AND p1.dept_id = #{deptId} </if>
+ LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 AND p1.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = '1' </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if><if test="deptId != null"> AND p2.dept_id = #{deptId} </if>
WHERE INSTR(camera_fun_type, 2)
UNION ALL
SELECT
@@ -387,8 +387,8 @@
COUNT(p2.id) AS errorNum,
COUNT(p1.id) - COUNT(p2.id) AS normalNum
FROM t_monitor
- LEFT JOIN t_yw_point p1 ON t_monitor.serial_number = p1.serial_number <if test="dataScope == 1"> AND p1.province_tag = 'province' </if><if test="deptId != null"> AND p1.dept_id = #{deptId} </if>
- LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 AND p1.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 'province' </if><if test="deptId != null"> AND p2.dept_id = #{deptId} </if>
+ LEFT JOIN t_yw_point p1 ON t_monitor.serial_number = p1.serial_number <if test="dataScope == 1"> AND p1.province_tag = 1 </if><if test="dataScope == 3"> AND p1.important_tag = 1 </if><if test="deptId != null"> AND p1.dept_id = #{deptId} </if>
+ LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 AND p1.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if><if test="deptId != null"> AND p2.dept_id = #{deptId} </if>
WHERE INSTR(camera_fun_type, 3)
</select>
@@ -405,8 +405,8 @@
COUNT(m2.id) AS faceErrorNum
FROM
sys_dept d
- LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 'province' </if>
- LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 AND p.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 'province' </if>
+ LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 1 </if><if test="dataScope == 3"> AND p.important_tag = 1 </if>
+ LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 AND p.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if>
LEFT JOIN t_monitor m ON m.serial_number = p.serial_number AND INSTR(m.camera_fun_type, 1)
LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 1)
WHERE d.del_flag = 0 AND d.area IS NOT NULL
@@ -423,8 +423,8 @@
COUNT(m2.id) AS carErrorNum
FROM
sys_dept d
- LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 'province' </if>
- LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 AND p.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 'province' </if>
+ LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 1 </if><if test="dataScope == 3"> AND p.important_tag = 1 </if>
+ LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 AND p.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if>
LEFT JOIN t_monitor m ON m.serial_number = p.serial_number AND INSTR(m.camera_fun_type, 2)
LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 2)
WHERE d.del_flag = 0 AND d.area IS NOT NULL
@@ -441,8 +441,8 @@
COUNT(m2.id) AS videoErrorNum
FROM
sys_dept d
- LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 'province' </if>
- LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 AND p.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 'province' </if>
+ LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 1 </if><if test="dataScope == 3"> AND p.important_tag = 1 </if>
+ LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 AND p.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if>
LEFT JOIN t_monitor m ON m.serial_number = p.serial_number AND INSTR(m.camera_fun_type, 3)
LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 3)
WHERE d.del_flag = 0 AND d.area IS NOT NULL
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 82d305d..5d2a153 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -172,7 +172,8 @@
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
- <if test="dataScope == 1"> AND p.province_tag = 'province' </if>
+ <if test="dataScope == 1"> AND p.province_tag = 1 </if>
+ <if test="dataScope == 3"> AND p.important_tag = 1 </if>
<if test="deptId != null"> AND p.dept_id = #{deptId} </if>
</select>
@@ -186,7 +187,8 @@
LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0
LEFT JOIN t_work_order w ON w.serial_number = p.serial_number AND w.deleted = 0
WHERE d.del_flag = 0 AND d.area IS NOT NULL
- <if test="dataScope == 1"> AND p.province_tag = 'province' </if>
+ <if test="dataScope == 1"> AND p.province_tag = 1 </if>
+ <if test="dataScope == 3"> AND p.important_tag = 1 </if>
<!-- <if test="deptId != null"> AND p.dept_id = #{deptId} </if> -->
GROUP BY d.area, d.dept_id
ORDER BY d.dept_id
@@ -215,6 +217,6 @@
LEFT JOIN t_work_order_error_type woet ON woet.work_order_no = wo.work_order_no
LEFT JOIN t_work_order_auditing_record woar ON woar.work_order_id = wo.id
WHERE wo.deleted = 0 AND wo.status = #{status} AND woar.result = #{auditStatus}
- AND wo.deduct = 0 AND woar.create_time between #{startTime} and #{endTime}
+ AND wo.deduct = 0 AND woar.create_time between #{startTime} and #{endTime}
</select>
</mapper>
--
Gitblit v1.8.0