bug

lyfO_o

2021-12-30 ad2f00d48ac45030ed26dcb37445585e2d3e94f8

bug

 src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java

@@ -398,7 +398,7 @@
            String reagentId = selectedOpeWarehouseReserve.getReagentId();
            String articleNumber = selectedOpeWarehouseReserve.getArticleNumber();

            this.setReagentStatusSelectList(opeReagentStatusService.getOpeReagentStatusList(reagentId, articleNumber,
            this.setReagentStatusSelectList(opeReagentStatusService.getOpeReagentStatusList22(reagentId, articleNumber,
                    ArrivalStatus.WAREHOUSE.getKey(), reagentCode, null, null, null));

//            System.out.print("this.getReagentStatusSelectList().size(): " + this.reagentStatusSelectList.size());
@@ -417,7 +417,7 @@
            System.out.println(reagentId);
            System.out.println(articleNumber);
            System.out.println(reagentCode);
            this.setReagentStatusSelectListForPerson(opeReagentStatusService.getOpeReagentStatusList(reagentId, articleNumber,
            this.setReagentStatusSelectListForPerson(opeReagentStatusService.getOpeReagentStatusList22(reagentId, articleNumber,
                    ArrivalStatus.WAREHOUSE.getKey(), reagentCode, null, null, null));

        }

 src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.java

@@ -15,6 +15,9 @@

    @SuppressWarnings("rawtypes")
    List<OpeReagentStatus> getOpeReagentStatusList(Map params) throws DataAccessException;
    List<OpeReagentStatus> getOpeReagentStatusList22(Map params) throws DataAccessException;


    @SuppressWarnings("rawtypes")
    int getOpeReagentStatusTotalCount(Map params) throws DataAccessException;


 src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml

@@ -145,11 +145,11 @@
        <if test="status != null">
            <choose>
                <when test="status == 1">
                    inner join sys_warehouse as sw on sw.id = oa.house_id
                    left join sys_warehouse as sw on sw.id = oa.house_id
                     left join sys_warehouse_container as swc on swc.id = oa.container_id
                </when>
                <when test="status == 2">
                    inner join sys_laboratory as sw on sw.id = oa.house_id
                    left join sys_laboratory as sw on sw.id = oa.house_id
                     left join sys_laboratory_container as swc on swc.id = oa.container_id
                </when>
            </choose>
@@ -205,6 +205,35 @@
    </if>
  </select>


    <select id="getOpeReagentStatusList22" parameterType="java.util.Map" resultMap="OpeReagentStatus">
        <include refid="queryColumns"/>
        from ope_reagent_status as oa
        left join sys_reagent sr on oa.reagent_id = sr.id
        left join sys_supplier as ss on sr.supplier_id = ss.id
        left join sys_user as su on oa.user_id = su.id

        <if test="status != null">
            <choose>
                <when test="status == 1">
                    inner join sys_warehouse as sw on sw.id = oa.house_id
                    left join sys_warehouse_container as swc on swc.id = oa.container_id
                </when>
                <when test="status == 2">
                    inner join sys_laboratory as sw on sw.id = oa.house_id
                    left join sys_laboratory_container as swc on swc.id = oa.container_id
                </when>
            </choose>
        </if>
        where oa.valid_flag = 1
        <include refid="queryWhereSql"/>

        order by oa.reagent_code asc
        <if test="first != null and pageSize != null">
            limit #{first}, #{pageSize}
        </if>
    </select>

    <select id="getOpeReagentStatusListForLab" parameterType="java.util.Map" resultMap="OpeReagentStatus">
        select oa.*,
        sr.*,

 src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java

@@ -114,4 +114,7 @@
    void exportLabStock2Excel(List<Map> list) throws Exception;

    OpeReagentStatus getStatus(String reagentId, String reagentCode);

    List<OpeReagentStatus> getOpeReagentStatusList22(String reagentId, String articleNumber, Integer status,
                                                            String reagentCode, String userId, Integer first, Integer pageSize);
}

 src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java

@@ -102,6 +102,29 @@
    }

    @Transactional(propagation = Propagation.REQUIRED)
    public List<OpeReagentStatus> getOpeReagentStatusList22(String reagentId, String articleNumber, Integer status,
                                                          String reagentCode, String userId, Integer first, Integer pageSize) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();

            params.put("reagentId", reagentId);
            params.put("articleNumber", articleNumber);
            params.put("status", status);
            addParamByUserId(userId, params);
            if (StringUtils.isNotBlank(reagentCode)) {
                params.put("reagentCode", "%" + reagentCode + "%");
            }
            params.put("first", first);
            params.put("pageSize", pageSize);
            return this.opeReagentStatusDao.getOpeReagentStatusList22(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);
            throw new BusinessException(ExceptionEnumCode.DB_ERR,
                    MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
        }
    }

    @Transactional(propagation = Propagation.REQUIRED)
    public List<OpeReagentStatus> getOpeReagentStatusListForLab(String name, String articleNumber, Integer status,
                                                          String reagentCode, String userId,String labName, Integer first, Integer pageSize) {
        try {