8-10提交代码

“zhuo”

2023-08-10 805248000274ad1bd010ec4a7ed6b2821be87d23

8-10提交代码

 cnas-server/pom.xml

@@ -24,6 +24,11 @@
            <artifactId>framework</artifactId>
            <version>${project.parent.version}</version>
        </dependency>
        <dependency>
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-all</artifactId>
            <version>5.8.12</version>
        </dependency>
    </dependencies>



 cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasAnnualPlanController.java

@@ -1,11 +1,23 @@
package com.yuanchu.limslaboratory.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.CnasAnnualPlan;
import com.yuanchu.limslaboratory.pojo.vo.CnasAnnualPlanVo;
import com.yuanchu.limslaboratory.service.CnasAnnualPlanService;
import com.yuanchu.limslaboratory.vo.Result;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;

import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

/**
 * <p>
@@ -15,16 +27,38 @@
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-10 11:50:11
 */
@Controller
@Api(tags = "CNAS管理-->审核年度计划")
@RestController
@RequestMapping("/cnasAnnualPlan")
public class CnasAnnualPlanController {

    @Resource
    private CnasAnnualPlanService cnasAnnualPlanService;

    @ApiOperation(value = "查询审查计划")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "page", value = "初始页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "pageSize", value = "每一页数量", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "beginTime", value = "检验开始时间", dataTypeClass = Date.class),
            @ApiImplicitParam(name = "endTime", value = "检验结束时间", dataTypeClass = Date.class),
    })
    @GetMapping("/selectAllList")
    public Result selectAllList(Integer page, Integer pageSize, @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
        IPage<CnasAnnualPlanVo> reportPage = cnasAnnualPlanService.selectAllList(new Page(page, pageSize), beginTime, endTime);
        Map<String, Object> map = new HashMap<>();
        map.put("total", reportPage.getTotal());
        map.put("row", reportPage.getRecords());
        return Result.success(map);
    }

//    public Result selectAll() {
//
//    }
    @ApiOperation(value = "新增审查计划")
    @PostMapping("/addCnasAnnualPlan")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "CnasAnnualPlan", value = "审查对象", dataTypeClass = Integer.class, required = true)
    })
    public Result addCnasAnnualPlan(@RequestBody CnasAnnualPlan cnasAnnualPlan) {
        cnasAnnualPlanService.save(cnasAnnualPlan);
        return Result.success();
    }

}

 cnas-server/src/main/java/com/yuanchu/limslaboratory/mapper/CnasAnnualPlanMapper.java

@@ -1,7 +1,12 @@
package com.yuanchu.limslaboratory.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.CnasAnnualPlan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.pojo.vo.CnasAnnualPlanVo;

import java.util.Date;

/**
 * <p>
@@ -13,4 +18,9 @@
 */
public interface CnasAnnualPlanMapper extends BaseMapper<CnasAnnualPlan> {

    /**
     * æŸ¥è¯¢å®¡æ ¸è®¡åˆ’
     * @return
     */
    IPage<CnasAnnualPlanVo> selectAllList(Page<Object> objectPage, Date beginTime, Date endTime);
}

 cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasAnnualPlan.java

@@ -1,10 +1,15 @@
package com.yuanchu.limslaboratory.pojo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;

@@ -16,87 +21,67 @@
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-10 11:50:11
 */
@Getter
@Setter
@Data
@TableName("cnas_annual_plan")
public class CnasAnnualPlan implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * ä¸»é”®id
     */
    @TableId(value = "id", type = IdType.AUTO)
    @ApiModelProperty(value = "主键id")
    private Integer id;

    /**
     * æ€§è´¨,0:内审,1:管理评审
     */
    @ApiModelProperty(value = "性质,0:内审,1:管理评审")
    private Integer auditType;

    /**
     * éƒ¨é—¨
     */
    @ApiModelProperty(value = "部门")
    private String department;

    /**
     * å®¡æ ¸ç›®çš„
     */
    @ApiModelProperty(value = "审核目的")
    private String auditPurpose;

    /**
     * å®¡æ ¸ç»„é•¿
     */
    @ApiModelProperty(value = "审核组长")
    private String auditLeader;

    /**
     * å®¡æ ¸ç»„员
     */
    @ApiModelProperty(value = "审核组员")
    private String auditEmp;

    /**
     * å®¡æ ¸ä¾æ®
     */
    @ApiModelProperty(value = "审核依据")
    private String auditPursuant;

    /**
     * å®¡æ ¸èŒƒå›´
     */
    @ApiModelProperty(value = "审核范围")
    private String auditScope;

    /**
     * ç¼–制人员
     */
    @ApiModelProperty(value = "编制人员")
    private String writeUser;

    /**
     * å½•å…¥äººå‘˜
     */
    @ApiModelProperty(value = "录入人员")
    private String keyboarder;

    /**
     * è®¡åˆ’时间
     */
    private LocalDateTime planTime;
    @ApiModelProperty(value = "计划时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date planTime;

    /**
     * ä¸åˆæ ¼é¡¹ç›®æ•°
     */
    @ApiModelProperty(value = "不合格项目数")
    private Integer count;

    /**
     * å®¡æ ¸çŠ¶æ€,0:即将开始,1:完成,2:逾期
     */
    @ApiModelProperty(value = "审核状态,0:即将开始,1:完成,2:逾期")
    private Integer auditState;

    @TableLogic(value = "1", delval = "0")
    @ApiModelProperty(value = "逻辑删除 æ­£å¸¸>=1,删除<=0", hidden = true)
    private Integer state;

    /**
     * å®¡æ ¸æ—¥æœŸ
     */
    private LocalDateTime auditTime;
    @ApiModelProperty(value = "审核日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date auditTime;

    private LocalDateTime createTime;
    @TableField(fill = FieldFill.INSERT)
    @ApiModelProperty(value = "编制日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createTime;

    private LocalDateTime updateTime;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateTime;
}

 cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/CnasAnnualPlanVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.yuanchu.limslaboratory.pojo.vo;

import com.yuanchu.limslaboratory.pojo.CnasAnnualPlan;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@Data
public class CnasAnnualPlanVo extends CnasAnnualPlan implements Serializable {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty(value = "年份")
    private Integer year;

    @ApiModelProperty(value = "月份")
    private Integer month;
}

 cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasAnnualPlanService.java

@@ -1,7 +1,12 @@
package com.yuanchu.limslaboratory.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.CnasAnnualPlan;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.vo.CnasAnnualPlanVo;

import java.util.Date;

/**
 * <p>
@@ -13,4 +18,9 @@
 */
public interface CnasAnnualPlanService extends IService<CnasAnnualPlan> {

    /**
     * æŸ¥è¯¢å®¡æ ¸è®¡åˆ’
     * @return
     */
    IPage<CnasAnnualPlanVo> selectAllList(Page<Object> objectPage, Date beginTime, Date endTime);
}

 cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasAnnualPlanServiceImpl.java

@@ -1,10 +1,19 @@
package com.yuanchu.limslaboratory.service.impl;

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.CnasAnnualPlan;
import com.yuanchu.limslaboratory.mapper.CnasAnnualPlanMapper;
import com.yuanchu.limslaboratory.pojo.vo.CnasAnnualPlanVo;
import com.yuanchu.limslaboratory.service.CnasAnnualPlanService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;

/**
 * <p>
@@ -17,4 +26,24 @@
@Service
public class CnasAnnualPlanServiceImpl extends ServiceImpl<CnasAnnualPlanMapper, CnasAnnualPlan> implements CnasAnnualPlanService {

    @Resource
    private CnasAnnualPlanMapper cnasAnnualPlanMapper;

    /**
     * æŸ¥è¯¢å®¡æ ¸è®¡åˆ’
     * @return
     */
    @Override
    public IPage<CnasAnnualPlanVo> selectAllList(Page<Object> objectPage, Date beginTime, Date endTime) {
        IPage<CnasAnnualPlanVo> page = cnasAnnualPlanMapper.selectAllList(objectPage, beginTime, endTime);
        page.getRecords().forEach(cnasAnnualPlanVo -> {
            //获取计划时间
            Date time = cnasAnnualPlanVo.getPlanTime();
            //添加年
            cnasAnnualPlanVo.setYear(DateUtil.year(time));
            //添加月
            cnasAnnualPlanVo.setMonth(DateUtil.month(time) + 1);
        });
        return page;
    }
}

 cnas-server/src/main/resources/mapper/CnasAnnualPlanMapper.xml

@@ -1,5 +1,29 @@
<?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.CnasAnnualPlanMapper">

    <!--查询审核计划-->
    <select id="selectAllList" resultType="com.yuanchu.limslaboratory.pojo.vo.CnasAnnualPlanVo">
        select id,
               audit_type,
               department,
               audit_purpose,
               audit_leader,
               audit_emp,
               audit_pursuant,
               audit_scope,
               write_user,
               keyboarder,
               plan_time,
               count,
               audit_state,
               state,
               audit_time,
               create_time,
               update_time
        from cnas_annual_plan
        where state = 1
          <if test="beginTime != null and endTime != null">
              and plan_time between #{beginTime} and #{endTime}
          </if>
    </select>
</mapper>

 inspection-server/src/main/resources/mapper/ReportMapper.xml

@@ -15,6 +15,7 @@
        join user u on i.user_id = u.id
        join inspection_material im on i.id = im.inspection_id
        <where>
            r.state = 1
            <if test="status != null">
                and r.status = #{status}
            </if>
@@ -39,6 +40,7 @@
        join inspection i on r.inspection_id = i.id
        join inspection_material im on i.id = im.inspection_id
        <where>
            r.state = 1
            <if test="status == null">
                and r.status in (0, 1)
            </if>