特殊部门审核

bailuntec-cost-core/src/main/java/com/blt/other/module/auth/service/IOaCompanyService.java

@@ -6,6 +6,7 @@ import com.blt.other.module.auth.dto.request.CompanyReviewerListReq;
 import com.blt.other.module.auth.model.OaCompany;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -36,4 +37,11 @@ public interface IOaCompanyService extends IService<OaCompany> {
      */
     IPage<OaCompany> reviewerList(CompanyReviewerListReq req);
 
+
+    /**
+     * oa公司字典 缓存
+     *
+     * @return oa公司字典
+     */
+    Map<String, OaCompany> companyDict();
 }

bailuntec-cost-core/src/main/java/com/blt/other/module/auth/service/impl/OaCompanyServiceImpl.java

@@ -7,16 +7,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.blt.other.module.auth.dao.CostReviewerMapper;
 import com.blt.other.module.auth.dao.OaCompanyMapper;
-import com.blt.other.module.auth.dao.OaUserMapper;
 import com.blt.other.module.auth.dto.request.CompanyReviewerListReq;
 import com.blt.other.module.auth.model.CostReviewer;
 import com.blt.other.module.auth.model.OaCompany;
-import com.blt.other.module.auth.model.OaUser;
 import com.blt.other.module.auth.service.IOaCompanyService;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -73,4 +71,10 @@ public class OaCompanyServiceImpl extends ServiceImpl<OaCompanyMapper, OaCompany
         return page;
     }
 
+    @Cacheable("companyDict")
+    @Override
+    public Map<String, OaCompany> companyDict() {
+        return this.list().stream().collect(Collectors.toMap(OaCompany::getName, oaCompany -> oaCompany));
+    }
+
 }

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

+package com.blt.other.module.cost.controller;
+
+
+import com.bailuntec.cost.api.response.CostResult;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.blt.other.module.cost.dto.request.*;
+import com.blt.other.module.cost.model.SpecDepartmentCheckConfig;
+import com.blt.other.module.cost.service.ISpecDepartmentCheckConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-12-16
+ */
+@Api(tags = "特殊审核人")
+@RestController
+@RequestMapping("/specDepartmentCheckConfig")
+public class SpecDepartmentCheckConfigController {
+
+
+    @Resource
+    ISpecDepartmentCheckConfigService specDepartmentCheckConfigService;
+
+
+    @ApiOperation("分页查询特殊审核人")
+    @PostMapping("/queryPage")
+    public CostResult<Page<SpecDepartmentCheckConfig>> queryPage(@RequestBody SpecDepartmentCheckQueryPageReq req) {
+        Page<SpecDepartmentCheckConfig> page = specDepartmentCheckConfigService.queryPage(req);
+        return CostResult.success(page);
+    }
+
+    @ApiOperation("批量设置特殊审核人")
+    @PostMapping("/batchUpdateReviewer")
+    public CostResult<Void> batchUpdateReviewer(@RequestBody BatchUpdateReviewerReq req) {
+        specDepartmentCheckConfigService.batchUpdateReviewer(req);
+        return CostResult.success();
+    }
+
+    @ApiOperation("新增特殊审核数据")
+    @PostMapping("/add")
+    public CostResult<Void> add(@RequestBody SpecDepartmentCheckAddReq req) {
+        specDepartmentCheckConfigService.add(req);
+        return CostResult.success();
+    }
+
+    @ApiOperation("批量导入数据")
+    @PostMapping("/importExcel")
+    public CostResult<Void> importExcel(SpecDepartmentCheckImportExcelReq excel) throws IOException {
+        specDepartmentCheckConfigService.importExcel(excel);
+        return CostResult.success();
+    }
+
+    @ApiOperation("导出excel")
+    @PostMapping("/importExcel")
+    public CostResult<Void> exportExcel(HttpServletResponse response,
+                                        @RequestBody SpecDepartmentCheckExportExcelReq req) throws IOException {
+        specDepartmentCheckConfigService.exportExcel(response, req);
+        return CostResult.success();
+    }
+}

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

+package com.blt.other.module.cost.dao;
+
+import com.blt.other.module.cost.dto.request.SpecDepartmentCheckExportExcelReq;
+import com.blt.other.module.cost.model.SpecDepartmentCheckConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-12-16
+ */
+public interface SpecDepartmentCheckConfigMapper extends BaseMapper<SpecDepartmentCheckConfig> {
+
+}

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

+package com.blt.other.module.cost.dto.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/12/17 10:23 上午
+ */
+@Data
+public class BatchUpdateReviewerReq {
+
+    @ApiModelProperty("特殊配置id list")
+    private List<Integer> idList;
+
+    @ApiModelProperty("更新人")
+    private Integer updateUserId;
+}

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

+package com.blt.other.module.cost.dto.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/12/17 10:28 上午
+ */
+@Data
+public class SpecDepartmentCheckAddReq {
+
+    @ApiModelProperty(value = "付款财务主体id")
+    private Integer costCompanyId;
+
+    @ApiModelProperty(value = "申请人oa公司id")
+    private Integer oaCompanyId;
+
+    @ApiModelProperty(value = "特殊审核人oa用户id")
+    private Integer reviewerUserId;
+
+    @ApiModelProperty(value = "修改人id")
+    private Integer updateUserId;
+
+}

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

+package com.blt.other.module.cost.dto.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/12/17 11:34 上午
+ */
+@Data
+public class SpecDepartmentCheckBaseQuery {
+
+    @ApiModelProperty(value = "付款财务主体id")
+    private Integer costCompanyId;
+
+    @ApiModelProperty(value = "申请人oa公司id")
+    private Integer oaCompanyId;
+
+    @ApiModelProperty(value = "特殊审核人oa用户id")
+    private Integer reviewerUserId;
+
+    @ApiModelProperty(value = "修改时间开始")
+    private LocalDateTime lastUpdateTimeStart;
+
+    @ApiModelProperty(value = "修改时间开始结束")
+    private LocalDateTime lastUpdateTimeStartEnd;
+
+    @ApiModelProperty(value = "修改人")
+    private Integer updateUserId;
+
+}

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

+package com.blt.other.module.cost.dto.request;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/12/17 10:31 上午
+ */
+public class SpecDepartmentCheckExportExcelReq extends SpecDepartmentCheckBaseQuery {
+}

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

+package com.blt.other.module.cost.dto.request;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/12/17 10:31 上午
+ */
+@Data
+public class SpecDepartmentCheckImportExcelReq {
+
+    private MultipartFile multipartFile;
+    private Integer currentUserId;
+}

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

+package com.blt.other.module.cost.dto.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/12/17 10:19 上午
+ */
+@Data
+public class SpecDepartmentCheckQueryPageReq  extends SpecDepartmentCheckBaseQuery{
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+
+
+}

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

+package com.blt.other.module.cost.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-12-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="SpecDepartmentCheckConfig对象", description="")
+public class SpecDepartmentCheckConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "付款财务主体id")
+    private Integer costCompanyId;
+
+    @ApiModelProperty(value = "付款财务主体")
+    private String costCompanyName;
+
+    @ApiModelProperty(value = "申请人oa公司id")
+    private Integer oaCompanyId;
+
+    @ApiModelProperty(value = "申请人oa公司")
+    private String oaCompany;
+
+    @ApiModelProperty(value = "特殊审核人oa用户id")
+    private Integer reviewerUserId;
+
+    @ApiModelProperty(value = "特殊审核人")
+    private String reviewerUser;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private LocalDateTime lastUpdateTime;
+
+    @ApiModelProperty(value = "修改人id")
+    private Integer updateUserId;
+
+    @ApiModelProperty(value = "修改人")
+    private String updateUserName;
+
+
+}

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

@@ -6,6 +6,7 @@ import com.blt.other.module.auth.dto.request.CompanyReviewerListReq;
 import com.blt.other.module.database.model.CostCompanyDomain;
 
 import java.util.List;
+import java.util.Map;
 
 public interface CostCompanyService extends IService<CostCompanyDomain> {
 
@@ -26,13 +27,6 @@ public interface CostCompanyService extends IService<CostCompanyDomain> {
 
     List<CostCompanyDomain> getAllCompanyAuthority();
 
-    /**
-     * 根据 companyNo 获取付款主体
-     *
-     * @param companyNo
-     * @return
-     */
-    CostCompanyDomain getCompanyByCompanyNo(String companyNo);
 
     /**
      * <p>
@@ -77,4 +71,12 @@ public interface CostCompanyService extends IService<CostCompanyDomain> {
      * @param hrReviewerUserIdList 财务审核核人oa userid
      */
     void modifyHrReviewer(Integer userId, List<String> companyNoList, List<Integer> hrReviewerUserIdList);
+
+
+    /**
+     * 财务主体字典 缓存
+     *
+     * @return 财务主体字典
+     */
+    Map<String, CostCompanyDomain> costCompanyMap();
 }

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

+package com.blt.other.module.cost.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.blt.other.module.cost.dto.request.*;
+import com.blt.other.module.cost.model.SpecDepartmentCheckConfig;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-12-16
+ */
+public interface ISpecDepartmentCheckConfigService extends IService<SpecDepartmentCheckConfig> {
+
+    /**
+     * 分页查询特殊审核人
+     *
+     * @param req req
+     * @return res
+     */
+    Page<SpecDepartmentCheckConfig> queryPage(SpecDepartmentCheckQueryPageReq req);
+
+    /**
+     * 批量设置特殊审核人
+     *
+     * @param req req
+     */
+    void batchUpdateReviewer(BatchUpdateReviewerReq req);
+
+    /**
+     * 新增特殊审核数据
+     *
+     * @param req req
+     */
+    void add(SpecDepartmentCheckAddReq req);
+
+    /**
+     * importExcel
+     *
+     * @param req req
+     */
+    void importExcel(SpecDepartmentCheckImportExcelReq req) throws IOException;
+
+    /**
+     * 导出excel
+     *
+     * @param response response
+     * @param req req
+     */
+    void exportExcel(HttpServletResponse response, SpecDepartmentCheckExportExcelReq req) throws IOException;
+}

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

@@ -18,8 +18,8 @@ import com.blt.other.module.database.model.CostCompanyDomain;
 import com.blt.other.module.purchasing.vo.CompanyVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import springfox.documentation.annotations.Cacheable;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -88,17 +88,6 @@ public class CostCompanyServiceImpl extends ServiceImpl<CostCompanyDao, CostComp
         return costCompanyDao.getAllCompanyAuthority();
     }
 
-    /**
-     * 根据 companyNo 获取 company
-     *
-     * @param companyNo
-     * @return
-     */
-    @Override
-    public CostCompanyDomain getCompanyByCompanyNo(String companyNo) {
-        return costCompanyDao.selectByNo(companyNo);
-    }
-
     @Override
     public IPage<CostCompanyDomain> reviewerList(CompanyReviewerListReq req) {
 
@@ -241,6 +230,11 @@ public class CostCompanyServiceImpl extends ServiceImpl<CostCompanyDao, CostComp
         });
     }
 
+    @Cacheable("costCompanyMap")
+    @Override
+    public Map<String, CostCompanyDomain> costCompanyMap() {
+        return this.list().stream().collect(Collectors.toMap(CostCompanyDomain::getCompanyName, costCompanyDomain -> costCompanyDomain));
+    }
 
     /**
      * 生成唯一的主体编号

bailuntec-cost-core/src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@ spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
 #    url: jdbc:mysql://gz-cdb-lnrmt5zh.sql.tencentcdb.com:61369/bailun_other?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-    url: jdbc:mysql://10.0.8.2:3306/bailun_other?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://10.0.8.2:3306/bailun_other?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true
     username: root
     password: "#7kfnymAM$Y9-Ntf"
     hikari:

bailuntec-cost-core/src/main/resources/mapper/CostCompanyMapper.xml

@@ -43,6 +43,7 @@
         FROM cost_company
     </select>
 
+
     <select id="getAllCompanyAuthority" resultType="com.blt.other.module.database.model.CostCompanyDomain">
         SELECT value as id,
                company_name,

bailuntec-cost-core/src/main/resources/mapper/cost/SpecDepartmentCheckConfigMapper.xml

+<?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.blt.other.cost.dao.SpecDepartmentCheckConfigMapper">
+
+</mapper>

bailuntec-cost-core/src/main/resources/mapper/module/cost/SpecDepartmentCheckConfigMapper.xml

+<?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.blt.other.module.cost.dao.SpecDepartmentCheckConfigMapper">
+
+    <select id="exportExcel" resultType="com.blt.other.module.cost.model.SpecDepartmentCheckConfig"></select>
+</mapper>