From dc8d6c0248f0ef687cc7f9e5dcd21541396e2472 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 26 二月 2025 15:25:05 +0800
Subject: [PATCH] 设施和环境条件代码迁移
---
cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumRecordMapper.java | 3 +
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java | 1
cnas-require/src/main/resources/mapper/FeTempHumDateMapper.xml | 31 +++++++++++++++
cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.xml | 13 ++++++
cnas-require/src/main/resources/static/temp_hum_date.docx | 0
cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml | 54 +++++++++++++++++++++++++++
cnas-process/src/main/java/com/ruoyi/process/controller/QualitySuperviseController.java | 7 ++-
7 files changed, 105 insertions(+), 4 deletions(-)
diff --git a/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
new file mode 100644
index 0000000..97653c7
--- /dev/null
+++ b/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
@@ -0,0 +1,54 @@
+<?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.ruoyi.personnel.mapper.PersonTrainingDetailedMapper">
+
+ <select id="queryTheAnnualPlanDetailsTable" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
+ SELECT cptd.*,
+ u1.name training_lecturer_name,
+ dl.name holding_department_name, !isnull(cptr.training_record_id) whether_claim
+ FROM cnas_person_training_detailed cptd
+ left join user u1 on cptd.training_lecturer_id = u1.id
+ left join department_lims dl on dl.id = cptd.holding_department
+ left join cnas_person_training_record cptr on cptr.user_id = #{loginUserId} and cptr.course_id = cptd.id
+ <where>
+ <if test="id != null">
+ and cptd.plan_id = #{id}
+ </if>
+ <if test="userId != null">
+ and u1.id = #{userId}
+ </if>
+ <if test="trainingLecturerName != null and trainingLecturerName != ''">
+ and u1.name like concat('%', #{trainingLecturerName}, '%')
+ </if>
+ <if test="trainingDate != null and trainingDate != ''">
+ and date_format(cptd.training_date,'%Y-%m-%d') = #{trainingDate}
+ </if>
+ </where>
+ </select>
+
+ <!-- 鏍规嵁涓昏〃id鏌ヨ璇︽儏 -->
+ <select id="selectTrainingList" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
+ SELECT cptd.*,
+ u1.name training_lecturer_name
+ FROM cnas_person_training_detailed cptd
+ left join user u1 on cptd.training_lecturer_id = u1.id
+ where cptd.plan_id = #{trainingId}
+ </select>
+
+ <!-- 鏌ヨ璇︾粏 -->
+ <select id="selectTrainingDetail" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
+ SELECT cptd.*,
+ u1.name training_lecturer_name
+ FROM cnas_person_training_detailed cptd
+ left join user u1 on cptd.training_lecturer_id = u1.id
+ where cptd.id = #{id}
+ </select>
+
+ <!-- 鏌ヨ浠婂勾浜哄憳鍩硅淇℃伅 -->
+ <select id="getThisYearTrainingDetailed" resultType="com.ruoyi.personnel.pojo.PersonTrainingDetailed">
+ select cptd.id,
+ cptd.training_objectives
+ from cnas_person_training_detailed cptd
+ where training_date like concat('%', YEAR(NOW()), '%')
+ </select>
+</mapper>
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/QualitySuperviseController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/QualitySuperviseController.java
index b2da7ec..eeb68f7 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/QualitySuperviseController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/QualitySuperviseController.java
@@ -83,11 +83,12 @@
/**
* 鐩戠潱璁″垝璇︽儏鍒楄〃
- * @param data
+ * @param qualitySuperviseDetails
+ * @param page
* @return
*/
@ApiOperation(value = "鐩戠潱璁″垝璇︽儏鍒楄〃")
- @PostMapping("/pageQualitySuperviseDetail")
+ @GetMapping("/pageQualitySuperviseDetail")
public Result<IPage<QualitySuperviseDetailsDto>> pageQualitySuperviseDetail(QualitySuperviseDetailsDto qualitySuperviseDetails,Page page) throws Exception {
return Result.success(qualitySuperviseService.pageQualitySuperviseDetail(page, qualitySuperviseDetails));
}
@@ -120,7 +121,7 @@
* @return
*/
@ApiOperation(value = "鍒犻櫎鐩戠潱璁″垝璇︽儏")
- @GetMapping("/delQualitySuperviseDetail")
+ @DeleteMapping("/delQualitySuperviseDetail")
public Result delQualitySuperviseDetail(Integer superviseDetailsId){
return Result.success(qualitySuperviseDetailsService.removeById(superviseDetailsId));
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
index 1d58571..2283874 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
@@ -238,6 +238,7 @@
*/
@Override
public List<Map<String, String>> getRecordUser(Integer superviseDetailsId) {
+ List<Map<String, String>> recordUser = baseMapper.getRecordUser(superviseDetailsId);
return baseMapper.getRecordUser(superviseDetailsId);
}
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumRecordMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumRecordMapper.java
index 8e0e9ab..9130a25 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumRecordMapper.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/FeTempHumRecordMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.require.dto.FeTempHumRecordDto;
import com.ruoyi.require.pojo.FeTempHumRecord;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -16,5 +17,5 @@
*/
public interface FeTempHumRecordMapper extends BaseMapper<FeTempHumRecord> {
- IPage<FeTempHumRecordDto> getFeTempHumRecordPage(Page page, Integer dateId);
+ IPage<FeTempHumRecordDto> getFeTempHumRecordPage(Page page, @Param("dateId") Integer dateId);
}
diff --git a/cnas-require/src/main/resources/mapper/FeTempHumDateMapper.xml b/cnas-require/src/main/resources/mapper/FeTempHumDateMapper.xml
new file mode 100644
index 0000000..b59bb72
--- /dev/null
+++ b/cnas-require/src/main/resources/mapper/FeTempHumDateMapper.xml
@@ -0,0 +1,31 @@
+<?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.ruoyi.require.mapper.FeTempHumDateMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.FeTempHumDate">
+ <id column="date_id" property="dateId" />
+ <result column="month_date" property="monthDate" />
+ <result column="test_area_name" property="testAreaName" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_user" property="createUser" />
+ <result column="update_user" property="updateUser" />
+ </resultMap>
+
+ <select id="getFeTempHumDate" resultType="com.ruoyi.require.dto.FeTempHumDateDto">
+ select * from (
+ select c.*, u.name create_name
+ from cnas_fe_temp_hum_date c
+ left join user u on c.create_user = u.id) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+ <select id="selectFeTempHumDateIncludeFormattedDate" resultType="java.lang.Integer">
+ select count(*)
+ from cnas_fe_temp_hum_date
+ where test_area_name = #{laboratory}
+ and month_date = #{formattedDate}
+ </select>
+</mapper>
diff --git a/cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.xml b/cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.xml
new file mode 100644
index 0000000..3a5cfa6
--- /dev/null
+++ b/cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.xml
@@ -0,0 +1,13 @@
+<?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.ruoyi.require.mapper.FeTempHumRecordMapper">
+
+ <select id="getFeTempHumRecordPage" resultType="com.ruoyi.require.dto.FeTempHumRecordDto">
+ select c.*, u1.name afternoon_recorder_user, u2.name morning_recorder_user
+ from cnas_fe_temp_hum_record c
+ left join user u1 on u1.id = c.afternoon_recorder_id
+ left join user u2 on u2.id = c.morning_recorder_id
+ where c.date_id = #{dateId}
+ ORDER BY c.temp_hum_id desc
+ </select>
+</mapper>
diff --git a/cnas-require/src/main/resources/static/temp_hum_date.docx b/cnas-require/src/main/resources/static/temp_hum_date.docx
new file mode 100644
index 0000000..2c91d51
--- /dev/null
+++ b/cnas-require/src/main/resources/static/temp_hum_date.docx
Binary files differ
--
Gitblit v1.9.3