ERP_override.git

			@@ -55,17 +55,20 @@
			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);
			//将异常传入数据库
			@@ -96,11 +99,7 @@
			log.setContent(object.toString());
			log.setFunction("deleteCustomer删除");
			logService.saveLog(log);

			}



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

			}
			return saveState;

			@@ -135,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);