瀏覽代碼

调整车队流程接口,修改车队、司机保存表

阿伏兔 4 年之前
父節點
當前提交
68ece9eb9f
共有 18 個文件被更改,包括 820 次插入370 次删除
  1. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCarManageController.java
  2. 34 36
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCompanyMsgController.java
  3. 33 17
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetDriverMsgController.java
  4. 5 3
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TCorpsController.java
  5. 10 0
      ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
  6. 4 3
      ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetCompanyMsgService.java
  7. 3 2
      ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetDriverMsgService.java
  8. 50 26
      ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetCompanyMsgServiceImpl.java
  9. 32 27
      ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetDriverMsgServiceImpl.java
  10. 4 0
      ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml
  11. 9 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
  12. 13 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
  13. 395 186
      ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TCorps.java
  14. 15 0
      ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TCorpsMapper.java
  15. 13 1
      ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITCorpsService.java
  16. 14 0
      ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java
  17. 183 68
      ruoyi-warehouse/src/main/resources/mapper/basicData/TCorpsMapper.xml
  18. 2 0
      ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsitemsMapper.xml

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCarManageController.java

@@ -41,7 +41,7 @@ public class FleetCarManageController extends BaseController
     /**
      * 查询【车辆】列表
      */
-    @PreAuthorize("@ss.hasPermi('fleet:carManage:list')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:query')")
     @GetMapping("/query")
     public TableDataInfo query(FleetCarManage fleetCarManage)
     {

+ 34 - 36
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCompanyMsgController.java

@@ -6,6 +6,9 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import com.ruoyi.basicData.domain.TCorps;
+import com.ruoyi.basicData.service.ITCorpsService;
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -13,6 +16,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.basicData.domain.FleetCompanyMsg;
 import com.ruoyi.basicData.service.IFleetCompanyMsgService;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysUserService;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.ss.usermodel.*;
@@ -42,6 +46,12 @@ public class FleetCompanyMsgController extends BaseController
     private ISysUserService userService;
 
     @Autowired
+    private ITCorpsService tCorpsService;
+
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+
+    @Autowired
     private IFleetCompanyMsgService fleetCompanyMsgService;
 
     /**
@@ -58,12 +68,14 @@ public class FleetCompanyMsgController extends BaseController
     /**
      * 查询【车队】列表
      */
-    @PreAuthorize("@ss.hasPermi('fleet:companyMsg:list')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:query')")
     @GetMapping("/query")
-    public TableDataInfo query(FleetCompanyMsg fleetCompanyMsg)
+    public TableDataInfo query(TCorps tCorps)
     {
+        String typeValue = "[\"4\"]";
+        tCorps.setfTypeid(typeValue);
         startPage();
-        List<FleetCompanyMsg> list = fleetCompanyMsgService.selectFleetCompanyMsgList(fleetCompanyMsg);
+        List<TCorps> list = tCorpsService.selectTCorpsList(tCorps);
         return getDataTable(list);
     }
 
@@ -101,56 +113,42 @@ public class FleetCompanyMsgController extends BaseController
     }
 
     /**
-     * 新增【车队】
+     * 新增司机详情
      */
-    @PreAuthorize("@ss.hasPermi('fleet:companyMsg:add')")
-    @Log(title = "【车队】", businessType = BusinessType.INSERT)
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:add')")
+    @Log(title = "客户详情", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
-    public AjaxResult add(@RequestBody FleetCompanyMsg fleetCompanyMsg)
-    {
-        // 校验车队唯一
-        if (UserConstants.NOT_UNIQUE.equals(fleetCompanyMsgService.checkUFNoUnique(fleetCompanyMsg))) {
-            return AjaxResult.error("新增车队'" + fleetCompanyMsg.getCompanyName() + "'失败,名称已存在");
-        }
-        if(StringUtils.isNull(fleetCompanyMsg.getCompanyName()) ||
-                StringUtils.isNull(fleetCompanyMsg.getCompanyAddress()) ||
-                StringUtils.isNull(fleetCompanyMsg.getOpeningBank()) ||
-                StringUtils.isNull(fleetCompanyMsg.getBankAccount()) ||
-                StringUtils.isNull(fleetCompanyMsg.getLoginAccount()) ||
-                StringUtils.isNull(fleetCompanyMsg.getLinkPhone()) ){
-            return AjaxResult.error("请维护必填项");
+    @RepeatSubmit
+    public AjaxResult add(@RequestBody TCorps tCorps) {
+        // 检验编号、名称、简称 唯一
+        if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkUFNoUnique(tCorps))) {
+            return AjaxResult.error("新增信息'" + tCorps.getfNo() + "'失败,编号已存在");
+        } else if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkUFNnameUnique(tCorps))) {
+            return AjaxResult.error("新增信息'" + tCorps.getfName() + "'失败,名称已存在");
+        } else if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkUFCnameUnique(tCorps))) {
+            return AjaxResult.error("新增信息'" + tCorps.getfCname() + "'失败,简称已存在");
+        } else if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkULoginAccountUnique(tCorps))) {
+            return AjaxResult.error("新增信息'" + tCorps.getfCname() + "'失败,登录账号已存在");
         }
         SysUser user = new SysUser();
-        user.setUserName(fleetCompanyMsg.getLoginAccount());
-        user.setPhonenumber(fleetCompanyMsg.getLinkPhone());
+        user.setPhonenumber(tCorps.getfTel());
+        user.setUserName(tCorps.getLoginAccount());
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
         } else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
         }
-        return fleetCompanyMsgService.insertFleetCompanyMsg(fleetCompanyMsg);
-    }
-
-    /**
-     * 修改【车队】
-     */
-    @PreAuthorize("@ss.hasPermi('fleet:companyMsg:edit')")
-    @Log(title = "【车队】", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FleetCompanyMsg fleetCompanyMsg)
-    {
-        fleetCompanyMsg.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(fleetCompanyMsgService.updateFleetCompanyMsg(fleetCompanyMsg));
+        return fleetCompanyMsgService.insertFleetCompanyMsg(tCorps);
     }
 
     /**
      * 删除【车队】
      */
-    @PreAuthorize("@ss.hasPermi('fleet:companyMsg:remove')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:remove')")
     @Log(title = "【车队】", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(fleetCompanyMsgService.deleteFleetCompanyMsgByIds(ids));
+        return fleetCompanyMsgService.deleteFleetCompanyMsgByIds(ids);
     }
 }

+ 33 - 17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetDriverMsgController.java

@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.fleet.basicData;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.basicData.domain.TCorps;
+import com.ruoyi.basicData.service.ITCorpsService;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -37,6 +39,10 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/fleet/driverMsg")
 public class FleetDriverMsgController extends BaseController
 {
+
+    @Autowired
+    private ITCorpsService tCorpsService;
+
     @Autowired
     private IFleetDriverMsgService fleetDriverMsgService;
 
@@ -54,13 +60,17 @@ public class FleetDriverMsgController extends BaseController
         return getDataTable(list);
     }
 
-    @PreAuthorize("@ss.hasPermi('fleet:driverMsg:list')")
-    @GetMapping("/qurey")
-    public TableDataInfo qurey(FleetDriverMsg fleetDriverMsg)
+    /**
+     * 查询【车队】列表
+     */
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:query')")
+    @GetMapping("/query")
+    public TableDataInfo query(TCorps tCorps)
     {
+        String typeValue = "[\"6\"]";
+        tCorps.setfTypeid(typeValue);
         startPage();
-        // List<FleetDriverMsg> list = fleetDriverMsgService.selectFleetDriverMsgList(fleetDriverMsg);
-        List<Map<String, Object>> list = fleetDriverMsgService.selectFleetDriverMsgListMap(fleetDriverMsg);
+        List<Map<String, Object>> list = tCorpsService.selectFleetDriverMsgListMap(tCorps);
         return getDataTable(list);
     }
 
@@ -93,22 +103,28 @@ public class FleetDriverMsgController extends BaseController
     @PreAuthorize("@ss.hasPermi('fleet:driverMsg:add')")
     @Log(title = "【司机】", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody FleetDriverMsg fleetDriverMsg)
+    public AjaxResult add(@RequestBody TCorps tCorps)
     {
-        if (StringUtils.isEmpty(fleetDriverMsg.getTel())) {
+        if (StringUtils.isEmpty(tCorps.getfTel())) {
             return AjaxResult.error("请填写司机手机号");
         }
-        if(fleetDriverMsg.getId()==null){
-            //检验登录名  唯一
-            SysUser sysUser = userService.selectUserByUserName(fleetDriverMsg.getTel());
-            if (StringUtils.isNotNull(sysUser) && "00".equals(sysUser.getUserType())) {
-                return AjaxResult.error("新增驾驶员'" + fleetDriverMsg.getName() + "'失败,登录账号(联系电话)已存在()");
-            }
-            /*if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(fleetDriverMsg.getTel()))) {
-                return AjaxResult.error("新增驾驶员'" + fleetDriverMsg.getName() + "'失败,登录账号(联系电话)已存在()");
-            }*/
+        // 检验编号、名称、简称 唯一
+        if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkUFNoUnique(tCorps))) {
+            return AjaxResult.error("新增信息'" + tCorps.getfNo() + "'失败,编号已存在");
+        } else if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkUFNnameUnique(tCorps))) {
+            return AjaxResult.error("新增信息'" + tCorps.getfName() + "'失败,名称已存在");
+        } else if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkUFCnameUnique(tCorps))) {
+            return AjaxResult.error("新增信息'" + tCorps.getfCname() + "'失败,简称已存在");
+        }
+        SysUser user = new SysUser();
+        user.setPhonenumber(tCorps.getfTel());
+        user.setUserName(tCorps.getLoginAccount());
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
+        } else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
         }
-        return fleetDriverMsgService.insertFleetDriverMsg(fleetDriverMsg);
+        return fleetDriverMsgService.insertFleetDriverMsg(tCorps);
     }
 
     /**

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

@@ -76,11 +76,13 @@ public class TCorpsController extends BaseController {
         // 检验编号、名称、简称 唯一
         TCorps tCorps1 = JSONArray.parseObject(tCorps, TCorps.class);
         if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkUFNoUnique(tCorps1))) {
-            return AjaxResult.error("新增客户'" + tCorps1.getfNo() + "'失败,编号已存在");
+            return AjaxResult.error("新增信息'" + tCorps1.getfNo() + "'失败,编号已存在");
         } else if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkUFNnameUnique(tCorps1))) {
-            return AjaxResult.error("新增客户'" + tCorps1.getfName() + "'失败,名称已存在");
+            return AjaxResult.error("新增信息'" + tCorps1.getfName() + "'失败,名称已存在");
         } else if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkUFCnameUnique(tCorps1))) {
-            return AjaxResult.error("新增客户'" + tCorps1.getfCname() + "'失败,简称已存在");
+            return AjaxResult.error("新增信息'" + tCorps1.getfCname() + "'失败,简称已存在");
+        } else if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkULoginAccountUnique(tCorps1))) {
+            return AjaxResult.error("新增信息'" + tCorps1.getfCname() + "'失败,登录账号已存在");
         }
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());

+ 10 - 0
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java

@@ -25,6 +25,16 @@ public class LoginBody {
     private String phonenumber;
 
     /**
+     * 用户唯一标识
+     */
+    private String encryptedData;
+
+    /**
+     * 用户唯一标识加密算法
+     */
+    private String encryptedIv;
+
+    /**
      * 加密算法
      */
     private String iv;

+ 4 - 3
ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetCompanyMsgService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.basicData.service;
 
 
+import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.basicData.domain.FleetCompanyMsg;
 import org.springframework.web.multipart.MultipartFile;
@@ -37,10 +38,10 @@ public interface IFleetCompanyMsgService
     /**
      * 新增【车队】
      * 
-     * @param fleetCompanyMsg 【车队】
+     * @param tCorps 【车队】
      * @return 结果
      */
-    public AjaxResult insertFleetCompanyMsg(FleetCompanyMsg fleetCompanyMsg);
+    public AjaxResult insertFleetCompanyMsg(TCorps tCorps);
 
     /**
      * 修改【车队】
@@ -56,7 +57,7 @@ public interface IFleetCompanyMsgService
      * @param ids 需要删除的【车队】ID
      * @return 结果
      */
-    public int deleteFleetCompanyMsgByIds(Long[] ids);
+    public AjaxResult deleteFleetCompanyMsgByIds(Long[] ids);
 
     /**
      * 删除【车队】信息

+ 3 - 2
ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetDriverMsgService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.basicData.service;
 
+import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.basicData.domain.FleetDriverMsg;
 
@@ -33,10 +34,10 @@ public interface IFleetDriverMsgService
     /**
      * 新增【司机】
      * 
-     * @param fleetDriverMsg 【司机】
+     * @param tCorps 【司机】
      * @return 结果
      */
-    public AjaxResult insertFleetDriverMsg(FleetDriverMsg fleetDriverMsg);
+    public AjaxResult insertFleetDriverMsg(TCorps tCorps);
 
     /**
      * 修改【司机】

+ 50 - 26
ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetCompanyMsgServiceImpl.java

@@ -2,7 +2,9 @@ package com.ruoyi.basicData.service.impl;
 
 
 import com.ruoyi.basicData.domain.FleetCompanyMsg;
+import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.basicData.mapper.FleetCompanyMsgMapper;
+import com.ruoyi.basicData.mapper.TCorpsMapper;
 import com.ruoyi.basicData.service.IFleetCompanyMsgService;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -10,17 +12,17 @@ import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsplans;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsplansMapper;
 import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.service.ISysDictDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.aspectj.weaver.loadtime.Aj;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,7 +31,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 import static com.ruoyi.common.utils.poi.Excel.filter;
@@ -44,6 +45,9 @@ import static com.ruoyi.common.utils.poi.Excel.filter;
 @Service
 public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     @Autowired
+    private TCorpsMapper tCorpsMapper;
+
+    @Autowired
     private SysUserMapper sysUserMapper;
 
     @Autowired
@@ -53,8 +57,14 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     private SysUserRoleMapper sysUserRoleMapper;
 
     @Autowired
+    private ISysDictDataService sysDictDataService;
+
+    @Autowired
     private FleetCompanyMsgMapper fleetCompanyMsgMapper;
 
+    @Autowired
+    private FtmsorderbillsplansMapper ftmsorderbillsplansMapper;
+
     /**
      * 查询【车队】
      *
@@ -85,33 +95,35 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     /**
      * 新增【车队】
      *
-     * @param fleetCompanyMsg 【车队】
+     * @param tCorps 【车队】
      * @return 结果
      */
     @Override
     @Transactional
-    public AjaxResult insertFleetCompanyMsg(FleetCompanyMsg fleetCompanyMsg) {
-        if (null != fleetCompanyMsg.getId() && !fleetCompanyMsg.getId().equals("")) {
-            fleetCompanyMsg.setBillStatus(6L);
-            fleetCompanyMsg.setUpdateBy(SecurityUtils.getUsername());
-            fleetCompanyMsg.setUpdateTime(new Date());
-            fleetCompanyMsgMapper.updateFleetCompanyMsg(fleetCompanyMsg);
-            SysUser sysUser = sysUserMapper.selectUserByUserName(fleetCompanyMsg.getLoginAccount());
+    public AjaxResult insertFleetCompanyMsg(TCorps tCorps) {
+        String typeValue = "[\"4\"]";
+        tCorps.setfTypeid(typeValue);
+        tCorps.setfStatus("1");
+        if (StringUtils.isNotNull(tCorps.getfId())) {
+            tCorps.setUpdateBy(SecurityUtils.getUsername());
+            tCorps.setUpdateTime(new Date());
+            tCorpsMapper.updateTCorps(tCorps);
+            // 更新用户信息
+            SysUser sysUser = sysUserMapper.selectUserByUserName(tCorps.getLoginAccount());
             if (StringUtils.isNull(sysUser)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("未找到用户信息,请添加后再提交");
             }
             sysUser.setUpdateTime(new Date());
             sysUser.setUpdateBy(SecurityUtils.getUsername());
-            sysUser.setPhonenumber(fleetCompanyMsg.getLinkPhone());
+            sysUser.setPhonenumber(tCorps.getfTel());
             sysUserMapper.updateUser(sysUser);
             return AjaxResult.success();
         } else {
-            fleetCompanyMsg.setBillStatus(6L);
-            fleetCompanyMsg.setCreateBy(SecurityUtils.getUsername());
-            fleetCompanyMsg.setCreatTime(new Date());
-            fleetCompanyMsgMapper.insertFleetCompanyMsg(fleetCompanyMsg);
-            AjaxResult ajaxResult = createUser(fleetCompanyMsg);
+            tCorps.setCreateTime(new Date());
+            tCorps.setCreateBy(SecurityUtils.getUsername());
+            tCorpsMapper.insertTCorps(tCorps);
+            AjaxResult ajaxResult = createUser(tCorps);
             String code = ajaxResult.get("code").toString();
             if ("500".equals(code)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -122,16 +134,16 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     }
 
     @Transactional
-    public AjaxResult createUser(FleetCompanyMsg fleetCompanyMsg) {
+    public AjaxResult createUser(TCorps tCorps) {
         // 创建用户
         SysUser user = new SysUser();
         user.setUserType("00");
         user.setCreateTime(new Date());
         user.setCreateBy(SecurityUtils.getUsername());
-        user.setNickName(fleetCompanyMsg.getLinkPhone());
-        user.setUserName(fleetCompanyMsg.getLoginAccount());
-        user.setPhonenumber(fleetCompanyMsg.getLinkPhone());
-        user.setPassword(SecurityUtils.encryptPassword(fleetCompanyMsg.getLinkPhone()));
+        user.setNickName(tCorps.getfTel());
+        user.setUserName(tCorps.getLoginAccount());
+        user.setPhonenumber(tCorps.getfTel());
+        user.setPassword(SecurityUtils.encryptPassword(tCorps.getfTel()));
         sysUserMapper.insertUser(user);
         // 查询是否存在车队 角色
         SysRole role = sysRoleMapper.selectRoleByName("车队");
@@ -168,8 +180,20 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
      * @return 结果
      */
     @Override
-    public int deleteFleetCompanyMsgByIds(Long[] ids) {
-        return fleetCompanyMsgMapper.deleteFleetCompanyMsgByIds(ids);
+    @Transactional
+    public AjaxResult deleteFleetCompanyMsgByIds(Long[] ids) {
+        int i = 1;
+        for(Long id:ids){
+            Ftmsorderbillsplans ftmsorderbillsplans =new Ftmsorderbillsplans();
+            ftmsorderbillsplans.setCarcorPid(id);
+            if(ftmsorderbillsplansMapper.selectftmsorderbillsplansCountList(ftmsorderbillsplans) > 0){
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return AjaxResult.error("客户第" + i + "行调度安排已被使用不可删除");
+            }
+            tCorpsMapper.deleteTCorpsById(id);
+            i++;
+        }
+        return AjaxResult.success();
     }
 
     /**
@@ -180,7 +204,7 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
      */
     @Override
     public int deleteFleetCompanyMsgById(Long id) {
-        return fleetCompanyMsgMapper.deleteFleetCompanyMsgById(id);
+        return tCorpsMapper.deleteTCorpsById(id);
     }
 
     @Override

+ 32 - 27
ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetDriverMsgServiceImpl.java

@@ -1,7 +1,9 @@
 package com.ruoyi.basicData.service.impl;
 
 import com.ruoyi.basicData.domain.FleetDriverMsg;
+import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.basicData.mapper.FleetDriverMsgMapper;
+import com.ruoyi.basicData.mapper.TCorpsMapper;
 import com.ruoyi.basicData.service.IFleetDriverMsgService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysRole;
@@ -11,7 +13,6 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
 import com.ruoyi.orderPlan.mapper.FtmsorderbillscarsMapper;
-import com.ruoyi.system.domain.SysUserPost;
 import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
@@ -37,6 +38,9 @@ import java.util.Map;
 @Service
 public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
     @Autowired
+    private TCorpsMapper corpsMapper;
+
+    @Autowired
     private FleetDriverMsgMapper fleetDriverMsgMapper;
 
     @Autowired
@@ -84,40 +88,40 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
     /**
      * 新增【司机】
      *
-     * @param fleetDriverMsg 【司机】
+     * @param tCorps 【司机】
      * @return 结果
      */
     @Override
     @Transactional
-    public AjaxResult insertFleetDriverMsg(FleetDriverMsg fleetDriverMsg) {
+    public AjaxResult insertFleetDriverMsg(TCorps tCorps) {
         // 检验必填
-        if (StringUtils.isNull(fleetDriverMsg.getFleetCompanyId()) ||
-                StringUtils.isNull(fleetDriverMsg.getName()) ||
-                StringUtils.isNull(fleetDriverMsg.getIdcarNum())) {
+        if (StringUtils.isNull(tCorps.getfPid()) ||
+                StringUtils.isNull(tCorps.getfName()) ||
+                StringUtils.isNull(tCorps.getfScale())) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("请填写必输项");
         }
-        fleetDriverMsg.setBillStatus(6L);
-        if (null != fleetDriverMsg.getId()) {
-            updateDriverPhone(fleetDriverMsg);
-            fleetDriverMsg.setUpdateTime(new Date());
-            fleetDriverMsg.setUpdateBy(SecurityUtils.getUsername());
-            fleetDriverMsgMapper.updateFleetDriverMsg(fleetDriverMsg);
+        tCorps.setfStatus("1");
+        if (null != tCorps.getfId()) {
+            updateDriverPhone(tCorps);
+            tCorps.setUpdateTime(new Date());
+            tCorps.setUpdateBy(SecurityUtils.getUsername());
+            corpsMapper.updateTCorps(tCorps);
             return AjaxResult.success();
         } else {
             // 添加用户表
             SysUser sysUser = new SysUser();
-            sysUser.setUserName(fleetDriverMsg.getTel());
-            sysUser.setNickName(fleetDriverMsg.getName());
-            sysUser.setPhonenumber(fleetDriverMsg.getTel());
+            sysUser.setUserName(tCorps.getfTel());
+            sysUser.setNickName(tCorps.getfName());
+            sysUser.setPhonenumber(tCorps.getfTel());
             //sysUser.setEmail(fleetDriverMsg.get);
             sysUser.setUserType("11");
-            sysUser.setPassword(SecurityUtils.encryptPassword(fleetDriverMsg.getTel()));
+            sysUser.setPassword(SecurityUtils.encryptPassword(tCorps.getfTel()));
             sysUser.setDeptId(120L); // 当前给定、后期修改
             Long[] rolr = {110L}; // 当前给定、后期修改
             sysUser.setRoleIds(rolr);
             // 查询是否有用户提前关注小程序
-            SysUser user = userMapper.selectUserByTel(fleetDriverMsg.getTel());
+            SysUser user = userMapper.selectUserByTel(tCorps.getfTel());
             if (StringUtils.isNotNull(user)) {
                 // 该用户提前关注小程序了
                 sysUser.setOpenId(user.getOpenId());
@@ -142,27 +146,28 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             sysUserRole.setUserId(sysUser.getUserId());
             list.add(sysUserRole);
             userRoleMapper.batchUserRole(list);
-            fleetDriverMsg.setCreateBy(SecurityUtils.getUsername());
-            fleetDriverMsg.setCreatTime(new Date());
-            fleetDriverMsgMapper.insertFleetDriverMsg(fleetDriverMsg);
+            tCorps.setCreateTime(new Date());
+            tCorps.setCreateBy(SecurityUtils.getUsername());
+            corpsMapper.insertTCorps(tCorps);
+
             return AjaxResult.success();
         }
     }
 
     @Transactional
-    public void updateDriverPhone(FleetDriverMsg fleetDriverMsg) {
-        FleetDriverMsg driverMsg = fleetDriverMsgMapper.selectFleetDriverMsgById(fleetDriverMsg.getId());
-        SysUser sysUser = userMapper.selectUserByTel(driverMsg.getTel());
+    public void updateDriverPhone(TCorps tCorps) {
+        TCorps corps = corpsMapper.selectTCorpsById(tCorps.getfId());
+        SysUser sysUser = userMapper.selectUserByTel(corps.getfTel());
         if (StringUtils.isNotNull(sysUser)) {
             boolean updateStatus = false;
             // 跟新用户手机号以及姓名
-            if (!sysUser.getPhonenumber().equals(fleetDriverMsg.getTel())) {
+            if (!sysUser.getPhonenumber().equals(tCorps.getfTel())) {
                 updateStatus = true;
-                sysUser.setPhonenumber(fleetDriverMsg.getTel());
+                sysUser.setPhonenumber(tCorps.getfTel());
             }
-            if (!sysUser.getNickName().equals(fleetDriverMsg.getName())) {
+            if (!sysUser.getNickName().equals(tCorps.getfTel())) {
                 updateStatus = true;
-                sysUser.setNickName(fleetDriverMsg.getName());
+                sysUser.setNickName(tCorps.getfTel());
             }
             if (updateStatus) {
                 sysUser.setUpdateTime(new Date());

+ 4 - 0
ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -574,6 +574,8 @@
             c.id,
             c.p_id AS pId,
             c.org_id AS orgId,
+            c.order_no AS orderNo,
+            dic.dict_label cntrName,
             t.corp_id AS fCorpId,
             corp.f_name AS fCorpIds,
             u.nick_name AS planUserId,
@@ -642,6 +644,8 @@
             LEFT JOIN sys_user driver ON driver.user_id = c.driver_user_id
             LEFT JOIN t_corps corp ON corp.f_id = t.corp_id
             LEFT JOIN t_goods g ON g.f_id = t.goods_id
+            LEFT JOIN sys_dict_data dic ON dic.dict_value = c.cntr_id
+            AND dic.dict_type = 'data_cntrId'
         where
             c.id = #{id}
         ORDER BY c.id desc

+ 9 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java

@@ -58,4 +58,13 @@ public interface ISysDictDataService
      * @return 结果
      */
     public int updateDictData(SysDictData dictData);
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     *
+     * @param dictType 字典类型
+     * @param dictData 字典键值
+     * @return 字典标签
+     */
+    public String selectDictValue(String dictType, String dictData);
 }

+ 13 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java

@@ -45,6 +45,18 @@ public class SysDictDataServiceImpl implements ISysDictDataService
     }
 
     /**
+     * 根据字典类型和字典键值查询字典数据信息
+     *
+     * @param dictType 字典类型
+     * @param dictData 字典键值
+     * @return 字典标签
+     */
+    @Override
+    public String selectDictValue(String dictType, String dictData) {
+        return dictDataMapper.selectDictValue(dictType, dictData);
+    }
+
+    /**
      * 根据字典数据ID查询信息
      * 
      * @param dictCode 字典数据ID
@@ -106,4 +118,5 @@ public class SysDictDataServiceImpl implements ISysDictDataService
         }
         return row;
     }
+
 }

+ 395 - 186
ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TCorps.java

@@ -18,420 +18,452 @@ import java.util.Date;
 public class TCorps extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /**
-     * $column.columnComment
-     */
+    /** $column.columnComment */
     private Long fId;
 
-    /**
-     * 客户类别
-     */
+    /** $column.columnComment */
+    private Long fPid;
+
+    /** 客户类别 */
     @Excel(name = "客户类别")
     private String fTypeid;
 
-    /**
-     * 编号
-     */
+    /** 编号 */
     @Excel(name = "编号")
     private String fNo;
 
-    /**
-     * 名称
-     */
+    /** 名称 */
     @Excel(name = "名称")
     private String fName;
 
-    /**
-     * 简称
-     */
+    /** 简称 */
     @Excel(name = "简称")
     private String fCname;
 
-    /**
-     * 英文名称
-     */
+    /** 英文名称 */
     @Excel(name = "英文名称")
     private String fEname;
 
-    /**
-     * 电话
-     */
+    /** 电话 */
     @Excel(name = "电话")
     private String fTel;
 
-    /**
-     * 传真
-     */
+    /** 传真 */
     @Excel(name = "传真")
     private String fFax;
 
-    /**
-     * 邮箱
-     */
+    /** 邮箱 */
     @Excel(name = "邮箱")
     private String fEmail;
 
-    /**
-     * 联系人
-     */
+    /** 联系人 */
     @Excel(name = "联系人")
     private String fManage;
 
-    /**
-     * 地址
-     */
+    /** 地址 */
     @Excel(name = "地址")
     private String fAddr;
 
-    /**
-     * 英文地址
-     */
+    /** 英文地址 */
     @Excel(name = "英文地址")
     private String fEaddr;
 
-    /**
-     * 规模
-     */
+    /** 规模 */
     @Excel(name = "规模")
     private String fScale;
 
-    /**
-     * 省
-     */
+    /** 省 */
     @Excel(name = "省")
     private String fProvince;
 
-    /**
-     * 市
-     */
+    /** 市 */
     @Excel(name = "市")
     private String fCity;
 
-    /**
-     * 结算表票结、月结
-     */
+    /** 结算表票结、月结 */
     @Excel(name = "结算表票结、月结")
     private Long fStltypeid;
 
-    /**
-     * 结费天数
-     */
+    /** 结费天数 */
     @Excel(name = "结费天数")
     private Long fStldays;
 
-    /**
-     * 合同号
-     */
+    /** 合同号 */
     @Excel(name = "合同号")
     private String fContractno;
 
-    /**
-     * 合同起
-     */
+    /** 合同起 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "合同起", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fContractb;
 
-    /**
-     * 合同至
-     */
+    /** 合同至 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "合同至", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fContracte;
 
-    /**
-     * 税号
-     */
+    /** 税号 */
     @Excel(name = "税号")
     private String fTax;
 
-    /**
-     * 开票电话
-     */
+    /** 开票电话 */
     @Excel(name = "开票电话")
     private String fInvtel;
 
-    /**
-     * 开票地址
-     */
+    /** 开票地址 */
     @Excel(name = "开票地址")
     private String fInvaddr;
 
-    /**
-     * 本位币账号
-     */
+    /** 本位币账号 */
     @Excel(name = "本位币账号")
     private String fBankno;
 
-    /**
-     * 本位币银行
-     */
+    /** 本位币银行 */
     @Excel(name = "本位币银行")
     private String fBankname;
 
-    /**
-     * 外币账号
-     */
+    /** 外币账号 */
     @Excel(name = "外币账号")
     private String fUbankno;
 
-    /**
-     * 外币银行
-     */
+    /** 外币银行 */
     @Excel(name = "外币银行")
     private String fUbankname;
 
-    /**
-     * 状态默认 T ,正常T 停用F 下拉选择
-     */
+    /** 状态默认 T ,正常T 停用F 下拉选择 */
     @Excel(name = "状态默认 T ,正常T 停用F 下拉选择")
     private String fStatus;
 
-    /**
-     * 删除状态
-     */
-    @TableLogic
+    /** 删除状态 */
     private String delFlag;
 
-    /**
-     * 客户类别
-     */
-    @Excel(name = "客户类别")
+    /** 客户类别(拼接起来的) */
+    @Excel(name = "客户类别(拼接起来的)")
     private String fTypename;
 
+    /** 登陆账号 */
+    @Excel(name = "登陆账号")
+    private String loginAccount;
+
+    /** 信用等级 */
+    @Excel(name = "信用等级")
+    private String creditLv;
+
+    /** 账期天数(订单结束后最迟结款天数)  */
+    @Excel(name = "账期天数(订单结束后最迟结款天数) ")
+    private Long paymentDays;
+
+    /** 公司车辆数 */
+    @Excel(name = "公司车辆数")
+    private Long carNum;
+
+    /** 总公司 */
+    @Excel(name = "总公司")
+    private String headOffice;
+
+    /** 注册资本 */
+    @Excel(name = "注册资本")
+    private String registerdCapital;
+
+    /** 法人 */
+    @Excel(name = "法人")
+    private String legalPerson;
+
+    /** 所属行业 */
+    @Excel(name = "所属行业")
+    private String insdustry;
+
+    /** 社会统一信用代码 */
+    @Excel(name = "社会统一信用代码")
+    private String creditNum;
+
+    /** 纳税人识别号 */
+    @Excel(name = "纳税人识别号")
+    private String taxpayerNum;
+
+    /** 工商注册号 */
+    @Excel(name = "工商注册号")
+    private String industryCommerceNum;
+
+    /** 组织机构代码 */
+    @Excel(name = "组织机构代码")
+    private String organizationNum;
+
+    /** 登记机关 */
+    @Excel(name = "登记机关")
+    private String registerOrganization;
+
+    /** 成立日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "成立日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dateOfEstablishment;
+
+    /** 企业类型 */
+    @Excel(name = "企业类型")
+    private String companyType;
+
+    /** 营业期限 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "营业期限", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date businessDeadline;
+
+    /** 营业区域 */
+    @Excel(name = "营业区域")
+    private String businessArea;
+
+    /** 审核年检日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核年检日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date annualDate;
+
+    /** 注册地址 */
+    @Excel(name = "注册地址")
+    private String registerdAddress;
+
+    /** 经营范围 */
+    @Excel(name = "经营范围")
+    private String manageScope;
+
+    public Long getfId() {
+        return fId;
+    }
 
     public void setfId(Long fId) {
         this.fId = fId;
     }
 
-    public Long getfId() {
-        return fId;
+    public Long getfPid() {
+        return fPid;
     }
 
-    public void setfTypeid(String fTypeid) {
-        this.fTypeid = fTypeid;
+    public void setfPid(Long fPid) {
+        this.fPid = fPid;
     }
 
     public String getfTypeid() {
         return fTypeid;
     }
 
-    public void setfNo(String fNo) {
-        this.fNo = fNo;
+    public void setfTypeid(String fTypeid) {
+        this.fTypeid = fTypeid;
     }
 
     public String getfNo() {
         return fNo;
     }
 
-    public void setfName(String fName) {
-        this.fName = fName;
+    public void setfNo(String fNo) {
+        this.fNo = fNo;
     }
 
     public String getfName() {
         return fName;
     }
 
-    public void setfCname(String fCname) {
-        this.fCname = fCname;
+    public void setfName(String fName) {
+        this.fName = fName;
     }
 
     public String getfCname() {
         return fCname;
     }
 
-    public void setfEname(String fEname) {
-        this.fEname = fEname;
+    public void setfCname(String fCname) {
+        this.fCname = fCname;
     }
 
     public String getfEname() {
         return fEname;
     }
 
-    public void setfTel(String fTel) {
-        this.fTel = fTel;
+    public void setfEname(String fEname) {
+        this.fEname = fEname;
     }
 
     public String getfTel() {
         return fTel;
     }
 
-    public void setfFax(String fFax) {
-        this.fFax = fFax;
+    public void setfTel(String fTel) {
+        this.fTel = fTel;
     }
 
     public String getfFax() {
         return fFax;
     }
 
-    public void setfEmail(String fEmail) {
-        this.fEmail = fEmail;
+    public void setfFax(String fFax) {
+        this.fFax = fFax;
     }
 
     public String getfEmail() {
         return fEmail;
     }
 
-    public void setfManage(String fManage) {
-        this.fManage = fManage;
+    public void setfEmail(String fEmail) {
+        this.fEmail = fEmail;
     }
 
     public String getfManage() {
         return fManage;
     }
 
-    public void setfAddr(String fAddr) {
-        this.fAddr = fAddr;
+    public void setfManage(String fManage) {
+        this.fManage = fManage;
     }
 
     public String getfAddr() {
         return fAddr;
     }
 
-    public void setfEaddr(String fEaddr) {
-        this.fEaddr = fEaddr;
+    public void setfAddr(String fAddr) {
+        this.fAddr = fAddr;
     }
 
     public String getfEaddr() {
         return fEaddr;
     }
 
-    public void setfScale(String fScale) {
-        this.fScale = fScale;
+    public void setfEaddr(String fEaddr) {
+        this.fEaddr = fEaddr;
     }
 
     public String getfScale() {
         return fScale;
     }
 
-    public void setfProvince(String fProvince) {
-        this.fProvince = fProvince;
+    public void setfScale(String fScale) {
+        this.fScale = fScale;
     }
 
     public String getfProvince() {
         return fProvince;
     }
 
-    public void setfCity(String fCity) {
-        this.fCity = fCity;
+    public void setfProvince(String fProvince) {
+        this.fProvince = fProvince;
     }
 
     public String getfCity() {
         return fCity;
     }
 
-    public void setfStltypeid(Long fStltypeid) {
-        this.fStltypeid = fStltypeid;
+    public void setfCity(String fCity) {
+        this.fCity = fCity;
     }
 
     public Long getfStltypeid() {
         return fStltypeid;
     }
 
-    public void setfStldays(Long fStldays) {
-        this.fStldays = fStldays;
+    public void setfStltypeid(Long fStltypeid) {
+        this.fStltypeid = fStltypeid;
     }
 
     public Long getfStldays() {
         return fStldays;
     }
 
-    public void setfContractno(String fContractno) {
-        this.fContractno = fContractno;
+    public void setfStldays(Long fStldays) {
+        this.fStldays = fStldays;
     }
 
     public String getfContractno() {
         return fContractno;
     }
 
-    public void setfContractb(Date fContractb) {
-        this.fContractb = fContractb;
+    public void setfContractno(String fContractno) {
+        this.fContractno = fContractno;
     }
 
     public Date getfContractb() {
         return fContractb;
     }
 
-    public void setfContracte(Date fContracte) {
-        this.fContracte = fContracte;
+    public void setfContractb(Date fContractb) {
+        this.fContractb = fContractb;
     }
 
     public Date getfContracte() {
         return fContracte;
     }
 
-    public void setfTax(String fTax) {
-        this.fTax = fTax;
+    public void setfContracte(Date fContracte) {
+        this.fContracte = fContracte;
     }
 
     public String getfTax() {
         return fTax;
     }
 
-    public void setfInvtel(String fInvtel) {
-        this.fInvtel = fInvtel;
+    public void setfTax(String fTax) {
+        this.fTax = fTax;
     }
 
     public String getfInvtel() {
         return fInvtel;
     }
 
-    public void setfInvaddr(String fInvaddr) {
-        this.fInvaddr = fInvaddr;
+    public void setfInvtel(String fInvtel) {
+        this.fInvtel = fInvtel;
     }
 
     public String getfInvaddr() {
         return fInvaddr;
     }
 
-    public void setfBankno(String fBankno) {
-        this.fBankno = fBankno;
+    public void setfInvaddr(String fInvaddr) {
+        this.fInvaddr = fInvaddr;
     }
 
     public String getfBankno() {
         return fBankno;
     }
 
-    public void setfBankname(String fBankname) {
-        this.fBankname = fBankname;
+    public void setfBankno(String fBankno) {
+        this.fBankno = fBankno;
     }
 
     public String getfBankname() {
         return fBankname;
     }
 
-    public void setfUbankno(String fUbankno) {
-        this.fUbankno = fUbankno;
+    public void setfBankname(String fBankname) {
+        this.fBankname = fBankname;
     }
 
     public String getfUbankno() {
         return fUbankno;
     }
 
-    public void setfUbankname(String fUbankname) {
-        this.fUbankname = fUbankname;
+    public void setfUbankno(String fUbankno) {
+        this.fUbankno = fUbankno;
     }
 
     public String getfUbankname() {
         return fUbankname;
     }
 
-    public void setfStatus(String fStatus) {
-        this.fStatus = fStatus;
+    public void setfUbankname(String fUbankname) {
+        this.fUbankname = fUbankname;
     }
 
     public String getfStatus() {
         return fStatus;
     }
 
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
+    public void setfStatus(String fStatus) {
+        this.fStatus = fStatus;
     }
 
     public String getDelFlag() {
         return delFlag;
     }
 
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
     public String getfTypename() {
         return fTypename;
     }
@@ -440,43 +472,220 @@ public class TCorps extends BaseEntity {
         this.fTypename = fTypename;
     }
 
+    public String getLoginAccount() {
+        return loginAccount;
+    }
+
+    public void setLoginAccount(String loginAccount) {
+        this.loginAccount = loginAccount;
+    }
+
+    public String getCreditLv() {
+        return creditLv;
+    }
+
+    public void setCreditLv(String creditLv) {
+        this.creditLv = creditLv;
+    }
+
+    public Long getPaymentDays() {
+        return paymentDays;
+    }
+
+    public void setPaymentDays(Long paymentDays) {
+        this.paymentDays = paymentDays;
+    }
+
+    public Long getCarNum() {
+        return carNum;
+    }
+
+    public void setCarNum(Long carNum) {
+        this.carNum = carNum;
+    }
+
+    public String getHeadOffice() {
+        return headOffice;
+    }
+
+    public void setHeadOffice(String headOffice) {
+        this.headOffice = headOffice;
+    }
+
+    public String getRegisterdCapital() {
+        return registerdCapital;
+    }
+
+    public void setRegisterdCapital(String registerdCapital) {
+        this.registerdCapital = registerdCapital;
+    }
+
+    public String getLegalPerson() {
+        return legalPerson;
+    }
+
+    public void setLegalPerson(String legalPerson) {
+        this.legalPerson = legalPerson;
+    }
+
+    public String getInsdustry() {
+        return insdustry;
+    }
+
+    public void setInsdustry(String insdustry) {
+        this.insdustry = insdustry;
+    }
+
+    public String getCreditNum() {
+        return creditNum;
+    }
+
+    public void setCreditNum(String creditNum) {
+        this.creditNum = creditNum;
+    }
+
+    public String getTaxpayerNum() {
+        return taxpayerNum;
+    }
+
+    public void setTaxpayerNum(String taxpayerNum) {
+        this.taxpayerNum = taxpayerNum;
+    }
+
+    public String getIndustryCommerceNum() {
+        return industryCommerceNum;
+    }
+
+    public void setIndustryCommerceNum(String industryCommerceNum) {
+        this.industryCommerceNum = industryCommerceNum;
+    }
+
+    public String getOrganizationNum() {
+        return organizationNum;
+    }
+
+    public void setOrganizationNum(String organizationNum) {
+        this.organizationNum = organizationNum;
+    }
+
+    public String getRegisterOrganization() {
+        return registerOrganization;
+    }
+
+    public void setRegisterOrganization(String registerOrganization) {
+        this.registerOrganization = registerOrganization;
+    }
+
+    public Date getDateOfEstablishment() {
+        return dateOfEstablishment;
+    }
+
+    public void setDateOfEstablishment(Date dateOfEstablishment) {
+        this.dateOfEstablishment = dateOfEstablishment;
+    }
+
+    public String getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(String companyType) {
+        this.companyType = companyType;
+    }
+
+    public Date getBusinessDeadline() {
+        return businessDeadline;
+    }
+
+    public void setBusinessDeadline(Date businessDeadline) {
+        this.businessDeadline = businessDeadline;
+    }
+
+    public String getBusinessArea() {
+        return businessArea;
+    }
+
+    public void setBusinessArea(String businessArea) {
+        this.businessArea = businessArea;
+    }
+
+    public Date getAnnualDate() {
+        return annualDate;
+    }
+
+    public void setAnnualDate(Date annualDate) {
+        this.annualDate = annualDate;
+    }
+
+    public String getRegisterdAddress() {
+        return registerdAddress;
+    }
+
+    public void setRegisterdAddress(String registerdAddress) {
+        this.registerdAddress = registerdAddress;
+    }
+
+    public String getManageScope() {
+        return manageScope;
+    }
+
+    public void setManageScope(String manageScope) {
+        this.manageScope = manageScope;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("fId", getfId())
-                .append("fTypeid", getfTypeid())
-                .append("fNo", getfNo())
-                .append("fName", getfName())
-                .append("fCname", getfCname())
-                .append("fEname", getfEname())
-                .append("fTel", getfTel())
-                .append("fFax", getfFax())
-                .append("fEmail", getfEmail())
-                .append("fManage", getfManage())
-                .append("fAddr", getfAddr())
-                .append("fEaddr", getfEaddr())
-                .append("fScale", getfScale())
-                .append("fProvince", getfProvince())
-                .append("fCity", getfCity())
-                .append("fStltypeid", getfStltypeid())
-                .append("fStldays", getfStldays())
-                .append("fContractno", getfContractno())
-                .append("fContractb", getfContractb())
-                .append("fContracte", getfContracte())
-                .append("fTax", getfTax())
-                .append("fInvtel", getfInvtel())
-                .append("fInvaddr", getfInvaddr())
-                .append("fBankno", getfBankno())
-                .append("fBankname", getfBankname())
-                .append("fUbankno", getfUbankno())
-                .append("fUbankname", getfUbankname())
-                .append("fStatus", getfStatus())
-                .append("delFlag", getDelFlag())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
+        return "TCorps{" +
+                "fId=" + fId +
+                ", fPid='" + fPid + '\'' +
+                ", fTypeid='" + fTypeid + '\'' +
+                ", fNo='" + fNo + '\'' +
+                ", fName='" + fName + '\'' +
+                ", fCname='" + fCname + '\'' +
+                ", fEname='" + fEname + '\'' +
+                ", fTel='" + fTel + '\'' +
+                ", fFax='" + fFax + '\'' +
+                ", fEmail='" + fEmail + '\'' +
+                ", fManage='" + fManage + '\'' +
+                ", fAddr='" + fAddr + '\'' +
+                ", fEaddr='" + fEaddr + '\'' +
+                ", fScale='" + fScale + '\'' +
+                ", fProvince='" + fProvince + '\'' +
+                ", fCity='" + fCity + '\'' +
+                ", fStltypeid=" + fStltypeid +
+                ", fStldays=" + fStldays +
+                ", fContractno='" + fContractno + '\'' +
+                ", fContractb=" + fContractb +
+                ", fContracte=" + fContracte +
+                ", fTax='" + fTax + '\'' +
+                ", fInvtel='" + fInvtel + '\'' +
+                ", fInvaddr='" + fInvaddr + '\'' +
+                ", fBankno='" + fBankno + '\'' +
+                ", fBankname='" + fBankname + '\'' +
+                ", fUbankno='" + fUbankno + '\'' +
+                ", fUbankname='" + fUbankname + '\'' +
+                ", fStatus='" + fStatus + '\'' +
+                ", delFlag='" + delFlag + '\'' +
+                ", fTypename='" + fTypename + '\'' +
+                ", loginAccount='" + loginAccount + '\'' +
+                ", creditLv='" + creditLv + '\'' +
+                ", paymentDays=" + paymentDays +
+                ", carNum=" + carNum +
+                ", headOffice='" + headOffice + '\'' +
+                ", registerdCapital='" + registerdCapital + '\'' +
+                ", legalPerson='" + legalPerson + '\'' +
+                ", insdustry='" + insdustry + '\'' +
+                ", creditNum='" + creditNum + '\'' +
+                ", taxpayerNum='" + taxpayerNum + '\'' +
+                ", industryCommerceNum='" + industryCommerceNum + '\'' +
+                ", organizationNum='" + organizationNum + '\'' +
+                ", registerOrganization='" + registerOrganization + '\'' +
+                ", dateOfEstablishment=" + dateOfEstablishment +
+                ", companyType='" + companyType + '\'' +
+                ", businessDeadline=" + businessDeadline +
+                ", businessArea='" + businessArea + '\'' +
+                ", annualDate=" + annualDate +
+                ", registerdAddress='" + registerdAddress + '\'' +
+                ", manageScope='" + manageScope + '\'' +
+                '}';
     }
 }

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

@@ -6,6 +6,7 @@ import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.basicData.domain.TCorps;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客户详情Mapper接口
@@ -82,4 +83,18 @@ public interface TCorpsMapper extends BaseMapper<TCorps> {
      * @return
      */
     public TCorps checkUFCnameUnique(String fCname);
+
+    /**
+     *  检验登录账号
+     * @param loginAccount
+     * @return
+     */
+    public TCorps checkULoginAccountUnique(String loginAccount);
+
+    /**
+     *  查询客户列表信息
+     * @param tCorps
+     * @return
+     */
+    public List<Map<String, Object>> selectFleetDriverMsgListMap(TCorps tCorps);
 }

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

@@ -35,7 +35,6 @@ public interface ITCorpsService {
      * 新增客户详情
      *
      * @param tCorps 客户详情
-     * @param loginUser
      * @return 结果
      */
     public AjaxResult insertTCorps(String tCorps, String tCustomerContacts, LoginUser loginUser);
@@ -81,4 +80,17 @@ public interface ITCorpsService {
      * @return
      */
     public String checkUFCnameUnique(TCorps tCorps);
+
+    /**
+     *  检验登录账号
+     * @return
+     */
+    public String checkULoginAccountUnique(TCorps tCorps1);
+
+    /**
+     *  车队查询列表
+     * @param tCorps
+     * @return
+     */
+    public List<Map<String, Object>> selectFleetDriverMsgListMap(TCorps tCorps);
 }

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

@@ -207,4 +207,18 @@ public class TCorpsServiceImpl implements ITCorpsService {
         }
         return UserConstants.UNIQUE;
     }
+
+    @Override
+    public String checkULoginAccountUnique(TCorps tCorps) {
+        TCorps corps = tCorpsMapper.checkULoginAccountUnique(tCorps.getLoginAccount());
+        if (StringUtils.isNotNull(corps) && !corps.getfId().equals(tCorps.getfId())) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    @Override
+    public List<Map<String, Object>> selectFleetDriverMsgListMap(TCorps tCorps) {
+        return tCorpsMapper.selectFleetDriverMsgListMap(tCorps);
+    }
 }

+ 183 - 68
ruoyi-warehouse/src/main/resources/mapper/basicData/TCorpsMapper.xml

@@ -5,81 +5,121 @@
 <mapper namespace="com.ruoyi.basicData.mapper.TCorpsMapper">
 
     <resultMap type="TCorps" id="TCorpsResult">
-        <result property="fId" column="f_id"/>
-        <result property="fTypeid" column="f_typeid"/>
-        <result property="fNo" column="f_no"/>
-        <result property="fName" column="f_name"/>
-        <result property="fCname" column="f_cname"/>
-        <result property="fEname" column="f_ename"/>
-        <result property="fTel" column="f_tel"/>
-        <result property="fFax" column="f_fax"/>
-        <result property="fEmail" column="f_email"/>
-        <result property="fManage" column="f_manage"/>
-        <result property="fAddr" column="f_addr"/>
-        <result property="fEaddr" column="f_eaddr"/>
-        <result property="fScale" column="f_scale"/>
-        <result property="fProvince" column="f_province"/>
-        <result property="fCity" column="f_city"/>
-        <result property="fStltypeid" column="f_stltypeid"/>
-        <result property="fStldays" column="f_stldays"/>
-        <result property="fContractno" column="f_contractno"/>
-        <result property="fContractb" column="f_contractb"/>
-        <result property="fContracte" column="f_contracte"/>
-        <result property="fTax" column="f_tax"/>
-        <result property="fInvtel" column="f_invtel"/>
-        <result property="fInvaddr" column="f_invaddr"/>
-        <result property="fBankno" column="f_bankno"/>
-        <result property="fBankname" column="f_bankname"/>
-        <result property="fUbankno" column="f_ubankno"/>
-        <result property="fUbankname" column="f_ubankname"/>
-        <result property="fStatus" column="f_status"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark"/>
-        <result property="fTypename" column="f_typename"/>
+        <result property="fId"    column="f_id"    />
+        <result property="fPid"    column="f_pid"    />
+        <result property="fTypeid"    column="f_typeid"    />
+        <result property="fNo"    column="f_no"    />
+        <result property="fName"    column="f_name"    />
+        <result property="fCname"    column="f_cname"    />
+        <result property="fEname"    column="f_ename"    />
+        <result property="fTel"    column="f_tel"    />
+        <result property="fFax"    column="f_fax"    />
+        <result property="fEmail"    column="f_email"    />
+        <result property="fManage"    column="f_manage"    />
+        <result property="fAddr"    column="f_addr"    />
+        <result property="fEaddr"    column="f_eaddr"    />
+        <result property="fScale"    column="f_scale"    />
+        <result property="fProvince"    column="f_province"    />
+        <result property="fCity"    column="f_city"    />
+        <result property="fStltypeid"    column="f_stltypeid"    />
+        <result property="fStldays"    column="f_stldays"    />
+        <result property="fContractno"    column="f_contractno"    />
+        <result property="fContractb"    column="f_contractb"    />
+        <result property="fContracte"    column="f_contracte"    />
+        <result property="fTax"    column="f_tax"    />
+        <result property="fInvtel"    column="f_invtel"    />
+        <result property="fInvaddr"    column="f_invaddr"    />
+        <result property="fBankno"    column="f_bankno"    />
+        <result property="fBankname"    column="f_bankname"    />
+        <result property="fUbankno"    column="f_ubankno"    />
+        <result property="fUbankname"    column="f_ubankname"    />
+        <result property="fStatus"    column="f_status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="fTypename"    column="f_typename"    />
+        <result property="loginAccount"    column="login_account"    />
+        <result property="creditLv"    column="credit_lv"    />
+        <result property="paymentDays"    column="payment_days"    />
+        <result property="carNum"    column="car_num"    />
+        <result property="headOffice"    column="head_office"    />
+        <result property="registerdCapital"    column="registerd_capital"    />
+        <result property="legalPerson"    column="legal_person"    />
+        <result property="insdustry"    column="insdustry"    />
+        <result property="creditNum"    column="credit_num"    />
+        <result property="taxpayerNum"    column="taxpayer_num"    />
+        <result property="industryCommerceNum"    column="industry_commerce_num"    />
+        <result property="organizationNum"    column="organization_num"    />
+        <result property="registerOrganization"    column="register_organization"    />
+        <result property="dateOfEstablishment"    column="date_of_establishment"    />
+        <result property="companyType"    column="company_type"    />
+        <result property="businessDeadline"    column="business_deadline"    />
+        <result property="businessArea"    column="business_area"    />
+        <result property="annualDate"    column="annual_date"    />
+        <result property="registerdAddress"    column="registerd_address"    />
+        <result property="manageScope"    column="manage_scope"    />
     </resultMap>
 
     <sql id="selectTCorpsVo">
-        select f_id, f_typeid, f_no, f_name, f_cname, f_ename, f_tel, f_fax, f_email, f_manage, f_addr, f_eaddr, f_scale, f_province, f_city, f_stltypeid, f_stldays, f_contractno, f_contractb, f_contracte, f_tax, f_invtel, f_invaddr, f_bankno, f_bankname, f_ubankno, f_ubankname, f_status, del_flag, create_by, create_time, update_by, update_time, remark ,f_typename from t_corps
+        select f_id, f_pid, f_typeid, f_no, f_name, f_cname, f_ename, f_tel, f_fax, f_email, f_manage, f_addr, f_eaddr, f_scale, f_province, f_city, f_stltypeid, f_stldays, f_contractno, f_contractb, f_contracte, f_tax, f_invtel, f_invaddr, f_bankno, f_bankname, f_ubankno, f_ubankname, f_status, del_flag, create_by, create_time, update_by, update_time, remark, f_typename, login_account, credit_lv, payment_days, car_num, head_office, registerd_capital, legal_person, insdustry, credit_num, taxpayer_num, industry_commerce_num, organization_num, register_organization, date_of_establishment, company_type, business_deadline, business_area, annual_date, registerd_address, manage_scope from t_corps
     </sql>
 
     <select id="selectTCorpsList" parameterType="TCorps" resultMap="TCorpsResult">
         <include refid="selectTCorpsVo"/>
         <where>
-            <if test="fTypeid != null  and fTypeid != ''">and f_typeid like concat('%', #{fTypeid}, '%') </if>
-            <if test="fNo != null  and fNo != ''">and f_no like concat('%', #{fNo}, '%')</if>
-            <if test="fName != null  and fName != ''">and f_name like concat('%', #{fName}, '%')</if>
-            <if test="fCname != null  and fCname != ''">and f_cname like concat('%', #{fCname}, '%')</if>
-            <if test="fEname != null  and fEname != ''">and f_ename like concat('%', #{fEname}, '%')</if>
-            <if test="fTel != null  and fTel != ''">and f_tel like concat('%', #{fTel}, '%')</if>
-            <if test="fFax != null  and fFax != ''">and f_fax = #{fFax}</if>
-            <if test="fEmail != null  and fEmail != ''">and f_email = #{fEmail}</if>
-            <if test="fManage != null  and fManage != ''">and f_manage = #{fManage}</if>
-            <if test="fAddr != null  and fAddr != ''">and f_addr = #{fAddr}</if>
-            <if test="fEaddr != null  and fEaddr != ''">and f_eaddr = #{fEaddr}</if>
-            <if test="fScale != null  and fScale != ''">and f_scale = #{fScale}</if>
-            <if test="fProvince != null  and fProvince != ''">and f_province = #{fProvince}</if>
-            <if test="fCity != null  and fCity != ''">and f_city = #{fCity}</if>
-            <if test="fStltypeid != null ">and f_stltypeid = #{fStltypeid}</if>
-            <if test="fStldays != null ">and f_stldays = #{fStldays}</if>
-            <if test="fContractno != null  and fContractno != ''">and f_contractno = #{fContractno}</if>
-            <if test="fContractb != null ">and f_contractb = #{fContractb}</if>
-            <if test="fContracte != null ">and f_contracte = #{fContracte}</if>
-            <if test="fTax != null  and fTax != ''">and f_tax = #{fTax}</if>
-            <if test="fInvtel != null  and fInvtel != ''">and f_invtel = #{fInvtel}</if>
-            <if test="fInvaddr != null  and fInvaddr != ''">and f_invaddr = #{fInvaddr}</if>
-            <if test="fBankno != null  and fBankno != ''">and f_bankno = #{fBankno}</if>
-            <if test="fBankname != null  and fBankname != ''">and f_bankname like concat('%', #{fBankname}, '%')</if>
-            <if test="fUbankno != null  and fUbankno != ''">and f_ubankno = #{fUbankno}</if>
-            <if test="fUbankname != null  and fUbankname != ''">and f_ubankname like concat('%', #{fUbankname}, '%')
-            </if>
-            <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
-            <if test="fTypename != null  and fTypename != ''">and f_typename like concat('%', #{fTypename}, '%') </if>
+            <if test="fTypeid != null  and fTypeid != ''"> and f_typeid like concat('%', #{fTypeid}, '%')</if>
+            <if test="fPid != null  and fPid != ''"> and f_pid = #{fPid}</if>
+            <if test="fNo != null  and fNo != ''"> and f_no = #{fNo}</if>
+            <if test="fName != null  and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>
+            <if test="fCname != null  and fCname != ''"> and f_cname like concat('%', #{fCname}, '%')</if>
+            <if test="fEname != null  and fEname != ''"> and f_ename like concat('%', #{fEname}, '%')</if>
+            <if test="fTel != null  and fTel != ''"> and f_tel = #{fTel}</if>
+            <if test="fFax != null  and fFax != ''"> and f_fax = #{fFax}</if>
+            <if test="fEmail != null  and fEmail != ''"> and f_email = #{fEmail}</if>
+            <if test="fManage != null  and fManage != ''"> and f_manage = #{fManage}</if>
+            <if test="fAddr != null  and fAddr != ''"> and f_addr = #{fAddr}</if>
+            <if test="fEaddr != null  and fEaddr != ''"> and f_eaddr = #{fEaddr}</if>
+            <if test="fScale != null  and fScale != ''"> and f_scale = #{fScale}</if>
+            <if test="fProvince != null  and fProvince != ''"> and f_province = #{fProvince}</if>
+            <if test="fCity != null  and fCity != ''"> and f_city = #{fCity}</if>
+            <if test="fStltypeid != null "> and f_stltypeid = #{fStltypeid}</if>
+            <if test="fStldays != null "> and f_stldays = #{fStldays}</if>
+            <if test="fContractno != null  and fContractno != ''"> and f_contractno = #{fContractno}</if>
+            <if test="fContractb != null "> and f_contractb = #{fContractb}</if>
+            <if test="fContracte != null "> and f_contracte = #{fContracte}</if>
+            <if test="fTax != null  and fTax != ''"> and f_tax = #{fTax}</if>
+            <if test="fInvtel != null  and fInvtel != ''"> and f_invtel = #{fInvtel}</if>
+            <if test="fInvaddr != null  and fInvaddr != ''"> and f_invaddr = #{fInvaddr}</if>
+            <if test="fBankno != null  and fBankno != ''"> and f_bankno = #{fBankno}</if>
+            <if test="fBankname != null  and fBankname != ''"> and f_bankname like concat('%', #{fBankname}, '%')</if>
+            <if test="fUbankno != null  and fUbankno != ''"> and f_ubankno = #{fUbankno}</if>
+            <if test="fUbankname != null  and fUbankname != ''"> and f_ubankname like concat('%', #{fUbankname}, '%')</if>
+            <if test="fStatus != null  and fStatus != ''"> and f_status = #{fStatus}</if>
+            <if test="fTypename != null  and fTypename != ''"> and f_typename like concat('%', #{fTypename}, '%')</if>
+            <if test="loginAccount != null  and loginAccount != ''"> and login_account = #{loginAccount}</if>
+            <if test="creditLv != null  and creditLv != ''"> and credit_lv = #{creditLv}</if>
+            <if test="paymentDays != null "> and payment_days = #{paymentDays}</if>
+            <if test="carNum != null "> and car_num = #{carNum}</if>
+            <if test="headOffice != null  and headOffice != ''"> and head_office = #{headOffice}</if>
+            <if test="registerdCapital != null  and registerdCapital != ''"> and registerd_capital = #{registerdCapital}</if>
+            <if test="legalPerson != null  and legalPerson != ''"> and legal_person = #{legalPerson}</if>
+            <if test="insdustry != null  and insdustry != ''"> and insdustry = #{insdustry}</if>
+            <if test="creditNum != null  and creditNum != ''"> and credit_num = #{creditNum}</if>
+            <if test="taxpayerNum != null  and taxpayerNum != ''"> and taxpayer_num = #{taxpayerNum}</if>
+            <if test="industryCommerceNum != null  and industryCommerceNum != ''"> and industry_commerce_num = #{industryCommerceNum}</if>
+            <if test="organizationNum != null  and organizationNum != ''"> and organization_num = #{organizationNum}</if>
+            <if test="registerOrganization != null  and registerOrganization != ''"> and register_organization = #{registerOrganization}</if>
+            <if test="dateOfEstablishment != null "> and date_of_establishment = #{dateOfEstablishment}</if>
+            <if test="companyType != null  and companyType != ''"> and company_type = #{companyType}</if>
+            <if test="businessDeadline != null "> and business_deadline = #{businessDeadline}</if>
+            <if test="businessArea != null  and businessArea != ''"> and business_area = #{businessArea}</if>
+            <if test="annualDate != null "> and annual_date = #{annualDate}</if>
+            <if test="registerdAddress != null  and registerdAddress != ''"> and registerd_address = #{registerdAddress}</if>
+            <if test="manageScope != null  and manageScope != ''"> and manage_scope = #{manageScope}</if>
         </where>
-        ORDER BY  CONVERT(f_name USING gbk) asc
     </select>
 
     <select id="selectTCorpsById" parameterType="Long" resultMap="TCorpsResult">
@@ -87,10 +127,39 @@
         where f_id = #{fId}
     </select>
 
+    <select id="selectFleetDriverMsgListMap" parameterType="TCorps" resultType="Map">
+        SELECT
+            dri.id AS id,
+            com.company_name AS companyName,
+            dri.`name` AS `name`,
+            dri.sex AS sex,
+            dri.birthday AS birthday,
+            dri.allow_driver_car AS allowDriverCar,
+            dri.first_certificate_date AS firstCertificateDate,
+            dri.idcar_num AS idcarNum,
+            dri.tel AS tel,
+            dri.address AS address,
+            dri.resume_pic AS resumePic,
+            dri.driving_pic AS drivingPic,
+            dri.creat_time AS creatTime,
+            dri.modification_time AS modificationTime,
+            dri.bill_status AS billStatus,
+            dri.del_flag,
+            dri.create_by,
+            dri.update_by,
+            dri.update_time,
+            dri.remarks AS remarks
+        FROM
+            fleet_driver_msg dri
+        LEFT JOIN fleet_company_msg AS com ON dri.fleet_company_id = com.id
+
+    </select>
+
     <insert id="insertTCorps" parameterType="TCorps" useGeneratedKeys="true" keyProperty="fId">
         insert into t_corps
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fTypeid != null">f_typeid,</if>
+            <if test="fPid != null and fPid != ''">f_pid,</if>
+            <if test="fTypeid != null and fTypeid != ''">f_typeid,</if>
             <if test="fNo != null and fNo != ''">f_no,</if>
             <if test="fName != null and fName != ''">f_name,</if>
             <if test="fCname != null">f_cname,</if>
@@ -124,9 +193,30 @@
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="fTypename != null">f_typename,</if>
+            <if test="loginAccount != null">login_account,</if>
+            <if test="creditLv != null">credit_lv,</if>
+            <if test="paymentDays != null">payment_days,</if>
+            <if test="carNum != null">car_num,</if>
+            <if test="headOffice != null">head_office,</if>
+            <if test="registerdCapital != null">registerd_capital,</if>
+            <if test="legalPerson != null">legal_person,</if>
+            <if test="insdustry != null">insdustry,</if>
+            <if test="creditNum != null">credit_num,</if>
+            <if test="taxpayerNum != null">taxpayer_num,</if>
+            <if test="industryCommerceNum != null">industry_commerce_num,</if>
+            <if test="organizationNum != null">organization_num,</if>
+            <if test="registerOrganization != null">register_organization,</if>
+            <if test="dateOfEstablishment != null">date_of_establishment,</if>
+            <if test="companyType != null">company_type,</if>
+            <if test="businessDeadline != null">business_deadline,</if>
+            <if test="businessArea != null">business_area,</if>
+            <if test="annualDate != null">annual_date,</if>
+            <if test="registerdAddress != null">registerd_address,</if>
+            <if test="manageScope != null">manage_scope,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fTypeid != null">#{fTypeid},</if>
+            <if test="fPid != null and fPid != ''">#{fPid},</if>
+            <if test="fTypeid != null and fTypeid != ''">#{fTypeid},</if>
             <if test="fNo != null and fNo != ''">#{fNo},</if>
             <if test="fName != null and fName != ''">#{fName},</if>
             <if test="fCname != null">#{fCname},</if>
@@ -160,12 +250,33 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="fTypename != null">#{fTypename},</if>
+            <if test="loginAccount != null">#{loginAccount},</if>
+            <if test="creditLv != null">#{creditLv},</if>
+            <if test="paymentDays != null">#{paymentDays},</if>
+            <if test="carNum != null">#{carNum},</if>
+            <if test="headOffice != null">#{headOffice},</if>
+            <if test="registerdCapital != null">#{registerdCapital},</if>
+            <if test="legalPerson != null">#{legalPerson},</if>
+            <if test="insdustry != null">#{insdustry},</if>
+            <if test="creditNum != null">#{creditNum},</if>
+            <if test="taxpayerNum != null">#{taxpayerNum},</if>
+            <if test="industryCommerceNum != null">#{industryCommerceNum},</if>
+            <if test="organizationNum != null">#{organizationNum},</if>
+            <if test="registerOrganization != null">#{registerOrganization},</if>
+            <if test="dateOfEstablishment != null">#{dateOfEstablishment},</if>
+            <if test="companyType != null">#{companyType},</if>
+            <if test="businessDeadline != null">#{businessDeadline},</if>
+            <if test="businessArea != null">#{businessArea},</if>
+            <if test="annualDate != null">#{annualDate},</if>
+            <if test="registerdAddress != null">#{registerdAddress},</if>
+            <if test="manageScope != null">#{manageScope},</if>
         </trim>
     </insert>
 
     <update id="updateTCorps" parameterType="TCorps">
         update t_corps
         <trim prefix="SET" suffixOverrides=",">
+            <if test="fPid != null">f_pid = #{fPid},</if>
             <if test="fTypeid != null">f_typeid = #{fTypeid},</if>
             <if test="fNo != null and fNo != ''">f_no = #{fNo},</if>
             <if test="fName != null and fName != ''">f_name = #{fName},</if>
@@ -227,4 +338,8 @@
         select f_id,f_addr from t_corps where f_cname = #{fCname} limit 1
     </select>
 
+    <select id="checkULoginAccountUnique" parameterType="String" resultMap="TCorpsResult">
+        select f_id,f_addr from t_corps where login_account = #{loginAccount} limit 1
+    </select>
+
 </mapper>

+ 2 - 0
ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsitemsMapper.xml

@@ -473,6 +473,7 @@
             c.f_name AS fName,
             items.f_mblno AS fMblno,
             items.f_bsdate AS fBsdate,
+            items.f_is_pass AS fIsPass,
             CASE
                 WHEN items.f_billstatus = 20 THEN
                     '待入库'
@@ -510,6 +511,7 @@
             c.f_name AS fName,
             items.f_mblno AS fMblno,
             items.f_bsdate AS fBsdate,
+            items.f_is_pass AS fIsPass,
             CASE
                 WHEN items.f_billstatus = 20 THEN
                     '待出库'