From 804b2935156a5651805ddd1a9766047383e414cd Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 10 八月 2023 17:55:03 +0800
Subject: [PATCH] 测试
---
cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasSatisfactionSurveyController.java | 38 ++++++
cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasSatisfactionSurveyServiceImpl.java | 31 +++++
cnas-server/src/main/resources/mapper/CnasSatisfactionSurveyMapper.xml | 36 ++++++
framework/pom.xml | 6
cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/CnasSatisfactionSurveyDto.java | 39 ++++++
cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/CnasSatisfactionSurveyVo.java | 29 ++++
cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasSatisfactionSurveyService.java | 20 +++
cnas-server/src/main/java/com/yuanchu/limslaboratory/mapper/CnasSatisfactionSurveyMapper.java | 19 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java | 4
cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java | 138 +++++++++++++++++++++++
10 files changed, 357 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasSatisfactionSurveyController.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasSatisfactionSurveyController.java
new file mode 100644
index 0000000..95646d1
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasSatisfactionSurveyController.java
@@ -0,0 +1,38 @@
+package com.yuanchu.limslaboratory.controller;
+
+import com.yuanchu.limslaboratory.pojo.Dto.CnasSatisfactionSurveyDto;
+import com.yuanchu.limslaboratory.pojo.vo.CnasSatisfactionSurveyVo;
+import com.yuanchu.limslaboratory.service.CnasSatisfactionSurveyService;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/10
+ */
+@RestController
+@RequestMapping("/cnasSatisfactionSurvey")
+@Api(tags = "CNAS-->婊℃剰搴﹁皟鏌�")
+public class CnasSatisfactionSurveyController {
+
+ @Resource
+ private CnasSatisfactionSurveyService service;
+
+ /**
+ * 鑾峰彇婊℃剰搴﹁皟鏌ヤ俊鎭�
+ * @return
+ */
+ @ApiOperation(value = "鑾峰彇婊℃剰搴﹁皟鏌�")
+ @GetMapping("/getCnasSatisfactionSurvey")
+ public Result<CnasSatisfactionSurveyVo>getCnasSatisfactionSurvey(CnasSatisfactionSurveyDto cnasSatisfactionSurveyDto){
+ return Result.success(service.getCnasSatisfactionSurvey(cnasSatisfactionSurveyDto));
+ }
+
+
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/mapper/CnasSatisfactionSurveyMapper.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/mapper/CnasSatisfactionSurveyMapper.java
new file mode 100644
index 0000000..2b73e83
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/mapper/CnasSatisfactionSurveyMapper.java
@@ -0,0 +1,19 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.CnasSatisfactionSurvey;
+import com.yuanchu.limslaboratory.pojo.Dto.CnasSatisfactionSurveyDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/10
+ */
+@Repository
+public interface CnasSatisfactionSurveyMapper extends BaseMapper<CnasSatisfactionSurvey> {
+
+ IPage<CnasSatisfactionSurvey>selectCnasSatisfactionSurvey(Page<CnasSatisfactionSurvey>page, @Param("dto") CnasSatisfactionSurveyDto dto);
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java
new file mode 100644
index 0000000..ddf02ce
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java
@@ -0,0 +1,138 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.sql.Date;
+import java.time.LocalDateTime;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/10
+ */
+@Data
+@TableName("cnas_satisfaction_survey")
+public class CnasSatisfactionSurvey implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭id
+ */
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ private String projectName;
+
+ /**
+ * 璋冩煡鏃ユ湡
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date surveyDate;
+
+ /**
+ * 瀹㈡埛鍗曚綅鍚嶇О
+ */
+ private String userUnit;
+
+ /**
+ * 鏃ユ湡
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date dateInfo;
+
+ /**
+ * 濉啓浜哄鍚�
+ */
+ private String fillName;
+
+ /**
+ * 鑱屼綅
+ */
+ private String post;
+
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ private String telephone;
+
+ /**
+ * 褰曞叆鏃ユ湡
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date entryDate;
+
+ /**
+ * 褰曞叆浜篿d
+ */
+ private Long userId;
+
+ /**
+ * 褰曞叆浜哄悕绉�
+ */
+ private String userName;
+
+ /**
+ * 闄勪欢鍦板潃
+ */
+ private String fileUrl;
+
+ /**
+ * 鏈嶅姟鎬佸害
+ */
+ private String serviceAttitude;
+
+ /**
+ * 鎶�鏈兘鍔�
+ */
+ private String technicalPower;
+
+ /**
+ * 妫�娴嬪伐浣�
+ */
+ private String testJob;
+
+ /**
+ * 鏀硅繘瑕佹眰
+ */
+ private String improvementRequirements;
+
+ /**
+ * 鍏朵粬琛ュ厖
+ */
+ private String otherSupplements;
+
+ @TableLogic(value = "1")
+ private Integer state;
+
+
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private LocalDateTime createdTime;
+
+
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private LocalDateTime updatedTime;
+}
+
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/CnasSatisfactionSurveyDto.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/CnasSatisfactionSurveyDto.java
new file mode 100644
index 0000000..13b98ee
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/CnasSatisfactionSurveyDto.java
@@ -0,0 +1,39 @@
+package com.yuanchu.limslaboratory.pojo.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="CnasSatisfactionSurveyDto", description="")
+public class CnasSatisfactionSurveyDto implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "褰撳墠椤�", example = "1", required = true)
+ private Long currentPage;
+
+ @ApiModelProperty(value = "鍒嗛〉澶氬皯鏉�", example = "10", required = true)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "璋冩煡鏃ユ湡", example = "2020-01-02", required = true)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date surveyDate;
+
+ @ApiModelProperty(value = "褰曞叆鏃ユ湡", example = "2025-06-08", required = true)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date entryDate;
+
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/CnasSatisfactionSurveyVo.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/CnasSatisfactionSurveyVo.java
new file mode 100644
index 0000000..3c6a92a
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/CnasSatisfactionSurveyVo.java
@@ -0,0 +1,29 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.yuanchu.limslaboratory.pojo.CnasSatisfactionSurvey;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/10
+ */
+@Data
+public class CnasSatisfactionSurveyVo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @JsonSerialize
+ private List<CnasSatisfactionSurvey> cnasSatisfactionSurveyList;
+
+ @JsonSerialize
+ private Long total;
+
+ public CnasSatisfactionSurveyVo(List<CnasSatisfactionSurvey> cnasSatisfactionSurveyList, Long total) {
+ this.cnasSatisfactionSurveyList = cnasSatisfactionSurveyList;
+ this.total = total;
+ }
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasSatisfactionSurveyService.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasSatisfactionSurveyService.java
new file mode 100644
index 0000000..e80a3f7
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasSatisfactionSurveyService.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.Dto.CnasSatisfactionSurveyDto;
+import com.yuanchu.limslaboratory.pojo.vo.CnasSatisfactionSurveyVo;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/10
+ */
+public interface CnasSatisfactionSurveyService{
+
+ /**
+ * 鑾峰彇婊℃剰搴﹁皟鏌ヤ俊鎭�
+ * @param cnasSatisfactionSurveyDto
+ * @return
+ */
+ CnasSatisfactionSurveyVo getCnasSatisfactionSurvey(CnasSatisfactionSurveyDto cnasSatisfactionSurveyDto);
+
+
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasSatisfactionSurveyServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasSatisfactionSurveyServiceImpl.java
new file mode 100644
index 0000000..846cd7c
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasSatisfactionSurveyServiceImpl.java
@@ -0,0 +1,31 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.mapper.CnasSatisfactionSurveyMapper;
+import com.yuanchu.limslaboratory.pojo.CnasSatisfactionSurvey;
+import com.yuanchu.limslaboratory.pojo.Dto.CnasSatisfactionSurveyDto;
+import com.yuanchu.limslaboratory.pojo.vo.CnasSatisfactionSurveyVo;
+import com.yuanchu.limslaboratory.service.CnasSatisfactionSurveyService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/10
+ */
+@Service
+public class CnasSatisfactionSurveyServiceImpl implements CnasSatisfactionSurveyService {
+
+
+ @Resource
+ private CnasSatisfactionSurveyMapper mapper;
+
+ @Override
+ public CnasSatisfactionSurveyVo getCnasSatisfactionSurvey(CnasSatisfactionSurveyDto cnasSatisfactionSurveyDto) {
+ Page<CnasSatisfactionSurvey>page=new Page<>(cnasSatisfactionSurveyDto.getCurrentPage(), cnasSatisfactionSurveyDto.getPageNum(),true);
+ IPage<CnasSatisfactionSurvey> cnasSatisfactionSurveyIPage = mapper.selectCnasSatisfactionSurvey(page, cnasSatisfactionSurveyDto);
+ return new CnasSatisfactionSurveyVo(cnasSatisfactionSurveyIPage.getRecords(),cnasSatisfactionSurveyIPage.getTotal());
+ }
+}
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..2beef0a
--- /dev/null
+++ b/cnas-server/src/main/resources/mapper/CnasSatisfactionSurveyMapper.xml
@@ -0,0 +1,36 @@
+<?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.date_info dateInfo,
+ 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.improvement_requirements improvementRequirements
+ FROM
+ cnas_satisfaction_survey css,
+ `user` u
+ WHERE
+ 1 = 1
+ AND css.user_id = u.id
+ and css.state=1
+ <if test="dto.surveyDate!=null">
+ and css.survey_date = ${dto.surveyDate}
+ </if>
+ <if test="dto.entryDate!=null">
+ and css.entry_date = ${dto.entryDate}
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/framework/pom.xml b/framework/pom.xml
index 9a79668..2aad47d 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -12,7 +12,6 @@
<version>0.0.1-SNAPSHOT</version>
<name>framework</name>
<description>framework</description>
-
<packaging>jar</packaging>
<dependencies>
<!--鏁版嵁搴撹繛鎺ユ睜-->
@@ -38,6 +37,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.8.18</version>
+ </dependency>
</dependencies>
</project>
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java
index fa2e0bf..71b1e6c 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java
@@ -26,8 +26,8 @@
private static final long serialVersionUID = 1L;
- @TableId(type =IdType.ASSIGN_ID)
- private Long id;
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
/**
* 鏍峰搧缂栧彿
--
Gitblit v1.9.3