From 9785f0992383b06ade980449c5d83719605465ca Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期六, 24 八月 2024 14:03:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml | 1 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 11 ++++- ycl-pojo/src/main/java/com/ycl/platform/domain/query/DashboardQuery.java | 2 ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java | 4 +- ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java | 9 +--- ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java | 5 ++ ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml | 11 +++++ ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 24 ++++++------ ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 3 - 11 files changed, 46 insertions(+), 29 deletions(-) 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/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 2bce97b..5d2a153 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml @@ -16,6 +16,7 @@ <result column="deduct" property="deduct"/> <result column="errorType" property="errorType"/> <result column="status" property="status"/> + <result column="source" property="source"/> <!-- <collection property="errorTypeList" select="getErrorType" column="{workOrderNo=work_order_no,errList=errList}" ofType="string"/>--> </resultMap> @@ -33,9 +34,11 @@ wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct, u.unit_name, p.yw_person_name, + tm.name as source, GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType FROM t_work_order wo + INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number LEFT JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0 LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0 INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no @@ -54,7 +57,7 @@ AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end} </if> GROUP BY - wo.id, wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct, + wo.id, wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id,tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct, u.unit_name, p.yw_person_name ORDER BY wo.create_time DESC @@ -169,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> @@ -183,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 diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml index 0e50e52..40e64a0 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml @@ -32,6 +32,7 @@ <if test="description != null and description != ''"> and description = #{description}</if> <if test="deleted != null and deleted != ''"> and deleted = #{deleted}</if> </where> + ORDER BY order_num ASC </select> <select id="selectYwThresholdById" parameterType="Long" resultMap="YwThresholdResult"> -- Gitblit v1.8.0