点击优化和Bug修改

gdg

2021-01-08 4f4898cc6e137ee5b47542cf8b1c73f3da3a1ee5

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

@@ -137,6 +137,22 @@
        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) {
@@ -258,16 +274,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());