内控系统代码提交

blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/LargeFileEndpoint.java

@@ -388,7 +388,6 @@ public class LargeFileEndpoint {
             } else if (param.getFilename().contains("docx")) {
                 newBladeFile = this.commonFileClient.wordToPdf(multipartFile);
             } else if (param.getFilename().contains("png") || param.getFilename().contains("jpg")) {
-
                 newBladeFile = this.commonFileClient.pngOrJpgToPdf(multipartFile);
             }
             BeanUtils.copyProperties(bladeFile, newBladeFile);

blade-service-api/blade-control-api/src/main/java/org/springblade/control/dto/CorporationInfoDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.dto;
+
+import org.springblade.control.entity.CorporationInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 公司制度信息表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CorporationInfoDTO extends CorporationInfo {
+    private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/dto/UserpayInfoDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.dto;
+
+import org.springblade.control.entity.UserpayInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 薪酬管理数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserpayInfoDTO extends UserpayInfo {
+    private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/CorporationInfo.java

@@ -0,0 +1,73 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.mp.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 公司制度信息表实体类
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+@Data
+@TableName("c_corporation_info")
+@EqualsAndHashCode(callSuper = true)
+public class CorporationInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 制度pdf地址
+     */
+    @ApiModelProperty(value = "制度pdf地址")
+    private String link;
+    /**
+     * 制度域名
+     */
+    @ApiModelProperty(value = "制度域名")
+    private String domainUrl;
+    /**
+     * 制度名称
+     */
+    @ApiModelProperty(value = "制度名称")
+    private String name;
+    /**
+     * 制度原名
+     */
+    @ApiModelProperty(value = "制度原名")
+    private String originalName;
+    /**
+     * 制度拓展名
+     */
+    @ApiModelProperty(value = "制度拓展名")
+    private String extension;
+    /**
+     * 制度文件大小
+     */
+    @ApiModelProperty(value = "制度文件大小")
+    private Long attachSize;
+
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/UserpayInfo.java

@@ -0,0 +1,149 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.mp.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 薪酬管理实体类
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+@Data
+@TableName("c_userpay_info")
+@EqualsAndHashCode(callSuper = true)
+public class UserpayInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id主键
+     */
+    @ApiModelProperty(value = "用户id主键")
+    private Long userId;
+    /**
+     * yyyy-mm 格式
+     */
+    @ApiModelProperty(value = "时间yyyy-mm")
+    private String costTime;
+    /**
+     * 应出勤天数
+     */
+    @ApiModelProperty(value = "应出勤天数")
+    private Integer yAllDays;
+    /**
+     * 实际出勤天数
+     */
+    @ApiModelProperty(value = "实际出勤天数")
+    private Integer sAllDays;
+    /**
+     * 年假
+     */
+    @ApiModelProperty(value = "年假")
+    private Integer yearDays;
+    /**
+     * 调休假
+     */
+    @ApiModelProperty(value = "调休假")
+    private Integer cLeaveDays;
+    /**
+     * 病假
+     */
+    @ApiModelProperty(value = "病假")
+    private Integer sickLeaveDays;
+    /**
+     * 事假
+     */
+    @ApiModelProperty(value = "事假")
+    private Integer absenceDays;
+    /**
+     * 基础工资
+     */
+    @ApiModelProperty(value = "基础工资")
+    private BigDecimal basicSalary;
+    /**
+     * 岗位工资
+     */
+    @ApiModelProperty(value = "岗位工资")
+    private BigDecimal postSalary;
+    /**
+     * 绩效工资
+     */
+    @ApiModelProperty(value = "绩效工资")
+    private BigDecimal meritSalary;
+    /**
+     * 奖金
+     */
+    @ApiModelProperty(value = "奖金")
+    private BigDecimal bonusSalary;
+    /**
+     * 伙食补贴
+     */
+    @ApiModelProperty(value = "伙食补贴")
+    private BigDecimal mealWance;
+    /**
+     * 其他补贴
+     */
+    @ApiModelProperty(value = "其他补贴")
+    private BigDecimal otherWance;
+    /**
+     * 考勤扣款
+     */
+    @ApiModelProperty(value = "考勤扣款")
+    private BigDecimal attendDuction;
+    /**
+     * 其他扣款
+     */
+    @ApiModelProperty(value = "其他扣款")
+    private BigDecimal otherDuction;
+    /**
+     * 应发工资
+     */
+    @ApiModelProperty(value = "应发工资")
+    private BigDecimal grossPay;
+    /**
+     * 代缴个税
+     */
+    @ApiModelProperty(value = "代缴个税")
+    private BigDecimal personalTax;
+    /**
+     * 代缴社保
+     */
+    @ApiModelProperty(value = "代缴社保")
+    private BigDecimal socialSec;
+    /**
+     * 实发工资
+     */
+    @ApiModelProperty(value = "实发工资")
+    private BigDecimal netSalary;
+    /**
+     * 描述
+     */
+    @ApiModelProperty(value = "描述")
+    private String desc;
+
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/CorporationInfoVO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.vo;
+
+import org.springblade.control.entity.CorporationInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 公司制度信息表视图实体类
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CorporationInfoVO extends CorporationInfo {
+    private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/UserpayInfoVO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.vo;
+
+import org.springblade.control.entity.UserpayInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 薪酬管理视图实体类
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserpayInfoVO extends UserpayInfo {
+    private static final long serialVersionUID = 1L;
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/controller/UserpayInfoController.java

@@ -0,0 +1,118 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.control.entity.UserpayInfo;
+import org.springblade.control.vo.UserpayInfoVO;
+import org.springblade.control.service.IUserpayInfoService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 薪酬管理 控制器
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/userpayinfo")
+@Api(value = "薪酬管理", tags = "薪酬管理接口")
+public class UserpayInfoController extends BladeController {
+
+    private final IUserpayInfoService userpayInfoService;
+
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "详情", notes = "传入userpayInfo")
+    public R<UserpayInfo> detail(UserpayInfo userpayInfo) {
+        UserpayInfo detail = userpayInfoService.getOne(Condition.getQueryWrapper(userpayInfo));
+        return R.data(detail);
+    }
+
+
+    /**
+     * 自定义分页 薪酬管理
+     */
+    @GetMapping("/page")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "分页薪酬管理", notes = "传入userpayInfo")
+    public R<IPage<UserpayInfoVO>> page(UserpayInfoVO userpayInfo, Query query) {
+        IPage<UserpayInfoVO> pages = userpayInfoService.selectUserpayInfoPage(Condition.getPage(query), userpayInfo);
+        return R.data(pages);
+    }
+
+    /**
+     * 新增 薪酬管理
+     */
+    @PostMapping("/save")
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "新增", notes = "传入userpayInfo")
+    public R save(@Valid @RequestBody UserpayInfo userpayInfo) {
+        return R.status(userpayInfoService.save(userpayInfo));
+    }
+
+    /**
+     * 修改 薪酬管理
+     */
+    @PostMapping("/update")
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "修改", notes = "传入userpayInfo")
+    public R update(@Valid @RequestBody UserpayInfo userpayInfo) {
+        return R.status(userpayInfoService.updateById(userpayInfo));
+    }
+
+    /**
+     * 新增或修改 薪酬管理
+     */
+    @PostMapping("/submit")
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "新增或修改", notes = "传入userpayInfo")
+    public R submit(@Valid @RequestBody UserpayInfo userpayInfo) {
+        return R.status(userpayInfoService.saveOrUpdate(userpayInfo));
+    }
+
+
+    /**
+     * 删除 薪酬管理
+     */
+    @PostMapping("/remove")
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "逻辑删除", notes = "传入ids")
+    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return R.status(userpayInfoService.deleteLogic(Func.toLongList(ids)));
+    }
+
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/CorporationInfoMapper.java

@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.mapper;
+
+import org.springblade.control.entity.CorporationInfo;
+import org.springblade.control.vo.CorporationInfoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 公司制度信息表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+public interface CorporationInfoMapper extends BaseMapper<CorporationInfo> {
+
+    /**
+     * 自定义分页
+     *
+     * @param page
+     * @param corporationInfo
+     * @return
+     */
+    List<CorporationInfoVO> selectCorporationInfoPage(IPage page, CorporationInfoVO corporationInfo);
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/CorporationInfoMapper.xml

@@ -0,0 +1,30 @@
+<?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="org.springblade.control.mapper.CorporationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="corporationInfoResultMap" type="org.springblade.control.entity.CorporationInfo">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="link" property="link"/>
+        <result column="domain_url" property="domainUrl"/>
+        <result column="name" property="name"/>
+        <result column="original_name" property="originalName"/>
+        <result column="extension" property="extension"/>
+        <result column="attach_size" property="attachSize"/>
+    </resultMap>
+
+
+    <select id="selectCorporationInfoPage" resultMap="corporationInfoResultMap">
+        select *
+        from c_corporation_info
+        where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserpayInfoMapper.java

@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.mapper;
+
+import org.springblade.control.entity.UserpayInfo;
+import org.springblade.control.vo.UserpayInfoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 薪酬管理 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+public interface UserpayInfoMapper extends BaseMapper<UserpayInfo> {
+
+    /**
+     * 自定义分页
+     *
+     * @param page
+     * @param userpayInfo
+     * @return
+     */
+    List<UserpayInfoVO> selectUserpayInfoPage(IPage page, UserpayInfoVO userpayInfo);
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserpayInfoMapper.xml

@@ -0,0 +1,38 @@
+<?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="org.springblade.control.mapper.UserpayInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="userpayInfoResultMap" type="org.springblade.control.entity.UserpayInfo">
+        <result column="id" property="id"/>
+        <result column="user_id" property="userId"/>
+        <result column="cost_time" property="costTime"/>
+        <result column="y_all_days" property="yAllDays"/>
+        <result column="s_all_days" property="sAllDays"/>
+        <result column="year_days" property="yearDays"/>
+        <result column="c_leave_days" property="cLeaveDays"/>
+        <result column="sick_leave_days" property="sickLeaveDays"/>
+        <result column="absence_days" property="absenceDays"/>
+        <result column="basic_salary" property="basicSalary"/>
+        <result column="post_salary" property="postSalary"/>
+        <result column="merit_salary" property="meritSalary"/>
+        <result column="bonus_salary" property="bonusSalary"/>
+        <result column="meal_wance" property="mealWance"/>
+        <result column="other_wance" property="otherWance"/>
+        <result column="attend_duction" property="attendDuction"/>
+        <result column="other_duction" property="otherDuction"/>
+        <result column="gross_pay" property="grossPay"/>
+        <result column="personal_tax" property="personalTax"/>
+        <result column="social_sec" property="socialSec"/>
+        <result column="net_salary" property="netSalary"/>
+        <result column="desc" property="desc"/>
+    </resultMap>
+
+
+    <select id="selectUserpayInfoPage" resultMap="userpayInfoResultMap">
+        select *
+        from c_userpay_info
+        where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/blade-control/src/main/java/org/springblade/control/service/ICorporationInfoService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.service;
+
+import org.springblade.control.entity.CorporationInfo;
+import org.springblade.control.vo.CorporationInfoVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 公司制度信息表 服务类
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+public interface ICorporationInfoService extends BaseService<CorporationInfo> {
+
+    /**
+     * 自定义分页
+     *
+     * @param page
+     * @param corporationInfo
+     * @return
+     */
+    IPage<CorporationInfoVO> selectCorporationInfoPage(IPage<CorporationInfoVO> page, CorporationInfoVO corporationInfo);
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/IUserpayInfoService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.service;
+
+import org.springblade.control.entity.UserpayInfo;
+import org.springblade.control.vo.UserpayInfoVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 薪酬管理 服务类
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+public interface IUserpayInfoService extends BaseService<UserpayInfo> {
+
+    /**
+     * 自定义分页
+     *
+     * @param page
+     * @param userpayInfo
+     * @return
+     */
+    IPage<UserpayInfoVO> selectUserpayInfoPage(IPage<UserpayInfoVO> page, UserpayInfoVO userpayInfo);
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/AnnualBudgetServiceImpl.java

@@ -563,7 +563,7 @@ public class AnnualBudgetServiceImpl extends BaseServiceImpl<AnnualBudgetMapper,
         List<AllProjectStatsVO> vos = new ArrayList<>();
         //获取部门映射值
         List<DictInfo> costTypeDict = monthPlanService.getDepartmentDict();
-        Map<Integer, List<DictInfo>> collect = costTypeDict.parallelStream()
+        Map<Double, List<DictInfo>> collect = costTypeDict.parallelStream()
                 .collect(Collectors.groupingBy(DictInfo::getDictValue));
         //风险计划按项目分组，再按照部门分组，再统计计划总数
         Map<Long, List<ProjectCostBudget>> map = riskPlan.parallelStream()

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/CorporationInfoServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.service.impl;
+
+import org.springblade.control.entity.CorporationInfo;
+import org.springblade.control.vo.CorporationInfoVO;
+import org.springblade.control.mapper.CorporationInfoMapper;
+import org.springblade.control.service.ICorporationInfoService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 公司制度信息表 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+@Service
+public class CorporationInfoServiceImpl extends BaseServiceImpl<CorporationInfoMapper, CorporationInfo> implements ICorporationInfoService {
+
+    @Override
+    public IPage<CorporationInfoVO> selectCorporationInfoPage(IPage<CorporationInfoVO> page, CorporationInfoVO corporationInfo) {
+        return page.setRecords(baseMapper.selectCorporationInfoPage(page, corporationInfo));
+    }
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectCostBudgetServiceImpl.java

@@ -710,7 +710,7 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
         List<DictInfo> costType = baseMapper.getCostType();
         DictInfo dictInfo = new DictInfo();
         dictInfo.setDictName("所有");
-        dictInfo.setDictValue(-1);
+        dictInfo.setDictValue(-1.00);
         costType.add(dictInfo);
         return costType;
     }
@@ -723,7 +723,7 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
         List<DictInfo> unitType = baseMapper.getUnitType();
         DictInfo dictInfo = new DictInfo();
         dictInfo.setDictName("所有");
-        dictInfo.setDictValue(-1);
+        dictInfo.setDictValue(-1.0);
         unitType.add(dictInfo);
         return unitType;
     }

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/UserpayInfoServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.service.impl;
+
+import org.springblade.control.entity.UserpayInfo;
+import org.springblade.control.vo.UserpayInfoVO;
+import org.springblade.control.mapper.UserpayInfoMapper;
+import org.springblade.control.service.IUserpayInfoService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 薪酬管理 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-07-06
+ */
+@Service
+public class UserpayInfoServiceImpl extends BaseServiceImpl<UserpayInfoMapper, UserpayInfo> implements IUserpayInfoService {
+
+    @Override
+    public IPage<UserpayInfoVO> selectUserpayInfoPage(IPage<UserpayInfoVO> page, UserpayInfoVO userpayInfo) {
+        return page.setRecords(baseMapper.selectUserpayInfoPage(page, userpayInfo));
+    }
+
+}