检验模块

zss

2023-07-27 0e1722e96e5483d560eda8f1cf96282955d4f224

检验模块

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java

@@ -102,7 +102,8 @@
    })
    @PostMapping("/submitInspection")
    public Result submitInspection(String inspectionId) {
        return Result.success(inspectionService.subInspectionByInsId(inspectionId));
        inspectionService.subInspectionByInsId(inspectionId);
        return Result.success();
    }

    @ApiOperation("作废检验单申请")
@@ -111,6 +112,7 @@
    })
    @PostMapping("/delInspection")
    public Result delInspection(String inspectionId) {
        return Result.success(inspectionService.delInspectionByInsId(inspectionId));
        inspectionService.delInspectionByInsId(inspectionId);
        return Result.success();
    }
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java

@@ -4,6 +4,7 @@
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
import com.yuanchu.limslaboratory.pojo.dto.InspectionMaterialListDto;
import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
@@ -78,8 +79,8 @@
            @ApiImplicitParam(name = "inspectionMaterialListId", value = "样品ID", dataTypeClass = Integer.class, required = true),
    })
    @PutMapping("/updateInspectionMaterialList/{inspectionMaterialListId}")
    public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialList inspectionMaterialList) {
        inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId, inspectionMaterialList);
    public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialListDto inspectionMaterialListDto) {
        inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId, inspectionMaterialListDto);
        return Result.success();
    }
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java

@@ -1,10 +1,8 @@
package com.yuanchu.limslaboratory.controller;


import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.User;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.yuanchu.limslaboratory.service.InstrumentService;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -12,7 +10,6 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
@@ -32,6 +29,9 @@
    UserService userService;

    @Resource
    InstrumentService instrumentService;

    @Resource
    InspectionProductListService inspectionProductListService;

    @ApiOperation("查询试验员信息")
@@ -49,6 +49,22 @@
        return Result.success(userService.selectByUserId(id));
    }

    @ApiOperation("查询设备信息")
    @GetMapping("/selectInstrument")
    public Result selectInstrument() {
        return Result.success(instrumentService.selectInstrument());
    }

    @ApiOperation("选择设备信息")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "设备ID", dataTypeClass = Integer.class, required = true),
    })
    @PostMapping("/selectInstrumentById")
    public Result selectInstrumentById(Integer id) {
        Instrument instrument = instrumentService.getById(id);
        return Result.success(instrument.getEquipmentName());
    }

    @ApiOperation("根据检验计划样品id查询检验项目")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "样品id", dataTypeClass = Integer.class, required = true)

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java

@@ -47,8 +47,6 @@
        return Result.success("修改成功!");
    }



    /**
     * å°†å¾…提交的的检验项目的检测记录的状态转为待审核
     * @param id

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java

@@ -2,8 +2,11 @@


import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.service.ProductService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -29,6 +32,9 @@
    @Resource
    private PlanService planService;

    @Resource
    ProductService productService;

    @ApiOperation("查询所有检验计划分配")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize", value = "页数", dataTypeClass = Integer.class, required = true),
@@ -40,13 +46,31 @@
        return Result.success(planService.selectAllPlan(pageSize, countSize, state));
    }

    @ApiOperation("分配检验计划中分配项目")
    @PostMapping("/upPlan")
    public Result upPlan(@RequestBody InspectionProductListDto inspectionProductListDto) {
        planService.upPlan(inspectionProductListDto);
        return Result.success();
    @ApiOperation("根据项目名查询所有试验方法")
    @GetMapping("/selectInstrumentByProname")
    public Result selectInstrumentByProname(String name) {
        return Result.success(productService.selectInstrumentByProname(name));
    }

    @ApiOperation("选择试验方法")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "项目id", dataTypeClass = Integer.class, required = true),
    })
    @PostMapping("/selectProMethodById")
    public Result selectProMethodById(Integer id) {
        Product product = productService.getById(id);
        return Result.success(product.getMethod());
    }

    @ApiOperation("分配检验计划中分配项目")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "检验样品ID", dataTypeClass = Integer.class, required = true),
    })
    @PutMapping("/upPlan/{id}")
    public Result upPlan(@PathVariable Integer id ,@RequestBody InspectionProductListDto inspectionProductListDto) {
        planService.upPlan(id,inspectionProductListDto);
        return Result.success();
    }

    @ApiOperation("作废检验计划")
    @ApiImplicitParams(value = {
@@ -54,7 +78,8 @@
    })
    @PutMapping("/delPlan/{id}")
    public Result delPlan(@PathVariable Integer id) {
        return Result.success(planService.delPlan(id));
        planService.delPlan(id);
        return Result.success();
    }

    @ApiOperation("查询成品检验")

 inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java

@@ -15,7 +15,7 @@
 */
public interface InspectionMaterialListMapper extends BaseMapper<InspectionMaterialList> {

    //查询检验单里面的物料信息
    //查询检验单里面的样品信息
    List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId);

}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import org.springframework.beans.factory.annotation.Autowired;

@@ -22,5 +23,5 @@


    //根据样品id查询检验计划样品里面的检验项目
    List<InspectionProductListDto> selectByMaterId(Integer id);
    List<InspectionProductListVo> selectByMaterId(Integer id);
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java

@@ -2,11 +2,10 @@

import com.yuanchu.limslaboratory.pojo.Plan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
import com.yuanchu.limslaboratory.pojo.vo.FinPlanVo;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -22,5 +21,5 @@
    List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state);

    //查询成品检验
    List<PlanDto> selectInspection(int pageSize, int countSize, Integer state);
    List<FinPlanVo> selectInspection(int pageSize, int countSize, Integer state);
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java

@@ -3,7 +3,6 @@
import com.yuanchu.limslaboratory.pojo.Inspection;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@Data

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionMaterialListDto.java

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


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

import java.io.Serializable;

//修改样品信息
@Data
public class InspectionMaterialListDto implements Serializable {


    /**
     * æŠ¥æ£€æ•°é‡-物料数量
     */
    @ApiModelProperty(value = "报检数量-物料数量",required = true)
    private Integer materialNum;
    /**
     * ä¾›åº”商
     */
    @ApiModelProperty(value = "供应商",required = true)
    private String materialSupplier;
    /**
     * ç‰©æ–™åç§°
     */
    @ApiModelProperty(value = "物料名称",required = true)
    private String materialName;
    /**
     * ç‰©æ–™å­˜æ”¾åœ°
     */
    @ApiModelProperty(value = "物料存放地",required = true)
    private String materialLocation;
    /**
     * ç‰©æ–™æ‰¹æ¬¡
     */
    @ApiModelProperty(value = "物料批次",required = true)
    private String materialBatch;
    /**
     * ç‰©æ–™ç›˜å·
     */
    @ApiModelProperty(value = "物料盘号",required = true)
    private String materialReelNumber;
    /**
     * è§„格名称/型号名称
     */
    @ApiModelProperty(value = "规格名称/型号名称",required = true)
    private String specificationsSerialNumber;
    /**
     * ç”µåŽ‹ç­‰çº§
     */
    @ApiModelProperty("电压等级")
    private String specificationsVoltageLevel;
    /**
     * ä¸»çº¿å¿ƒæˆªé¢
     */
    @ApiModelProperty("主线心截面")
    private String specificationsCrossSection;
    /**
     * ä¸»çº¿èŠ¯èŠ¯æ•°
     */
    @ApiModelProperty("主线芯芯数")
    private String specificationsNumberOfCores;
    /**
     * ç”Ÿäº§æŒ‡ä»¤å·
     */
    @ApiModelProperty("生产指令号")
    private String specificationsInstruct;

    @ApiModelProperty("备注")
    private String notes;




}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionProductListDto.java

@@ -1,36 +1,19 @@
package com.yuanchu.limslaboratory.pojo.dto;

import com.baomidou.mybatisplus.annotation.*;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

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

/**
 * <p>
 *
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-07-17
 */
//分配计划


//(更改)分配检验项目的试验员,设备,时间,试验方法等参数
@Data
public class InspectionProductListDto implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "报检样品id")
    @JsonSerialize
    private int inspectionMaterialListId;

    @ApiModelProperty(value = "项目检验开始日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -64,19 +47,12 @@
    @JsonSerialize
    private String internal;

    @ApiModelProperty(value = "试验单试验开始日期", hidden = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date inspectStartTime;

    @ApiModelProperty(value = "试验单试验结束日期", hidden = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date inspectEndTime;

    @ApiModelProperty(value = "检验项目试验员")
    @ApiModelProperty(value = "关联检验项目试验员id")
    @JsonSerialize
    private String userName;
    private Integer userId;

    @ApiModelProperty(value = "关联 è®¾å¤‡å")
    @ApiModelProperty(value = "关联 è®¾å¤‡id")
    @JsonSerialize
    private String instrumentName;
    private Integer instrumentId;
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java

@@ -8,6 +8,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;

//(修改)(查询)检测记录
@Data
public class InspectionRecordsDto implements Serializable {


 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/FinPlanVo.java

ÎļþÃû´Ó inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.yuanchu.limslaboratory.pojo.dto;
package com.yuanchu.limslaboratory.pojo.vo;


import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -7,16 +7,15 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yuanchu.limslaboratory.pojo.Plan;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

//成品检验
//(分页查询)记录成品检验
@Data
public class PlanDto  implements Serializable {
public class FinPlanVo implements Serializable {

    @ApiModelProperty(value = "计划编号")
    @TableId(value = "id", type = IdType.AUTO)

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionProductListVo.java

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

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

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

/**
 * <p>
 *
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-07-17
 */
//查询检验项目
@Data
public class InspectionProductListVo implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "报检样品id")
    @JsonSerialize
    private int inspectionMaterialListId;

    @ApiModelProperty(value = "项目检验开始日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "项目检验结束日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "项目名称")
    @JsonSerialize
    private String name;

    @ApiModelProperty(value = "试验方法")
    @JsonSerialize
    private String method;

    @ApiModelProperty(value = "试验要求")
    @JsonSerialize
    private String ask;

    @ApiModelProperty(value = "单位")
    @JsonSerialize
    private String unit;

    @ApiModelProperty(value = "招标人要求值")
    @JsonSerialize
    private String required;

    @ApiModelProperty(value = "内控值")
    @JsonSerialize
    private String internal;

    @ApiModelProperty(value = "试验单试验开始日期", hidden = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date inspectStartTime;

    @ApiModelProperty(value = "试验单试验结束日期", hidden = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date inspectEndTime;

    @ApiModelProperty(value = "检验项目试验员")
    @JsonSerialize
    private String userName;

    @ApiModelProperty(value = "关联 è®¾å¤‡å")
    @JsonSerialize
    private String instrumentName;
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java

@@ -12,7 +12,7 @@
import java.io.Serializable;
import java.util.Date;

//检验计划分配
//(分页查询)检验计划分配
@Data
public class PlanVo implements Serializable {


 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
import com.yuanchu.limslaboratory.pojo.Plan;
import com.yuanchu.limslaboratory.pojo.dto.InspectionMaterialListDto;

import java.util.List;

@@ -41,8 +42,8 @@
    /**
     *根据样品id修改样品信息
     * @param inspectionMaterialListId
     * @param inspectionMaterialList
     * @param inspectionMaterialListDto
     * @return
     */
    void updateInspectionMaterialList( Integer inspectionMaterialListId,InspectionMaterialList inspectionMaterialList);
    void updateInspectionMaterialList(Integer inspectionMaterialListId, InspectionMaterialListDto inspectionMaterialListDto);
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo;

import java.util.List;

@@ -18,14 +19,11 @@
public interface InspectionProductListService extends IService<InspectionProductList> {




    /**
     * æ ¹æ®æ ·å“id查询检验计划样品里面的检验项目
     * @param id
     * @return
     */
    List<InspectionProductListDto> selectProductById(Integer id);

    List<InspectionProductListVo> selectProductById(Integer id);

}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java

@@ -39,13 +39,13 @@
     * @param inspectionId
     * @return
     */
    boolean delInspectionByInsId(String inspectionId);
    void delInspectionByInsId(String inspectionId);

    /**
     * æ ¹æ®æ£€éªŒå•id提交检验申请
     * @param inspectionId
     * @return
     */
    boolean subInspectionByInsId(String inspectionId);
    void subInspectionByInsId(String inspectionId);

}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java

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

import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.Plan;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
import com.yuanchu.limslaboratory.pojo.vo.FinPlanVo;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -34,15 +32,15 @@
     * @param id
     * @return
     */
    boolean delPlan(Integer id);
    void delPlan(Integer id);



    /**
     * ç»™æ£€éªŒè®¡åˆ’中的检验项目分配试验员,设备,以及日期
     * @param inspectionProductList
     * @param inspectionProductListDto
     */
    void upPlan(InspectionProductListDto inspectionProductListDto);
    void upPlan(Integer id ,InspectionProductListDto inspectionProductListDto);

    /**
     * æŸ¥è¯¢æˆå“æ£€éªŒ
@@ -51,5 +49,5 @@
     * @param state
     * @return
     */
    List<PlanDto> selectInspection(int pageSize, int countSize, Integer state);
    List<FinPlanVo> selectInspection(int pageSize, int countSize, Integer state);
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java

@@ -5,10 +5,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.mapper.*;
import com.yuanchu.limslaboratory.pojo.*;
import com.yuanchu.limslaboratory.pojo.dto.InspectionMaterialListDto;
import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -38,7 +40,7 @@
    InspectionProductListService inspectionProductListService;


    //查询检验单里面的物料信息
    //查询检验单里面的样品信息
    @Override
    public List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId) {
        return inspectionMaterialListMapper.selectInspectionMaterialListByInsId(insId);
@@ -85,7 +87,9 @@
    //根据样品id修改样品信息
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateInspectionMaterialList(Integer inspectionMaterialListId, InspectionMaterialList inspectionMaterialList) {
    public void updateInspectionMaterialList(Integer inspectionMaterialListId, InspectionMaterialListDto inspectionMaterialListDto) {
        InspectionMaterialList inspectionMaterialList = new InspectionMaterialList();
        BeanUtils.copyProperties(inspectionMaterialListDto,inspectionMaterialList);
        LambdaUpdateWrapper<InspectionMaterialList> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.eq(InspectionMaterialList::getId, inspectionMaterialListId);
        inspectionMaterialListMapper.update(inspectionMaterialList, updateWrapper);

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java

@@ -6,6 +6,7 @@
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -31,7 +32,7 @@

    //根据样品id查询检验计划样品里面的检验项目
    @Override
    public List<InspectionProductListDto> selectProductById(Integer id) {
    public List<InspectionProductListVo> selectProductById(Integer id) {
        return inspectionProductListMapper.selectByMaterId(id);
    }


 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java

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


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.mapper.PlanMapper;
@@ -15,6 +18,7 @@
import com.yuanchu.limslaboratory.service.InspectionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@@ -41,7 +45,7 @@
    InspectionMaterialListMapper inspectionMaterialListMapper;

    @Resource
    InspectionProductListMapper inspectionProductListMapper;
    InspectionProductListService inspectionProductListService;

    //添加检验申请单
    @Override
@@ -59,35 +63,40 @@

    //作废申请检验单
    @Override
    public boolean delInspectionByInsId(String inspectionId) {
        //检验单作废
    public void delInspectionByInsId(String inspectionId) {
        /*检验单作废*/
        Inspection inspection = inspectionMapper.selectById(inspectionId);
        inspection.setState(0);
        int judge1 = inspectionMapper.updateById(inspection);
        //检验计划作废
        inspectionMapper.updateById(inspection);
        /*检验计划作废*/
        UpdateWrapper<Plan> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("inspection_id", inspectionId).set("state", 0);
        planMapper.update(new Plan(),updateWrapper );
        //检验样品作废(根据报检单id删除样品信息)
        /*检验样品作废(根据报检单id删除样品信息)*/
        UpdateWrapper<InspectionMaterialList> wrapper1 = new UpdateWrapper<>();
        wrapper1.eq("inspection_id", inspectionId).set("state", 0);
        int judge2 = inspectionMaterialListMapper.update(new InspectionMaterialList(), wrapper1);
        return judge1 > 0 && judge2 > 0;
        //检验样品中的检验项目作废
        inspectionMaterialListMapper.update(new InspectionMaterialList(), wrapper1);
        /*检验样品中的检验项目作废*/
        //查出检验样品id

        LambdaQueryWrapper<InspectionMaterialList> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(InspectionMaterialList::getInspectionId,inspectionId);
        List<InspectionMaterialList> inspectionMaterialLists = inspectionMaterialListMapper.selectList(queryWrapper);
        for (InspectionMaterialList inspectionMaterialList : inspectionMaterialLists) {
            UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
            wrapper.eq("inspection_material_list_id", inspectionMaterialList.getId()).set("state", 0);
            inspectionProductListService.update(new InspectionProductList(), wrapper);
        }
    }

    //提交申请检验单
    @Override
    public boolean subInspectionByInsId(String inspectionId) {
    public void subInspectionByInsId(String inspectionId) {
        Inspection inspection = inspectionMapper.selectById(inspectionId);
        //状态改为已提交2
        inspection.setState(2);
        int judge = inspectionMapper.updateById(inspection);
        inspectionMapper.updateById(inspection);
        //计划表新增
        Plan plan = Plan.builder().inspectionId(inspectionId).state(1).userId(inspection.getInspectUserId()).createTime(new Date()).build();
        planMapper.insert(plan);
        return judge > 0;
    }
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java

@@ -1,16 +1,15 @@
package com.yuanchu.limslaboratory.service.impl;


import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yuanchu.limslaboratory.mapper.*;
import com.yuanchu.limslaboratory.pojo.*;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
import com.yuanchu.limslaboratory.pojo.vo.FinPlanVo;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.yuanchu.limslaboratory.service.PlanService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
@@ -42,10 +41,7 @@
    InspectionMaterialListMapper inspectionMaterialListMapper;

    @Resource
    UserMapper userMapper;

    @Resource
    InstrumentMapper instrumentMapper;
    InspectionProductListService inspectionProductListService;

    //查询所有检验计划分配
    @Override
@@ -58,20 +54,37 @@

    //作废检验计划
    @Override
    public boolean delPlan(Integer id) {
    public void delPlan(Integer id) {
        Plan plan = planMapper.selectById(id);

        /*检验计划作废*/
        //状态改为作废0
        plan.setState(0);
        int judge = planMapper.updateById(plan);
        return judge > 0;
        planMapper.updateById(plan);

        /*检验样品作废(根据报检单id删除样品信息)*/
        UpdateWrapper<InspectionMaterialList> wrapper1 = new UpdateWrapper<>();
        wrapper1.eq("inspection_id", plan.getInspectionId()).set("state", 0);
        inspectionMaterialListMapper.update(new InspectionMaterialList(), wrapper1);

        /*检验样品中的检验项目作废*/
        //查出检验样品id
        LambdaQueryWrapper<InspectionMaterialList> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(InspectionMaterialList::getInspectionId, plan.getInspectionId());
        List<InspectionMaterialList> inspectionMaterialLists = inspectionMaterialListMapper.selectList(queryWrapper);
        for (InspectionMaterialList inspectionMaterialList : inspectionMaterialLists) {
            UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
            wrapper.eq("inspection_material_list_id", inspectionMaterialList.getId()).set("state", 0);
            inspectionProductListService.update(new InspectionProductList(), wrapper);
        }
    }

    //修改(分配)检验计划里分配计划的信息
    @Override
    public void upPlan(InspectionProductListDto inspectionProductListDto) {
    public void upPlan(Integer id, InspectionProductListDto inspectionProductListDto) {
        /*更新计划表中的状态(3:已分配),更新时间*/
        //查询报检单id
        InspectionMaterialList inspectionMaterialList = inspectionMaterialListMapper.selectById(inspectionProductListDto.getInspectionMaterialListId());
        InspectionMaterialList inspectionMaterialList = inspectionMaterialListMapper.selectById(id);
        LambdaQueryWrapper<Plan> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(Plan::getInspectionId, inspectionMaterialList.getInspectionId());
        Plan plan = planMapper.selectOne(queryWrapper);
@@ -83,17 +96,8 @@

        /*更新检验项目表中的项目检验开始日期,项目检验结束日期,项目试验员,试验要求,更新时间,设备id*/
        InspectionProductList inspectionProductList = new InspectionProductList();
        //复制之后,inspectionProductList里面有项目检验开始、结束日期,项目名称,试验方法,试验要求,单位,
        BeanUtils.copyProperties(inspectionProductListDto, inspectionProductList);
        //根据设备名获取设备id
        LambdaQueryWrapper<Instrument> wrapper1 = new LambdaQueryWrapper<>();
        wrapper1.eq(Instrument::getEquipmentName, inspectionProductListDto.getInstrumentName());
        Instrument instrument = instrumentMapper.selectOne(wrapper1);
        //根据用户名获取用户id
        LambdaQueryWrapper<User> wrapper2 = new LambdaQueryWrapper<>();
        wrapper2.eq(User::getName, inspectionProductListDto.getUserName());
        User user = userMapper.selectOne(wrapper2);
        inspectionProductList.setUpdateTime(new Date()).setUserId(user.getId()).setInstrumentId(instrument.getId());
        inspectionProductList.setInspectionMaterialListId(id);
        //根据报检样品id和项目名称进行更新检验项目表
        LambdaUpdateWrapper<InspectionProductList> updateWrapper2 = new LambdaUpdateWrapper<>();
        updateWrapper2.eq(InspectionProductList::getInspectionMaterialListId, inspectionProductList.getInspectionMaterialListId())
@@ -103,7 +107,7 @@

    //查询成品检验
    @Override
    public List<PlanDto> selectInspection(int pageSize, int countSize, Integer state) {
    public List<FinPlanVo> selectInspection(int pageSize, int countSize, Integer state) {
        return planMapper.selectInspection((pageSize - 1) * countSize, pageSize * countSize, state);
    }
}

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

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionProductListMapper">

    <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto">
    <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo">
        select inspection_material_list_id,
               inspect_start_time inspectStartTime,
               inspect_end_time   inspectEndTime,
@@ -14,13 +14,27 @@
               internal,
               start_time,
               end_time,
               user.name          userName,
               uname           userName,
               equipment_name     instrumentName
        from lims_laboratory.inspection_product_list ipl
                 join lims_laboratory.inspection_material_list iml on iml.id = ipl.inspection_material_list_id
                 join lims_laboratory.inspection i on i.id = iml.inspection_id
                 join lims_laboratory.user on ipl.user_id = user.id
                 join lims_laboratory.instrument on ipl.instrument_id = instrument.id
        where inspection_material_list_id = #{id}
        from (select inspection_material_list_id,
                     pl.name   name,
                     user.name uname,
                     method,
                     ask,
                     unit,
                     required,
                     internal,
                     start_time,
                     end_time,
                     equipment_name
              from lims_laboratory.inspection_product_list pl
                       left join lims_laboratory.user on pl.user_id = user.id
                       left join lims_laboratory.instrument on pl.instrument_id = instrument.id) ipl
           , lims_laboratory.inspection_material_list iml
           , lims_laboratory.inspection i
        where iml.id = ipl.inspection_material_list_id
          and iml.id = ipl.inspection_material_list_id
          and i.id = iml.inspection_id
          and ipl.inspection_material_list_id = #{id}
    </select>
</mapper>

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

@@ -45,7 +45,7 @@
        limit #{pageSize},#{countSize}
    </select>

    <select id="selectInspection" resultType="com.yuanchu.limslaboratory.pojo.dto.PlanDto">
    <select id="selectInspection" resultType="com.yuanchu.limslaboratory.pojo.vo.FinPlanVo">
        select i.mid , p.inspection_id , p.state, p.create_time, p.name userName, i.name inspectUserName
        from (select inspection_id, state, plan.create_time, name
        from lims_laboratory.plan

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;
import java.util.Map;
import java.util.Objects;

@@ -21,4 +22,8 @@
public interface InstrumentMapper extends BaseMapper<Instrument> {

    IPage<Map<String, Object>> getListInstrumentInformation(Integer conditions,Boolean whetherWhether, String numberOrNameOrSpecifications, Integer classifyId, Page<Objects> page);

    //查询所有设备信息
    List<Map> selectInstrument();

}

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java

@@ -5,6 +5,7 @@
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import java.util.Map;
import java.util.Objects;

@@ -33,4 +34,10 @@
    Instrument getIdInstrumentInformation(Integer instrumentId);

    Integer updateEquipmentPointInformation(Instrument instrument);

    /**
     * æŸ¥è¯¢æ‰€æœ‰è®¾å¤‡ä¿¡æ¯
     * @return
     */
    List<Map> selectInstrument();
}

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java

@@ -13,6 +13,7 @@
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Objects;

@@ -79,4 +80,10 @@
        }
        return 0;
    }

    //查询所有设备信息
    @Override
    public List<Map> selectInstrument() {
        return instrumentMapper.selectInstrument();
    }
}

 laboratory-server/src/main/resources/mapper/InstrumentMapper.xml

@@ -19,4 +19,7 @@
        </if>
        AND i.`user_id` = u.`id`
    </select>
    <select id="selectInstrument" resultType="Map">
        select id,equipment_name from lims_laboratory.instrument
    </select>
</mapper>

 standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java

@@ -20,4 +20,7 @@
    List<Product> selectProductByMaterialId(String materialId);

    Map<String, Object> getProductInformation(Integer productId);

    //通过项目名查询项目的试验方法
    List<Map> selectInstrumentByProname(String name);
}

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java

@@ -31,4 +31,11 @@
    void MaterialIdDeleteProduct(List<String> deleteMaterialId);

    Integer updateMaterialInformation(Product product);

    /**
     * é€šè¿‡é¡¹ç›®åæŸ¥è¯¢é¡¹ç›®çš„试验方法
     * @param name
     * @return
     */
    List<Map> selectInstrumentByProname(String name);
}

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java

@@ -99,5 +99,11 @@
        LambdaUpdateWrapper<Product> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.eq(Product::getId, product.getId());
        return productMapper.update(product, updateWrapper);
    }

    //通过项目名查询项目的试验方法
    @Override
    public List<Map> selectInstrumentByProname(String name) {
        return productMapper.selectInstrumentByProname(name);
    }
}

 standard-server/src/main/resources/mapper/ProductMapper.xml

@@ -1,7 +1,7 @@
<?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.ProductMapper">
    <select id="selectProductByMaterialId" resultType="Product">
    <select id="selectProductByMaterialId" resultType="com.yuanchu.limslaboratory.pojo.Product">
        select id, name, method, father, unit, required, internal
        from product
        where material_id = #{material_id}
@@ -9,9 +9,19 @@
    </select>

    <select id="getProductInformation" parameterType="integer" resultType="map">
        SELECT p.method, ifnull(null, p.father) projectClassification, p.user_id, date_format(p.update_time, '%Y-%m-%d %H:%i:%s') updateTime,
               p.unit, p.required, p.internal
        SELECT p.method,
               ifnull(null, p.father)                          projectClassification,
               p.user_id,
               date_format(p.update_time, '%Y-%m-%d %H:%i:%s') updateTime,
               p.unit,
               p.required,
               p.internal
        FROM product p
        where p.id = #{productId}
    </select>
    <select id="selectInstrumentByProname" resultType="java.util.Map">
        select id, method
        from lims_laboratory.product
        where name=#{name}
    </select>
</mapper>

 user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java

@@ -26,5 +26,5 @@

    IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);

    List<User> selectUser();
    List<Map> selectUser();
}

 user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java

@@ -79,5 +79,5 @@
     * æŸ¥è¯¢æ‰€æœ‰ç”¨æˆ·ä¿¡æ¯
     * @return
     */
    List<User> selectUser();
    List<Map> selectUser();
}

 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java

@@ -75,7 +75,7 @@
    }

    @Override
    public List<User> selectUser() {
    public List<Map> selectUser() {
        return userMapper.selectUser();
    }


 user-server/src/main/resources/mapper/UserMapper.xml

@@ -37,21 +37,8 @@
        </if>
    </select>

    <select id="selectUser" resultType="com.yuanchu.limslaboratory.pojo.User">
        select id,
               account,
               password,
               name,
               phone,
               email,
               age,
               job_state,
               info,
               create_time,
               update_time,
               version,
               role_id,
               enterprise_id
    <select id="selectUser" resultType="Map">
        select id, name
        from lims_laboratory.user
    </select>
</mapper>