全局 session

部门审核
特殊审核

bailuntec-cost-api/src/main/java/com/bailuntec/cost/api/dto/CostDto.java

@@ -211,6 +211,9 @@ public class CostDto {
     private String isTaxStr; // 0 不抵扣个税  1 抵扣个税
 
 
+    private String lendType;
+
+
     @TableField(exist = false)
     private String costCurrentReviewer;
 

bailuntec-cost-api/src/main/java/com/bailuntec/cost/api/dto/CostPlanDto.java

@@ -55,5 +55,7 @@ public class CostPlanDto {
     private Integer isTax; // 0 不抵扣个税  1 抵扣个税
     private String isTaxStr; // 0 不抵扣个税  1 抵扣个税
 
+    private String lendType;
+
 
 }

bailuntec-cost-api/src/main/java/com/bailuntec/cost/api/dto/CostPlanTempDto.java

@@ -7,6 +7,7 @@ import java.math.BigDecimal;
 
 @Data
 public class CostPlanTempDto {
+
     private Integer id; // 费用单表 id
     private String costPlanNo; // 费用计划编号
     private String tempNo; // 计划缓存编号
@@ -26,5 +27,7 @@ public class CostPlanTempDto {
     @ApiModelProperty("会计一级科目")
     private String accountingSubjectName;
 
+    private String lendType;
+
 }
 

bailuntec-cost-api/src/main/java/com/bailuntec/cost/api/response/CostResult.java

@@ -16,12 +16,15 @@ public class CostResult<T> {
     private Boolean success;
     private T data;
 
+    private String code;
+
 
     public static <T> CostResult<T> success(String message, T data) {
         CostResult<T> result = new CostResult<>();
         result.setSuccess(true);
         result.setMessage(message);
         result.setData(data);
+        result.setCode("200");
         return result;
     }
 
@@ -43,12 +46,14 @@ public class CostResult<T> {
         CostResult<T> result = new CostResult<>();
         result.setSuccess(false);
         result.setMessage(message);
+        result.setCode("500");
         return result;
     }
 
     public static <T> CostResult<T> error() {
         CostResult<T> result = new CostResult<>();
         result.setSuccess(false);
+        result.setCode("500");
         return result;
     }
 }

bailuntec-cost-core/src/main/java/com/blt/other/common/base/SysUser.java

@@ -33,13 +33,13 @@ public class SysUser {
     @JsonProperty("OaUserId")
     private Integer oaUserId;
 
-    @JSONField(name = "Company")
-    @JsonProperty("Company")
-    private SysCompany company;
-
-    @JSONField(name = "Department")
-    @JsonProperty("Department")
-    private SysDepartment department;
+//    @JSONField(name = "Company")
+//    @JsonProperty("Company")
+//    private SysCompany company;
+//
+//    @JSONField(name = "Department")
+//    @JsonProperty("Department")
+//    private SysDepartment department;
 
     @JSONField(name = "auth_time")
     @JsonProperty("auth_time")

bailuntec-cost-core/src/main/java/com/blt/other/common/config/GlobalCorsConfig.java

@@ -22,25 +22,25 @@ public class GlobalCorsConfig {
 
         CorsConfiguration config = new CorsConfiguration();
         //放行哪些原始域
-        config.addAllowedOrigin("*");
-
-
 
-        //是否允许发送Cookie信息
-        config.setAllowCredentials(true);
+        config.addAllowedOrigin("*");
+//        config.addAllowedOrigin("http://127.0.0.1:8082");
+//        config.addAllowedOrigin("http://81.71.125.58:8082");
+//        config.addAllowedOrigin("http://localhost:8081");
         //开放哪些Http方法，允许跨域访问
         config.addAllowedMethod("*");
         //允许HTTP请求中的携带哪些Header信息
         config.addAllowedHeader("*");
-        //暴露哪些头部信息（因为跨域访问默认不能获取全部头部信息）
 
+        //暴露哪些头部信息（因为跨域访问默认不能获取全部头部信息）
         config.addExposedHeader("Content-Type");
         config.addExposedHeader("X-Requested-With");
         config.addExposedHeader("accept");
         config.addExposedHeader("Origin");
         config.addExposedHeader("Access-Control-Request-Method");
         config.addExposedHeader("Access-Control-Request-Headers");
-
+        //是否允许发送Cookie信息
+        config.setAllowCredentials(true);
 
         //2.添加映射路径
         UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();

bailuntec-cost-core/src/main/java/com/blt/other/common/exception/GlobalExceptionHandler.java

@@ -35,6 +35,7 @@ public class GlobalExceptionHandler {
         result.put("success", false);
         result.put("msg", e.getMessage());
         result.put("message", e.getMessage());
+        result.put("code", e.getCode());
 
         log.error(e.getMessage());
         return result;
@@ -52,6 +53,7 @@ public class GlobalExceptionHandler {
         result.put("success", false);
         result.put("msg", e.getMessage());
         result.put("message", e.getMessage());
+        result.put("code", "500");
 
         log.error(e.getMessage(), e);
         return result;
@@ -68,6 +70,8 @@ public class GlobalExceptionHandler {
         result.put("success", false);
         result.put("msg", "数据重复");
         result.put("message", "数据重复");
+        result.put("code", "500");
+
 
         log.error(e.getMessage(), e);
         return result;
@@ -85,6 +89,8 @@ public class GlobalExceptionHandler {
         result.put("success", false);
         result.put("msg", e.getMessage() + e.getStackTrace()[0].toString());
         result.put("message", e.getMessage() + e.getStackTrace()[0].toString());
+        result.put("code", "500");
+
 
         log.error(e.getMessage(), e);
         return result;

bailuntec-cost-core/src/main/java/com/blt/other/common/interceptor/SessionHandlerInterceptor.java

 package com.blt.other.common.interceptor;
 
+import com.blt.other.common.base.SysUser;
+import com.blt.other.common.exception.BizRuntimeException;
+import com.blt.other.common.util.JwtUtil;
 import com.blt.other.common.util.SessionUtils;
+import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -16,18 +20,22 @@ public class SessionHandlerInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-        try {
-            String userid = request.getHeader("userid");
-            SessionUtils.putCurrentUserId(Integer.valueOf(userid));
-        }catch (Exception ignore){
+        String token = Lists.newArrayList(request.getHeader("Cookie").split(";"))
+                .stream()
+                .filter(item -> item.contains("BailunToken"))
+                .findAny()
+                .map(item -> item.replaceAll("BailunToken=", ""))
+                .orElseThrow(() -> new BizRuntimeException("400", "请先登陆"));
+
+        SysUser sysUser = JwtUtil.validateToken(token);
+        SessionUtils.putSysUser(sysUser);
 
-        }
         return true;
     }
 
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
-        SessionUtils.removeCurrentUserId();
+        SessionUtils.removeSysUser();
     }
 
 }

bailuntec-cost-core/src/main/java/com/blt/other/common/util/DateTimeUtil.java

@@ -12,13 +12,14 @@ public class DateTimeUtil {
 
     /**
      * 日期字符串转换为Date对象
+     *
      * @param dateStr
      * @param pattern
      * @return
      * @throws ParseException
      */
-    public static Date stringToDate(String dateStr, String pattern){
-        if(isNotEmpty(dateStr)){
+    public static Date stringToDate(String dateStr, String pattern) {
+        if (isNotEmpty(dateStr)) {
             try {
                 return new SimpleDateFormat(pattern).parse(dateStr.trim());
             } catch (ParseException e) {
@@ -30,29 +31,32 @@ public class DateTimeUtil {
 
     /**
      * Date对象转换为日期字符串
+     *
      * @param date
      * @param pattern
      * @return
      */
-    public static String dateToString(Date date, String pattern){
+    public static String dateToString(Date date, String pattern) {
         return new SimpleDateFormat(pattern).format(date);
     }
 
     /**
      * 日期字符串是否为空
+     *
      * @param dateStr
      * @return
      */
-    public static boolean isNotEmpty(String dateStr){
+    public static boolean isNotEmpty(String dateStr) {
         return dateStr != null && !"".equals(dateStr.trim());
     }
 
     /**
      * 获取距离某日期特定月数的月份的第一天
+     *
      * @param monthNumber 要加减的月数
      * @return
      */
-    public static Date getMonthFirstDay(Date date, int monthNumber){
+    public static Date getMonthFirstDay(Date date, int monthNumber) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
         calendar.add(Calendar.MONTH, monthNumber);
@@ -62,11 +66,12 @@ public class DateTimeUtil {
 
     /**
      * 获取距离特定日期天数的日期
+     *
      * @param date
      * @param days 要加减的天数
      * @return 加减后的日期
      */
-    public static Date addDays(Date date, int days){
+    public static Date addDays(Date date, int days) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
         calendar.add(Calendar.DAY_OF_MONTH, days);
@@ -75,9 +80,10 @@ public class DateTimeUtil {
 
     /**
      * 获取当前月第一天
+     *
      * @return
      */
-    public static Date getCurrentMonthFirstDay(){
+    public static Date getCurrentMonthFirstDay() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DAY_OF_MONTH, 1);
         return stringToDate(dateToString(calendar.getTime(), DATE_FORMAT), DATE_FORMAT);
@@ -85,9 +91,10 @@ public class DateTimeUtil {
 
     /**
      * 获取当前月最大日期
+     *
      * @return
      */
-    public static Date getCurrentMonthMaxDay(){
+    public static Date getCurrentMonthMaxDay() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DATE));
         return stringToDate(dateToString(calendar.getTime(), DATE_FORMAT), DATE_FORMAT);
@@ -95,26 +102,24 @@ public class DateTimeUtil {
 
     /**
      * 获取今天的日期
+     *
      * @return
      */
-    public static Date getCurrentDay(){
+    public static Date getCurrentDay() {
         Calendar calendar = Calendar.getInstance();
         return stringToDate(dateToString(calendar.getTime(), DATE_FORMAT), DATE_FORMAT);
     }
 
     /**
      * 获取今天的昨天日期
+     *
      * @return
      */
-    public static Date getCurrentLastDay(){
+    public static Date getCurrentLastDay() {
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.DAY_OF_MONTH, -1);
         return stringToDate(dateToString(calendar.getTime(), DATE_FORMAT), DATE_FORMAT);
     }
 
 
-    public static void main(String[] args) {
-        System.out.println(dateToString(getCurrentLastDay(), DATE_FORMAT));
-    }
-
 }

bailuntec-cost-core/src/main/java/com/blt/other/common/util/JwtUtil.java

@@ -36,7 +36,7 @@ public class JwtUtil {
      *
      * @param token jwtToken
      */
-    public static void validateToken(String token) {
+    public static SysUser validateToken(String token) {
         try {
             Map<String, Object> map = new HashMap<>();
 
@@ -47,12 +47,13 @@ public class JwtUtil {
                     .build();
             JwtClaims claims = consumer.processToClaims(token.replaceAll(TOKEN_PREFIX, ""));
             if (claims != null) {
-                System.out.println("认证通过！");
-                log.info(claims.toJson());
+                log.info("认证通过：user:{}", claims.toJson());
 
                 SysUser sysUser = JsonUtilByFsJson.jsonToBean(claims.toJson(), SysUser.class);
                 log.info(sysUser.toString());
+                return sysUser;
             }
+            throw new BizRuntimeException("400", "登陆失效");
         } catch (Exception e) {
             e.printStackTrace();
             throw new BizRuntimeException("400", "登陆失效");

bailuntec-cost-core/src/main/java/com/blt/other/common/util/SessionUtils.java

 package com.blt.other.common.util;
 
 
+import com.blt.other.common.base.SysUser;
+
 /**
  * 应用会话管理工具类
  */
 public class SessionUtils {
 
 
-    /*当前登录用户id*/
-    private static final ThreadLocal<Integer> useridThreadLocal = new ThreadLocal<>();
+    /*当前登录用户*/
+    private static final ThreadLocal<SysUser> sysUserThreadLocal = new ThreadLocal<>();
+
 
-    public static void putCurrentUserId(Integer currentUserId) {
-        useridThreadLocal.set(currentUserId);
+    public static void putSysUser(SysUser sysUser) {
+        sysUserThreadLocal.set(sysUser);
     }
 
-    public static Integer getCurrentUserId() {
-        return useridThreadLocal.get();
+    public static SysUser getSysUser() {
+        return sysUserThreadLocal.get();
     }
 
-    public static void removeCurrentUserId() {
-        useridThreadLocal.remove();
+    public static void removeSysUser() {
+        sysUserThreadLocal.remove();
     }
 
 
+    public static Integer getCurrentUserId() {
+        return sysUserThreadLocal.get().getOaUserId();
+    }
+
 }

bailuntec-cost-core/src/main/java/com/blt/other/database/model/CostPlanDomain.java

@@ -153,6 +153,9 @@ public class CostPlanDomain implements Serializable {
     @ApiModelProperty("借还单 借还支付币种 -> 借支币种汇率")
     private BigDecimal cur;
 
+    private String lendType;
+
+
     public CostPlanDto castToDto() {
         StatusMapper statusMapper = SpringContextUtil.getBean(StatusMapper.class);
 

bailuntec-cost-core/src/main/java/com/blt/other/database/model/CostPlanTempDomain.java

@@ -28,6 +28,7 @@ public class CostPlanTempDomain {
     @ApiModelProperty("会计一级科目")
     private String accountingSubjectName;
 
+    private String lendType;
 
     public CostPlanTempDto castToDto() {
         CostTypeKindDao costTypeKindDao = SpringContextUtil.getBean(CostTypeKindDao.class);

bailuntec-cost-core/src/main/java/com/blt/other/module/auth/dao/OaDepartmentMapper.java

@@ -31,5 +31,9 @@ public interface OaDepartmentMapper extends BaseMapper<OaDepartment> {
 
     OaDepartment selectByDepartmentId(Integer oaDepartmentId);
 
+    OaDepartment selectByName(String name);
+
+
+
     List<OaDepartment> allOaDepartment();
 }

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/CostPlanTempController.java

@@ -33,7 +33,7 @@ public class CostPlanTempController {
 
     @ApiOperation(value = "保存无附件费用计划子项")
     @PostMapping(value = {"/addItem"})
-    public AddItemResp addItem(AddItemReq req) {
+    public AddItemResp addItem(@RequestBody AddItemReq req) {
         try {
             return costPlanTempService.doSave(req);
         } catch (Exception ex) {
@@ -76,7 +76,7 @@ public class CostPlanTempController {
 
     @ApiOperation("更新费用项")
     @PostMapping(value = {"/resetItem/noFile", "/resetItem/file"})
-    public ResetItemResp resetNoFile(ResetItemReq req) {
+    public ResetItemResp resetNoFile(@RequestBody ResetItemReq req) {
 
         CostPlanTempDomain tmp = costPlanTempService.resetItem(req);
         ResetItemResp resp = new ResetItemResp();

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/dto/request/SpecDepartmentCheckAddReq.java

@@ -20,8 +20,8 @@ public class SpecDepartmentCheckAddReq {
     @ApiModelProperty(value = "申请人oa公司id")
     private Integer oaCompanyId;
 
-    @ApiModelProperty(value = "特殊审核人oa用户id")
-    private Integer reviewerUserId;
+    @ApiModelProperty(value = "特殊审核部门id")
+    private Integer reviewerDepartmentId;
 
     @ApiModelProperty(value = "修改人id")
     private Integer updateUserId;

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/dto/request/SpecDepartmentCheckBaseQuery.java

@@ -22,8 +22,8 @@ public class SpecDepartmentCheckBaseQuery {
     @ApiModelProperty(value = "申请人oa公司id")
     private Integer oaCompanyId;
 
-    @ApiModelProperty(value = "特殊审核人oa用户id")
-    private Integer reviewerUserId;
+    @ApiModelProperty(value = "特殊审核部门id")
+    private Integer reviewerDepartmentId;
 
     @ApiModelProperty(value = "修改时间开始")
     private LocalDateTime lastUpdateTimeStart;

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/dto/request/SpecDepartmentCheckModifyReq.java

@@ -23,8 +23,8 @@ public class SpecDepartmentCheckModifyReq {
     @ApiModelProperty(value = "申请人oa公司id")
     private Integer oaCompanyId;
 
-    @ApiModelProperty(value = "特殊审核人oa用户id")
-    private Integer reviewerUserId;
+    @ApiModelProperty(value = "特殊审核部门id")
+    private Integer reviewerDepartmentId;
 
     @ApiModelProperty(value = "修改人id")
     private Integer updateUserId;

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/model/CostDetailDomain.java

@@ -59,5 +59,8 @@ public class CostDetailDomain {
     private Integer isTax; // 0 不抵扣个税  1 抵扣个税
     private Integer companyValue; // 公司主体value
 
+    private String lendType;
+
+    
 }
 

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/model/CostDomain.java

@@ -232,6 +232,8 @@ public class CostDomain implements Serializable {
     @TableField(exist = false)
     private String costCurrentReviewer;
 
+    private String lendType;
+
 
     public CostDto castToDto() {
 

bailuntec-cost-core/src/main/java/com/blt/other/module/sys/controller/DepartmentReviewerController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.blt.other.module.sys.dto.request.AddDepartmentReviewerReq;
 import com.blt.other.module.sys.dto.request.DepartmentReviewerListReq;
 import com.blt.other.module.sys.dto.request.ModifyDepartmentReviewerReq;
+import com.blt.other.module.sys.dto.request.RemoveDepartmentReviewerReq;
 import com.blt.other.module.sys.dto.response.DepartmentReviewerListItem;
 import com.blt.other.module.sys.service.IDepartmentReviewerService;
 import io.swagger.annotations.Api;
@@ -51,4 +52,11 @@ public class DepartmentReviewerController {
         return CostResult.success();
     }
 
+    @ApiOperation("删除部门审核人")
+    @PostMapping("/removeDepartmentReviewer")
+    public CostResult<Void> removeDepartmentReviewer(@RequestBody RemoveDepartmentReviewerReq req) {
+        departmentReviewerService.removeDepartmentReviewer(req);
+        return CostResult.success();
+    }
+
 }

bailuntec-cost-core/src/main/java/com/blt/other/module/sys/dto/request/RemoveDepartmentReviewerReq.java

+package com.blt.other.module.sys.dto.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/12/21 2:05 下午
+ */
+@Data
+public class RemoveDepartmentReviewerReq {
+
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+
+}

bailuntec-cost-core/src/main/java/com/blt/other/module/sys/model/SpecDepartmentCheckConfig.java

@@ -2,15 +2,15 @@ package com.blt.other.module.sys.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *
@@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="SpecDepartmentCheckConfig对象", description="")
+@ApiModel(value = "SpecDepartmentCheckConfig对象", description = "")
 public class SpecDepartmentCheckConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -41,11 +41,17 @@ public class SpecDepartmentCheckConfig implements Serializable {
     @ApiModelProperty(value = "申请人oa公司")
     private String oaCompany;
 
-    @ApiModelProperty(value = "特殊审核人oa用户id")
-    private Integer reviewerUserId;
+//    @ApiModelProperty(value = "特殊审核人oa用户id")
+//    private Integer reviewerUserId;
+//
+//    @ApiModelProperty(value = "特殊审核人")
+//    private String reviewerUser;
+
+    @ApiModelProperty(value = "特殊审核部门id")
+    private Integer reviewerDepartmentId;
 
-    @ApiModelProperty(value = "特殊审核人")
-    private String reviewerUser;
+    @ApiModelProperty(value = "特殊审核部门id")
+    private String reviewerDepartmentName;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "创建时间")

bailuntec-cost-core/src/main/java/com/blt/other/module/sys/service/IDepartmentReviewerService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.blt.other.module.sys.dto.request.AddDepartmentReviewerReq;
 import com.blt.other.module.sys.dto.request.DepartmentReviewerListReq;
 import com.blt.other.module.sys.dto.request.ModifyDepartmentReviewerReq;
+import com.blt.other.module.sys.dto.request.RemoveDepartmentReviewerReq;
 import com.blt.other.module.sys.dto.response.DepartmentReviewerListItem;
 import com.blt.other.module.sys.model.DepartmentReviewer;
 
@@ -39,4 +40,11 @@ public interface IDepartmentReviewerService extends IService<DepartmentReviewer>
      * @param req req
      */
     void addDepartmentReviewer(AddDepartmentReviewerReq req);
+
+    /**
+     * 删除部门审核
+     *
+     * @param req req
+     */
+    void removeDepartmentReviewer(RemoveDepartmentReviewerReq req);
 }

bailuntec-cost-core/src/main/java/com/blt/other/module/sys/service/impl/DepartmentReviewerServiceImpl.java

@@ -5,17 +5,22 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.blt.other.common.util.SessionUtils;
+import com.blt.other.module.auth.dao.OaDepartmentMapper;
 import com.blt.other.module.auth.dao.OaUserMapper;
+import com.blt.other.module.auth.model.OaDepartment;
 import com.blt.other.module.sys.dao.CostReviewerMapper;
 import com.blt.other.module.sys.dao.DepartmentReviewerMapper;
 import com.blt.other.module.sys.dto.request.AddDepartmentReviewerReq;
 import com.blt.other.module.sys.dto.request.DepartmentReviewerListReq;
 import com.blt.other.module.sys.dto.request.ModifyDepartmentReviewerReq;
+import com.blt.other.module.sys.dto.request.RemoveDepartmentReviewerReq;
 import com.blt.other.module.sys.dto.response.DepartmentReviewerListItem;
 import com.blt.other.module.sys.model.CostReviewer;
 import com.blt.other.module.sys.model.DepartmentReviewer;
 import com.blt.other.module.sys.service.ICostReviewerService;
 import com.blt.other.module.sys.service.IDepartmentReviewerService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -31,6 +36,7 @@ import java.util.stream.Collectors;
  * @author robbendev
  * @since 2020-12-21
  */
+@Slf4j
 @Service
 public class DepartmentReviewerServiceImpl extends ServiceImpl<DepartmentReviewerMapper, DepartmentReviewer> implements IDepartmentReviewerService {
 
@@ -40,6 +46,8 @@ public class DepartmentReviewerServiceImpl extends ServiceImpl<DepartmentReviewe
     ICostReviewerService costReviewerService;
     @Resource
     OaUserMapper oaUserMapper;
+    @Resource
+    OaDepartmentMapper oaDepartmentMapper;
 
     @Override
     public IPage<DepartmentReviewerListItem> departmentReviewerList(DepartmentReviewerListReq req) {
@@ -59,6 +67,8 @@ public class DepartmentReviewerServiceImpl extends ServiceImpl<DepartmentReviewe
 
     @Override
     public void modifyDepartmentReviewer(ModifyDepartmentReviewerReq req) {
+        log.info("更新部门审核人配置");
+
         DepartmentReviewer departmentReviewer = this.getById(req.getId());
         departmentReviewer.setAutoReviewAmount(req.getAutoReviewerAmount());
 
@@ -66,26 +76,55 @@ public class DepartmentReviewerServiceImpl extends ServiceImpl<DepartmentReviewe
             costReviewerMapper.delete(new LambdaQueryWrapper<CostReviewer>()
                     .eq(CostReviewer::getReferId, req.getId()));
 
-            costReviewerService.saveBatch(req.getDepartmentReviewerUserIdList().stream()
-                    .map(id -> {
-                        CostReviewer costReviewer = new CostReviewer();
-                        costReviewer.setReferId(req.getId());
-                        costReviewer.setReviewerUserId(id);
-                        costReviewer.setReviewerUserName(oaUserMapper.selectByOaUserId(id).getUserName());
-                        costReviewer.setType(CostReviewer.departmentReviewer);
-                        return costReviewer;
-                    })
-                    .collect(Collectors.toList()));
+            this.saveDepartmentCostReviewer(req.getDepartmentReviewerUserIdList(), req.getId());
         }
 
     }
 
     @Override
     public void addDepartmentReviewer(AddDepartmentReviewerReq req) {
+        log.info("新增部门审核人配置");
+
         DepartmentReviewer departmentReviewer = new DepartmentReviewer();
 
         departmentReviewer.setAutoReviewAmount(req.getAutoReviewAmount());
 
+        OaDepartment primaryDepartment = oaDepartmentMapper.selectByDepartmentId(req.getPrimaryDepartmentId());
+        departmentReviewer.setPrimaryDepartmentId(primaryDepartment.getDepartmentId());
+        departmentReviewer.setPrimaryDepartmentName(primaryDepartment.getName());
+
+        OaDepartment secondDepartment = oaDepartmentMapper.selectByDepartmentId(req.getPrimaryDepartmentId());
+        departmentReviewer.setSecondDepartmentId(secondDepartment.getDepartmentId());
+        departmentReviewer.setSecondDepartmentName(secondDepartment.getName());
+
+
+        departmentReviewer.setUpdateUserId(SessionUtils.getCurrentUserId());
+        departmentReviewer.setUpdateUserName(SessionUtils.getSysUser().getUserName());
+
+        baseMapper.insert(departmentReviewer);
+
 
+        this.saveDepartmentCostReviewer(req.getDepartmentReviewerUserIdList(), departmentReviewer.getId());
+
+    }
+
+    private void saveDepartmentCostReviewer(List<Integer> departmentReviewerUserIdList, Integer departmentReviewerId) {
+
+        costReviewerService.saveBatch(departmentReviewerUserIdList.stream()
+                .map(id -> {
+                    CostReviewer costReviewer = new CostReviewer();
+                    costReviewer.setReferId(departmentReviewerId);
+                    costReviewer.setReviewerUserId(id);
+                    costReviewer.setReviewerUserName(oaUserMapper.selectByOaUserId(id).getUserName());
+                    costReviewer.setType(CostReviewer.departmentReviewer);
+                    return costReviewer;
+                })
+                .collect(Collectors.toList()));
+    }
+
+    @Override
+    public void removeDepartmentReviewer(RemoveDepartmentReviewerReq req) {
+        log.info("删除部门审核人");
+        baseMapper.deleteById(req.getId());
     }
 }

bailuntec-cost-core/src/main/java/com/blt/other/module/sys/service/impl/SpecDepartmentCheckConfigServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.blt.other.module.auth.dao.OaCompanyMapper;
+import com.blt.other.module.auth.dao.OaDepartmentMapper;
 import com.blt.other.module.auth.dao.OaUserMapper;
 import com.blt.other.module.auth.model.OaUser;
 import com.blt.other.module.auth.service.IOaCompanyService;
@@ -61,8 +62,8 @@ public class SpecDepartmentCheckConfigServiceImpl extends ServiceImpl<SpecDepart
         if (req.getOaCompanyId() != null) {
             wrapper.eq(SpecDepartmentCheckConfig::getOaCompanyId, req.getOaCompanyId());
         }
-        if (req.getReviewerUserId() != null) {
-            wrapper.eq(SpecDepartmentCheckConfig::getReviewerUserId, req.getReviewerUserId());
+        if (req.getReviewerDepartmentId() != null) {
+            wrapper.eq(SpecDepartmentCheckConfig::getReviewerDepartmentId, req.getReviewerDepartmentId());
         }
         if (req.getUpdateUserId() != null) {
             wrapper.eq(SpecDepartmentCheckConfig::getUpdateUserId, req.getUpdateUserId());
@@ -96,11 +97,14 @@ public class SpecDepartmentCheckConfigServiceImpl extends ServiceImpl<SpecDepart
         });
     }
 
+    @Resource
+    OaDepartmentMapper oaDepartmentMapper;
+
     @Override
     public void add(SpecDepartmentCheckAddReq req) {
         SpecDepartmentCheckConfig specDepartmentCheckConfig = new SpecDepartmentCheckConfig();
-        specDepartmentCheckConfig.setReviewerUserId(req.getReviewerUserId());
-        specDepartmentCheckConfig.setReviewerUser(oaUserMapper.selectByOaUserId(req.getReviewerUserId()).getUserName());
+        specDepartmentCheckConfig.setReviewerDepartmentId(req.getReviewerDepartmentId());
+        specDepartmentCheckConfig.setReviewerDepartmentName(oaDepartmentMapper.selectByDepartmentId(req.getReviewerDepartmentId()).getName());
 
         specDepartmentCheckConfig.setOaCompanyId(req.getOaCompanyId());
         specDepartmentCheckConfig.setOaCompany(oaCompanyMapper.selectByCompanyId(req.getOaCompanyId()).getName());
@@ -121,8 +125,7 @@ public class SpecDepartmentCheckConfigServiceImpl extends ServiceImpl<SpecDepart
                 this,
                 costCompanyService,
                 oaCompanyService,
-                oaUserMapper,
-                req.getCurrentUserId());
+                oaDepartmentMapper);
         EasyExcel.read(req.getMultipartFile().getInputStream(), SpecDepartmentCheckConfigImportExcelItem.class, listener).sheet().doRead();
     }
 
@@ -139,7 +142,7 @@ public class SpecDepartmentCheckConfigServiceImpl extends ServiceImpl<SpecDepart
                     SpecDepartmentCheckConfigExportExcelItem item = new SpecDepartmentCheckConfigExportExcelItem();
                     item.setCostCompanyName(specDepartmentCheckConfig.getCostCompanyName());
                     item.setOaCompany(specDepartmentCheckConfig.getOaCompany());
-                    item.setReviewerUser(specDepartmentCheckConfig.getReviewerUser());
+                    item.setReviewerDepartmentName(specDepartmentCheckConfig.getReviewerDepartmentName());
                     return item;
                 })
                 .collect(Collectors.toList());
@@ -150,9 +153,9 @@ public class SpecDepartmentCheckConfigServiceImpl extends ServiceImpl<SpecDepart
     public void modify(SpecDepartmentCheckModifyReq req) {
 
         SpecDepartmentCheckConfig specDepartmentCheckConfig = this.getById(req.getId());
-        if (req.getReviewerUserId() != null) {
-            specDepartmentCheckConfig.setReviewerUserId(req.getReviewerUserId());
-            specDepartmentCheckConfig.setReviewerUser(oaUserMapper.selectByOaUserId(req.getReviewerUserId()).getUserName());
+        if (req.getReviewerDepartmentId() != null) {
+            specDepartmentCheckConfig.setReviewerDepartmentId(req.getReviewerDepartmentId());
+            specDepartmentCheckConfig.setReviewerDepartmentName(oaDepartmentMapper.selectByDepartmentId(req.getReviewerDepartmentId()).getName());
         }
 
         if (req.getOaCompanyId() != null) {
@@ -188,9 +191,9 @@ public class SpecDepartmentCheckConfigServiceImpl extends ServiceImpl<SpecDepart
         @ApiModelProperty(value = "申请人oa公司")
         private String oaCompany;
 
-        @ExcelProperty("特殊审核人")
-        @ApiModelProperty(value = "特殊审核人")
-        private String reviewerUser;
+        @ExcelProperty(value = "特殊审核部门")
+        @ApiModelProperty(value = "特殊审核部门")
+        private String reviewerDepartmentName;
 
     }
 
@@ -205,9 +208,9 @@ public class SpecDepartmentCheckConfigServiceImpl extends ServiceImpl<SpecDepart
         @ApiModelProperty(value = "申请人oa公司")
         private String oaCompany;
 
-        @ExcelProperty("特殊审核人")
-        @ApiModelProperty(value = "特殊审核人")
-        private String reviewerUser;
+        @ExcelProperty(value = "特殊审核部门")
+        @ApiModelProperty(value = "特殊审核部门")
+        private String reviewerDepartmentName;
 
     }
 
@@ -216,19 +219,19 @@ public class SpecDepartmentCheckConfigServiceImpl extends ServiceImpl<SpecDepart
         private final ISpecDepartmentCheckConfigService specDepartmentCheckConfigService;
         private final CostCompanyService costCompanyService;
         private final IOaCompanyService oaCompanyService;
-        private final OaUserMapper oaUserMapper;
-
-        private final Integer currnetUserId;
+        private final OaDepartmentMapper oaDepartmentMapper;
 
 
         private static final Logger LOGGER = LoggerFactory.getLogger(SpecDepartmentCheckConfigExcelItemListener.class);
 
-        SpecDepartmentCheckConfigExcelItemListener(ISpecDepartmentCheckConfigService specDepartmentCheckConfigService, CostCompanyService costCompanyService, IOaCompanyService oaCompanyService, OaUserMapper oaUserMapper, Integer currentUserId) {
+        SpecDepartmentCheckConfigExcelItemListener(ISpecDepartmentCheckConfigService specDepartmentCheckConfigService,
+                                                   CostCompanyService costCompanyService,
+                                                   IOaCompanyService oaCompanyService,
+                                                   OaDepartmentMapper oaDepartmentMapper) {
             this.specDepartmentCheckConfigService = specDepartmentCheckConfigService;
             this.costCompanyService = costCompanyService;
             this.oaCompanyService = oaCompanyService;
-            this.oaUserMapper = oaUserMapper;
-            this.currnetUserId = currentUserId;
+            this.oaDepartmentMapper = oaDepartmentMapper;
         }
 
         private static final int BATCH_COUNT = 2000;
@@ -262,18 +265,15 @@ public class SpecDepartmentCheckConfigServiceImpl extends ServiceImpl<SpecDepart
                         specDepartmentCheckConfig.setOaCompany(specDepartmentCheckConfig.getOaCompany());
                         specDepartmentCheckConfig.setOaCompanyId(oaCompanyService.companyDict().get(specDepartmentCheckConfigImportExcelItem.getOaCompany()).getOaCompanyId());
 
-                        specDepartmentCheckConfig.setReviewerUser(specDepartmentCheckConfigImportExcelItem.getReviewerUser());
-                        specDepartmentCheckConfig.setReviewerUserId(oaUserMapper.selectByUserName(specDepartmentCheckConfigImportExcelItem.getReviewerUser()).getOaUserId());
-
-                        specDepartmentCheckConfig.setReviewerUserId(currnetUserId);
-                        specDepartmentCheckConfig.setReviewerUser(oaUserMapper.selectById(currnetUserId).getUserName());
+                        specDepartmentCheckConfig.setReviewerDepartmentId(oaDepartmentMapper.selectByName(specDepartmentCheckConfigImportExcelItem.getReviewerDepartmentName()).getDepartmentId());
+                        specDepartmentCheckConfig.setReviewerDepartmentName(specDepartmentCheckConfigImportExcelItem.getReviewerDepartmentName());
 
                         specDepartmentCheckConfig.setLastUpdateTime(LocalDateTime.now());
                         return specDepartmentCheckConfig;
                     })
                     .filter(specDepartmentCheckConfig -> specDepartmentCheckConfig.getCostCompanyId() != null)
                     .filter(specDepartmentCheckConfig -> specDepartmentCheckConfig.getOaCompanyId() != null)
-                    .filter(specDepartmentCheckConfig -> specDepartmentCheckConfig.getReviewerUserId() != null)
+                    .filter(specDepartmentCheckConfig -> specDepartmentCheckConfig.getReviewerDepartmentId() != null)
                     .collect(Collectors.toList());
 
 

bailuntec-cost-core/src/main/resources/mapper/auth/OaDepartmentMapper.xml

@@ -43,6 +43,11 @@
         from oa_department t1
                  left join oa_company t2 on t1.company_id = t2.oa_company_id
     </select>
+    <select id="selectByName" resultType="com.blt.other.module.auth.model.OaDepartment">
+        select *
+        from oa_department
+        where name = #{name}
+    </select>
 
 
 </mapper>