6 设备工具明细 功能调整

gaoaoy

2024-03-07 8816a5ef1bd1226969b15302fcb01a163f26348b

6 设备工具明细 功能调整

 cnas-server/src/main/resources/mapper/LaboratoryMapper.xml

@@ -13,7 +13,7 @@
        laboratory_number,
        phone_number,
        head,
        address,
        l.address,
        u1.name create_user_name,
        l.create_time
        from laboratory l
@@ -32,7 +32,7 @@
                       laboratory_number,
                       phone_number,
                       head,
                       address,
                       l.address,
                       u1.name create_user_name,
                       l.create_time
                from laboratory l

 inspect-server/src/main/resources/mapper/InsOrderMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
<?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.mom.mapper.InsOrderMapper">

    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrder">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
            <result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
            <result property="orderingCustomers" column="ordering_customers" jdbcType="VARCHAR"/>
            <result property="orderingUnit" column="ordering_unit" jdbcType="VARCHAR"/>
            <result property="urgency" column="urgency" jdbcType="VARCHAR"/>
            <result property="appointedTime" column="appointed_time" jdbcType="TIMESTAMP"/>
            <result property="laboratoryName" column="laboratory_name" jdbcType="VARCHAR"/>
            <result property="sampleClassification" column="sample_classification" jdbcType="VARCHAR"/>
            <result property="model" column="model" jdbcType="VARCHAR"/>
            <result property="sample" column="sample" jdbcType="VARCHAR"/>
            <result property="numberSamples" column="number_samples" jdbcType="INTEGER"/>
            <result property="leaveSample" column="leave_sample" jdbcType="VARCHAR"/>
            <result property="retainedSamples" column="retained_samples" jdbcType="INTEGER"/>
            <result property="smapleType" column="smaple_type" jdbcType="VARCHAR"/>
            <result property="entrustCompany" column="entrust_company" jdbcType="VARCHAR"/>
            <result property="entrustName" column="entrust_name" jdbcType="VARCHAR"/>
            <result property="documentTime" column="document_time" jdbcType="TIMESTAMP"/>
            <result property="entrustmentTime" column="entrustment_time" jdbcType="TIMESTAMP"/>
            <result property="inspectionProgress" column="inspection_progress" jdbcType="VARCHAR"/>
            <result property="inspectionResult" column="inspection_result" jdbcType="VARCHAR"/>
            <result property="createUser" column="create_user" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,entrust_code,sample_code,
        ordering_customers,ordering_unit,urgency,
        appointed_time,laboratory_name,sample_classification,
        model,sample,number_samples,
        leave_sample,retained_samples,smaple_type,
        entrust_company,entrust_name,document_time,
        entrustment_time,inspection_progress,inspection_result,
        create_user,create_time,update_user,
        update_time
    </sql>
</mapper>

 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java

@@ -1,12 +1,7 @@
package com.yuanchu.mom.controller;

import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.Custom;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
@@ -16,15 +11,11 @@
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.utils.RedisUtil;
import com.yuanchu.mom.utils.ServletUtils;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.DigestUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.HashMap;
@@ -149,4 +140,11 @@
        return Result.success(customService.addCustom(custom));
    }

    //获取设备负责人
    @ApiOperation(value = "获取设备负责人")
    @GetMapping("/getDeviceManager")
    public Result<?> getDeviceManager() {
        return Result.success(userService.getDeviceManager());
    }

}

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

@@ -16,4 +16,7 @@

    IPage<User> selectUserDtoPageList(IPage<UserPageDto> page, QueryWrapper<UserPageDto> ew);

    //获取设备负责人
    List<User> getDeviceManager();

}

 user-server/src/main/java/com/yuanchu/mom/service/CustomService.java

@@ -1,13 +1,9 @@
package com.yuanchu.mom.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.Custom;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.Power;

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

/**
@@ -22,5 +18,4 @@
    int delCustomById(Integer id);

    int addCustom(Custom custom);

}

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

@@ -1,7 +1,6 @@
package com.yuanchu.mom.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;

@@ -24,4 +23,6 @@

    List<User> getUserMenu();

    List<User> getDeviceManager();

}

 user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java

@@ -1,28 +1,20 @@
package com.yuanchu.mom.service.impl;

import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.utils.ServletUtils;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.DigestUtils;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -76,4 +68,9 @@
    public List<User> getUserMenu() {
        return userMapper.selectList(Wrappers.<User>lambdaQuery().eq(User::getState, 1).select(User::getName, User::getId));
    }

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

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

@@ -13,4 +13,7 @@
            ${ew.customSqlSegment}
        </if>
    </select>
    <select id="getDeviceManager" resultType="com.yuanchu.mom.dto.UserPageDto">
        select id,name from user where state=1
    </select>
</mapper>