测试

Fixiaobai

2023-08-10 804b2935156a5651805ddd1a9766047383e414cd

测试

 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));
    }


}

 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);
}

 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;

    /**
     * å½•å…¥äººid
     */
    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;
}


 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;

}

 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;
    }
}

 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);


}

 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());
    }
}

 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>

 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>

 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;

    /**
     * æ ·å“ç¼–号