From 89ce3214508857c93ba80daa8bbf05d7ca289962 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Tue, 16 Apr 2024 09:08:48 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCustomerController.java | 55 ++++++++----------- .../system/mapper/SysCustomerMapper.java | 6 +- .../system/service/ISysCustomerService.java | 1 + .../service/impl/SysCustomerServiceImpl.java | 8 ++- .../mapper/system/SysCustomerMapper.xml | 21 ++++--- 5 files changed, 47 insertions(+), 44 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java index 526a5bac..8a530826 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java @@ -1,5 +1,6 @@ package com.ruoyi.system.controller; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.util.MapUtils; @@ -139,39 +140,31 @@ public class SysCustomerController extends BaseController SysCustomerVo sysCustomer1 = new SysCustomerVo(); sysCustomer1.setEnterpriseName(sysCustomer.getEnterpriseName()); sysCustomer1.setCustomerPurser(sysCustomer.getCustomerPurser()); - List sysCustomerList = sysCustomerService.selectSysCustomerList(sysCustomer1); - int index = sysCustomerList.size(); - if (index >= 1){ - SysCustomer sysCustomer2 = sysCustomerList.get(0); + SysCustomerVo sysCustomerVo2 = sysCustomerService.selectSysCustomerByCustomer(sysCustomer1); + if(ObjectUtil.isNotEmpty(sysCustomerVo2)){ return AjaxResult.error("该客户已被其他业务员添加,"+" 客户名称 :" + - sysCustomer2.getEnterpriseName() + - "事业部 : "+ sysCustomer2.getCustomerPurser() + - " 业务员 : " + sysCustomer2.getBusinessMembers()); - }else if (index == 0){ - Integer ok = sysCustomerService.insertSysCustomer(sysCustomer); - //添加操作记录 - SysCustomerOper sysCustomerOper = new SysCustomerOper(); - sysCustomerOper.setPurser(sysCustomer.getCustomerPurser()); - sysCustomerOper.setEnterpriseCode(sysCustomerOper.getEnterpriseCode()); - sysCustomerOper.setEnterpriseName(sysCustomer.getEnterpriseName()); - sysCustomerOper.setOper("新增"); - sysCustomerOper.setOperPeople(ShiroUtils.getLoginName()); - sysCustomerOper.setOperStatus(sysCustomer.getAuditStatus()); - sysCustomerOper.setCreateTime(new Date()); - if(ok!=null && ok > 0){ - sysCustomerOper.setOperStatus("0"); - }else{ - sysCustomerOper.setOperStatus("1"); - } - // 使用状态-否 - sysCustomer.setUseStatus("0"); - // 审核状态-待审核 - sysCustomer.setAuditStatus("0"); - sysCustomerService.submitApply(sysCustomer); - sysCustomerOperService.insertSysCustomerOper(sysCustomerOper); - return AjaxResult.success("添加成功,等待审核"); + sysCustomerVo2.getEnterpriseName() + + "事业部 : "+ sysCustomerVo2.getCustomerPurser() + + " 业务员 : " + sysCustomerVo2.getBusinessMembers()); } - return AjaxResult.success(""); + Integer ok = sysCustomerService.insertSysCustomer(sysCustomer); + //添加操作记录 + SysCustomerOper sysCustomerOper = new SysCustomerOper(); + sysCustomerOper.setPurser(sysCustomer.getCustomerPurser()); + sysCustomerOper.setEnterpriseCode(sysCustomer.getEnterpriseCode()); + sysCustomerOper.setEnterpriseName(sysCustomer.getEnterpriseName()); + sysCustomerOper.setOper("新增"); + sysCustomerOper.setOperPeople(ShiroUtils.getLoginName()); + sysCustomerOper.setOperStatus(sysCustomer.getAuditStatus()); + sysCustomerOper.setCreateTime(new Date()); + sysCustomerOper.setOperStatus(ok > 0?"0":"1"); + // 使用状态-否 + sysCustomer.setUseStatus("0"); + // 审核状态-待审核 + sysCustomer.setAuditStatus("0"); + sysCustomerService.submitApply(sysCustomer); + sysCustomerOperService.insertSysCustomerOper(sysCustomerOper); + return AjaxResult.success("添加成功,等待审核"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java index 42984788..7c74fac5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java @@ -28,10 +28,10 @@ public interface SysCustomerMapper /** * 查询客户基本信息列表 * - * @param sysCustomer 客户基本信息 + * @param sysCustomerVo 客户基本信息 * @return 客户基本信息集合 */ - List selectSysCustomerList(SysCustomer sysCustomer); + List selectSysCustomerList(SysCustomerVo sysCustomerVo); /** * 新增客户基本信息 @@ -75,4 +75,6 @@ public interface SysCustomerMapper int restoreSysCustomerById(Long id); SysCustomerVo cancelSysCustomerById(Long id); + + SysCustomerVo selectSysCustomerByCustomer(SysCustomerVo sysCustomerVo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java index 7426ccde..62ff51fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java @@ -86,4 +86,5 @@ public interface ISysCustomerService public ProcessInstance submitApply(SysCustomer sysCustomer); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java index c16be315..db457f1c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java @@ -91,10 +91,9 @@ public class SysCustomerServiceImpl implements ISysCustomerService PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); - + Page returnList = new Page<>(); //PageHelper 仅对第一List分页有效 Page list = (Page) sysCustomerMapper.selectSysCustomerList(sysCustomerVo1); - Page returnList = new Page<>(); for(SysCustomerVo sysCustomerVo : list){ SysUser sysUser = userMapper.selectUserByLoginName(sysCustomerVo.getCreateBy()); if (sysUser != null) { @@ -233,6 +232,11 @@ public class SysCustomerServiceImpl implements ISysCustomerService return sysCustomerMapper.selectSysCustomerBycode(); } + @Override + public SysCustomerVo selectSysCustomerByCustomer(SysCustomerVo sysCustomerVo) { + return sysCustomerMapper.selectSysCustomerByCustomer(sysCustomerVo); + } + @Override public SysCustomer selectSysCustomerByEnterpriseCode(String enterpriseCode) { return sysCustomerMapper.selectSysCustomerByEnterpriseCode(enterpriseCode); diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml index 9b6d69be..2a728ce9 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml @@ -130,12 +130,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_customer @@ -342,11 +345,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - update set sys_customer set use_status = 1 where id = #{id} + delete from sys_customer where id = #{id} - update set sys_customer set use_status = 1 where id in + delete from sys_customer where id in #{id}