From d0a6fc23f31f924cb1744397478dc4c7c57c04e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/resources/mapper/CnasSatisfactionSurveyMapper.xml |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/cnas-server/src/main/resources/mapper/CnasSatisfactionSurveyMapper.xml b/cnas-server/src/main/resources/mapper/CnasSatisfactionSurveyMapper.xml
new file mode 100644
index 0000000..3302613
--- /dev/null
+++ b/cnas-server/src/main/resources/mapper/CnasSatisfactionSurveyMapper.xml
@@ -0,0 +1,38 @@
+<?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.yuanchu.limslaboratory.mapper.CnasSatisfactionSurveyMapper">
+
+    <select id="selectCnasSatisfactionSurvey"
+            resultType="CnasSatisfactionSurvey">
+        SELECT
+            css.id id,
+            css.project_name projectName,
+            css.survey_date surveyDate,
+            css.user_unit userUnit,
+            css.`fill_name` fillName,
+            css.post post,
+            css.telephone telephone,
+            css.entry_date entryDate,
+            u.`name` userName,
+            css.service_attitude serviceAttitude,
+            css.technical_power technicalPower,
+            css.test_job testJob,
+            css.reasonable_charge reasonableCharge,
+            css.improvement_requirements improvementRequirements,
+            css.other_supplements otherSupplements
+        FROM
+            cnas_satisfaction_survey css,
+            `user` u
+        WHERE
+            1 = 1
+          AND css.user_id = u.id
+          and css.state=1
+        <if test="surveyDate!=null">
+            and date_format(css.survey_date,'%Y%m%d') = ${surveyDate}
+        </if>
+        <if test="entryDate!=null">
+            and date_format(css.entry_date,'%Y%m%d') = ${entryDate}
+        </if>
+        order by css.id Desc
+    </select>
+</mapper>
\ No newline at end of file

--
Gitblit v1.9.3