change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

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

@@ -74,7 +74,7 @@
    }

    @Transactional(propagation = Propagation.REQUIRED)
    public SysSupplier getSysSupplier(String id) {
    public SysSupplier getSysSupplier(Long id) {
        try {
            return this.sysSupplierDao.getSysSupplier(id);
        } catch (DataAccessException e) {
@@ -84,7 +84,7 @@
    }

    @Override
    public String getSysSupplierId(String name, String groupId) {
    public Long getSysSupplierId(String name, Long groupId) {
        try {
            return this.sysSupplierDao.getSysSupplierId(name, groupId);
        } catch (DataAccessException e) {
@@ -94,7 +94,7 @@
    }

    @Override
    public String getSysSupplierIdByname(String name) {
    public Long getSysSupplierIdByname(String name) {
        try {
            return this.sysSupplierDao.getSysSupplierIdByname(name);
        } catch (DataAccessException e) {
@@ -106,9 +106,9 @@
    @Transactional(propagation = Propagation.REQUIRED)
    public SysSupplier insertSysSupplier(SysSupplier sysSupplier) {
        try {
            if (sysSupplier.getId() == null) {
                sysSupplier.setId(IDUtils.uuid());
            }
//            if (sysSupplier.getId() == null) {
//                sysSupplier.setId(IDUtils.uuid());
//            }
            this.sysSupplierDao.insertSysSupplier(sysSupplier);
            return sysSupplier;
        } catch (DuplicateKeyException ex) {
@@ -151,7 +151,7 @@
                return false;
            }

            List<String> ids = new ArrayList<String>();
            List<Long> ids = new ArrayList<Long>();
            for (SysSupplier sysSupplier : sysSupplierList) {
                ids.add(sysSupplier.getId());
            }
@@ -176,7 +176,7 @@
    public void importSupplier(FileUploadEvent event) throws Exception {

        List<SysSupplier> list = sysSupplierDao.getSysSupplierList(new HashMap());
        Map<String, String> supplierMap = new HashMap();
        Map<String, Long> supplierMap = new HashMap();
        list.forEach(supplier -> {
            supplierMap.put(supplier.getName(), supplier.getId());
        });
@@ -218,6 +218,9 @@
                }
                valuesList.add(cellInfo);
            }
            if (valuesList.size() != 4){
                break;
            }

            SysSupplier sysSupplier = new SysSupplier();
            //这一行有供应商是数据库里的就跳过
@@ -225,7 +228,7 @@
                continue;
            }

            sysSupplier.setId(IDUtils.uuid());
         //   sysSupplier.setId(IDUtils.uuid());
            sysSupplier.setName(valuesList.get(0));
            sysSupplier.setPersonName(valuesList.get(1));
            sysSupplier.setPhone(valuesList.get(2));
@@ -257,4 +260,9 @@
        ExcelUtils.export2Excel(list,"供应商信息",map);
    }

    @Override
    public SysSupplier getSysSupplierByName(String name) {
        return sysSupplierDao.getSysSupplierByName(name);
    }

}