改动

zss

2023-08-22 affabbd21802dacbf943692912a83e63106670e4

改动

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

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


import com.yuanchu.limslaboratory.pojo.ProjectNum;
import com.yuanchu.limslaboratory.service.HomeService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Service;
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 zss
 * @since 2023-08-03 13:03:36
 */
@Api(tags = "首页")
@RestController
@RequestMapping("/home")
public class HomeController {

    @Resource
    HomeService homeService;

    @ApiOperation("计算检验与未检验的单子与项目的数量接口")
    @GetMapping("/checkProjectNum")
    public Result checkProjectNum() {
        ProjectNum projectNum=homeService.checkProjectNum();
        return Result.success(projectNum);
    }
}

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

@@ -6,6 +6,7 @@
import java.util.*;

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.mapper.UserMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
@@ -45,6 +46,9 @@
    @Resource
    LinkBasicInformationService linkBasicInformationService;

    @Resource
    UserMapper userMapper;

    @ApiOperation(value = "查询检验申请单列表")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize", value = "页数", dataTypeClass = Integer.class, required = true),
@@ -71,10 +75,10 @@
            case 0:
                //原材料
                return Result.success(rawMaterialService.selectRawmaAll());
            case 1:
            case 2:
                //委托单
                return Result.success(linkBasicInformationService.selectLinkAll());
            case 2:
            case 1:
                //成品检验
                return Result.success("请输入检验信息!");
        }
@@ -99,6 +103,22 @@
        return Result.success(inspectionService.selectInspectsListById(id));
    }

    @ApiOperation(value = "选择检验项目的责任人")
    @GetMapping("/selectUser")
    public Result selectUser() {
        return Result.success(userMapper.selectUser());
    }

    @ApiOperation(value = "保存检验项目责任人")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "检验单项目id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "userProId", value = "责任人id", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/chooseUseProId")
    public Result chooseUseProId(Integer id,Integer userProId) {
        return Result.success(inspectionService.chooseUseProId(id,userProId));
    }

    @ApiOperation(value = "作废检验单")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "检验单id", dataTypeClass = Integer.class, required = true)

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

@@ -58,7 +58,7 @@
    @ApiOperation("分配")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "检验项目id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "userId", value = "检验人id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "userId", value = "执行人id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "instrumentId", value = "设备id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/distribution")

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

@@ -22,5 +22,11 @@
     * @return
     */
    IPage<Map<String, Object>> selectInspectsList(Page<Object> page, String message);

    //计算已检验检验单数量
    Integer seleCountIns();

    //计算未检验的数量
    Integer seleCountUnIns();
}


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

@@ -21,5 +21,11 @@

    //根据检验样品id作废检验项目
    void updat(Integer id);

    //计算已检验项目数量
    Integer seleCountInspro();

    //计算未检验项目数量
    Integer seleCountUnInspro();
}


 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformingFeedbackDto.java

@@ -24,12 +24,12 @@
    @ApiModelProperty(value = "分页多少条", example = "10", required = true)
    private Long pageNum;

    @ApiModelProperty(value = "样品编号", example = "1680929494813868034", required = true)
    @ApiModelProperty(value = "样品编号", example = "1680929494813868034")
    private String materialCode;

    @ApiModelProperty(value = "样品名称", example = "电线电缆", required = true)
    @ApiModelProperty(value = "样品名称", example = "电线电缆")
    private String materialName;

    @ApiModelProperty(value = "申请单号", example = "XG-UGYUGH", required = true)
    @ApiModelProperty(value = "申请单号", example = "XG-UGYUGH")
    private String inspectionCode;
}

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

@@ -84,7 +84,7 @@
    private Integer inspectionMaterialId;

    /**
     * å…³è” ç”¨æˆ·id è¯•éªŒå‘˜
     * å…³è” ç”¨æˆ·id æ‰§è¡Œäºº
     **/
    private Integer userId;

@@ -92,5 +92,10 @@
     * å…³è” è®¾å¤‡id
     **/
    private Integer instrumentId;

    /**
     * å…³è” ç”¨æˆ·id è´£ä»»äºº
     **/
    private Integer userProId;
}


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

@@ -18,6 +18,8 @@

    private static final long serialVersionUID = 1L;

    private Integer id;

    /**
     * æ ·å“ç¼–号
     */
@@ -50,4 +52,8 @@
     */
    private String specifications;

    /**
     * ç»“论0:不合格 ; 1:合格
     */
    private Integer result;
}

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

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

import lombok.Data;

@Data
public class ProjectNum {

    private int insNum;         //已检验的检验单数量
    private int insUnNum;       //未检验的检验单数量
    private int insproNum;      //已检验的检验项目数量
    private int insproUnNum;    //未检验的检验项目数量

}

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

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

import com.yuanchu.limslaboratory.pojo.ProjectNum;

public interface HomeService {

    /**
     * è®¡ç®—检验与未检验的单子与项目的数量接口
     * @return
     */
    ProjectNum checkProjectNum();

}

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

@@ -50,5 +50,13 @@
     * @return
     */
    String delInspect(Integer id);

    /**
     * ä¿å­˜æ£€éªŒé¡¹ç›®è´£ä»»äºº
     * @param id
     * @param userProId
     * @return
     */
    String chooseUseProId(Integer id, Integer userProId);
}


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

@@ -46,7 +46,7 @@

    /**
     * ä¸ŠæŠ¥
     * @param code
     * @param id
     * @return
     */
    String reported(Integer id);

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
package com.yuanchu.limslaboratory.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
import com.yuanchu.limslaboratory.mapper.InspectionProductMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.pojo.ProjectNum;
import com.yuanchu.limslaboratory.service.HomeService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;


@Service
public class HomeServiceImpl implements HomeService {

    @Resource
    InspectionMapper inspectionMapper;

    @Resource
    InspectionProductMapper inspectionProductMapper;


    //计算检验与未检验的单子与项目的数量接口
    @Override
    public ProjectNum checkProjectNum() {
        ProjectNum projectNum = new ProjectNum();
        //已检验的检验单数量
        projectNum.setInsNum(inspectionMapper.seleCountIns());
        //未检验的检验单数量
        projectNum.setInsUnNum(inspectionMapper.seleCountUnIns());
        //已检验的检验项目数量
        projectNum.setInsproNum(inspectionProductMapper.seleCountInspro());
        //未检验的检验项目数量
        projectNum.setInsproUnNum(inspectionProductMapper.seleCountUnInspro());
        return projectNum;
    }
}

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

@@ -15,6 +15,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -201,6 +202,16 @@
        return "作废成功!";
    }

    //保存检验项目责任人
    @Override
    public String chooseUseProId(Integer id, Integer userProId) {
        InspectionProduct inspectionProduct = new InspectionProduct();
        inspectionProduct.setId(id);
        inspectionProduct.setUserProId(userProId);
        inspectionProductMapper.updateById(inspectionProduct);
        return "保存成功!";
    }


}


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

@@ -65,6 +65,7 @@
    public String distribution(Integer id, Integer userId, Integer instrumentId) {
        InspectionProduct inspectionProduct = new InspectionProduct();
        inspectionProduct.setId(id);
        //执行人
        inspectionProduct.setUserId(userId);
        inspectionProduct.setInstrumentId(instrumentId);
        inspectionProductMapper.updateById(inspectionProduct);

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

@@ -25,5 +25,21 @@
            and i.code like concat('%', #{message}, '%')
            or im.name like concat('%', #{message}, '%')
        </if>
    </select>

    <!--计算检验的检验单数量-->
    <select id="seleCountIns" resultType="java.lang.Integer">
        select count(id)
        from lims_laboratory.inspection
        where state = 1
          and inspection_status in (0, 1)
    </select>

    <!--计算未检验的检验单数量-->
    <select id="seleCountUnIns" resultType="java.lang.Integer">
        select count(id)
        from lims_laboratory.inspection
        where state = 1
          and inspection_status is null
    </select>
</mapper>

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

@@ -21,4 +21,20 @@
            set state=0
        where inspection_material_id=#{id}
    </update>

    <!--计算已检验项目数量-->
    <select id="seleCountInspro" resultType="java.lang.Integer">
        select count(id)
        from lims_laboratory.inspection_product
        where state = 1
          and test_state in (0, 1)
    </select>

    <!--计算未检验项目数量-->
    <select id="seleCountUnInspro" resultType="java.lang.Integer">
        select count(id)
        from lims_laboratory.inspection_product
        where state = 1
          and test_state is null
    </select>
</mapper>

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

@@ -1,35 +1,34 @@
<?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.NonConformingFeedbackMapper">

    <select id="selectNonConformingFeedback" resultType="nonConformingFeedback" parameterType="com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto">
        SELECT
    <select id="selectNonConformingFeedback" resultType="nonConformingFeedback"
            parameterType="com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto">
        SELECT im.id,
            im.`code` materialCode,
            im.`name` materialName,
            i.`code` inspectionCode,
            i.create_time createTime,
            u.`name` testManager,
            im.specifications specifications
        im.specifications specifications,
        inspection_status result
        FROM
            inspection i,
            inspection_material im,
            `user` u
        lims_laboratory.inspection i,
        lims_laboratory.inspection_material im,
        lims_laboratory.`user` u
        WHERE
            1 = 1
          AND i.id = im.inspection_id
        i.id = im.inspection_id
          AND i.user_id = u.id
        <if test="nonConformingFeedbackDto.materialCode!=null and nonConformingFeedbackDto.materialCode!=''">
            and  im.`code` like concat("%",#{nonConformingFeedbackDto.materialCode},"%")
            and im.`code` like concat('%',#{nonConformingFeedbackDto.materialCode},'%')
        </if>
        <if test="nonConformingFeedbackDto.materialName!=null and nonConformingFeedbackDto.materialName!=''">
            and im.`name` like concat("%",#{nonConformingFeedbackDto.materialName},"%")
            and im.`name` like concat('%',#{nonConformingFeedbackDto.materialName},'%')
        </if>
        <if test="nonConformingFeedbackDto.inspectionCode!=null and nonConformingFeedbackDto.inspectionCode!=''">
            and im.specifications like concat("%",#{nonConformingFeedbackDto.inspectionCode},"%")
            and im.specifications like concat('%',#{nonConformingFeedbackDto.inspectionCode},'%')
        </if>
          and i.state=1
          and im.state=1
        and i.inspection_status =0
    </select>

</mapper>

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

@@ -4,13 +4,10 @@
    <resultMap id="selectAllPlanMap" type="map">
        <id property="code" column="code"/>
        <result property="id" column="id"/>
        <result property="samplename" column="samplename"/>
        <result property="inspectionStatus" column="inspectionStatus"/>
        <result property="startTime" column="startTime"/>
        <result property="endTime" column="endTime"/>
        <collection property="father" resultMap="selectAllPlanMapTowMap" javaType="List"/>
    </resultMap>
    <resultMap id="selectAllPlanMapTowMap" type="map">
        <id property="samplename" column="samplename"/>
        <collection property="chldren" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
    </resultMap>
    <resultMap id="selectAllPlanMapTowsMap" type="map">

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

@@ -26,8 +26,7 @@
    // å››çº§æ ‘
    List<Map<String, Object>> FourTree(String specificationsName);

    //选择样品名称
    List<String> selectmater();





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

@@ -23,10 +23,10 @@
    //添加标准-->选择项目分组
    List<String> selectfather();




    //查询项目模版根据样品名
    List<Map<String, Object>> seleMode(String name);

    //选择样品名称
    List<String> selectmater();
}


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

@@ -85,9 +85,11 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Integer addMaterialInformation(AddMaterialDto addMaterialDto) {
        Material material = materialMapper.selectOne(Wrappers.<Material>query().eq("name", addMaterialDto.getMaterialName()));
        material.setType(addMaterialDto.getType());
        int isInsertSuccess = materialMapper.updateById(material);
        Material material = new Material()
                .setCode("BZ" + IdWorker.getIdStr())
                .setName(addMaterialDto.getMaterialName())
                .setType(addMaterialDto.getType());
        int isInsertSuccess = materialMapper.insert(material);
        if (isInsertSuccess > 0) {
            Standard standard = new Standard()
                    .setMaterialId(material.getId())
@@ -125,7 +127,7 @@
    //添加指标-->选择样品名称
    @Override
    public List<String> selectmater() {
        return materialMapper.selectmater();
        return productModelMapper.selectmater();
    }



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

@@ -28,13 +28,10 @@
    @Resource
    ProductModelMapper productModelMapper;

    @Resource
    MaterialMapper materialMapper;

    //选择样品
    @Override
    public List<String> selectmater() {
        return materialMapper.selectmater();
        return productModelMapper.selectmater();
    }

    //添加标准-->选择项目分组
@@ -58,10 +55,6 @@
            BeanUtils.copyProperties(productModelDto, productModel);
            productModelMapper.insert(productModel);
        }
        //添加物料产品库
        Material material = new Material();
        material.setName(productModelDto.getMaterial()).setCode(MyUtil.getTimeSixNumberCode("CP", "CP"));
        materialMapper.insert(material);
    }

    //查询标准模版列表

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

@@ -68,10 +68,5 @@
        p.`specifications_id`
        WHERE m.`state` = 1
    </select>
    <!--添加标准选择样品名称-->
    <select id="selectmater" resultType="java.lang.String">
        select  name
        from lims_laboratory.material
        where state = 1
    </select>

</mapper>

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

@@ -48,5 +48,12 @@
        from lims_laboratory.product_model
        where state = 1
          and material =#{name}
    </select>

    <!--添加标准选择样品名称-->
    <select id="selectmater" resultType="java.lang.String">
        select material
        from lims_laboratory.product_model
        where state = 1
    </select>
</mapper>

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

@@ -40,5 +40,6 @@
    <select id="selectUser" resultType="Map">
        select id, name
        from lims_laboratory.user
        where job_state!=0
    </select>
</mapper>