Fixiaobai
2023-08-30 6cd215389e72e5c12be9e5ee124b470b9d620f4d
修改委托单位
已修改6个文件
27 ■■■■■ 文件已修改
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sys/src/main/java/com/yuanchu/limslaboratory/commandLineRunner/ResolutionRequestsCommandLineRunner.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.enums.InterfaceType;
import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.yuanchu.limslaboratory.utils.MyUtil;
@@ -76,7 +78,7 @@
            @ApiImplicitParam(name = "id", value = "委托样品id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/delLink")
    @AuthHandler
    @AuthHandler(type = InterfaceType.DELETE,menuId = MenuEnums.commissionInspection,isAdd = true)
    public Result<?> delLink(Integer id){
        linkBasicInformationService.delLink(id);
        return Result.success("删除成功!");
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java
@@ -32,4 +32,5 @@
    LinkBasicInformation getLinkBasicInformation(@Param("uid")String uid);
    int deleteByID(Integer id);
}
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -1,5 +1,6 @@
package com.yuanchu.limslaboratory.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Snowflake;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -133,6 +134,7 @@
            RawMaterial rawMaterial = new RawMaterial();
            rawMaterial.setId(inspectionVo.getId());
            rawMaterial.setType(1);
            rawMaterial.setInspectionDate(DateUtil.date());
            rawMaterial.setSurveyor(userMapper.selectById(id).getName());
            rawMaterialMapper.updateById(rawMaterial);
        }
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
@@ -45,10 +45,10 @@
        QueryWrapper<LinkBasicInformation> queryWrapper = new QueryWrapper<>();
        queryWrapper.lambda().select(LinkBasicInformation::getId).eq(LinkBasicInformation::getUid, linkBasicInformation.getUid());
        LinkBasicInformation linkBasicInformation1 = linkBasicInformationMapper.selectOne(queryWrapper);
        Optional.ofNullable(linkBasicInformation.getId()).ifPresent(l->{
        Optional.ofNullable(linkBasicInformation1.getId()).ifPresent(l->{
            //执行删除
            linkDetectionMapper.deleteByLinkbasic(linkBasicInformation1.getId());
            linkBasicInformationMapper.deleteById(linkBasicInformation1.getId());
            linkBasicInformationMapper.deleteByID(linkBasicInformation1.getId());
        });
        //委托编号
        String code = MyUtil.getTimeSixNumberCode("SL", "SL");
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -1,6 +1,9 @@
<?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.LinkBasicInformationMapper">
    <delete id="deleteByID">
        delete from link_basic_information where id=#{id}
    </delete>
    <select id="getLinkBasicPage" resultType="map">
        SELECT d.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`,
        d.`specifications_models`,
@@ -62,12 +65,11 @@
               ld.unit                  unit,
               ld.samples_number        samplesNumber,
               ld.remarks               remarks
        FROM link_basic_information lb,
        FROM link_basic_information lb left join
             link_detection ld
        WHERE lb.id = ld.link_basic_id
          AND lb.uid = #{uid}
             on lb.id = ld.link_basic_id
        where lb.uid = #{uid}
          and lb.state = 1
          AND ld.state = 1
    </select>
    <resultMap id="getLinkBasicInformationMap" type="com.yuanchu.limslaboratory.pojo.LinkBasicInformation">
sys/src/main/java/com/yuanchu/limslaboratory/commandLineRunner/ResolutionRequestsCommandLineRunner.java
@@ -39,9 +39,6 @@
    @Autowired
    private RoleManageMapper roleManageMapper;
    @Autowired
    private MenuMapper menuMapper;
    @SneakyThrows
    @Override
    public void run(String... args) throws Exception {
@@ -104,8 +101,9 @@
                        .noneMatch(value2 -> value2.equals(map1.get("url")))  // 查找不同的值
                ).collect(Collectors.toList());
        if(differentMaps.size()>0){
            int insertInterfaceList = roleManageMapper.insertInterfaceList(differentMaps);
            if (insertInterfaceList>0) log.info("新增接口成功!");
            if (insertInterfaceList>0) log.info(String.valueOf(differentMaps));log.info("新增接口成功!");
        }else {
            log.info("无需增加新的接口!");
        }