合并

李宇

2021-01-27 d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb

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

@@ -61,7 +61,7 @@
        }
    }

    public List<SysReagent> getSysReagentListNew(String name, String cas, String supplierId,Integer type, Integer first, Integer pageSize) {
    public List<SysReagent> getSysReagentListNew(String name, String cas, String supplierId,Integer type, Integer first, Integer pageSize,String productSn) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("name", name);
@@ -70,6 +70,7 @@
            params.put("type", type);
            params.put("first", first);
            params.put("pageSize", pageSize);
            params.put("productSn", productSn);
            return this.sysReagentDao.getSysReagentListNew(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);
@@ -112,6 +113,47 @@
        return sysReagentDao.favorList(params);
    }

    @Override
    public int reagentCount(SysUser user, String name, String cas, String supplierId, String productSn) {
        Map<String, Object> params = new HashMap<>();
        params.put("user", user.getId());
        params.put("name", name);
        params.put("cas", cas);
        params.put("supplierId", supplierId);
        params.put("productSn", productSn);
        return sysReagentDao.reagentCount(params);
    }

    @Override
    public List<SysReagent> reagentList(SysUser user, String name, String cas, String supplierId, String productSn, int first, int pageSize,int count) {
        Map<String, Object> params = new HashMap<>();
        params.put("user", user.getId());
        params.put("name", name);
        params.put("cas", cas);
        params.put("supplierId", supplierId);
        params.put("productSn", productSn);
        params.put("first", first);
        params.put("pageSize", pageSize);
        params.put("MaxSize", count);
        return sysReagentDao.reagentList(params);
    }

    @Override
    public String getReagentUnitByReagentId(String reagentId) {
        return sysReagentDao.getReagentUnitByReagentId(reagentId);
    }

    @Override
    public List<SysReagent> getReagent(String name, String cas, String factory, String specifications, String packing) {
        Map<String, String> params = new HashMap<>();
        params.put("name", name);
        params.put("cas", cas);
        params.put("factory", factory);
        params.put("specifications", specifications);
        params.put("packing", packing);
        return sysReagentDao.getReagent(params);
    }


    @Transactional(propagation = Propagation.REQUIRED)
    public int getSysReagentTotalCount(String name, String cas, String supplierId,Integer type) {
@@ -135,13 +177,14 @@
    }


    public int getSysReagentTotalCountNew(String name, String cas, String supplierId,Integer type) {
    public int getSysReagentTotalCountNew(String name, String cas, String supplierId,Integer type,String productSn) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("name", name);
            params.put("cas", cas);
            params.put("type", type);
            params.put("supplierId", supplierId);
            params.put("productSn", productSn);
            return this.sysReagentDao.getSysReagentTotalCountNew(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);
@@ -233,16 +276,18 @@
    }

    @Override
    @Transactional
    public int insertSysReagentList(List<SysReagent> sysReagentList) {
        try {
            int i = 0;
            for (SysReagent sysReagent:sysReagentList
                 ) {
                SysReagent sysReagentTmpl = new SysReagent();
                sysReagentTmpl = sysReagentDao.getSysReagentByCas(sysReagent);
                if(sysReagentTmpl!=null){
                    sysReagent.setId(sysReagentTmpl.getId());
                    this.sysReagentDao.updateSysReagentForExport(sysReagent);
                List<SysReagent> sysReagentTmpl = sysReagentDao.getSysReagentByCas(sysReagent);
                if(sysReagentTmpl.size()>0){
                    for (SysReagent sr : sysReagentTmpl) {
                        sysReagent.setId(sr.getId());
                        this.sysReagentDao.updateSysReagentForExport(sysReagent);
                    }
                }else{
                    if (sysReagent.getId() == null) {
                        sysReagent.setId(IDUtils.uuid());