admin/dc_project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大屏业务完善

Browse Source
This commit is contained in:
lhx
2025-11-13 17:38:10 +08:00
parent 7834610b3f
commit c6bc11e9b8
38 changed files with 881 additions and 2455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/resources/mapper/EquipmentMapper.xml
View File

@@ -4,31 +4,6 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dc.dc_project.mapper.EquipmentMapper">
<resultMap id="BaseResultMap" type="com.dc.dc_project.model.pojo.Equipment">
<id property="id" column="id" />
<result property="org_id" column="org_id" />
<result property="name" column="name" />
<result property="model" column="model" />
<result property="manufacturer" column="manufacturer" />
<result property="serial_no" column="serial_no" />
<result property="purchase_date" column="purchase_date" />
<result property="price" column="price" />
<result property="range_value" column="range_value" />
<result property="accuracy" column="accuracy" />
<result property="status" column="status" />
<result property="calibration_org" column="calibration_org" />
<result property="calibration_date" column="calibration_date" />
<result property="valid_until" column="valid_until" />
<result property="remind_days" column="remind_days" />
<result property="location" column="location" />
<result property="responsible_user" column="responsible_user" />
<result property="remark" column="remark" />
<result property="created_at" column="created_at" />
<result property="updated_at" column="updated_at" />
<result property="created_by" column="created_by" />
<result property="updated_by" column="updated_by" />
<result property="is_deleted" column="is_deleted" />
</resultMap>
<sql id="Base_Column_List">
id,org_id,name,model,manufacturer,serial_no,
@@ -37,4 +12,20 @@
responsible_user,remark,created_at,updated_at,created_by,
updated_by,is_deleted
</sql>
<select id="getCheckOverdueCount" resultType="com.dc.dc_project.model.vo.bigScreen.SystemWarningItemVo">
SELECT se.id, se.name, se.valid_until AS date, DATEDIFF(se.valid_until, #{nowStr}) AS day FROM sys_equipment se
<where>
se.valid_until <![CDATA[<]]> #{nowStr}
AND se.is_deleted = 0
</where>
ORDER BY se.valid_until ASC
</select>
<select id="getCheckExpiringCount" resultType="com.dc.dc_project.model.vo.bigScreen.SystemWarningItemVo">
SELECT se.id, se.name, se.valid_until AS date, DATEDIFF(se.valid_until, #{nowStr}) AS day FROM sys_equipment se
<where>
se.valid_until BETWEEN #{nowStr} AND DATE_ADD(#{nowStr}, INTERVAL 30 DAY)
AND se.is_deleted = 0
</where>
ORDER BY se.valid_until ASC
</select>
</mapper>

17
src/main/resources/mapper/RecordEngineeringMapper.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dc.dc_project.mapper.RecordEngineeringMapper">
<resultMap id="BaseResultMap" type="com.dc.dc_project.model.pojo.RecordEngineering">
<id property="id" column="id" />
<result property="engineeringName" column="engineering_name" />
<result property="createdAt" column="created_at" />
<result property="updatedAt" column="updated_at" />
</resultMap>
<sql id="Base_Column_List">
id,engineering_name,created_at,updated_at
</sql>
</mapper>

42
src/main/resources/mapper/RecordEntrustMapper.xml
View File

@@ -4,32 +4,30 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dc.dc_project.mapper.RecordEntrustMapper">
<resultMap id="BaseResultMap" type="com.dc.dc_project.model.pojo.RecordEntrust">
<id property="id" column="id" />
<result property="entrust_no" column="entrust_no" />
<result property="org_id" column="org_id" />
<result property="client_name" column="client_name" />
<result property="entrust_date" column="entrust_date" />
<result property="contact_name" column="contact_name" />
<result property="contact_phone" column="contact_phone" />
<result property="sample_name" column="sample_name" />
<result property="sample_code" column="sample_code" />
<result property="sample_type" column="sample_type" />
<result property="receive_date" column="receive_date" />
<result property="test_type" column="test_type" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="created_by" column="created_by" />
<result property="updated_by" column="updated_by" />
<result property="created_at" column="created_at" />
<result property="updated_at" column="updated_at" />
<result property="is_deleted" column="is_deleted" />
</resultMap>
<sql id="Base_Column_List">
id,entrust_no,org_id,client_name,entrust_date,contact_name,
contact_phone,sample_name,sample_code,sample_type,receive_date,
test_type,status,remark,created_by,updated_by,
created_at,updated_at,is_deleted
</sql>
<select id="getCountByTime" resultType="java.lang.Long">
select count(*) from sys_record_entrust where entrust_date between #{startTime} and #{endTime}
</select>
<select id="getCountByTimeGroupE" resultType="com.dc.dc_project.model.vo.bigScreen.RecordStatisticsVo">
SELECT
p.id AS engineering_id,
p.engineering_name AS engineering_name,
COUNT(DISTINCT e.id) AS entrust_count,
COUNT(r.id) AS report_count,
SUM(CASE WHEN r.conclusion = '不合格' OR r.conclusion LIKE '%不合格%' THEN 1 ELSE 0 END) AS unqualified_count
FROM sys_record_engineering p
LEFT JOIN sys_record_entrust e ON p.id = e.engineering_id
LEFT JOIN sys_record_report r ON e.id = r.entrust_id
<where>
e.create_time &gt;= #{startTimeStr}
AND e.create_time &lt;= #{endTimeStr}
</where>
GROUP BY p.id, p.engineering_name
ORDER BY entrust_count DESC;
</select>
</mapper>

16
src/main/resources/mapper/RecordReportMapper.xml
View File

@@ -4,20 +4,6 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dc.dc_project.mapper.RecordReportMapper">
<resultMap id="BaseResultMap" type="com.dc.dc_project.model.pojo.RecordReport">
<id property="id" column="id" />
<result property="report_no" column="report_no" />
<result property="entrust_id" column="entrust_id" />
<result property="issue_date" column="issue_date" />
<result property="reviewer_id" column="reviewer_id" />
<result property="approver_id" column="approver_id" />
<result property="status" column="status" />
<result property="conclusion" column="conclusion" />
<result property="file_url" column="file_url" />
<result property="remark" column="remark" />
<result property="created_at" column="created_at" />
<result property="updated_at" column="updated_at" />
</resultMap>
<sql id="Base_Column_List">
id,report_no,entrust_id,issue_date,reviewer_id,approver_id,
@@ -25,6 +11,6 @@
updated_at
</sql>
<select id="getCountByTime" resultType="java.lang.Long">
select COUNT(*) from record_report
select COUNT(*) from sys_record_report where issue_date between #{startTimeStr} and #{endTimeStr}
</select>
</mapper>

45
src/main/resources/mapper/RecordSampleMapper.xml
View File

@@ -4,26 +4,6 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dc.dc_project.mapper.RecordSampleMapper">
<resultMap id="BaseResultMap" type="com.dc.dc_project.model.pojo.RecordSample">
<id property="id" column="id" />
<result property="entrust_id" column="entrust_id" />
<result property="sample_code" column="sample_code" />
<result property="sample_name" column="sample_name" />
<result property="sample_type" column="sample_type" />
<result property="sampling_date" column="sampling_date" />
<result property="sampling_point" column="sampling_point" />
<result property="sampling_position" column="sampling_position" />
<result property="representative_count" column="representative_count" />
<result property="condition_desc" column="condition_desc" />
<result property="storage_location" column="storage_location" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="created_by" column="created_by" />
<result property="updated_by" column="updated_by" />
<result property="created_at" column="created_at" />
<result property="updated_at" column="updated_at" />
<result property="is_deleted" column="is_deleted" />
</resultMap>
<sql id="Base_Column_List">
id,entrust_id,sample_code,sample_name,sample_type,sampling_date,
@@ -31,4 +11,29 @@
status,remark,created_by,updated_by,created_at,
updated_at,is_deleted
</sql>
<select id="getCheckNotCheckedCount" resultType="com.dc.dc_project.model.vo.bigScreen.SystemWarningItemVo">
SELECT sys.id, sys.sample_name, sys.calibration_date data, DATEDIFF(sys.calibration_date, #{nowStr}) AS day FROM sys_record_sample sys
<where>
sys.status != 2
AND sys.is_deleted = 0
AND sys.calibration_date &lt; #{nowStr}
</where>
ORDER BY sys.calibration_date ASC
LIMIT #{page.offset}, #{page.size}
</select>
<select id="getCheckNotChecked" resultType="com.dc.dc_project.model.vo.bigScreen.SystemWarningItemVo">
SELECT
sys.id,
sys.sample_name AS name,
sys.calibration_date AS date,
DATEDIFF(sys.calibration_date, #{nowStr}) AS day
FROM sys_record_sample sys
<where>
sys.status != 2
AND sys.is_deleted = 0
AND sys.calibration_date BETWEEN #{nowStr} AND DATE_ADD(#{nowStr}, INTERVAL 15 DAY)
</where>
ORDER BY sys.calibration_date ASC
LIMIT #{page.offset}, #{page.size}
</select>
</mapper>