转正申请

hx-oa/src/main/java/com/fjhx/oa/controller/promotion/PromotionApplyController.java

@@ -0,0 +1,46 @@
+package com.fjhx.oa.controller.promotion;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.promotion.dto.PromotionApplySelectDto;
+import com.fjhx.oa.entity.promotion.vo.PromotionApplyVo;
+import com.fjhx.oa.service.promotion.PromotionApplyService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+
+/**
+ * <p>
+ * 转正申请 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-06-19
+ */
+@RestController
+@RequestMapping("/promotionApply")
+public class PromotionApplyController {
+
+    @Autowired
+    private PromotionApplyService promotionApplyService;
+
+    /**
+     * 转正申请分页
+     */
+    @PostMapping("/page")
+    public Page<PromotionApplyVo> page(@RequestBody PromotionApplySelectDto dto) {
+        return promotionApplyService.getPage(dto);
+    }
+
+    /**
+     * 转正申请明细
+     */
+    @PostMapping("/detail")
+    public PromotionApplyVo detail(@RequestBody BaseSelectDto dto) {
+        return promotionApplyService.detail(dto.getId());
+    }
+
+}

hx-oa/src/main/java/com/fjhx/oa/entity/promotion/dto/PromotionApplyDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.oa.entity.promotion.dto;
+
+import com.fjhx.oa.entity.promotion.po.PromotionApply;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 转正申请新增编辑入参实体
+ *
+ * @author
+ * @since 2024-06-19
+ */
+@Getter
+@Setter
+public class PromotionApplyDto extends PromotionApply {
+
+}

hx-oa/src/main/java/com/fjhx/oa/entity/promotion/dto/PromotionApplySelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.oa.entity.promotion.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 转正申请列表查询入参实体
+ *
+ * @author
+ * @since 2024-06-19
+ */
+@Getter
+@Setter
+public class PromotionApplySelectDto extends BaseSelectDto {
+
+}

hx-oa/src/main/java/com/fjhx/oa/entity/promotion/po/PromotionApply.java

@@ -0,0 +1,43 @@
+package com.fjhx.oa.entity.promotion.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 转正申请
+ * </p>
+ *
+ * @author
+ * @since 2024-06-19
+ */
+@Getter
+@Setter
+@TableName("promotion_apply")
+public class PromotionApply extends BasePo {
+
+    /**
+     * 10实习员工、20试用员工、30正式员工
+     */
+    private Integer employeeType;
+
+    /**
+     * 转正日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date promotionDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private Long flowId;
+    private Integer status;
+
+}

hx-oa/src/main/java/com/fjhx/oa/entity/promotion/vo/PromotionApplyVo.java

@@ -0,0 +1,19 @@
+package com.fjhx.oa.entity.promotion.vo;
+
+import com.fjhx.oa.entity.promotion.po.PromotionApply;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 转正申请列表查询返回值实体
+ *
+ * @author
+ * @since 2024-06-19
+ */
+@Getter
+@Setter
+public class PromotionApplyVo extends PromotionApply {
+
+    private String userName;
+
+}

hx-oa/src/main/java/com/fjhx/oa/entity/user/po/UserSalaryManage.java

@@ -27,7 +27,7 @@ public class UserSalaryManage {
     /**
      * 10实习员工、20试用员工、30正式员工
      */
-    private String employeeType;
+    private Integer employeeType;
     /**
      * 试用期薪资比例
      */

hx-oa/src/main/java/com/fjhx/oa/flow/PromotionApplyFlow.java

@@ -0,0 +1,76 @@
+package com.fjhx.oa.flow;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.fjhx.common.enums.FlowStatusEnum1;
+import com.fjhx.flow.core.FlowDelegate;
+import com.fjhx.flow.enums.FlowStatusEnum;
+import com.fjhx.oa.entity.promotion.dto.PromotionApplyDto;
+import com.fjhx.oa.entity.promotion.po.PromotionApply;
+import com.fjhx.oa.entity.user.dto.UserSalaryManageDto;
+import com.fjhx.oa.entity.user.vo.UserSalaryManageVo;
+import com.fjhx.oa.service.promotion.PromotionApplyService;
+import com.fjhx.oa.service.user.UserSalaryManageService;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+public class PromotionApplyFlow extends FlowDelegate {
+
+    @Resource
+    private PromotionApplyService promotionApplyService;
+    @Resource
+    private UserSalaryManageService userSalaryManageService;
+
+    @Override
+    public String getFlowKey() {
+        return "promotion_apply_flow";
+    }
+
+    @Override
+    public Long start(Long flowId, JSONObject submitData) {
+        PromotionApplyDto dto = submitData.toJavaObject(PromotionApplyDto.class);
+        dto.setFlowId(flowId);
+        dto.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
+
+        //回填用户名
+        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
+        submitData.put("userName", nickName);
+
+        promotionApplyService.saveOrUpdate(dto);
+        return dto.getId();
+    }
+
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        promotionApplyService.update(q -> q
+                .eq(PromotionApply::getId, businessId)
+                .set(PromotionApply::getStatus, FlowStatusEnum1.REJECT.getKey())
+        );
+    }
+
+    @Override
+    public void cancellation(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        promotionApplyService.update(q -> q
+                .eq(PromotionApply::getId, businessId)
+                .set(PromotionApply::getStatus, FlowStatusEnum1.CANCELLATION.getKey())
+        );
+    }
+
+    @Override
+    public void end(Long flowId, Long businessId, JSONObject submitData) {
+        PromotionApply byId = promotionApplyService.getById(businessId);
+        promotionApplyService.update(q -> q
+                .eq(PromotionApply::getId, businessId)
+                .set(PromotionApply::getStatus, FlowStatusEnum1.PASS.getKey())
+        );
+        //更新用户薪资
+        UserSalaryManageVo detail = userSalaryManageService.detail(byId.getCreateUser());
+        UserSalaryManageDto userSalaryManageDto = BeanUtil.copyProperties(detail, UserSalaryManageDto.class);
+        userSalaryManageDto.setEmployeeType(byId.getEmployeeType());
+        userSalaryManageDto.setFullTimeDate(byId.getPromotionDate());
+        userSalaryManageService.edit(userSalaryManageDto);
+    }
+}

hx-oa/src/main/java/com/fjhx/oa/mapper/promotion/PromotionApplyMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.oa.mapper.promotion;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.promotion.po.PromotionApply;
+import com.fjhx.oa.entity.promotion.vo.PromotionApplyVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 转正申请 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-06-19
+ */
+public interface PromotionApplyMapper extends BaseMapper<PromotionApply> {
+
+    /**
+     * 转正申请分页
+     */
+    Page<PromotionApplyVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<PromotionApply> wrapper);
+
+}

hx-oa/src/main/java/com/fjhx/oa/service/promotion/PromotionApplyService.java

@@ -0,0 +1,30 @@
+package com.fjhx.oa.service.promotion;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.promotion.dto.PromotionApplySelectDto;
+import com.fjhx.oa.entity.promotion.po.PromotionApply;
+import com.fjhx.oa.entity.promotion.vo.PromotionApplyVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 转正申请 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-06-19
+ */
+public interface PromotionApplyService extends BaseService<PromotionApply> {
+
+    /**
+     * 转正申请分页
+     */
+    Page<PromotionApplyVo> getPage(PromotionApplySelectDto dto);
+
+    /**
+     * 转正申请明细
+     */
+    PromotionApplyVo detail(Long id);
+
+}

hx-oa/src/main/java/com/fjhx/oa/service/promotion/impl/PromotionApplyServiceImpl.java

@@ -0,0 +1,61 @@
+package com.fjhx.oa.service.promotion.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.oa.entity.promotion.dto.PromotionApplySelectDto;
+import com.fjhx.oa.entity.promotion.po.PromotionApply;
+import com.fjhx.oa.entity.promotion.vo.PromotionApplyVo;
+import com.fjhx.oa.mapper.promotion.PromotionApplyMapper;
+import com.fjhx.oa.service.promotion.PromotionApplyService;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import com.ruoyi.system.utils.UserUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+
+/**
+ * <p>
+ * 转正申请 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-06-19
+ */
+@Service
+public class PromotionApplyServiceImpl extends ServiceImpl<PromotionApplyMapper, PromotionApply> implements PromotionApplyService {
+
+    @Override
+    public Page<PromotionApplyVo> getPage(PromotionApplySelectDto dto) {
+        IWrapper<PromotionApply> wrapper = getWrapper();
+
+        wrapper.keyword(dto.getKeyword(), new SqlField("su.nick_name"));
+
+
+        //权限过滤 自己看自己，财务看全部
+        List<String> userRoleKeys = UserUtil.getUserRoleKeys(SecurityUtils.getUserId());
+        if (!userRoleKeys.contains("cfo")) {
+            wrapper.eq("pa", PromotionApply::getCreateUser, SecurityUtils.getUserId());
+        }
+
+        wrapper.orderByDesc("pa", PromotionApply::getId);
+        Page<PromotionApplyVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
+        UserUtil.assignmentNickName(page.getRecords(), PromotionApplyVo::getCreateUser, PromotionApplyVo::setUserName);
+
+        return page;
+    }
+
+    @Override
+    public PromotionApplyVo detail(Long id) {
+        PromotionApply PromotionApply = this.getById(id);
+        PromotionApplyVo result = BeanUtil.toBean(PromotionApply, PromotionApplyVo.class);
+        UserUtil.assignmentNickName(Collections.emptyList(), PromotionApplyVo::getCreateUser, PromotionApplyVo::setUserName);
+        return result;
+    }
+
+}

hx-oa/src/main/java/com/fjhx/oa/service/user/impl/UserSalaryManageServiceImpl.java

@@ -27,6 +27,7 @@ import com.ruoyi.system.utils.UserUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -97,6 +98,16 @@ public class UserSalaryManageServiceImpl extends ServiceImpl<UserSalaryManageMap
         }
 
         //再处理新数据
+        //计算工资
+        BigDecimal amount = dto.getUserSalaryDetailList().stream()
+                .filter(item -> ObjectUtil.equals(item.getType(), 10))
+                .map(UserSalaryDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal perfAmount = dto.getUserSalaryDetailList().stream()
+                .filter(item -> ObjectUtil.equals(item.getType(), 20))
+                .map(UserSalaryDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+        dto.setAmount(amount);
+        dto.setPerfAmount(perfAmount);
+
         dataVer++;//版本号+1
         this.updateById(dto);
         ObsFileUtil.editFile(dto.getFileList(), dto.getUserId(), 10);

hx-oa/src/main/resources/mapper/promotion/PromotionApplyMapper.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.fjhx.oa.mapper.promotion.PromotionApplyMapper">
+    <select id="getPage" resultType="com.fjhx.oa.entity.promotion.vo.PromotionApplyVo">
+        select pa.id,
+               pa.employee_type,
+               pa.promotion_date,
+               pa.remark,
+               pa.flow_id,
+               pa.status,
+               pa.create_user,
+               pa.create_time,
+               pa.update_user,
+               pa.update_time
+        from promotion_apply pa
+                 LEFT JOIN sys_user su ON su.user_id = pa.create_user
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>