From e20b48127bb4123a3139ee58e96b99b9c7e33e8f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 14 Jul 2021 14:18:22 +0800
Subject: [PATCH] 派遣单位,记录接口同步
---
src/main/java/org/springblade/modules/dispatcher/service/IDispatcherUnitService.java | 13 +++
src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java | 9 +-
src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java | 7 ++
src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java | 26 ++++++++
src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java | 12 ++++
src/main/java/org/springblade/modules/dispatcher/service/IDispatcherService.java | 4
src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java | 8 ++
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java | 13 ++++
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml | 50 ++++++++++++++--
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java | 7 ++
pom.xml | 5 +
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 12 ++--
12 files changed, 144 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0565f5e..567381d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,6 +205,11 @@
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.belerweb</groupId>
+ <artifactId>pinyin4j</artifactId>
+ <version>2.5.1</version>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
index bef8a40..2a74e26 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -33,6 +33,7 @@
import javax.validation.Valid;
import java.util.Date;
+import java.util.List;
/**
* 控制器
@@ -76,6 +77,18 @@
return R.data(pages);
}
+
+ /**
+ * 自定义树
+ * @param dispatcher
+ * @return
+ */
+ @GetMapping("/page-tree")
+ public R pageTree(DispatcherUnitVO dispatcher) {
+ List<DispatcherUnitVO> pages = dispatcherUnitService.selectDispatcherUnitPageTree(dispatcher);
+ return R.data(pages);
+ }
+
/**
* 新增
*/
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 ed41dc8..59f0c13 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
@@ -60,9 +60,9 @@
@ApiModelProperty(value = "派遣人")
private String dispatcher;
/**
- * 派遣时间
+ * 派遣开始时间
*/
- @ApiModelProperty(value = "派遣时间")
+ @ApiModelProperty(value = "派遣开始时间")
@TableField("dispatcherTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -81,4 +81,26 @@
private String dispatcherUnitId;
+ /**
+ * 派遣保安ids
+ */
+ @TableField("user_ids")
+ private String userIds;
+
+
+ /**
+ * 派遣结束时间
+ */
+ @TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+
+ /**
+ * 保安公司(组织机构)id
+ */
+ @TableField("dept_id")
+ private Long deptId;
+
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
index 4abc8e6..2c059c6 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
@@ -7,6 +7,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
import java.util.Date;
@@ -29,13 +30,13 @@
private Long id;
/**
- * 派遣单位名称
- */
+ * 派遣单位名称
+ */
private String name;
/**
- * 部门id
- */
+ * 部门id
+ */
@TableField("dept_id")
private Long deptId;
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 5492667..ec2cdaa 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -10,13 +10,7 @@
<result column="dispatcher" property="dispatcher"/>
<result column="dispatcherTime" property="dispatchertime"/>
<result column="dispatcherAddress" property="dispatcheraddress"/>
- <result column="dispatchercompany" property="dispatchercompany"/>
</resultMap>
-
-
-<!-- <select id="selectDispatcherPage" resultMap="dispatcherResultMap">-->
-<!-- select * from sys_dispatcher where is_deleted = 0-->
-<!-- </select>-->
<!--派遣记录分页数据-->
<select id="selectDispatcherPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
@@ -29,6 +23,12 @@
on
sdu.id = sd.dispatcher_unit_id
where 1=1
+ <if test="dispatcher.dispatcherUnitId!=null">
+ and sd.dispatcher_unit_id = #{dispatcher.dispatcherUnitId}
+ </if>
+ <if test="dispatcher.deptId!=null">
+ and sd.dept_id = #{dispatcher.deptId}
+ </if>
<if test="dispatcher.name!=null and dispatcher.name!=''">
and sd.name like concat('%', #{dispatcher.name},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java
index effe5b1..4113d86 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.java
@@ -47,4 +47,11 @@
* @return
*/
DispatcherUnitVO selectDispatcherUnitInfo(@Param("dispatcherUnit") DispatcherUnit dispatcherUnit);
+
+ /**
+ * 自定义树
+ * @param dispatcher
+ * @return
+ */
+ List<DispatcherUnitVO> selectDispatcherUnitPageTree(@Param("dispatcherUnit") DispatcherUnitVO dispatcher);
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
index f021c0a..072ed43 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
@@ -5,7 +5,45 @@
<!--派遣公司分页信息-->
<select id="selectDispatcherUnitPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
select
- sdu.*,bt.dept_name tenantName
+ sdu.*,bt.dept_name tenantName
+ from
+ sys_dispatcher_unit sdu
+ LEFT JOIN
+ blade_dept bt
+ ON
+ sdu.dept_id = bt.id
+ WHERE
+ 1=1
+ <if test="dispatcherUnit.tenantName!=null and dispatcherUnit.tenantName!=''">
+ and bt.dept_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.jurisdiction!=null">
+ and sdu.jurisdiction = #{dispatcherUnit.jurisdiction}
+ </if>
+ <if test="dispatcherUnit.district!=null">
+ and sdu.district = #{dispatcherUnit.district}
+ </if>
+ </select>
+
+ <!--自定义树-->
+ <select id="selectDispatcherUnitPageTree" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
+ select
+ sdu.id,sdu.name
from
sys_dispatcher_unit sdu
LEFT JOIN
@@ -44,15 +82,15 @@
<!--派遣公司详细信息-->
<select id="selectDispatcherUnitInfo" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
select
- sdu.*,bt.dept_name tenantName
+ sdu.*,bt.dept_name tenantName
from
- sys_dispatcher_unit sdu
+ sys_dispatcher_unit sdu
LEFT JOIN
- blade_dept bt
+ blade_dept bt
ON
- sdu.dept_id = bt.id
+ sdu.dept_id = bt.id
where
- 1=1
+ 1=1
<if test="dispatcherUnit.id!=null">
and sdu.id = #{dispatcherUnit.id}
</if>
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 906cd32..11c839f 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/IDispatcherService.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/IDispatcherService.java
@@ -39,9 +39,9 @@
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
index 352bb12..aac1ab4 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/IDispatcherUnitService.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/IDispatcherUnitService.java
@@ -21,6 +21,8 @@
import org.springblade.modules.dispatcher.entity.DispatcherUnit;
import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
+import java.util.List;
+
/**
* 服务类
*
@@ -39,9 +41,16 @@
IPage<DispatcherUnitVO> selectDispatcherUnitPage(IPage<DispatcherUnitVO> page, DispatcherUnitVO dispatcher);
/**
- * 派遣公司信息详情
+ * 派遣公司信息详情
* @param dispatcherUnit 派遣信息对象
* @return
- */
+ */
DispatcherUnitVO selectDispatcherUnitInfo(DispatcherUnit dispatcherUnit);
+
+ /**
+ * 自定义树
+ * @param dispatcher
+ * @return
+ */
+ List<DispatcherUnitVO> selectDispatcherUnitPageTree(DispatcherUnitVO 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
index adb3b09..c16b1dd 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
@@ -24,6 +24,8 @@
import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* 服务实现类
*
@@ -47,4 +49,14 @@
public DispatcherUnitVO selectDispatcherUnitInfo(DispatcherUnit dispatcherUnit) {
return baseMapper.selectDispatcherUnitInfo(dispatcherUnit);
}
+
+ /**
+ * 自定义树
+ * @param dispatcher
+ * @return
+ */
+ @Override
+ public List<DispatcherUnitVO> selectDispatcherUnitPageTree(DispatcherUnitVO dispatcher) {
+ return baseMapper.selectDispatcherUnitPageTree(dispatcher);
+ }
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
index a307d97..32abc87 100644
--- a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
@@ -31,6 +31,13 @@
public class DispatcherUnitVO extends DispatcherUnit {
private static final long serialVersionUID = 1L;
+ /**
+ * 保安公司名称
+ */
private String tenantName;
+ /**
+ * 派遣单位名称
+ */
+ private String dispatcherUnitName;
}
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 0a90c51..dd0874c 100644
--- a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
@@ -33,6 +33,14 @@
public class DispatcherVO extends Dispatcher {
private static final long serialVersionUID = 1L;
+ /**
+ * 派遣单位名称
+ */
private String dispatcherCompany;
+ /**
+ * 保安单位名称
+ */
+ private String deptName;
+
}
--
Gitblit v1.9.3