Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-27 c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
#	inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
#	standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java
#	standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
#	standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
#	standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
#	standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
#	standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
#	standard-server/src/main/resources/mapper/ProductMapper.xml
#	user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java

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

@@ -69,7 +69,7 @@
        return Result.success(inspectionService.selectAllInspection(pageSize, countSize, state));
    }

    @ApiOperation("查询检验单里面的物料信息")
    @ApiOperation("查询检验单里面的样品信息")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "inspectionId", value = "报检单ID", dataTypeClass = String.class, required = true),
    })
@@ -104,7 +104,8 @@
    })
    @PostMapping("/submitInspection")
    public Result submitInspection(String inspectionId) {
        return Result.success(inspectionService.subInspectionByInsId(inspectionId));
        inspectionService.subInspectionByInsId(inspectionId);
        return Result.success();
    }

    @ApiOperation("作废检验单申请")
@@ -113,6 +114,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

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


import com.yuanchu.limslaboratory.mapper.InspectionMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
@@ -13,6 +16,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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

/**
@@ -31,13 +36,24 @@
    @Autowired
    InspectionMaterialListService inspectionMaterialListService;

    @Resource
    InspectionMapper inspectionMapper;

    @ApiOperation("添加检验单中的检验样品")
    @PostMapping("/addInspectionMaterialList")
    public Result addInspectionMaterialList(@RequestHeader("X-Token") String token, @RequestBody InspectionMaterialList inspectionMaterialList) throws Exception {
        inspectionMaterialList.setState(1);
        Object object = RedisUtil.get(token);
        Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
        return Result.success(inspectionMaterialListService.addInspectionMaterialList(inspectionMaterialList, "" + unmarshal.get("id")));
        //如果检验单已作废,状态为0,则无法添加样品
        Inspection inspection = inspectionMapper.selectById(inspectionMaterialList.getInspectionId());
        if (inspection.getState()==0) {
            return Result.fail("检验单已作废无法添加检验样品");
        }
        else {
            inspectionMaterialList.setState(1);
            Object object = RedisUtil.get(token);
            Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
            inspectionMaterialListService.addInspectionMaterialList(inspectionMaterialList, "" + unmarshal.get("id"));
            return Result.success();
        }
    }

    @ApiOperation("删除样品")
@@ -46,10 +62,11 @@
    })
    @PostMapping("/delInspectionMaterialList")
    public Result delInspectionMaterialList(int inspectionMaterialListId) {
        return Result.success(inspectionMaterialListService.delInspectionMaterialListByInsId(inspectionMaterialListId));
        inspectionMaterialListService.delInspectionMaterialListByInsId(inspectionMaterialListId);
        return Result.success();
    }

    @ApiOperation("根据Id查询样品信息")
    @ApiOperation("根据样品Id查询样品信息")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "inspectionId", value = "样品ID", dataTypeClass = String.class, required = true),
    })
@@ -63,8 +80,8 @@
            @ApiImplicitParam(name = "inspectionMaterialListId", value = "样品ID", dataTypeClass = Integer.class, required = true),
    })
    @PutMapping("/updateInspectionMaterialList/{inspectionMaterialListId}")
    public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialList inspectionMaterialList) {
        return Result.success(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,7 +1,8 @@
package com.yuanchu.limslaboratory.controller;


import com.yuanchu.limslaboratory.pojo.User;
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;
@@ -9,7 +10,6 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
@@ -20,13 +20,19 @@
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-07-17
 */
@Api(tags = "检验模块-->分配计划-->检验项目")
@Api(tags = "检验模块-->检验样品-->检验项目")
@RestController
@RequestMapping("/inspection-product-list")
public class InspectionProductListController {

    @Resource
    UserService userService;

    @Resource
    InstrumentService instrumentService;

    @Resource
    InspectionProductListService inspectionProductListService;

    @ApiOperation("查询试验员信息")
    @GetMapping("/selectUser")
@@ -42,4 +48,30 @@
    public Result selectUserById(Integer id) {
        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)
    })
    @GetMapping("/selectProductById/{id}")
    public Result selectProductById(@PathVariable Integer id) {
        return Result.success(inspectionProductListService.selectProductById(id));
    }

}

 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,7 +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;
@@ -28,6 +32,9 @@
    @Resource
    private PlanService planService;

    @Resource
    ProductService productService;

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

    @ApiOperation("查询检验计划里面的检验项目")
    @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)
            @ApiImplicitParam(name = "id", value = "项目id", dataTypeClass = Integer.class, required = true),
    })
    @GetMapping("/selectProductById/{id}")
    public Result selectProductById(@PathVariable Integer id) {
        return Result.success(planService.selectProductById(id));
    @PostMapping("/selectProMethodById")
    public Result selectProMethodById(Integer id) {
        Product product = productService.getById(id);
        return Result.success(product.getMethod());
    }

    @ApiOperation("分配检验计划中分配项目")
    @PostMapping("/upPlan")
    public Result upPlan(@RequestBody InspectionProductList inspectionProductList) {
        planService.upPlan(inspectionProductList);
    @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();
    }

@@ -61,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

@@ -3,6 +3,8 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
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;

@@ -19,9 +21,7 @@
 */
public interface InspectionProductListMapper extends BaseMapper<InspectionProductList> {

    //添加检验项目
    int addInspectionProductList(List<InspectionProductList> list);

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

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

@@ -2,14 +2,14 @@

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>
 *  Mapper æŽ¥å£
 * Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
@@ -18,8 +18,8 @@
public interface PlanMapper extends BaseMapper<Plan> {

    //查询所有检验计划分配
    Map selectAllPlan(int pageSize, int countSize, Integer state);
    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/InspectionProductList.java

@@ -75,12 +75,12 @@

    private Integer version;

    @ApiModelProperty(value = "关联 æŠ¥æ£€id")
    @ApiModelProperty(value = "关联 æŠ¥æ£€ç‰©æ–™id")
    private int inspectionMaterialListId;

    @ApiModelProperty(value = "关联 ç”¨æˆ·id è¯•éªŒå‘˜")
    private Integer userId;

    @ApiModelProperty(value = "关联 è®¾å¤‡id")
    private Integer instrument_id;
    private Integer instrumentId;
}

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

@@ -61,7 +61,5 @@
    @ApiModelProperty(value = "关联 ç”¨æˆ·id(负责人id)")
    private Integer userId;

    @ApiModelProperty(value = "关联 è®¾å¤‡id")
    private Integer deviceId;

}

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

@@ -2,8 +2,10 @@

import com.yuanchu.limslaboratory.pojo.Inspection;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;

@Data
public class InspectionDto extends Inspection implements Serializable {

    private static final long serialVersionUID = 1L;

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

@@ -2,48 +2,54 @@

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;

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

    //检测项目

    @ApiModelProperty(value = "检测项目")
    @JsonSerialize
    private String name;

    //试验员
    @ApiModelProperty(value = "试验员")
    @JsonSerialize
    private String userName;

    //试验开始日期
    @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 method;

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

    //样品编号
    @ApiModelProperty(value = "样品编号")
    @JsonSerialize
    private int mid;

    //样品名称
    @ApiModelProperty(value = "样品名称")
    @JsonSerialize
    private String materialName;

    //规格型号
    @ApiModelProperty(value = "规格型号")
    @JsonSerialize
    private String specificationsSerialNumber;

    //样品数量
    @ApiModelProperty(value = "样品数量")
    @JsonSerialize
    private Integer materialNum;
}

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

ÎļþÒÑɾ³ý

 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;

@@ -29,20 +30,20 @@
     * @param userId
     * @return
     */
    InspectionMaterialList addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId);
    void addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId);

    /**
     * æ ¹æ®æ£€éªŒæ ·å“id删除样品信息
     * @param inspectionMaterialListId
     * @return
     */
    boolean delInspectionMaterialListByInsId(int inspectionMaterialListId);
    void delInspectionMaterialListByInsId(int inspectionMaterialListId);

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

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

@@ -3,6 +3,8 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
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,10 +20,10 @@


    /**
     * æ ¹æ®æ£€éªŒæ ·å“id删除样品里的检验项目
     * @param inspectionMaterialListId
     * æ ¹æ®æ ·å“id查询检验计划样品里面的检验项目
     * @param id
     * @return
     */
    int delInspectionProductList(int inspectionMaterialListId);
    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,11 +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.PlanDto;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.pojo.vo.FinPlanVo;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;

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

/**
 * <p>
@@ -24,27 +25,22 @@
     * @param state
     * @return
     */
    Map selectAllPlan(int pageSize, int countSize, Integer state);
    List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state);

    /**
     * æ ¹æ®è®¡åˆ’id作废检验计划
     * @param id
     * @return
     */
    boolean delPlan(Integer id);
    void delPlan(Integer id);

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


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

    /**
     * æŸ¥è¯¢æˆå“æ£€éªŒ
@@ -53,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

@@ -3,14 +3,14 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.mapper.PlanMapper;
import com.yuanchu.limslaboratory.mapper.ProductMapper;
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;
@@ -21,7 +21,7 @@

/**
 * <p>
 *  æœåŠ¡å®žçŽ°ç±»
 * æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
@@ -39,10 +39,8 @@
    @Resource
    InspectionProductListService inspectionProductListService;

    @Resource
    InspectionProductListMapper inspectionProductListMapper;

    //查询检验单里面的物料信息
    //查询检验单里面的样品信息
    @Override
    public List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId) {
        return inspectionMaterialListMapper.selectInspectionMaterialListByInsId(insId);
@@ -51,47 +49,48 @@
    //添加检验单中的检验样品
    @Override
    @Transactional(rollbackFor = Exception.class)
    public InspectionMaterialList addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId) {
        int judge = inspectionMaterialListMapper.insert(inspectionMaterialList);
        List<Product> list = productMapper.selectProductByMaterialId(inspectionMaterialList.getMaterialId());
        List<InspectionProductList> list1 = new ArrayList<>();
        list.forEach(a-> {
            InspectionProductList inspectionProductList = new InspectionProductList();
            inspectionProductList.setName(a.getName())
                    .setUnit(a.getUnit())
                    .setRequired(a.getRequired())
                    .setInternal(a.getInternal())
                    .setState(1)
                    .setInspectionMaterialListId(inspectionMaterialList.getId())
                    .setUserId(Integer.parseInt(userId));
            list1.add(inspectionProductList);
        });
        //添加检验项目
        int judge2 = inspectionProductListMapper.addInspectionProductList(list1);
        return judge>0&&judge2>0?inspectionMaterialList:null;
    public void addInspectionMaterialList(InspectionMaterialList inspectionMaterialList, String userId) {
           inspectionMaterialListMapper.insert(inspectionMaterialList);
            List<Product> list = productMapper.selectProductByMaterialId(inspectionMaterialList.getMaterialId());
            List<InspectionProductList> list1 = new ArrayList<>();
            list.forEach(a -> {
                InspectionProductList inspectionProductList = new InspectionProductList();
                inspectionProductList.setName(a.getName())
                        .setUnit(a.getUnit())
                        .setRequired(a.getRequired())
                        .setInternal(a.getInternal())
                        .setState(1)
                        .setInspectionMaterialListId(inspectionMaterialList.getId())
                        .setUserId(Integer.parseInt(userId));
                    list1.add(inspectionProductList);
            });
            //添加检验项目
            inspectionProductListService.saveBatch(list1);
    }

    //根据样品id删除检验样品
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean delInspectionMaterialListByInsId(int inspectionMaterialListId) {
    public void delInspectionMaterialListByInsId(int inspectionMaterialListId) {
        //删除检验样品
        InspectionMaterialList list = new InspectionMaterialList();
        list.setState(0);
        list.setId(inspectionMaterialListId);
        int judge1 = inspectionMaterialListMapper.updateById(list);
        inspectionMaterialListMapper.updateById(list);
        //根据样品id删除检验样品中的检验项目
        int judge2 = inspectionProductListService.delInspectionProductList(inspectionMaterialListId);
        return judge1>0&&judge2>0;
        UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
        wrapper.eq("inspection_material_list_id", inspectionMaterialListId).set("state", 0);
        inspectionProductListService.update(new InspectionProductList(), wrapper);
    }

    //根据样品id修改样品信息
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean 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);
        int judge = inspectionMaterialListMapper.update(inspectionMaterialList, updateWrapper);
        return judge>0;
        updateWrapper.eq(InspectionMaterialList::getId, inspectionMaterialListId);
        inspectionMaterialListMapper.update(inspectionMaterialList, updateWrapper);
    }
}

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

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

import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
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;
@@ -27,11 +30,11 @@



    //根据检验样品id删除样品里的检验项目
    //根据样品id查询检验计划样品里面的检验项目
    @Override
    public int delInspectionProductList(int inspectionMaterialListId) {
        UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
        wrapper.eq("inspectionMaterialListId", inspectionMaterialListId).set("state", 0);
        return inspectionProductListMapper.update(new InspectionProductList(),wrapper);
    public List<InspectionProductListVo> selectProductById(Integer id) {
        return inspectionProductListMapper.selectByMaterId(id);
    }


}

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

@@ -1,24 +1,32 @@
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;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.Plan;
import com.yuanchu.limslaboratory.pojo.dto.InspectionDto;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
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;


/**
 * <p>
 *  æœåŠ¡å®žçŽ°ç±»
 * æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
@@ -36,44 +44,59 @@
    @Resource
    InspectionMaterialListMapper inspectionMaterialListMapper;

    @Resource
    InspectionProductListService inspectionProductListService;

    //添加检验申请单
    @Override
    public Inspection addInspection(String userName,int type) {
        Inspection inspection = new Inspection(type, 0,1,1, userName);
    public Inspection addInspection(String userName, int type) {
        Inspection inspection = new Inspection(type, 0, 1, 1, userName);
        int judge = inspectionMapper.insert(inspection);
        return judge>0?inspection:null;
        return judge > 0 ? inspection : null;
    }

    //查询所有检验单列表
    @Override
    public List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state) {
        return inspectionMapper.selectAllInspection((pageSize - 1) * countSize,pageSize * countSize, state);
        return inspectionMapper.selectAllInspection((pageSize - 1) * countSize, pageSize * countSize, state);
    }

    //作废申请检验单
    @Override
    public boolean delInspectionByInsId(String inspectionId) {
        //检验单作废
    public void delInspectionByInsId(String inspectionId) {
        /*检验单作废*/
        Inspection inspection = inspectionMapper.selectById(inspectionId);
        inspection.setState(0);
        int judge1 = inspectionMapper.updateById(inspection);
        //检验样品作废(根据报检单id删除样品信息)
        UpdateWrapper<InspectionMaterialList> wrapper = new UpdateWrapper<>();
        wrapper.eq("inspection_id", inspectionId).set("state", 0);
        int judge2 = inspectionMaterialListMapper.update(new InspectionMaterialList(),wrapper);
        return judge1>0&&judge2>0;
        inspectionMapper.updateById(inspection);
        /*检验计划作废*/
        UpdateWrapper<Plan> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("inspection_id", inspectionId).set("state", 0);
        planMapper.update(new Plan(), updateWrapper);
        /*检验样品作废(根据报检单id删除样品信息)*/
        UpdateWrapper<InspectionMaterialList> wrapper1 = new UpdateWrapper<>();
        wrapper1.eq("inspection_id", inspectionId).set("state", 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).build();
        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,21 +1,24 @@
package com.yuanchu.limslaboratory.service.impl;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.Plan;
import com.yuanchu.limslaboratory.mapper.PlanMapper;
import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
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.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;
import org.springframework.stereotype.Service;

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


/**
 * <p>
@@ -34,9 +37,15 @@
    @Resource
    InspectionProductListMapper inspectionProductListMapper;

    @Resource
    InspectionMaterialListMapper inspectionMaterialListMapper;

    @Resource
    InspectionProductListService inspectionProductListService;

    //查询所有检验计划分配
    @Override
    public Map selectAllPlan(int pageSize, int countSize, Integer state) {
    public List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state) {
        if (state == null) {
            state = 2;
        }
@@ -45,32 +54,60 @@

    //作废检验计划
    @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);
        }
    }

    //根据样品id查询检验计划里面的检验项目
    //修改(分配)检验计划里分配计划的信息
    @Override
    public List<InspectionProductList> selectProductById(Integer id) {
        return inspectionProductListMapper.selectByMaterId(id);
    }
    public void upPlan(Integer id, InspectionProductListDto inspectionProductListDto) {
        /*更新计划表中的状态(3:已分配),更新时间*/
        //查询报检单id
        InspectionMaterialList inspectionMaterialList = inspectionMaterialListMapper.selectById(id);
        LambdaQueryWrapper<Plan> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(Plan::getInspectionId, inspectionMaterialList.getInspectionId());
        Plan plan = planMapper.selectOne(queryWrapper);
        plan.setState(3).setUpdateTime(new Date());
        //根据报检单id进行更新计划表
        LambdaUpdateWrapper<Plan> updateWrapper1 = new LambdaUpdateWrapper<>();
        updateWrapper1.eq(Plan::getInspectionId, plan.getInspectionId());
        planMapper.update(plan, updateWrapper1);

    //修改检验计划里分配计划的信息
    @Override
    public void upPlan(InspectionProductList inspectionProductList) {
        LambdaUpdateWrapper<InspectionProductList> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.eq(InspectionProductList::getInspectionMaterialListId, inspectionProductList.getInspectionMaterialListId())
                .eq(InspectionProductList::getMethod, inspectionProductList.getMethod());
        inspectionProductListMapper.update(inspectionProductList, updateWrapper);
        /*更新检验项目表中的项目检验开始日期,项目检验结束日期,项目试验员,试验要求,更新时间,设备id*/
        InspectionProductList inspectionProductList = new InspectionProductList();
        BeanUtils.copyProperties(inspectionProductListDto, inspectionProductList);
        inspectionProductList.setInspectionMaterialListId(id);
        //根据报检样品id和项目名称进行更新检验项目表
        LambdaUpdateWrapper<InspectionProductList> updateWrapper2 = new LambdaUpdateWrapper<>();
        updateWrapper2.eq(InspectionProductList::getInspectionMaterialListId, inspectionProductList.getInspectionMaterialListId())
                .eq(InspectionProductList::getName, inspectionProductList.getName());
        inspectionProductListMapper.update(inspectionProductList, updateWrapper2);
    }

    //查询成品检验
    @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

@@ -1,19 +1,12 @@
<?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.InspectionProductListMapper">
    <insert id="addInspectionProductList">
        INSERT INTO inspection_product_list (name, method, ask, unit, required, internal, create_time,
        update_time,inspection_material_list_id, user_id) VALUES
        <foreach collection="list" separator="," item="i">
            (#{i.name}, #{i.method}, #{i.ask}, #{i.unit}, #{i.required}, #{i.internal}, #{i.createTime},
            #{i.updateTime}, #{i.inspectionMaterialListId},
            #{i.userId})
        </foreach>
    </insert>

    <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.InspectionProductList">
        select id,
               name,
    <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo">
        select inspection_material_list_id,
               inspect_start_time inspectStartTime,
               inspect_end_time   inspectEndTime,
               ipl.name,
               method,
               ask,
               unit,
@@ -21,14 +14,27 @@
               internal,
               start_time,
               end_time,
               state,
               create_time,
               update_time,
               version,
               inspection_material_list_id,
               user_id,
               instrument_id
        from lims_laboratory.inspection_product_list
        where inspection_material_list_id = #{id}
               uname           userName,
               equipment_name     instrumentName
        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

@@ -1,27 +1,60 @@
<?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.PlanMapper">
    <select id="selectAllPlan" resultType="Map">
        select p.id,results,p.state,p.create_time,p.inspection_id,user_id,results,type,user_name
        from lims_laboratory.plan p left join lims_laboratory.inspection i
        on i.id=p.inspection_id
    <select id="selectAllPlan" resultType="com.yuanchu.limslaboratory.pojo.vo.PlanVo">
        select mid ,
        p.inspection_id ,
        state ,
        create_time ,
        name ,
        material_name ,
        specifications_serial_number ,
        material_id ,
        material_supplier ,
        start_time ,
        end_time ,
        results ,
        material_location ,
        method ,
        material_batch ,
        material_reel_number ,
        material_num
        from (select plan.user_id, plan.state, plan.create_time, plan.results, plan.inspection_id, name
        from lims_laboratory.plan
        join lims_laboratory.user u on plan.user_id = u.id) p
        left join (select iml.id mid,
        iml.specifications_serial_number,
        iml.material_id,
        iml.material_supplier,
        ipl.start_time,
        ipl.end_time,
        iml.material_location,
        iml.material_name,
        ipl.method,
        iml.material_batch,
        iml.material_reel_number,
        iml.material_num,
        iml.inspection_id
        from lims_laboratory.inspection_material_list iml
        left join lims_laboratory.inspection_product_list ipl on iml.id = ipl.inspection_material_list_id) il
        on p.inspection_id = il.inspection_id
        <if test="state!=null">
            where p.state = #{state}
            where state = #{state}
        </if>
        order by p.create_time desc
        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
                       left join lims_laboratory.user on plan.user_id = user.id) p
                 left join (select inspection.id, name, iml.id mid
                            from lims_laboratory.inspection
                                     left join lims_laboratory.user on user.id = inspection.inspect_user_id
                                     left join lims_laboratory.inspection_material_list iml on inspection.id = iml.inspection_id) i
                           on p.inspection_id = i.id
        from lims_laboratory.plan
        left join lims_laboratory.user on plan.user_id = user.id) p
        left join (select inspection.id, name, iml.id mid
        from lims_laboratory.inspection
        left join lims_laboratory.user on user.id = inspection.inspect_user_id
        left join lims_laboratory.inspection_material_list iml on inspection.id = iml.inspection_id) i
        on p.inspection_id = i.id
        <if test="state!=null">
            where p.state = #{state}
        </if>

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

@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Instrument;
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;

@@ -16,7 +18,12 @@
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-07-20
 */
@Mapper
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/MaterialMapper.java

@@ -17,7 +17,7 @@
public interface MaterialMapper extends BaseMapper<Material> {

    //查询物料信息
    List<Material> selectMaterialLimit(int num1,int num2, int type);
    List<Map> selectMaterialLimit(int num1,int num2, int type);

    //根据物料id查询物料信息
    Map selectMaterialById(String materialId);

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

@@ -25,4 +25,9 @@
    IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);

    Map<String, Object> selectOneChildren(Object father);

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

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

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

@@ -24,4 +24,11 @@
    IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);

    List<Map<String, Object>> pageFatherNameProductInformation(String fatherName);

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

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

@@ -47,7 +47,7 @@

    //查询物料信息
    @Override
    public List<Material> selectMaterialLimit(int pageSize, int countSize, int type) {
    public List<Map> selectMaterialLimit(int pageSize, int countSize, int type) {
        return materialMapper.selectMaterialLimit((pageSize - 1) * countSize,pageSize * countSize, type);
    }


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

@@ -22,7 +22,7 @@

/**
 * <p>
 *  æœåŠ¡å®žçŽ°ç±»
 * æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
@@ -71,4 +71,10 @@
        wrapper.select(Product::getId, Product::getName, Product::getUnit, Product::getRequired, Product::getInternal);
        return productMapper.selectMaps(wrapper);
    }

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

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

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

    <select id="selectMaterialLimit" resultType="com.yuanchu.limslaboratory.pojo.Material">
    <select id="selectMaterialLimit" resultType="Map">
        select id, name
        from material
        from lims_laboratory.material
        where state = 1
        and type = #{type}
        order by create_time desc
            limit #{num1},#{num2}
    </select>
    <select id="selectMaterialById" resultType="java.util.Map">
    <select id="selectMaterialById" resultType="Map">
        select m.id,
               m.num,
               m.supplier,
@@ -23,10 +23,11 @@
               s.cross_section              crossSection,
               s.number_of_cores            numberOfCores,
               s.instruct
        from material m,
             specifications s,
             serial_number sn
        from lims_laboratory.material m,
             lims_laboratory.specifications s,
             lims_laboratory.serial_number sn
        where m.specifications_id = s.id
          and s.serial_id = sn.id
        and m.id=#{materialId}
    </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/impl/UserServiceImpl.java

@@ -74,7 +74,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>