From 6f82bca9ecedd005f515f5f138f9e4e37d470fbc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 07 Jul 2021 15:43:03 +0800
Subject: [PATCH] 1.派遣记录分页，详情接口修改 2.派遣公司登记，查询,curd 接口新增

---
 src/main/java/org/springblade/modules/dispatcher/service/IDispatcherUnitService.java         |   49 ++++
 src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java                    |   36 +++
 src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java                      |   12 
 src/main/java/org/springblade/modules/dispatcher/service/IDispatcherService.java             |    6 
 src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java                        |    2 
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml             |   57 +++++
 src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherServiceImpl.java     |    9 
 src/main/java/org/springblade/modules/system/entity/User.java                                |    7 
 src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java        |    4 
 src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java                  |   81 ++++++++
 src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java |   54 +++++
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.java                |    9 
 src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java    |  121 ++++++++++++
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java            |   52 +++++
 src/main/resources/application.yml                                                           |    2 
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml                 |   42 ++++
 16 files changed, 534 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
index 3bcb510..9032235 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -54,8 +54,8 @@
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入dispatcher")
-	public R<Dispatcher> detail(Dispatcher dispatcher) {
-		Dispatcher detail = dispatcherService.getOne(Condition.getQueryWrapper(dispatcher));
+	public R<DispatcherVO> detail(Dispatcher dispatcher) {
+		DispatcherVO detail = dispatcherService.getDispatcherInfo(dispatcher);
 		return R.data(detail);
 	}
 
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
new file mode 100644
index 0000000..c39ac60
--- /dev/null
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -0,0 +1,121 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.dispatcher.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.dispatcher.entity.Dispatcher;
+import org.springblade.modules.dispatcher.entity.DispatcherUnit;
+import org.springblade.modules.dispatcher.service.IDispatcherService;
+import org.springblade.modules.dispatcher.service.IDispatcherUnitService;
+import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
+import org.springblade.modules.dispatcher.vo.DispatcherVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+
+/**
+ *  控制器
+ *
+ * @author zhongrj
+ * @since 2021-07-07
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/dispatcherUnit")
+@Api(value = "", tags = "接口")
+public class DispatcherUnitController extends BladeController {
+
+	private final IDispatcherUnitService dispatcherUnitService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	public R<DispatcherUnitVO> detail(DispatcherUnit dispatcherUnit) {
+		DispatcherUnitVO detail = dispatcherUnitService.selectDispatcherUnitInfo(dispatcherUnit);
+		return R.data(detail);
+	}
+
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	public R<IPage<DispatcherUnit>> list(DispatcherUnit dispatcherUnit, Query query) {
+		IPage<DispatcherUnit> pages = dispatcherUnitService.page(Condition.getPage(query), Condition.getQueryWrapper(dispatcherUnit));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页
+	 */
+	@GetMapping("/page")
+	public R<IPage<DispatcherUnitVO>> page(DispatcherUnitVO dispatcher, Query query) {
+		IPage<DispatcherUnitVO> pages = dispatcherUnitService.selectDispatcherUnitPage(Condition.getPage(query), dispatcher);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	public R save(@Valid @RequestBody DispatcherUnit dispatcherUnit) {
+		return R.status(dispatcherUnitService.save(dispatcherUnit));
+	}
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	public R update(@Valid @RequestBody DispatcherUnit dispatcherUnit) {
+		return R.status(dispatcherUnitService.updateById(dispatcherUnit));
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit) {
+		if (null==dispatcherUnit.getId()){
+			dispatcherUnit.setCreateTime(new Date());
+		}
+		return R.status(dispatcherUnitService.saveOrUpdate(dispatcherUnit));
+	}
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(dispatcherUnitService.removeByIds(Func.toLongList(ids)));
+	}
+
+
+}
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
index 2499d69..2cb74f9 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
@@ -22,10 +22,14 @@
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 实体类
@@ -62,7 +66,9 @@
 	*/
 		@ApiModelProperty(value = "派遣时间")
 		@TableField("dispatcherTime")
-	private LocalDateTime dispatchertime;
+		@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+		@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date dispatchertime;
 	/**
 	* 派遣地址
 	*/
@@ -73,8 +79,8 @@
 	 * 派遣地址
 	 */
 	@ApiModelProperty(value = "派遣单位")
-	@TableField("dispatcherCompany")
-	private String dispatchercompany;
+	@TableField("dispatcher_unit_id")
+	private String dispatcherUnitId;
 
 
 }
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
new file mode 100644
index 0000000..780686d
--- /dev/null
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
@@ -0,0 +1,81 @@
+package org.springblade.modules.dispatcher.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 派遣单位实体类
+ *
+ * @author zhongrj
+ * @since 2021-07-07
+ */
+@Data
+@TableName("sys_dispatcher_unit")
+public class DispatcherUnit implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@TableId(value = "id", type = IdType.AUTO)
+	private Long id;
+
+	/**
+	* 派遣单位名称
+	*/
+	private String name;
+
+	/**
+	* 保安公司 tenant_id
+	*/
+	@TableField("tenant_id")
+	private String tenantId;
+
+	/**
+	 * 联系人
+	 */
+	private String linkman;
+
+	/**
+	 * 联系电话
+	 */
+	private String phone;
+
+	/**
+	 * 省
+	 */
+	private Integer province;
+
+	/**
+	 * 市
+	 */
+	private Integer city;
+
+	/**
+	 * 区
+	 */
+	private Integer district;
+
+	/**
+	 * 详细地址
+	 */
+	private String address;
+
+	/**
+	 * 创建时间
+	 */
+	@TableField("create_time")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+
+}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.java b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.java
index 38e65db..7376af9 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.java
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.java
@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.dispatcher.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.dispatcher.entity.Dispatcher;
 import org.springblade.modules.dispatcher.vo.DispatcherVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,6 +38,12 @@
 	 * @param dispatcher
 	 * @return
 	 */
-	List<DispatcherVO> selectDispatcherPage(IPage page, DispatcherVO dispatcher);
+	List<DispatcherVO> selectDispatcherPage(IPage page, @Param("dispatcher") DispatcherVO dispatcher);
 
+	/**
+	 * 派遣记录详情
+	 * @param dispatcher 派遣记录对象
+	 * @return
+	 */
+	DispatcherVO getDispatcherInfo(@Param("dispatcher")Dispatcher dispatcher);
 }
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
index 68238ba..5492667 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -14,8 +14,46 @@
     </resultMap>
 
 
-    <select id="selectDispatcherPage" resultMap="dispatcherResultMap">
-        select * from sys_dispatcher where is_deleted = 0
+<!--    <select id="selectDispatcherPage" resultMap="dispatcherResultMap">-->
+<!--        select * from sys_dispatcher where is_deleted = 0-->
+<!--    </select>-->
+
+    <!--派遣记录分页数据-->
+    <select id="selectDispatcherPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
+        select
+            sd.*,sdu.name dispatcherCompany
+        from
+            sys_dispatcher sd
+        left join
+            sys_dispatcher_unit sdu
+        on
+            sdu.id = sd.dispatcher_unit_id
+        where 1=1
+        <if test="dispatcher.name!=null and  dispatcher.name!=''">
+            and sd.name like concat('%', #{dispatcher.name},'%')
+        </if>
+        <if test="dispatcher.cardid!=null and  dispatcher.cardid!=''">
+            and sd.cardid like concat('%', #{dispatcher.cardid},'%')
+        </if>
+        <if test="dispatcher.dispatcherCompany!=null and  dispatcher.dispatcherCompany!=''">
+            and sdu.name like concat('%', #{dispatcher.dispatcherCompany},'%')
+        </if>
+    </select>
+
+    <!--派遣记录详情-->
+    <select id="getDispatcherInfo" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
+        select
+            sd.*,sdu.name dispatcherCompany
+        from
+            sys_dispatcher sd
+        left join
+            sys_dispatcher_unit sdu
+        on
+            sdu.id = sd.dispatcher_unit_id
+        where 1=1
+        <if test="dispatcher.id!=null">
+            and sd.id = #{dispatcher.id}
+        </if>
     </select>
 
 </mapper>
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java
new file mode 100644
index 0000000..82cd29d
--- /dev/null
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java
@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.dispatcher.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.dispatcher.entity.Dispatcher;
+import org.springblade.modules.dispatcher.entity.DispatcherUnit;
+import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
+import org.springblade.modules.dispatcher.vo.DispatcherVO;
+
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-07-07
+ */
+public interface DispatcherUnitMapper extends BaseMapper<DispatcherUnit> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param dispatcherUnit
+	 * @return
+	 */
+	List<DispatcherUnitVO> selectDispatcherUnitPage(IPage page, @Param("dispatcherUnit") DispatcherUnitVO dispatcherUnit);
+
+	/**
+	 * 派遣公司信息详情
+	 * @param dispatcherUnit 派遣信息对象
+	 * @return
+	 */
+	DispatcherUnitVO selectDispatcherUnitInfo(@Param("dispatcherUnit")DispatcherUnit dispatcherUnit);
+}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
new file mode 100644
index 0000000..441c59e
--- /dev/null
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.dispatcher.mapper.DispatcherUnitMapper">
+
+    <!--派遣公司分页信息-->
+    <select id="selectDispatcherUnitPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
+        select
+            sdu.*,bt.tenant_name tenantName
+        from
+            sys_dispatcher_unit sdu
+        LEFT JOIN
+            blade_tenant bt
+        ON
+            sdu.tenant_id = bt.tenant_id
+        WHERE
+            1=1
+        <if test="dispatcherUnit.tenantName!=null and  dispatcherUnit.tenantName!=''">
+            and bt.tenant_name like concat('%', #{dispatcherUnit.tenantName},'%')
+        </if>
+        <if test="dispatcherUnit.name!=null and  dispatcherUnit.name!=''">
+            and sdu.name like concat('%', #{dispatcherUnit.name},'%')
+        </if>
+        <if test="dispatcherUnit.linkman!=null and  dispatcherUnit.linkman!=''">
+            and sdu.linkman like concat('%', #{dispatcherUnit.linkman},'%')
+        </if>
+        <if test="dispatcherUnit.phone!=null and  dispatcherUnit.phone!=''">
+            and sdu.phone like concat('%', #{dispatcherUnit.phone},'%')
+        </if>
+        <if test="dispatcherUnit.province!=null">
+            and sdu.province = #{dispatcherUnit.province}
+        </if>
+        <if test="dispatcherUnit.city!=null">
+            and sdu.city = #{dispatcherUnit.city}
+        </if>
+        <if test="dispatcherUnit.district!=null">
+            and sdu.district = #{dispatcherUnit.district}
+        </if>
+    </select>
+
+
+    <!--派遣公司详细信息-->
+    <select id="selectDispatcherUnitInfo" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
+        select
+            sdu.*,bt.tenant_name tenantName
+        from
+            sys_dispatcher_unit sdu
+        LEFT JOIN
+            blade_tenant bt
+        ON
+            sdu.tenant_id = bt.tenant_id
+        WHERE
+            1=1
+        <if test="dispatcherUnit.id!=null">
+            and sdu.id = #{dispatcherUnit.id}
+        </if>
+    </select>
+</mapper>
diff --git a/src/main/java/org/springblade/modules/dispatcher/service/IDispatcherService.java b/src/main/java/org/springblade/modules/dispatcher/service/IDispatcherService.java
index 2ad7516..0507c62 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/IDispatcherService.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/IDispatcherService.java
@@ -38,4 +38,10 @@
 	 */
 	IPage<DispatcherVO> selectDispatcherPage(IPage<DispatcherVO> page, DispatcherVO dispatcher);
 
+	/**
+	 * 派遣记录详情
+	 * @param dispatcher 派遣记录对象
+	 * @return
+	 */
+	DispatcherVO getDispatcherInfo(Dispatcher dispatcher);
 }
diff --git a/src/main/java/org/springblade/modules/dispatcher/service/IDispatcherUnitService.java b/src/main/java/org/springblade/modules/dispatcher/service/IDispatcherUnitService.java
new file mode 100644
index 0000000..5276e37
--- /dev/null
+++ b/src/main/java/org/springblade/modules/dispatcher/service/IDispatcherUnitService.java
@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.dispatcher.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.dispatcher.entity.Dispatcher;
+import org.springblade.modules.dispatcher.entity.DispatcherUnit;
+import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
+import org.springblade.modules.dispatcher.vo.DispatcherVO;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2021-07-07
+ */
+public interface IDispatcherUnitService extends IService<DispatcherUnit> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param dispatcher
+	 * @return
+	 */
+	IPage<DispatcherUnitVO> selectDispatcherUnitPage(IPage<DispatcherUnitVO> page, DispatcherUnitVO dispatcher);
+
+	/**
+	 * 派遣公司信息详情
+	 * @param dispatcherUnit 派遣信息对象
+	 * @return
+	 */
+	DispatcherUnitVO selectDispatcherUnitInfo(DispatcherUnit dispatcherUnit);
+}
diff --git a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherServiceImpl.java b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherServiceImpl.java
index 3ed4df9..41e85d9 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherServiceImpl.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherServiceImpl.java
@@ -38,4 +38,13 @@
 		return page.setRecords(baseMapper.selectDispatcherPage(page, dispatcher));
 	}
 
+	/**
+	 * 派遣记录详情
+	 * @param dispatcher 派遣记录对象
+	 * @return
+	 */
+	@Override
+	public DispatcherVO getDispatcherInfo(Dispatcher dispatcher) {
+		return baseMapper.getDispatcherInfo(dispatcher);
+	}
 }
diff --git a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
new file mode 100644
index 0000000..be057b3
--- /dev/null
+++ b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.dispatcher.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.dispatcher.entity.Dispatcher;
+import org.springblade.modules.dispatcher.entity.DispatcherUnit;
+import org.springblade.modules.dispatcher.mapper.DispatcherMapper;
+import org.springblade.modules.dispatcher.mapper.DispatcherUnitMapper;
+import org.springblade.modules.dispatcher.service.IDispatcherService;
+import org.springblade.modules.dispatcher.service.IDispatcherUnitService;
+import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
+import org.springblade.modules.dispatcher.vo.DispatcherVO;
+import org.springframework.stereotype.Service;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2021-07-07
+ */
+@Service
+public class DispatcherUnitServiceImpl extends ServiceImpl<DispatcherUnitMapper, DispatcherUnit> implements IDispatcherUnitService {
+
+	@Override
+	public IPage<DispatcherUnitVO> selectDispatcherUnitPage(IPage<DispatcherUnitVO> page, DispatcherUnitVO dispatcherUnitVO) {
+		return page.setRecords(baseMapper.selectDispatcherUnitPage(page, dispatcherUnitVO));
+	}
+
+	/**
+	 * 派遣公司信息详情
+	 * @param dispatcherUnit 派遣信息对象
+	 * @return
+	 */
+	@Override
+	public DispatcherUnitVO selectDispatcherUnitInfo(DispatcherUnit dispatcherUnit) {
+		return baseMapper.selectDispatcherUnitInfo(dispatcherUnit);
+	}
+}
diff --git a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
new file mode 100644
index 0000000..a307d97
--- /dev/null
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.dispatcher.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.dispatcher.entity.DispatcherUnit;
+
+/**
+ * 视图实体类
+ *
+ * @author zhongrj
+ * @since 2021-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DispatcherUnitVO extends DispatcherUnit {
+	private static final long serialVersionUID = 1L;
+
+	private String tenantName;
+
+}
diff --git a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
index 97926b4..eb5ec9c 100644
--- a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
@@ -33,4 +33,6 @@
 public class DispatcherVO extends Dispatcher {
 	private static final long serialVersionUID = 1L;
 
+	private String dispatcherCompany;
+
 }
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 91ce77f..23c7f38 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -16,7 +16,9 @@
  */
 package org.springblade.modules.system.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
@@ -91,7 +93,10 @@
 	 * 岗位id
 	 */
 	private String postId;
- * 身份证号
+
+
+	/**
+	 * 身份证
 	 */
 	private String cardid;
 	/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9b586ae..0565f5d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -194,6 +194,8 @@
     skip-url:
       - /blade-test/**
       - /recruitment/**
+      - /dispatcherUnit/**
+      - /dispatcher/**
     #授权认证配置
     auth:
       - method: ALL

--
Gitblit v1.9.3