yzc 1 жил өмнө
parent
commit
8887dbbadf

+ 9 - 0
hx-common/src/main/java/com/fjhx/common/enums/CodingRuleEnum.java

@@ -110,6 +110,15 @@ public enum CodingRuleEnum {
             getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
             getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
             getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
             getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
     )),
     )),
+
+    /**
+     * 学历补贴申请
+     */
+    EDUCATION_SUBSIDY_FLOW("education_subsidy", "学历补贴申请", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "ES-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
     ;
     ;
 
 
 
 

+ 71 - 0
hx-oa/src/main/java/com/fjhx/oa/controller/education/EducationSubsidyController.java

@@ -0,0 +1,71 @@
+package com.fjhx.oa.controller.education;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.education.dto.EducationSubsidyDto;
+import com.fjhx.oa.entity.education.dto.EducationSubsidySelectDto;
+import com.fjhx.oa.entity.education.vo.EducationSubsidyVo;
+import com.fjhx.oa.service.education.EducationSubsidyService;
+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-04-08
+ */
+@RestController
+@RequestMapping("/educationSubsidy")
+public class EducationSubsidyController {
+
+    @Autowired
+    private EducationSubsidyService educationSubsidyService;
+
+    /**
+     * 学历补贴申请分页
+     */
+    @PostMapping("/page")
+    public Page<EducationSubsidyVo> page(@RequestBody EducationSubsidySelectDto dto) {
+        return educationSubsidyService.getPage(dto);
+    }
+
+    /**
+     * 学历补贴申请明细
+     */
+    @PostMapping("/detail")
+    public EducationSubsidyVo detail(@RequestBody BaseSelectDto dto) {
+        return educationSubsidyService.detail(dto.getId());
+    }
+
+    /**
+     * 学历补贴申请新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody EducationSubsidyDto educationSubsidyDto) {
+        educationSubsidyService.addOrEdit(educationSubsidyDto);
+    }
+
+    /**
+     * 学历补贴申请编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody EducationSubsidyDto educationSubsidyDto) {
+        educationSubsidyService.addOrEdit(educationSubsidyDto);
+    }
+
+    /**
+     * 学历补贴申请删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        educationSubsidyService.delete(dto.getId());
+    }
+
+}

+ 17 - 0
hx-oa/src/main/java/com/fjhx/oa/entity/education/dto/EducationSubsidyDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.oa.entity.education.dto;
+
+import com.fjhx.oa.entity.education.po.EducationSubsidy;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 学历补贴申请新增编辑入参实体
+ *
+ * @author
+ * @since 2024-04-08
+ */
+@Getter
+@Setter
+public class EducationSubsidyDto extends EducationSubsidy {
+
+}

+ 17 - 0
hx-oa/src/main/java/com/fjhx/oa/entity/education/dto/EducationSubsidySelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.oa.entity.education.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 学历补贴申请列表查询入参实体
+ *
+ * @author
+ * @since 2024-04-08
+ */
+@Getter
+@Setter
+public class EducationSubsidySelectDto extends BaseSelectDto {
+
+}

+ 65 - 0
hx-oa/src/main/java/com/fjhx/oa/entity/education/po/EducationSubsidy.java

@@ -0,0 +1,65 @@
+package com.fjhx.oa.entity.education.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.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学历补贴申请
+ * </p>
+ *
+ * @author
+ * @since 2024-04-08
+ */
+@Getter
+@Setter
+@TableName("education_subsidy")
+public class EducationSubsidy extends BasePo {
+
+    /**
+     * 编号
+     */
+    private String code;
+
+    /**
+     * 学历id
+     */
+    private Long educationId;
+
+    /**
+     * 学历名称
+     */
+    private String educationName;
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 申请时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date applyTime;
+
+    /**
+     * 部门id
+     */
+    private Integer deptId;
+
+    /**
+     * 公司id
+     */
+    private Long companyId;
+
+    private Integer status;
+
+    private Long flowId;
+
+}

+ 17 - 0
hx-oa/src/main/java/com/fjhx/oa/entity/education/vo/EducationSubsidyVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.oa.entity.education.vo;
+
+import com.fjhx.oa.entity.education.po.EducationSubsidy;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 学历补贴申请列表查询返回值实体
+ *
+ * @author
+ * @since 2024-04-08
+ */
+@Getter
+@Setter
+public class EducationSubsidyVo extends EducationSubsidy {
+
+}

+ 73 - 0
hx-oa/src/main/java/com/fjhx/oa/flow/EducationSubsidyFlow.java

@@ -0,0 +1,73 @@
+package com.fjhx.oa.flow;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.enums.FlowStatusEnum1;
+import com.fjhx.common.service.coding.CodingRuleService;
+import com.fjhx.flow.core.FlowDelegate;
+import com.fjhx.flow.enums.FlowStatusEnum;
+import com.fjhx.oa.entity.education.dto.EducationSubsidyDto;
+import com.fjhx.oa.entity.education.po.EducationSubsidy;
+import com.fjhx.oa.service.education.EducationSubsidyService;
+import com.ruoyi.common.core.domain.BasePo;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+public class EducationSubsidyFlow extends FlowDelegate {
+
+    @Autowired
+    private EducationSubsidyService educationSubsidyService;
+    @Autowired
+    private CodingRuleService codingRuleService;
+
+    @Override
+    public String getFlowKey() {
+        return "education_subsidy_flow";
+    }
+
+    @Override
+    public Long start(Long flowId, JSONObject submitData) {
+        EducationSubsidyDto dto = submitData.toJavaObject(EducationSubsidyDto.class);
+        dto.setFlowId(flowId);
+
+        codingRuleService.createCode(CodingRuleEnum.EDUCATION_SUBSIDY_FLOW.getKey(), null);
+
+        educationSubsidyService.addOrEdit(dto);
+
+        return dto.getId();
+    }
+
+    @Override
+    public void end(Long flowId, Long businessId, JSONObject submitData) {
+        educationSubsidyService.update(q -> q
+                .eq(EducationSubsidy::getId, businessId)
+                .set(EducationSubsidy::getStatus, FlowStatusEnum1.REJECT.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
+    @Override
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        start(flowId, submitData);
+    }
+
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        educationSubsidyService.update(q -> q
+                .eq(EducationSubsidy::getId, businessId)
+                .set(EducationSubsidy::getStatus, FlowStatusEnum1.REJECT.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
+    @Override
+    public void cancellation(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        educationSubsidyService.cancellation(businessId);
+    }
+}

+ 26 - 0
hx-oa/src/main/java/com/fjhx/oa/mapper/education/EducationSubsidyMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.oa.mapper.education;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.education.po.EducationSubsidy;
+import com.fjhx.oa.entity.education.vo.EducationSubsidyVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 学历补贴申请 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-04-08
+ */
+public interface EducationSubsidyMapper extends BaseMapper<EducationSubsidy> {
+
+    /**
+     * 学历补贴申请分页
+     */
+    Page<EducationSubsidyVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<EducationSubsidy> wrapper);
+
+}

+ 42 - 0
hx-oa/src/main/java/com/fjhx/oa/service/education/EducationSubsidyService.java

@@ -0,0 +1,42 @@
+package com.fjhx.oa.service.education;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.education.dto.EducationSubsidyDto;
+import com.fjhx.oa.entity.education.dto.EducationSubsidySelectDto;
+import com.fjhx.oa.entity.education.po.EducationSubsidy;
+import com.fjhx.oa.entity.education.vo.EducationSubsidyVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 学历补贴申请 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-04-08
+ */
+public interface EducationSubsidyService extends BaseService<EducationSubsidy> {
+
+    /**
+     * 学历补贴申请分页
+     */
+    Page<EducationSubsidyVo> getPage(EducationSubsidySelectDto dto);
+
+    /**
+     * 学历补贴申请明细
+     */
+    EducationSubsidyVo detail(Long id);
+
+    /**
+     * 学历补贴申请新增
+     */
+    void addOrEdit(EducationSubsidyDto educationSubsidyDto);
+
+    /**
+     * 学历补贴申请删除
+     */
+    void delete(Long id);
+
+    void cancellation(Long businessId);
+}

+ 103 - 0
hx-oa/src/main/java/com/fjhx/oa/service/education/impl/EducationSubsidyServiceImpl.java

@@ -0,0 +1,103 @@
+package com.fjhx.oa.service.education.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.enums.FlowStatusEnum1;
+import com.fjhx.flow.entity.flow.po.FlowExample;
+import com.fjhx.flow.enums.FlowStatusEnum;
+import com.fjhx.flow.service.flow.FlowExampleService;
+import com.fjhx.oa.entity.education.dto.EducationSubsidyDto;
+import com.fjhx.oa.entity.education.dto.EducationSubsidySelectDto;
+import com.fjhx.oa.entity.education.po.EducationSubsidy;
+import com.fjhx.oa.entity.education.vo.EducationSubsidyVo;
+import com.fjhx.oa.mapper.education.EducationSubsidyMapper;
+import com.fjhx.oa.service.education.EducationConfigService;
+import com.fjhx.oa.service.education.EducationSubsidyService;
+import com.ruoyi.common.core.domain.BasePo;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * <p>
+ * 学历补贴申请 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-04-08
+ */
+@Service
+public class EducationSubsidyServiceImpl extends ServiceImpl<EducationSubsidyMapper, EducationSubsidy> implements EducationSubsidyService {
+
+    @Autowired
+    private FlowExampleService flowExampleService;
+    @Autowired
+    private EducationConfigService educationConfigService;
+
+    @Override
+    public Page<EducationSubsidyVo> getPage(EducationSubsidySelectDto dto) {
+        IWrapper<EducationSubsidy> wrapper = getWrapper();
+        wrapper.orderByDesc("es", EducationSubsidy::getId);
+        Page<EducationSubsidyVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<EducationSubsidyVo> records = page.getRecords();
+        setDetail(records);
+        return page;
+    }
+
+    @Override
+    public EducationSubsidyVo detail(Long id) {
+        EducationSubsidy EducationSubsidy = this.getById(id);
+        EducationSubsidyVo result = BeanUtil.toBean(EducationSubsidy, EducationSubsidyVo.class);
+        setDetail(Arrays.asList(result));
+
+        return result;
+    }
+
+    void setDetail(List<EducationSubsidyVo> records) {
+        if (ObjectUtil.isEmpty(records)) {
+            return;
+        }
+        educationConfigService.attributeAssign(records, EducationSubsidyVo::getEducationId, (item, education) -> {
+            item.setEducationName(education.getName());
+        });
+    }
+
+    @Override
+    public void addOrEdit(EducationSubsidyDto educationSubsidyDto) {
+        this.saveOrUpdate(educationSubsidyDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    @Override
+    public void cancellation(Long businessId) {
+        EducationSubsidy byId = getById(businessId);
+        this.update(q -> q
+                .eq(EducationSubsidy::getId, businessId)
+                .set(EducationSubsidy::getStatus, FlowStatusEnum1.CANCELLATION.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+
+        //销毁审批中的流程
+        flowExampleService.update(q -> q
+                .eq(FlowExample::getId, byId.getFlowId())
+                .in(FlowExample::getStatus, FlowStatusEnum.READY_START.getKey(), FlowStatusEnum.IN_PROGRESS.getKey())
+                .set(FlowExample::getStatus, FlowStatusEnum.CANCELLATION.getKey())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+                .set(BasePo::getUpdateTime, new Date())
+        );
+    }
+
+}

+ 21 - 0
hx-oa/src/main/resources/mapper/education/EducationSubsidyMapper.xml

@@ -0,0 +1,21 @@
+<?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.education.EducationSubsidyMapper">
+    <select id="getPage" resultType="com.fjhx.oa.entity.education.vo.EducationSubsidyVo">
+        select es.id,
+               es.code,
+               es.education_id,
+               es.education_name,
+               es.amount,
+               es.apply_time,
+               es.dept_id,
+               es.company_id,
+               es.create_user,
+               es.create_time,
+               es.update_user,
+               es.update_time
+        from education_subsidy es
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>