修改客户详情 保存方法，查询方法

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TCorpsController.java

@@ -5,9 +5,13 @@ import com.ruoyi.basicData.service.ITCorpsService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -64,8 +68,10 @@ public class TCorpsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('basicdata/customerDetails:corps:add')")
     @Log(title = "客户详情", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TCorps tCorps) {
-        return toAjax(tCorpsService.insertTCorps(tCorps));
+    public AjaxResult add(@RequestParam("corps") String tCorps, @RequestParam("customerContacts") String tCustomerContacts) {
+        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return tCorpsService.insertTCorps(tCorps, tCustomerContacts, loginUser);
     }
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TCorpsMapper.java

@@ -1,17 +1,18 @@
 package com.ruoyi.basicData.mapper;
 
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.ruoyi.basicData.domain.TCorps;
 
 import java.util.List;
 
-
 /**
  * 客户详情Mapper接口
  *
  * @author ruoyi
  * @date 2020-12-11
  */
-public interface TCorpsMapper {
+public interface TCorpsMapper extends BaseMapper<TCorps> {
     /**
      * 查询客户详情
      *

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TCustomerContactMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.basicData.mapper;
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.ruoyi.basicData.domain.TCustomerContact;
 
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2020-12-11
  */
-public interface TCustomerContactMapper {
+public interface TCustomerContactMapper extends BaseMapper<TCustomerContact> {
     /**
      * 查询客户联系人
      *

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITCorpsService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.basicData.service;
 
 import com.ruoyi.basicData.domain.TCorps;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
 
 import java.util.List;
 import java.util.Map;
@@ -33,9 +35,10 @@ public interface ITCorpsService {
      * 新增客户详情
      *
      * @param tCorps 客户详情
+     * @param loginUser
      * @return 结果
      */
-    public int insertTCorps(TCorps tCorps);
+    public AjaxResult insertTCorps(String tCorps, String tCustomerContacts, LoginUser loginUser);
 
     /**
      * 修改客户详情

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java

@@ -1,16 +1,22 @@
 package com.ruoyi.basicData.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.ruoyi.basicData.domain.TCorps;
+import com.ruoyi.basicData.domain.TCustomerContact;
 import com.ruoyi.basicData.mapper.TCorpsMapper;
+import com.ruoyi.basicData.mapper.TCustomerContactMapper;
 import com.ruoyi.basicData.service.ITCorpsService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 客户详情Service业务层处理
@@ -23,8 +29,8 @@ public class TCorpsServiceImpl implements ITCorpsService {
     @Autowired
     private TCorpsMapper tCorpsMapper;
 
-//    @Autowired
-//    private TCustomerContactMapper tCustomerContactMapper;
+    @Autowired
+    private TCustomerContactMapper tCustomerContactMapper;
 
     /**
      * 查询客户详情
@@ -37,8 +43,13 @@ public class TCorpsServiceImpl implements ITCorpsService {
     public Map<String, Object> selectTCorpsById(Long fId) {
         Map<String, Object> map = new HashMap<>();
         TCorps tCorps = tCorpsMapper.selectTCorpsById(fId);
-//        tCustomerContactMapper.se
-
+        if (StringUtils.isNull(tCorps)) {
+            map.put("corp", tCorps);
+        }
+        List<TCustomerContact> customerContactList = tCustomerContactMapper.selectList(new EntityWrapper<TCustomerContact>().eq("f_pid", fId));
+        if (StringUtils.isEmpty(customerContactList)) {
+            map.put("customerContact", customerContactList);
+        }
         return map;
     }
 
@@ -56,13 +67,41 @@ public class TCorpsServiceImpl implements ITCorpsService {
     /**
      * 新增客户详情
      *
-     * @param tCorps 客户详情
+     * @param tCorps            客户详情
+     * @param tCustomerContacts 客户联系人
+     * @param loginUser         当前登陆人
      * @return 结果
      */
     @Override
-    public int insertTCorps(TCorps tCorps) {
-        tCorps.setCreateTime(DateUtils.getNowDate());
-        return tCorpsMapper.insertTCorps(tCorps);
+    @Transactional
+    public AjaxResult insertTCorps(String tCorps, String tCustomerContacts, LoginUser loginUser) {
+        if (StringUtils.isEmpty(tCorps)) {
+            return AjaxResult.error("提交失败：客户信息为空");
+        }
+        if (StringUtils.isEmpty(tCustomerContacts)) {
+            return AjaxResult.error("提交失败：客户联系人为空");
+        }
+        TCorps corps = JSONArray.parseObject(tCorps, TCorps.class);
+        JSONArray jsonArray = JSONArray.parseArray(tCustomerContacts);
+        List<TCustomerContact> customerContactList = JSONObject.parseArray(jsonArray.toJSONString(), TCustomerContact.class);
+        corps.setfStatus("0");
+        if (StringUtils.isNull(corps.getfId())) {
+            corps.setCreateBy(loginUser.getUser().getUserName());
+            corps.setCreateTime(new Date());
+            tCorpsMapper.insertTCorps(corps);
+        } else {
+            corps.setUpdateBy(loginUser.getUser().getUserName());
+            corps.setUpdateTime(new Date());
+            tCorpsMapper.updateById(corps);
+            tCustomerContactMapper.delete(new EntityWrapper<TCustomerContact>().eq("f_pid", corps.getfId()));
+        }
+        for (TCustomerContact cc : customerContactList) {
+            cc.setfStatus("0");
+            cc.setCreateBy(loginUser.getUser().getUserName());
+            cc.setCreateTime(new Date());
+            tCustomerContactMapper.insertTCustomerContact(cc);
+        }
+        return AjaxResult.success();
     }
 
     /**