1.资产签字师查询

biz-base/src/main/java/com/dayou/controller/UserArchiveController.java

@@ -0,0 +1,83 @@
+package com.dayou.controller;
+
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.controller.BaseController;
+import com.dayou.service.IUserArchiveService;
+import com.dayou.entity.UserArchive;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+import com.dayou.utils.ConvertUtil;
+import com.dayou.utils.HttpKit;
+import com.dayou.exception.ErrorCode;
+import java.util.Date;
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
+/**
+ * 员工档案
+ *
+ * @author wucl
+ * @since 2024-09-02
+ */
+@RestController
+@RequestMapping("userArchive")
+@Slf4j
+public class UserArchiveController extends BaseController {
+    @Autowired
+    private IUserArchiveService userArchiveService;
+
+    /**
+    * 员工档案列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<UserArchive>> page(UserArchive userArchive, Page page){
+        Page<UserArchive> pages=userArchiveService.selectPage(page,userArchive);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 员工档案详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<UserArchive> detail(@PathVariable Long id){
+        UserArchive xUserArchive =userArchiveService.detail(id);
+        return RestResponse.data(xUserArchive);
+     }
+
+    /**
+     * 员工档案新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody UserArchive userArchive) {
+        Boolean ret = userArchiveService.add(userArchive);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 员工档案更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody UserArchive userArchive) {
+        Boolean ret = userArchiveService.update(userArchive);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 员工档案删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = userArchiveService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+}
+

biz-base/src/main/java/com/dayou/controller/UserController.java

@@ -326,5 +326,14 @@ public class UserController extends BaseController {
         return RestResponse.data(ret);
     }
 
+    /**
+     * 获取资产评估师用户
+     * @return RestResponse<List<PullDownModel>>
+     */
+    @GetMapping("/byAssetEvaluator")
+    public RestResponse<List<PullDownModel>> byAssetEvaluator(){
+        return RestResponse.data(ConvertUtil.copyList(userService.byAssetEvaluator(), PullDownModel.class));
+    }
+
 }
 

dao/src/main/java/com/dayou/mapper/UserArchiveMapper.java

@@ -0,0 +1,16 @@
+package com.dayou.mapper;
+
+import com.dayou.entity.UserArchive;
+import com.dayou.dao.CustomBaseMapper;
+
+/**
+ * <p>
+ * 员工档案 Mapper 接口
+ * </p>
+ *
+ * @author wucl
+ * @since 2024-09-02
+ */
+public interface UserArchiveMapper extends CustomBaseMapper<UserArchive> {
+
+}

dao/src/main/java/com/dayou/mapper/UserMapper.java

@@ -47,4 +47,17 @@ public interface UserMapper extends CustomBaseMapper<User> {
     List<PullDownModel> allotDepartmentUsers(@Param("departmentIds") Set<Long> departmentIds);
 
     List<User> infoPostName(@Param("postName") String postName);
+
+    /**
+     * 获取资产评估师用户
+     * @return List<User>
+     */
+    List<User> byAssetEvaluator();
+
+    /**
+     * 根据部门名称获取部门及其下辖部门人员
+     * @param depName 部门
+     * @return List<User>
+     */
+    List<User> byDepartmentName(@Param("depName") String depName);
 }

dao/src/main/resources/mapper/UserArchiveMapper.xml

@@ -0,0 +1,20 @@
+<?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.dayou.mapper.UserArchiveMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.UserArchive">
+        <result column="id" property="id" />
+        <result column="user_id" property="userId" />
+        <result column="major_evaluator_registration_no" property="majorEvaluatorRegistrationNo" />
+        <result column="land_evaluator_registration_no" property="landEvaluatorRegistrationNo" />
+        <result column="asset_evaluator_registration_no" property="assetEvaluatorRegistrationNo" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        user_id, major_evaluator_registration_no, land_evaluator_registration_no, asset_evaluator_registration_no
+    </sql>
+
+</mapper>

dao/src/main/resources/mapper/UserMapper.xml

@@ -240,4 +240,20 @@
           and u.deleted =0
         order by u.id
     </select>
+
+    <!--获取资产评估师用户-->
+    <select id="byAssetEvaluator" resultType="com.dayou.entity.User">
+        SELECT user.id,
+               user.name
+        FROM user, user_archive
+        WHERE user.id = user_archive.user_id
+        AND user_archive.asset_evaluator_registration_no IS NOT NULL
+        AND user.deleted = 0
+        AND user_archive.deleted = 0
+    </select>
+
+    <!--根据部门名称获取部门及其下辖部门人员-->
+    <select id="byDepartmentName" resultType="com.dayou.entity.User">
+
+    </select>
 </mapper>

domain/src/main/java/com/dayou/entity/UserArchive.java

@@ -0,0 +1,50 @@
+package com.dayou.entity;
+import com.dayou.common.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.dayou.annotation.ExcelSheet;
+import com.dayou.annotation.ExportCell;
+import com.dayou.annotation.ImportCell;
+/**
+ * <p>
+ * 员工档案
+ * </p>
+ *
+ * @author wucl
+ * @since 2024-09-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ExcelSheet(sheetName = "员工档案")
+public class UserArchive extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 房地产估价师注册号
+     */
+    @ImportCell
+    @ExportCell(columnName = "房地产估价师注册号")
+    private String majorEvaluatorRegistrationNo;
+
+    /**
+     * 土地估价师注册号
+     */
+    @ImportCell
+    @ExportCell(columnName = "土地估价师注册号")
+    private String landEvaluatorRegistrationNo;
+
+    /**
+     * 资产评估师资格证号
+     */
+    @ImportCell
+    @ExportCell(columnName = "资产评估师资格证号")
+    private String assetEvaluatorRegistrationNo;
+
+
+}

service/src/main/java/com/dayou/service/IUserArchiveService.java

@@ -0,0 +1,28 @@
+package com.dayou.service;
+import com.dayou.entity.UserArchive;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+/**
+ * <p>
+ * 员工档案 服务类
+ * </p>
+ *
+ * @author wucl
+ * @since 2024-09-02
+ */
+public interface IUserArchiveService extends IService<UserArchive> {
+
+        Page<UserArchive> selectPage(Page page,UserArchive userArchive);
+
+        UserArchive detail(Long id);
+
+        Boolean add(UserArchive userArchive);
+
+        Boolean update(UserArchive userArchive);
+
+        Boolean delete(Long id);
+
+}

service/src/main/java/com/dayou/service/IUserService.java

@@ -106,4 +106,10 @@ public interface IUserService extends IService<User> {
     List<User> infoPostName(String postName);
 
     List<DepartmentUserVO> departmentUsers();
+
+    /**
+     * 获取资产评估师用户
+     * @return List<User>
+     */
+    List<User> byAssetEvaluator();
 }

service/src/main/java/com/dayou/service/impl/UserArchiveServiceImpl.java

@@ -0,0 +1,66 @@
+package com.dayou.service.impl;
+
+import com.dayou.entity.UserArchive;
+import com.dayou.mapper.UserArchiveMapper;
+import com.dayou.service.IUserArchiveService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.dayou.utils.ExcelUtil;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+import java.util.List;
+import java.util.ArrayList;
+import org.springframework.transaction.annotation.Transactional;
+import com.dayou.enums.BatchTaskTypeEnum;
+
+/**
+ * <p>
+ * 员工档案 服务实现类
+ * </p>
+ *
+ * @author wucl
+ * @since 2024-09-02
+ */
+@Service
+public class UserArchiveServiceImpl extends ServiceImpl<UserArchiveMapper, UserArchive> implements IUserArchiveService {
+
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Page<UserArchive> selectPage(Page page,UserArchive userArchive){
+        return this.page(page, new QueryWrapper<UserArchive>(userArchive));
+    }
+
+
+    @Override
+    public UserArchive detail(Long id){
+        return this.getById(id);
+    }
+
+    @Override
+    public Boolean add(UserArchive userArchive){
+        return  this.save(userArchive);
+    }
+
+    @Override
+    public Boolean update(UserArchive userArchive){
+        return  this.updateById(userArchive);
+    }
+
+    @Override
+    public Boolean delete(Long id){
+        //逻辑删除
+        return this.removeById(id);
+    }
+}

service/src/main/java/com/dayou/service/impl/UserServiceImpl.java

@@ -612,6 +612,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     /**
+     * 获取资产评估师用户
+     * @return List<User>
+     */
+    @Override
+    public List<User> byAssetEvaluator() {
+        return userMapper.byAssetEvaluator();
+    }
+
+    /**
      * 递归查询下级岗位
      * @param postIds
      * @param juniorPost

sql/update_sql.sql

@@ -674,3 +674,23 @@ ALTER TABLE `order_fund_allot` ADD real_fund_id bigint(20) NOT NULL COMMENT '实
 ALTER TABLE assets_evaluation_target MODIFY COLUMN the_holder varchar(255) NULL COMMENT '产权持有人';
 ALTER TABLE assets_evaluation_target ADD COLUMN evaluation_type_defined_sec varchar(255) NULL COMMENT '其他自定义二级资产评估对象类型';
 
+/**
+  日期：2024-09-02
+  修改人:苟耕铨
+  未更新到test-env
+ */
+DROP TABLE IF EXISTS `user_archive`;
+CREATE TABLE `user_archive`  (
+                                 `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id',
+                                 `user_id` bigint(20) NOT NULL COMMENT '用户id',
+                                 `major_evaluator_registration_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房地产估价师注册号',
+                                 `land_evaluator_registration_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '土地估价师注册号',
+                                 `asset_evaluator_registration_no` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资产评估师资格证号',
+                                 `created` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+                                 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '逻辑删除标识:1:删除 0:未删除',
+                                 `modified` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '修改时间',
+                                 PRIMARY KEY (`id`) USING BTREE,
+                                 INDEX `user_id`(`user_id`) USING BTREE COMMENT '用户id索引'
+) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '员工档案' ROW_FORMAT = Dynamic;
+
+