修改委托

Fixiaobai

2023-08-29 e0e20362cadcd739be75960949b422b96e6481d7

修改委托

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

@@ -122,4 +122,12 @@
    public Result<?> isIfViewUUID(String viewId){
        return Result.success("查询成功",linkBasicInformationService.isIfViewUUID(viewId));
    }


    @ApiOperation("获取样品信息以及委托信息")
    @GetMapping("/getContractsSampleInfo")
    public Result<?> getContractsSampleInfo(String viewId){
        return Result.success(linkBasicInformationService.getContractsSampleInfo(viewId));
    }

}

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

@@ -5,6 +5,8 @@
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.pojo.vo.LinkBasicInformationVo;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;
@@ -28,4 +30,6 @@
    List<Map<String, Object>> selectLinkAll();


    LinkBasicInformation getLinkBasicInformation(@Param("uid")String uid);

}

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

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

import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.yuanchu.limslaboratory.pojo.LinkDetection;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.util.List;

/**
 * @Author å¼ å®¾
 * @Date 2023/8/29
 */
@EqualsAndHashCode(callSuper = true)
@Data
public class LinkBasicInformationVo extends LinkBasicInformation implements Serializable{

    /**
     *样品信息
     */
    private List<LinkDetection> detectionList;


}

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

@@ -36,4 +36,6 @@
    Map<String, String> selectViewUUID();

    boolean isIfViewUUID(String uuid);

    LinkBasicInformation getContractsSampleInfo(String viewId);
}

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

@@ -83,5 +83,10 @@
        return uuid.equals(RedisUtil.get("viewId"));
    }

    @Override
    public LinkBasicInformation getContractsSampleInfo(String viewId) {
        return linkBasicInformationMapper.getLinkBasicInformation(viewId);
    }


}

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

@@ -25,8 +25,8 @@
    </select>

    <select id="selectLinkAll" resultType="java.util.Map">
        SELECT d.id ,
            DATE_FORMAT(l.`inspection_time`, '%Y-%m-%d') formTime,
        SELECT d.id,
               DATE_FORMAT(l.`inspection_time`, '%Y-%m-%d') formTime,
               l.`entrusted`                                supplier,
               d.`sample_number`                            mcode,
               d.`sample_name`                              name,
@@ -42,4 +42,50 @@
          AND l.`state` = 1
          and inspection_status = 1
    </select>
    <select id="getLinkBasicInformation" resultMap="getLinkBasicInformationMap">
        SELECT lb.entrust_coding        entrustCoding,
               lb.contacts              contacts,
               lb.contact_number        contactNumber,
               lb.contact_address       contactAddress,
               lb.completion_deadline   completionDeadline,
               lb.inspection_time       inspectionTime,
               lb.sample_delivery_mode  sampleDeliveryMode,
               lb.sample_delivery_phone sampleDeliveryPhone,
               lb.report_number         reportNumber,
               lb.entrust_remarks       entrustRemarks,
               lb.uid                   uid,
               ld.id                    id,
               ld.sample_number         sampleNumber,
               ld.sample_name           sampleName,
               ld.specifications_models specificationsModels,
               ld.unit                  unit,
               ld.samples_number        samplesNumber,
               ld.remarks               remarks
        FROM link_basic_information lb,
             link_detection ld
        WHERE lb.id = ld.link_basic_id
          AND lb.uid = #{uid}
          and lb.state = 1
          AND ld.state = 1
    </select>

    <resultMap id="getLinkBasicInformationMap" type="com.yuanchu.limslaboratory.pojo.LinkBasicInformation">
        <result property="entrustCoding" column="entrustCoding"/>
        <result property="contacts" column="contacts"/>
        <result property="contactNumber" column="contactNumber"/>
        <result property="contactAddress" column="contactAddress"/>
        <result property="uid" column="uid"/>
        <result property="completionDeadline" column="completionDeadline"/>
        <result property="inspectionTime" column="inspectionTime"/>
        <result property="sampleDeliveryMode" column="sampleDeliveryMode"/>
        <result property="sampleDeliveryPhone" column="sampleDeliveryPhone"/>
        <collection property="linkDetectionList" ofType="LinkDetection">
            <result property="id" column="id"/>
            <result property="sampleNumber" column="sampleNumber"/>
            <result property="specificationsModels" column="specificationsModels"/>
            <result property="unit" column="unit"/>
            <result property="samplesNumber" column="samplesNumber"/>
            <result property="remarks" column="remarks"/>
        </collection>
    </resultMap>
</mapper>

 sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java

@@ -100,7 +100,7 @@
                //throw new AuthException("400","无权限");
            }
        } else {
            throw new AuthException("401", "登陆过期");
            throw new AuthException("401", "登陆过期!");
        }
    }


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

@@ -43,5 +43,6 @@
        select id, name
        from lims_laboratory.user
        where job_state!=0
        and type=1
    </select>
</mapper>