update

lyfO_o

2021-06-25 9c83533710bee14511ff454d092e20dcc8359105

update

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

@@ -519,22 +519,23 @@
                    } catch (Exception e) {
                        logger.error(e);
                    }
                    selectedList = null;
                    return list;
                }

                @Override
                public OpeApply getRowData(String rowKey) {
                    Iterator<OpeApply> iterator = this.iterator();
                    if (iterator != null) {
                        OpeApply oa = null;
                        while (iterator.hasNext()) {
                            oa = iterator.next();
                            if (rowKey.equals(oa.getId())) {
                                return oa;
                            }
                        }
                    }
                    return null;
//                    Iterator<OpeApply> iterator = this.iterator();
//                    if (iterator != null) {
//                        OpeApply oa = null;
//                        while (iterator.hasNext()) {
//                            oa = iterator.next();
//                            if (rowKey.equals(oa.getId())) {
//                                return oa;
//                            }
//                        }
//                    }
                    return opeApplyService.getOpeApply(rowKey);
                }
            };
        }
@@ -562,17 +563,17 @@

                @Override
                public SysReagent getRowData(String rowKey) {
                    Iterator<SysReagent> iterator = this.iterator();
                    if (iterator != null) {
                        SysReagent sr = null;
                        while (iterator.hasNext()) {
                            sr = iterator.next();
                            if (rowKey.equals(sr.getId())) {
                                return sr;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysReagent> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysReagent sr = null;
//                        while (iterator.hasNext()) {
//                            sr = iterator.next();
//                            if (rowKey.equals(sr.getId())) {
//                                return sr;
//                            }
//                        }
//                    }
                    return sysReagentService.getRowData(rowKey);
                }
            };
        }
@@ -601,17 +602,17 @@

                @Override
                public SysReagent getRowData(String rowKey) {
                    Iterator<SysReagent> iterator = this.iterator();
                    if (iterator != null) {
                        SysReagent sr = null;
                        while (iterator.hasNext()) {
                            sr = iterator.next();
                            if (rowKey.equals(sr.getId())) {
                                return sr;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysReagent> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysReagent sr = null;
//                        while (iterator.hasNext()) {
//                            sr = iterator.next();
//                            if (rowKey.equals(sr.getId())) {
//                                return sr;
//                            }
//                        }
//                    }
                    return sysReagentService.getRowData(rowKey);
                }
            };
        }
@@ -635,6 +636,7 @@
                        if (count > 0) {
                            list = opeApplyService.getOpeApplyList(null, null, null, null, applyUserId, null, null, first, pageSize,applyCode,null);
                        }
                        selectedList = null;
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -643,17 +645,17 @@

                @Override
                public OpeApply getRowData(String rowKey) {
                    Iterator<OpeApply> iterator = this.iterator();
                    if (iterator != null) {
                        OpeApply oa = null;
                        while (iterator.hasNext()) {
                            oa = iterator.next();
                            if (rowKey.equals(oa.getId())) {
                                return oa;
                            }
                        }
                    }
                    return null;
//                    Iterator<OpeApply> iterator = this.iterator();
//                    if (iterator != null) {
//                        OpeApply oa = null;
//                        while (iterator.hasNext()) {
//                            oa = iterator.next();
//                            if (rowKey.equals(oa.getId())) {
//                                return oa;
//                            }
//                        }
//                    }
                    return opeApplyService.getOpeApply(rowKey);
                }
            };
        }

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

@@ -467,22 +467,23 @@
                    /*} catch (Exception e) {
                        logger.error(e);
                    }*/
                    selectedList = null;
                    return list;
                }

                @Override
                public OpeApply getRowData(String rowKey) {
                    Iterator<OpeApply> iterator = this.iterator();
                    if (iterator != null) {
                        OpeApply oa = null;
                        while (iterator.hasNext()) {
                            oa = iterator.next();
                            if (rowKey.equals(oa.getId())) {
                                return oa;
                            }
                        }
                    }
                    return null;
//                    Iterator<OpeApply> iterator = this.iterator();
//                    if (iterator != null) {
//                        OpeApply oa = null;
//                        while (iterator.hasNext()) {
//                            oa = iterator.next();
//                            if (rowKey.equals(oa.getId())) {
//                                return oa;
//                            }
//                        }
//                    }
                    return opeApplyService.getOpeApply(rowKey);
                }
            };
        }

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

@@ -85,22 +85,23 @@
                    } catch (Exception e) {
                        logger.error("error occured.", e);
                    }
                    selectContainerList = null;
                    return list;
                }

                @Override
                public ContainerStatusMngDto getRowData(String rowKey) {
                    Iterator<ContainerStatusMngDto> iterator = this.iterator();
                    if (iterator != null) {
                        ContainerStatusMngDto su = null;
                        while (iterator.hasNext()) {
                            su = iterator.next();
                            if (rowKey.equals(su.getId())) {
                                return su;
                            }
                        }
                    }
                    return null;
//                    Iterator<ContainerStatusMngDto> iterator = this.iterator();
//                    if (iterator != null) {
//                        ContainerStatusMngDto su = null;
//                        while (iterator.hasNext()) {
//                            su = iterator.next();
//                            if (rowKey.equals(su.getId())) {
//                                return su;
//                            }
//                        }
//                    }
                    return sysContainerSensorsService.getRowData(rowKey);
                }
            };
        }

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

@@ -108,17 +108,17 @@

                @Override
                public OpeReagentStatus getRowData(String rowKey) {
                    Iterator<OpeReagentStatus> iterator = this.iterator();
                    if (iterator != null) {
                        OpeReagentStatus su = null;
                        while (iterator.hasNext()) {
                            su = iterator.next();
                            if (rowKey.equals(su.getId())) {
                                return su;
                            }
                        }
                    }
                    return null;
//                    Iterator<OpeReagentStatus> iterator = this.iterator();
//                    if (iterator != null) {
//                        OpeReagentStatus su = null;
//                        while (iterator.hasNext()) {
//                            su = iterator.next();
//                            if (rowKey.equals(su.getId())) {
//                                return su;
//                            }
//                        }
//                    }
                    return  null;
                }
            };
        }
@@ -144,22 +144,23 @@
                    } catch (Exception e) {
                        logger.error(e);
                    }
                    selectedStoreList = null;
                    return list;
                }

                @Override
                public OpeReagentStatus getRowData(String rowKey) {
                    Iterator<OpeReagentStatus> iterator = this.iterator();
                    if (iterator != null) {
                        OpeReagentStatus su = null;
                        while (iterator.hasNext()) {
                            su = iterator.next();
                            if (rowKey.equals(su.getId())) {
                                return su;
                            }
                        }
                    }
                    return null;
//                    Iterator<OpeReagentStatus> iterator = this.iterator();
//                    if (iterator != null) {
//                        OpeReagentStatus su = null;
//                        while (iterator.hasNext()) {
//                            su = iterator.next();
//                            if (rowKey.equals(su.getId())) {
//                                return su;
//                            }
//                        }
//                    }
                    return opeReagentStatusService.getOpeReagentStatus(rowKey);
                }
            };
        }

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

@@ -290,22 +290,23 @@
                    } catch (Exception e) {
                        logger.error(e);
                    }
                    selectedList = null;
                    return list;
                }

                @Override
                public OpeOrder getRowData(String rowKey) {
                    Iterator<OpeOrder> iterator = this.iterator();
                    if (iterator != null) {
                        OpeOrder oo = null;
                        while (iterator.hasNext()) {
                            oo = iterator.next();
                            if (rowKey.equals(oo.getId())) {
                                return oo;
                            }
                        }
                    }
                    return null;
//                    Iterator<OpeOrder> iterator = this.iterator();
//                    if (iterator != null) {
//                        OpeOrder oo = null;
//                        while (iterator.hasNext()) {
//                            oo = iterator.next();
//                            if (rowKey.equals(oo.getId())) {
//                                return oo;
//                            }
//                        }
//                    }
                    return opeOrderService.getOpeOrder(rowKey);
                }
            };
        }

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

@@ -151,22 +151,23 @@
                    } catch (Exception e) {
                        logger.error(e);
                    }
                    selectedList = null;
                    return list;
                }

                @Override
                public OpeApply getRowData(String rowKey) {
                    Iterator<OpeApply> iterator = this.iterator();
                    if (iterator != null) {
                        OpeApply oa = null;
                        while (iterator.hasNext()) {
                            oa = iterator.next();
                            if (rowKey.equals(oa.getId())) {
                                return oa;
                            }
                        }
                    }
                    return null;
//                    if (iterator != null) {
//                        OpeApply oa = null;
//                        while (iterator.hasNext()) {
//                            oa = iterator.next();
//                            if (rowKey.equals(oa.getId())) {
//                                return oa;
//                            }
//                        }
//                    }
                    return opeApplyService.getOpeApply(rowKey);
                }
            };
        }

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

@@ -1756,22 +1756,23 @@
                    } catch (Exception e) {
                        logger.error(e);
                    }
                    selectedList = null;
                    return list;
                }

                @Override
                public OpeWarehouseReserve getRowData(String rowKey) {
                    Iterator<OpeWarehouseReserve> iterator = this.iterator();
                    if (iterator != null) {
                        OpeWarehouseReserve su = null;
                        while (iterator.hasNext()) {
                            su = iterator.next();
                            if (rowKey.equals(su.getId())) {
                                return su;
                            }
                        }
                    }
                    return null;
//                    Iterator<OpeWarehouseReserve> iterator = this.iterator();
//                    if (iterator != null) {
//                        OpeWarehouseReserve su = null;
//                        while (iterator.hasNext()) {
//                            su = iterator.next();
//                            if (rowKey.equals(su.getId())) {
//                                return su;
//                            }
//                        }
//                    }
                    return opeWarehouseReserveService.getRowData(rowKey);
                }
            };
        }
@@ -1806,22 +1807,23 @@
                    } catch (Exception e) {
                        logger.error(e);
                    }
                    selectedListForPerson = null;
                    return list;
                }

                @Override
                public OpeApplyReserve getRowData(String rowKey) {
                    Iterator<OpeApplyReserve> iterator = this.iterator();
                    if (iterator != null) {
                        OpeApplyReserve su = null;
                        while (iterator.hasNext()) {
                            su = iterator.next();
                            if (rowKey.equals(su.getId())) {
                                return su;
                            }
                        }
                    }
                    return null;
//                    Iterator<OpeApplyReserve> iterator = this.iterator();
//                    if (iterator != null) {
//                        OpeApplyReserve su = null;
//                        while (iterator.hasNext()) {
//                            su = iterator.next();
//                            if (rowKey.equals(su.getId())) {
//                                return su;
//                            }
//                        }
//                    }
                    return opeApplyService.getOpeApplyReserveListByNameForRowData(rowKey);
                }
            };
        }
@@ -2668,17 +2670,17 @@

                @Override
                public SysReagent getRowData(String rowKey) {
                    Iterator<SysReagent> iterator = this.iterator();
                    if (iterator != null) {
                        SysReagent sr = null;
                        while (iterator.hasNext()) {
                            sr = iterator.next();
                            if (rowKey.equals(sr.getId())) {
                                return sr;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysReagent> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysReagent sr = null;
//                        while (iterator.hasNext()) {
//                            sr = iterator.next();
//                            if (rowKey.equals(sr.getId())) {
//                                return sr;
//                            }
//                        }
//                    }
                    return sysReagentService.getSysReagentListNewRowData(rowKey);
                }
            };
        }

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

@@ -5,6 +5,7 @@
import com.nanometer.smartlab.entity.OpeOrder;
import com.nanometer.smartlab.entity.OpeWarehouseReserve;

import org.apache.ibatis.annotations.Param;
import org.springframework.dao.DataAccessException;

import java.util.List;
@@ -57,4 +58,6 @@
    void updateOpeApplyInfo(Map params);

    void insertList(List<OpeApply> opeApplyList);

    OpeApplyReserve getOpeApplyReserveListByNameForRowData(@Param("id") String rowKey);
}

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

@@ -518,6 +518,45 @@
        where oa.valid_flag = 1
        and oa.id = #{0}
    </select>
    <select id="getOpeApplyReserveListByNameForRowData"
            resultMap="OpeApplyReserve">
         SELECT
        oa.id,
        oa.apply_code,
        sr.id reagent_id,
        oa. STATUS,
        sr.product_sn reagentProductSn,
        sr.`name` reagentName,
        bm2.meta_value controlProducts,
        bm3.meta_value reagentFormat,
        sr.main_metering reagentMainMetering,
        sr.price reagentPrice,
        sr.cas reagentCas,
        oa.article_number articleNumber,
        bm4.meta_value reagentCharacter,
        bm1.meta_value productHome,
        sr.dangerous_flag,
        oa.num,
        oa.apply_user_id apply_user,
        oa.used,
        su.`name` apply_user_id,
        su.project,
        su1.`name` as projectManage,
        oa.arrival_time
        FROM
        ope_apply AS oa
        LEFT JOIN sys_reagent sr ON sr.id = oa.reagent_id
        LEFT JOIN sys_user su ON su.id = oa.apply_user_id
        LEFT JOIN base_meta AS bm2 ON sr.control_products = bm2.id
        LEFT JOIN base_meta AS bm3 ON sr.reagent_format = bm3.id
        LEFT JOIN base_meta AS bm4 ON sr.reagent_character = bm4.id
        LEFT JOIN base_meta AS bm1 ON sr.product_home = bm1.id
        LEFT JOIN sys_project as project on project.project = su.project
        LEFT JOIN sys_user as su1 on su1.id = project.sys_user_id
        where oa.id = #{id}


    </select>


    <update id="updateByReId" parameterType="java.util.Map">

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

@@ -4,6 +4,7 @@
import java.util.Map;

import com.nanometer.smartlab.entity.OpeApply;
import org.apache.ibatis.annotations.Param;
import org.springframework.dao.DataAccessException;

import com.nanometer.smartlab.entity.OpeWarehouseReserve;
@@ -43,4 +44,6 @@
    void updateBtReserve(String id, Integer useNum);

    Integer countByReagentId(String id);

    OpeWarehouseReserve getRowData(@Param("id") String rowKey);
}

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

@@ -216,6 +216,13 @@
        and owr.valid_flag = 1
        group by owr.reagent_id
    </select>
    <select id="getRowData" resultMap="OpeWarehouseReserve">

        <include refid="queryColumns"/>
        from ope_warehouse_reserve as oa
        <include refid="queryJoins"/>
        where oa.id = #{id}
    </select>

    <update id="updateByReId" parameterType="java.util.Map">
        update ope_warehouse_reserve set reagent_id=#{newReId} where reagent_id=#{oldReId}

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

@@ -2,6 +2,7 @@

import com.nanometer.smartlab.entity.SysContainerSensors;
import com.nanometer.smartlab.entity.dto.ContainerStatusMngDto;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;
@@ -11,4 +12,6 @@
    List<ContainerStatusMngDto> selectAll(Map<String, Object> map);

    int countAll(Map<String, Object> map);
}

    ContainerStatusMngDto getRowData(@Param("id") String rowKey);
}

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

@@ -21,7 +21,7 @@
    id, container_id, temp, humidity, voc1, flag, type, update_time
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
    select 
    select
    <include refid="Base_Column_List" />
    from sys_container_sensors
    where id = #{id,jdbcType=VARCHAR}
@@ -243,4 +243,22 @@
    ORDER BY
    slc.update_time DESC
  </select>
</mapper>
    <select id="getRowData" resultType="com.nanometer.smartlab.entity.dto.ContainerStatusMngDto">
        SELECT slc.id,slc.temp, slc.humidity,slc.voc1 ,sl.name as laboratoryName,slc.name laboratoryContainerName,slc.flag,
    CASE
    WHEN substring(flag, 1,1) = '1' THEN TRUE ELSE FALSE END AS lowTempAlert,
    CASE
    WHEN substring(flag, 2,1) = '1' THEN TRUE ELSE FALSE END AS highTempAlert,
    CASE
    WHEN substring(flag, 3,1) = '1' THEN TRUE ELSE FALSE END AS lowHumidityAlert,
    CASE
    WHEN substring(flag, 4,1) = '1' THEN TRUE ELSE FALSE END AS highHumidityAlert,
    CASE
    WHEN substring(flag, 5,1) = '1' THEN TRUE ELSE FALSE END AS voc1Alert
    from sys_laboratory_container  slc
    LEFT JOIN sys_laboratory sl ON sl.id = slc.laboratory_id
    where slc.id = #{id}


    </select>
</mapper>

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

@@ -48,4 +48,7 @@
    */
    List<SysReagent> countReagentByDetail(@Param("params") Map detail);

    SysReagent getRowData(@Param("id") String rowKey);

    SysReagent getSysReagentListNewRowData(@Param("id")String rowKey);
}

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

@@ -517,4 +517,36 @@


  </select>
  <select id="getRowData" resultMap="SysReagent">
        select
        a.*,
        main_metering,
        reagent_unit,
        reagent_format,
        product_home,
        b.meta_value unitName,
        c.meta_value formatName,
        d.meta_value product_home_name,
        e.meta_value control_products_name,
        s.name AS supplierName
        from sys_reagent a
        left join base_meta b on b.id=a.reagent_unit
        left join base_meta c on c.id=a.reagent_format
        left join base_meta d on d.id=a.product_home
        left join base_meta e on e.id=a.control_products
        left join sys_supplier s ON s.id = a.supplier_id
        where a.id = #{id}

  </select>
  <select id="getSysReagentListNewRowData" resultMap="SysReagent">
     select sr.*, ss.meta_value as product_home_name, ifnull(w.reserve,0)  as reserve, bm.meta_value as control_products_name,supplier.name as supplierName
    from sys_reagent as sr

    left join base_meta as ss on sr.product_home = ss.id
    left join base_meta bm    on bm.id = sr.control_products
    left join (select reagent_id, sum(reserve) reserve from ope_warehouse_reserve where valid_flag = 1 group by reagent_id) w on w.reagent_id = sr.id

    left join sys_supplier supplier on supplier.id = sr.supplier_id
    where sr.id = #{id}
  </select>
</mapper>

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

@@ -74,4 +74,6 @@
    void btUpdateApplyAndOrder(List<OpeApply> opeList);

    void importApply(FileUploadEvent event, SysUser user) throws IOException;

    OpeApplyReserve getOpeApplyReserveListByNameForRowData(String rowKey);
}

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

@@ -858,4 +858,9 @@

    }

    @Override
    public OpeApplyReserve getOpeApplyReserveListByNameForRowData(String rowKey) {
        return opeApplyDao.getOpeApplyReserveListByNameForRowData(rowKey);
    }

}

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

@@ -50,4 +50,6 @@

    //根据试剂Id查找当前库存
    int countByReagentId(String id);

    OpeWarehouseReserve getRowData(String rowKey);
}

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

@@ -678,6 +678,11 @@
    }

    @Override
    public OpeWarehouseReserve getRowData(String rowKey) {
        return opeWarehouseReserveDao.getRowData(rowKey);
    }

    @Override
    public void btWarehouseReserveReduce(List<OpeApplyReserve> opeList) {
        if (opeList.size() < 1) {
            return;

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

@@ -28,5 +28,7 @@

    int countAll(Map<String, Object> params) throws  RuntimeException;

    ContainerStatusMngDto getRowData(String rowKey);

    //获得
}

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

@@ -109,5 +109,10 @@
        return sysContainerSensorsDao.countAll(params);
    }

    @Override
    public ContainerStatusMngDto getRowData(String rowKey) {
        return sysContainerSensorsDao.getRowData(rowKey);
    }


}

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

@@ -49,4 +49,7 @@
    */
    SysReagent getReagentByDetail(Map<String, Object> detail);

    SysReagent getRowData(String rowKey);

    SysReagent getSysReagentListNewRowData(String rowKey);
}

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

@@ -182,6 +182,16 @@
        return reagentIds.get(0);
    }

    @Override
    public SysReagent getRowData(String rowKey) {
        return sysReagentDao.getRowData(rowKey);
    }

    @Override
    public SysReagent getSysReagentListNewRowData(String rowKey) {
        return sysReagentDao.getSysReagentListNewRowData(rowKey);
    }


    @Transactional(propagation = Propagation.REQUIRED)
    public int getSysReagentTotalCount(String name, String cas, String supplierId,Integer type) {