Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

15 小时以前 2e1553e8a7120c2d38d69a8f400dcca2557b09fb

 north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java

@@ -47,23 +47,28 @@
    public Boolean insertCustomer(Map<String,Object> object) {
        boolean saveState = true;
        Log log = new Log();
        log.setOperatorId(object.get("userId").toString());
        log.setOperator(object.get("userName").toString());
        log.setContent(object.toString());
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
            Customer customer = JSONObject.parseObject(JSONObject.toJSONString(object.get("customer")), Customer.class);
           if(customer!=null){
               if (customer.getId()!=null && customer.getId()!=0){
                   customerMapper.updateCustomer(customer);
                   log.setFunction("insertCustomer修改");
               }else{
                   customerMapper.insertCustomer(customer);
                   log.setFunction("insertCustomer新增");
               Integer count = customerMapper.countByCustomerName(customer);
               if (count > 0) {
                   saveState = false;
               }else {
                   if (customer.getId()!=null && customer.getId()!=0){
                       customerMapper.updateCustomer(customer);
                       log.setFunction("insertCustomer修改");
                   }else{
                       customerMapper.insertCustomer(customer);
                       log.setFunction("insertCustomer新增");
                   }
                   logService.saveLog(log);
               }
               logService.saveLog(log);

           }

        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
@@ -89,14 +94,12 @@
                    customerMapper.deleteCustomer(customer);
                }
                Log log = new Log();
                log.setOperatorId(object.get("userId").toString());
                log.setOperator(object.get("userName").toString());
                log.setContent(object.toString());
                log.setFunction("deleteCustomer删除");
                logService.saveLog(log);

            }



        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
@@ -105,7 +108,6 @@
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;

        }
        return saveState;

@@ -131,7 +133,6 @@
            map.put("data", customerMapper.getSelectCustomerDeliveryDate(offset, pageSize,startDate,endDate, orderDetail));
            map.put("total", customerMapper.getSelectCustomerDeliveryDatePageTotal(offset, pageSize,startDate,endDate, orderDetail));
        }

        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);