员工替换

src/main/java/com/dk/mdm/controller/core/StaffController.java → src/main/java/com/dk/mdm/controller/mst/StaffController.java

@@ -1,29 +1,34 @@
-package com.dk.mdm.controller.core;
+package com.dk.mdm.controller.mst;
 
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultVO;
-import com.dk.common.service.BaseService;
 import com.dk.common.util.ExcelUtils;
-import com.dk.mdm.model.pojo.core.Staff;
+import com.dk.mdm.model.pojo.mst.Staff; 
+import com.dk.common.service.BaseService;
 import com.dk.mdm.model.query.core.StaffQuery;
 import com.dk.mdm.model.response.core.StaffResponse;
 import com.dk.mdm.model.vo.core.StaffVO;
-import com.dk.mdm.service.core.StaffService;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import com.dk.mdm.service.mst.StaffService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @desc   : 员工API接口
+ * @author : 姜永辉
+ * @date   : 2023/1/4 9:25
+ */
 @Api(tags = "员工API接口")
 @RestController
-@RequestMapping("/core/staff")
-public class StaffController {
+@RequestMapping("/mst/staff")
+public class StaffController{
 
     public BaseService<Staff> getService() {
         return staffService;
@@ -32,9 +37,10 @@ public class StaffController {
     @Autowired
     private StaffService staffService;
 
+
     /**
      * @desc : 条件查询
-     * @author : 姜宁
+     * @author : 姜永辉
      * @date : 2023/1/9 10:36
      */
     @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
@@ -45,7 +51,7 @@ public class StaffController {
 
     /**
      * @desc : 通过ID查询
-     * @author : 姜宁
+     * @author : 姜永辉
      * @date : 2023/1/9 10:41
      */
     @PostMapping({"/{id}"})
@@ -56,7 +62,7 @@ public class StaffController {
 
     /**
      * @desc : 新建员工
-     * @author : 姜宁
+     * @author : 姜永辉
      * @date : 2023/1/9 10:48
      */
     @ApiOperation(value = "新建员工", notes = "新建员工")
@@ -68,7 +74,7 @@ public class StaffController {
 
     /**
      * @desc : 编辑员工
-     * @author : 姜宁
+     * @author : 姜永辉
      * @date : 2023/1/9 10:49
      */
     @ApiOperation(value = "编辑员工", notes = "编辑员工")
@@ -80,7 +86,7 @@ public class StaffController {
 
     /**
      * @desc : 停用
-     * @author : 姜宁
+     * @author : 姜永辉
      * @date : 2023/1/9 10:34
      */
     @ApiOperation(value = "停用", notes = "停用")
@@ -91,7 +97,7 @@ public class StaffController {
 
     /**
      * @desc : 启用
-     * @author : 姜宁
+     * @author : 姜永辉
      * @date : 2023/1/9 10:34
      */
     @ApiOperation(value = "启用", notes = "启用")
@@ -102,7 +108,7 @@ public class StaffController {
 
     /**
      * @desc : 员工离职
-     * @author : 姜宁
+     * @author : 姜永辉
      * @date : 2023/2/13 13:15
      */
     @ApiOperation(value = "员工离职", notes = "员工离职")
@@ -114,7 +120,7 @@ public class StaffController {
 
     /**
      * @desc : 员工导入
-     * @author : 姜宁
+     * @author : 姜永辉
      * @date : 2023/2/28 14:32
      */
     @ApiOperation(value = "导入", notes = "导入")
@@ -136,4 +142,5 @@ public class StaffController {
         String title = "员工导入模板";
         ExcelUtils.exportExcel(new ArrayList<>(), title, title, StaffVO.class, title + ".xls", response);
     }
+
 }

src/main/java/com/dk/mdm/generator/Generator.java

@@ -53,7 +53,7 @@ public class Generator {
         GlobalConfig gc = new GlobalConfig();
         String projectPath = System.getProperty("user.dir");    //获取当前目录
         gc.setOutputDir(projectPath+"/src/main/java");          //输出到哪个目录
-        gc.setAuthor("周兴");                                    //作者
+        gc.setAuthor("姜永辉");                                    //作者
         gc.setOpen(false);                                      //是否打开目录
         gc.setFileOverride(false);                              //是否覆盖
         gc.setServiceName("%sService");                         //去Service的I前缀
@@ -95,7 +95,7 @@ public class Generator {
         //4、策略配置
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix("t_mst");                                             //表名前缀
-        strategy.setInclude("t_mst_org");                                        //设置要映射的表名,只需改这里即可,可以是一个数组，一次性生成多张表。
+        strategy.setInclude("t_mst_staff");                                        //设置要映射的表名,只需改这里即可,可以是一个数组，一次性生成多张表。
         strategy.setNaming(NamingStrategy.underline_to_camel);                      //转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);                //字段下划线转驼峰
         strategy.setEntityLombokModel(true);                                        //是否使用lombok开启注解

src/main/java/com/dk/mdm/infrastructure/convert/core/StaffConvert.java

@@ -1,6 +1,6 @@
 package com.dk.mdm.infrastructure.convert.core;
 
-import com.dk.mdm.model.pojo.core.Staff;
+import com.dk.mdm.model.pojo.mst.Staff;
 import com.dk.mdm.model.vo.core.StaffVO;
 import org.mapstruct.Mapper;
 

src/main/java/com/dk/mdm/mapper/core/StaffMapper.java

@@ -1,72 +0,0 @@
-package com.dk.mdm.mapper.core;
-
-import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.pojo.core.Staff;
-import com.dk.mdm.model.query.core.StaffQuery;
-import com.dk.mdm.model.response.core.StaffResponse;
-import com.dk.mdm.model.vo.core.StaffVO;
-import org.springframework.stereotype.Repository;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
-*  员工 Mapper
-*/
-@Repository
-public interface StaffMapper extends BaseMapper<Staff>{
-
-    /**
-     * @desc   : 根据条件进行查询
-     * @author : 姜宁
-     * @date   : 2023/1/9 10:42
-     */
-    List<StaffResponse> selectByCond(StaffQuery staffQuery);
-
-    /**
-     * @desc   : 根据条件进行查询（数量）
-     * @author : 姜宁
-     * @date   : 2023/1/9 10:42
-     */
-    Long countByCond(StaffQuery staffQuery);
-
-   /**
-    * @desc   : 员工编码是否重复
-    * @author : 姜宁
-    * @date   : 2023/1/9 15:14
-    */
-    Long selectByCode(Staff staff);
-
-    StaffResponse selectByStringId(String staffId);
-
-
-    /**
-     * @desc   : 更新员工状态
-     * @author : 姜宁
-     * @date   : 2023/2/13 13:43
-     */
-//    int updateStaffStatus(StaffVO staffVO);
-
-    /**
-     * @desc   :获取工种Id
-     * @author : 姜宁
-     * @date   : 2023/2/13 13:43
-     */
-    List<Map<String, Object>> selectStaffJobId(StaffVO staffVO);
-
-    /**
-     * @desc   : 获取职务Id
-     * @author : 姜宁
-     * @date   : 2023/3/1 15:27
-     */
-    List<Map<String, Object>> selectStaffPostId(StaffVO staffVO);
-
-    /**
-     * @desc   : 获取部门Id
-     * @author : 姜宁
-     * @date   : 2023/3/1 15:27
-     */
-    List<Map<String, Object>> selectStaffOrgId(StaffVO staffVO);
-}
-

src/main/java/com/dk/mdm/mapper/mst/StaffMapper.java

@@ -0,0 +1,32 @@
+package com.dk.mdm.mapper.mst;
+
+import com.dk.mdm.model.pojo.mst.Staff;
+import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.core.StaffQuery;
+import com.dk.mdm.model.response.core.StaffResponse;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @desc   : 员工 Mapper
+ * @author : 姜永辉
+ * @date   : 2023/1/4 9:25
+ */
+@Repository
+public interface StaffMapper extends BaseMapper<Staff>{
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 姜宁
+     * @date   : 2023/1/9 10:42
+     */
+    List<StaffResponse> selectByCond(StaffQuery staffQuery);
+
+    /**
+     * @desc   : 根据条件进行查询（数量）
+     * @author : 姜宁
+     * @date   : 2023/1/9 10:42
+     */
+    Long countByCond(StaffQuery staffQuery);
+}
+

src/main/java/com/dk/mdm/mapper/core/StaffMapper.xml → src/main/java/com/dk/mdm/mapper/mst/StaffMapper.xml

@@ -1,11 +1,12 @@
 <?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="com.dk.mdm.mapper.core.StaffMapper">
+<mapper namespace="com.dk.mdm.mapper.mst.StaffMapper">
 
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        t.staff_id, t.staff_code, t.staff_name,t.staff_phone, t.org_id, t.role_ids,  t.wx_user_id, t.remarks,
+        t.staff_id
+        , t.staff_code, t.staff_name,t.staff_phone, t.org_id, t.role_ids,  t.wx_user_id, t.remarks,
         t.flg_valid,t.flg_can_login,
         t.cp_id, t.op_create_time, t.op_create_user_id, t.op_update_time, t.op_update_user_id
     </sql>
@@ -16,26 +17,21 @@
         <result column="staff_code" property="staffCode"/>
         <result column="staff_name" property="staffName"/>
         <result column="staff_phone" property="staffPhone"/>
-        <result column="org_id" property="orgId"/>
+        <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
         <result column="org_name" property="orgName"/>
-        <result column="flg_can_login" property="flgCanLogin"/>
-        <result column="wx_user_id" property="wxUserId"/>
+        <result column="role_ids" property="roleIds" typeHandler="UuidListTypeHandler"/>
+        <result column="wx_user_id" property="wxUserId" typeHandler="UuidTypeHandler"/>
         <result column="remarks" property="remarks"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
-        <result column="role_ids" property="roleIds"
-                typeHandler="com.dk.common.infrastructure.handler.StringListTypeHandler"/>
-        <result column="op_create_time" property="opCreateTime"
-                typeHandler="com.dk.common.infrastructure.handler.TimestampTypeHandler"/>
-        <result column="op_create_user_id" property="opCreateUserId"/>
-        <result column="op_update_time" property="opUpdateTime"
-                typeHandler="com.dk.common.infrastructure.handler.TimestampTypeHandler"/>
-        <result column="op_update_user_id" property="opUpdateUserId"/>
+        <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
+        <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
+        <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
+        <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
         <result column="op_app_code" property="opAppCode"/>
-        <result column="op_timestamp" property="opTimestamp"
-                typeHandler="com.dk.common.infrastructure.handler.TimestampTypeHandler"/>
+        <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
         <result column="op_db_user" property="opDbUser"/>
-        <result column="userIds" property="userIds" typeHandler="IntListTypeHandler"/>
+        <result column="flg_can_login" property="flgCanLogin"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -86,11 +82,11 @@
         </foreach>
     </sql>
 
-    <!-- 查询表dkic_b.t_mst_staff，（条件查询+分页）列表 -->
+    <!-- 查询表t_mst_staff，（条件查询+分页）列表 -->
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        , org.org_name,org.level_name AS org_level_name
+        , org.org_name
         FROM dkic_b.t_mst_staff t
         LEFT JOIN dkic_b.t_mst_org org
         ON t.org_Id = org.org_Id
@@ -101,70 +97,38 @@
         </if>
     </select>
 
-    <!-- 查询表dkic_b.t_mst_staff，（条件查询）个数 -->
+    <!-- 查询表t_mst_staff，（条件查询）个数 -->
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
         FROM dkic_b.t_mst_staff t
-
         <include refid="Condition"/>
     </select>
 
-    <!--员工-->
-    <select id="selectByStringId" resultMap="BaseResultMap">
-        select <include refid="Base_Column_List"/>
-        from dkic_b.t_mst_staff t
-        where  t.staff_id = #{staffId,typeHandler=UuidTypeHandler}
-
-    </select>
-
-    <!--员工编码是否重复-->
-    <select id="selectByCode" resultType="Long">
-        select count(1)
-        from dkic_b.t_mst_staff
-        where #{staffCode} = staff_code
-        and #{cpId} = cp_id
-        <if test="staffId != null and staffId != 0">
-            and staff_id != #{staffId}
-        </if>
-    </select>
-
-
-<!--    &lt;!&ndash;更新员工状态&ndash;&gt;-->
-<!--    <update id="updateStaffStatus">-->
-<!--        update dkic_b.t_mst_staff-->
-<!--        set staff_status = #{staffStatus}-->
-<!--        where #{staffId} = staff_id-->
-<!--    </update>-->
-
-    <!--获取工种-->
-    <select id="selectStaffJobId" resultType="Map">
-        select job_id AS "jobId"
-        from core.t_job
-        where #{jobName} = job_name
-          and #{cpId} = cp_id
-          and flg_valid
-        order by display_no
+    <!-- 根据主键查询表t_mst_staff的一行数据 -->
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM dkic_b.t_mst_staff t
+        WHERE t.staff_id = #{staffId}::uuid
     </select>
 
-    <!--获取职务-->
-    <select id="selectStaffPostId" resultType="Map">
-        select post_id AS "postId"
-        from core.t_post
-        where #{postName} = post_name
-          and #{cpId} = cp_id
-          and flg_valid
-        order by display_no
+    <!-- 根据主键锁定表t_mst_staff的一行数据 -->
+    <select id="selectByIdForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM dkic_b.t_mst_staff t
+        WHERE t.staff_id  = #{staffId}
+        for update
     </select>
 
-    <!--获取部门-->
-    <select id="selectStaffOrgId" resultType="Map">
-        select org_id AS "orgId"
-        from dkic_b.t_mst_org
-        where #{orgName} = org_name
-          and #{cpId} = cp_id
-          and flg_valid
-        order by display_no
+    <!-- 根据主键锁定表t_mst_staff的多行数据 -->
+    <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM dkic_b.t_mst_staff t
+        <include refid="idsForeach"/>
+        for update
     </select>
 
     <insert id="insertBatch">
@@ -173,12 +137,14 @@
         <trim suffixOverrides=",">
             staff_code,
             staff_name,
-            job_id,
-            post_id,
+            staff_phone,
             org_id,
-            staff_status,
+            role_ids,
+            wx_user_id,
             remarks,
             cp_id,
+            op_app_code,
+            flg_can_login,
         </trim>
         )
         values
@@ -187,12 +153,14 @@
             <trim suffixOverrides=",">
                 #{item.staffCode},
                 #{item.staffName},
-                #{item.jobId},
-                #{item.postId},
-                #{item.orgId},
-                #{item.staffStatus},
+                #{item.staffPhone},
+                #{item.orgId}::uuid,
+                #{item.roleIds},
+                #{item.wxUserId}::uuid,
                 #{item.remarks},
                 #{item.cpId},
+                #{item.opAppCode},
+                #{item.flgCanLogin},
             </trim>
             )
         </foreach>

src/main/java/com/dk/mdm/service/core/StaffService.java → src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -1,31 +1,31 @@
-package com.dk.mdm.service.core;
+package com.dk.mdm.service.mst;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
-import com.dk.common.infrastructure.enums.ErrorCodeEnum;
-import com.dk.common.infrastructure.util.AuthUtils;
-import com.dk.common.mapper.BaseMapper;
 import com.dk.common.model.pojo.PageList;
-import com.dk.common.model.vo.core.UserVO;
 import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
-import com.dk.common.service.BaseService;
 import com.dk.mdm.infrastructure.convert.core.StaffConvert;
-import com.dk.mdm.mapper.core.StaffMapper;
-import com.dk.mdm.model.pojo.core.Staff;
+import com.dk.mdm.model.pojo.mst.Staff;
+import com.dk.mdm.mapper.mst.StaffMapper;
+import com.dk.common.service.BaseService;
+import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.core.StaffQuery;
 import com.dk.mdm.model.response.core.StaffResponse;
 import com.dk.mdm.model.vo.core.StaffVO;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
-import java.util.Map;
 
+/**
+ * @desc   : 员工API接口
+ * @author : 姜永辉
+ * @date   : 2023/1/4 9:25
+ */
 @Service
-@Transactional
 public class StaffService extends BaseService<Staff> {
 
 	@Override
@@ -33,21 +33,9 @@ public class StaffService extends BaseService<Staff> {
 		return staffMapper;
 	}
 
-	@Autowired
-	private StaffMapper staffMapper;
-
-	@Autowired
-	private StaffConvert staffConvert;
-
-	@Autowired
-	private UserService userService;
-
-	@Autowired
-	private AuthUtils authUtils;
-
 	/**
 	 * @desc   : 重写主键
-	 * @author : 姜宁
+	 * @author : 姜永辉
 	 * @date   : 2023/1/9 10:39
 	 */
 	@Override
@@ -55,6 +43,12 @@ public class StaffService extends BaseService<Staff> {
 		return "staff_id";
 	}
 
+	@Autowired
+	private StaffMapper staffMapper;
+
+	@Autowired
+	private StaffConvert staffConvert;
+
 	/**
 	 * @desc   : 条件查询
 	 * @author : 姜宁
@@ -66,10 +60,6 @@ public class StaffService extends BaseService<Staff> {
 				staffMapper.countByCond(staffQuery));
 	}
 
-	public ResponseResultVO<StaffResponse> selectByStringId(String id) {
-		return ResponseResultUtil.success(staffMapper.selectByStringId(id)) ;
-	}
-
 	/**
 	 * @desc   : 保存方法
 	 * @author : 姜宁
@@ -81,12 +71,7 @@ public class StaffService extends BaseService<Staff> {
 	public ResponseResultVO<?> insert(StaffVO staffVO) {
 		// 转化实体
 		Staff staff = staffConvert.convertToPo(staffVO);
-		// 判断编码是否重复
-		Long count = staffMapper.selectByCode(staff);
-		if(count > 0){
-			return ResponseResultUtil.error(ErrorCodeEnum.STAFF_CODE_EXISTS.getCode(),
-					ErrorCodeEnum.STAFF_CODE_EXISTS.getMessage());
-		}
+
 		return super.insert(staff);
 	}
 
@@ -101,12 +86,7 @@ public class StaffService extends BaseService<Staff> {
 	public ResponseResultVO<Boolean> update(StaffVO staffVO) {
 		// 转化实体
 		Staff staff = staffConvert.convertToPo(staffVO);
-		// 判断编码是否重复
-		Long count = staffMapper.selectByCode(staff);
-		if(count > 0){
-			return ResponseResultUtil.error(ErrorCodeEnum.STAFF_CODE_EXISTS.getCode(),
-					ErrorCodeEnum.STAFF_CODE_EXISTS.getMessage());
-		}
+
 		return super.update(staff);
 	}
 
@@ -137,39 +117,9 @@ public class StaffService extends BaseService<Staff> {
 		if (CollectionUtils.isEmpty(list) || list.size() == 0) {
 			return ResponseResultUtil.error(ResponseCodeEnum.INSERT_FAIL);
 		}
-		UserVO user = authUtils.getUser();
-		Integer ftyId = user.getFtyId();
-
-		for (StaffVO staffVO : list) {
-//			staffVO.setFtyId(ftyId).setStaffStatus(Constant.StringConstant.STAFF_STATUS_IN_OFFICE.getName());
-			// 获取工种Id
-			List<Map<String, Object>> jobList = staffMapper.selectStaffJobId(staffVO);
-			if (CollectionUtils.isEmpty(jobList) || jobList.size() == 0) {
-				return ResponseResultUtil.error(ResponseCodeEnum.INSERT_FAIL);
-			}
-
-			// 获取职务Id
-			List<Map<String, Object>> postList = staffMapper.selectStaffPostId(staffVO);
-			if (CollectionUtils.isEmpty(postList) || postList.size() == 0) {
-				return ResponseResultUtil.error(ResponseCodeEnum.INSERT_FAIL);
-			}
-
-			// 获取组织部门Id
-			List<Map<String, Object>> orgList = staffMapper.selectStaffOrgId(staffVO);
-			if (CollectionUtils.isEmpty(orgList) || orgList.size() == 0) {
-				return ResponseResultUtil.error(ResponseCodeEnum.INSERT_FAIL);
-			}
-			staffVO.setOrgId((String) orgList.get(0).get("orgId"));
-			// 转化实体
-			Staff staff = staffConvert.convertToPo(staffVO);
-			// 判断编码是否重复
-			Long count = staffMapper.selectByCode(staff);
-			if (count > 0) {
-				return ResponseResultUtil.error(ErrorCodeEnum.STAFF_CODE_EXISTS.getCode(),
-						ErrorCodeEnum.STAFF_CODE_EXISTS.getMessage());
-			}
-			super.insert(staff);
-		}
+
+
 		return ResponseResultUtil.success();
 	}
+
 }