标准库增加区间设置功能

value

2024-05-05 36b1e0df911a72aa483944685ada722192ff04c8

标准库增加区间设置功能

 cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java

@@ -94,7 +94,6 @@
    @ApiModelProperty(value = "检验次数")
    private Integer checkoutNumber;

    @ValueTableShow(12)
    @ApiModelProperty(value = "区间")
    private String section;


 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

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

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -92,10 +91,11 @@
        List<Device> devices = deviceMapper.selectList(Wrappers.<Device>lambdaQuery().eq(Device::getDeviceStatus, 0).isNotNull(Device::getInsProductIds));
        List<Device> devices2 = new ArrayList<>();
        for (Device device : devices) {
            List<Integer> ids = JSON.parseArray(device.getInsProductIds(), Integer.class);
            for (Integer i : ids) {
                if (i == id) {
            String[] ids = device.getInsProductIds().split(",");
            for (String i : ids) {
                if (i.equals(id+"")) {
                    devices2.add(device);
                    break;
                }
            }
        }

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -241,8 +241,14 @@
                }
                insSampleMapper.updateById(insSample);
            });
            return null;
            return insContext.keySet().stream().findFirst().orElse(null);
        }).thenAccept(res -> {
            if(res!=null){
                int pId = Integer.parseInt(res.replaceAll("\\D+", ""));
                // TODO: 2024/5/4 需要通过pid获取检验单当前试验室所有项目是否有检验结果后进行判断检验单是否更改成“已检”状态
//                InsProduct insProduct = insProductMapper.selectById(pId);
//                insSampleMapper.selectList(Wrappers.<>)
            }
        }).exceptionally(e -> {
            e.printStackTrace();
            return null;

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java

@@ -117,6 +117,9 @@
                    if(sp.getManHour()!=null&&!sp.getManHour().equals("")){
                        pl.setManHour(sp.getManHour());
                    }
                    if(sp.getSection()!=null&&!sp.getSection().equals("")){
                        pl.setSection(sp.getSection());
                    }
                    break;
                }
            }

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

@@ -14,12 +14,6 @@
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,label,value,
        create_user,create_time,update_user,
        update_time
    </sql>

    <select id="selectEnumPageList" resultType="com.yuanchu.mom.pojo.Enums">
        select * from (
        select e.id,e.category,e.label,e.value,e.order_num,e.type , u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time
@@ -33,10 +27,8 @@
    </select>
   
    <select id="selectEnumByCategory" resultType="com.yuanchu.mom.pojo.Enums">
        select e.id,e.category,e.label,e.value,e.order_num,e.type , u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time
        select e.id,e.category,e.label,e.value,e.order_num,e.type
        from enums e
        left join user u2 on u2.id = e.create_user
        left join user u3 on u3.id = e.update_user
        where e.category=#{category}
    </select>
</mapper>