Browse Source

医社保申请

yzc 1 year ago
parent
commit
23fb4e6b17
18 changed files with 537 additions and 7 deletions
  1. 9 0
      hx-common/src/main/java/com/fjhx/common/enums/CodingRuleEnum.java
  2. 8 0
      hx-oa/src/main/java/com/fjhx/oa/controller/education/EducationSubsidyController.java
  3. 79 0
      hx-oa/src/main/java/com/fjhx/oa/controller/medical/MedicalInsuranceController.java
  4. 5 0
      hx-oa/src/main/java/com/fjhx/oa/entity/education/dto/EducationSubsidyDto.java
  5. 1 1
      hx-oa/src/main/java/com/fjhx/oa/entity/education/po/EducationSubsidy.java
  6. 6 0
      hx-oa/src/main/java/com/fjhx/oa/entity/education/vo/EducationSubsidyVo.java
  7. 17 0
      hx-oa/src/main/java/com/fjhx/oa/entity/medical/dto/MedicalInsuranceDto.java
  8. 17 0
      hx-oa/src/main/java/com/fjhx/oa/entity/medical/dto/MedicalInsuranceSelectDto.java
  9. 83 0
      hx-oa/src/main/java/com/fjhx/oa/entity/medical/po/MedicalInsurance.java
  10. 21 0
      hx-oa/src/main/java/com/fjhx/oa/entity/medical/vo/MedicalInsuranceVo.java
  11. 3 2
      hx-oa/src/main/java/com/fjhx/oa/flow/EducationSubsidyFlow.java
  12. 73 0
      hx-oa/src/main/java/com/fjhx/oa/flow/MedicalInsuranceFlow.java
  13. 26 0
      hx-oa/src/main/java/com/fjhx/oa/mapper/medical/MedicalInsuranceMapper.java
  14. 11 3
      hx-oa/src/main/java/com/fjhx/oa/service/education/impl/EducationSubsidyServiceImpl.java
  15. 42 0
      hx-oa/src/main/java/com/fjhx/oa/service/medical/MedicalInsuranceService.java
  16. 106 0
      hx-oa/src/main/java/com/fjhx/oa/service/medical/impl/MedicalInsuranceServiceImpl.java
  17. 3 1
      hx-oa/src/main/resources/mapper/education/EducationSubsidyMapper.xml
  18. 27 0
      hx-oa/src/main/resources/mapper/medical/MedicalInsuranceMapper.xml

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

@@ -119,6 +119,15 @@ public enum CodingRuleEnum {
             getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
             getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
     )),
+
+    /**
+     * 医社保申请
+     */
+    MEDICAL_INSURANCE("medical_insurance", "学历补贴申请", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "MI-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
     ;
 
 

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

@@ -68,4 +68,12 @@ public class EducationSubsidyController {
         educationSubsidyService.delete(dto.getId());
     }
 
+    /**
+     * 学历补贴申请删除
+     */
+    @PostMapping("/cancellation")
+    public void cancellation(@RequestBody BaseSelectDto dto) {
+        educationSubsidyService.cancellation(dto.getId());
+    }
+
 }

+ 79 - 0
hx-oa/src/main/java/com/fjhx/oa/controller/medical/MedicalInsuranceController.java

@@ -0,0 +1,79 @@
+package com.fjhx.oa.controller.medical;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.medical.dto.MedicalInsuranceDto;
+import com.fjhx.oa.entity.medical.dto.MedicalInsuranceSelectDto;
+import com.fjhx.oa.entity.medical.vo.MedicalInsuranceVo;
+import com.fjhx.oa.service.medical.MedicalInsuranceService;
+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("/medicalInsurance")
+public class MedicalInsuranceController {
+
+    @Autowired
+    private MedicalInsuranceService medicalInsuranceService;
+
+    /**
+     * 医保申请分页
+     */
+    @PostMapping("/page")
+    public Page<MedicalInsuranceVo> page(@RequestBody MedicalInsuranceSelectDto dto) {
+        return medicalInsuranceService.getPage(dto);
+    }
+
+    /**
+     * 医保申请明细
+     */
+    @PostMapping("/detail")
+    public MedicalInsuranceVo detail(@RequestBody BaseSelectDto dto) {
+        return medicalInsuranceService.detail(dto.getId());
+    }
+
+    /**
+     * 医保申请新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody MedicalInsuranceDto medicalInsuranceDto) {
+        medicalInsuranceService.addOrEdit(medicalInsuranceDto);
+    }
+
+    /**
+     * 医保申请编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody MedicalInsuranceDto medicalInsuranceDto) {
+        medicalInsuranceService.addOrEdit(medicalInsuranceDto);
+    }
+
+    /**
+     * 医保申请删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        medicalInsuranceService.delete(dto.getId());
+    }
+
+    /**
+     * 医保申请删除
+     */
+    @PostMapping("/cancellation")
+    public void cancellation(@RequestBody BaseSelectDto dto) {
+        medicalInsuranceService.cancellation(dto.getId());
+    }
+
+}

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

@@ -1,9 +1,12 @@
 package com.fjhx.oa.entity.education.dto;
 
+import com.fjhx.file.entity.ObsFile;
 import com.fjhx.oa.entity.education.po.EducationSubsidy;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 学历补贴申请新增编辑入参实体
  *
@@ -14,4 +17,6 @@ import lombok.Setter;
 @Setter
 public class EducationSubsidyDto extends EducationSubsidy {
 
+    List<ObsFile> fileList;
+
 }

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

@@ -51,7 +51,7 @@ public class EducationSubsidy extends BasePo {
     /**
      * 部门id
      */
-    private Integer deptId;
+    private Long deptId;
 
     /**
      * 公司id

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

@@ -14,4 +14,10 @@ import lombok.Setter;
 @Setter
 public class EducationSubsidyVo extends EducationSubsidy {
 
+    private String createUserName;
+    private String deptName;
+
+    private String companyName;
+
+
 }

+ 17 - 0
hx-oa/src/main/java/com/fjhx/oa/entity/medical/dto/MedicalInsuranceDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.oa.entity.medical.dto;
+
+import com.fjhx.oa.entity.medical.po.MedicalInsurance;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 医保申请新增编辑入参实体
+ *
+ * @author
+ * @since 2024-04-08
+ */
+@Getter
+@Setter
+public class MedicalInsuranceDto extends MedicalInsurance {
+
+}

+ 17 - 0
hx-oa/src/main/java/com/fjhx/oa/entity/medical/dto/MedicalInsuranceSelectDto.java

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

+ 83 - 0
hx-oa/src/main/java/com/fjhx/oa/entity/medical/po/MedicalInsurance.java

@@ -0,0 +1,83 @@
+package com.fjhx.oa.entity.medical.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-04-08
+ */
+@Getter
+@Setter
+@TableName("medical_insurance")
+public class MedicalInsurance extends BasePo {
+
+    /**
+     * 申请时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date applyTime;
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+    /**
+     * 公司id
+     */
+    private Long companyId;
+
+    /**
+     * 岗位
+     */
+    private String position;
+
+    /**
+     * 入职时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date entryTime;
+
+    /**
+     * 转正时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date regularTime;
+
+    /**
+     * 申请项目
+     */
+    private String applyItem;
+
+    /**
+     * 费用承担
+     */
+    private String costBearing;
+
+    /**
+     * 抵扣方式
+     */
+    private String deductionMethod;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private String code;
+
+    private Integer status;
+
+    private Long flowId;
+
+}

+ 21 - 0
hx-oa/src/main/java/com/fjhx/oa/entity/medical/vo/MedicalInsuranceVo.java

@@ -0,0 +1,21 @@
+package com.fjhx.oa.entity.medical.vo;
+
+import com.fjhx.oa.entity.medical.po.MedicalInsurance;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 医保申请列表查询返回值实体
+ *
+ * @author
+ * @since 2024-04-08
+ */
+@Getter
+@Setter
+public class MedicalInsuranceVo extends MedicalInsurance {
+
+    private String createUserName;
+    private String deptName;
+    private String companyName;
+
+}

+ 3 - 2
hx-oa/src/main/java/com/fjhx/oa/flow/EducationSubsidyFlow.java

@@ -34,7 +34,8 @@ public class EducationSubsidyFlow extends FlowDelegate {
         EducationSubsidyDto dto = submitData.toJavaObject(EducationSubsidyDto.class);
         dto.setFlowId(flowId);
 
-        codingRuleService.createCode(CodingRuleEnum.EDUCATION_SUBSIDY_FLOW.getKey(), null);
+        dto.setCode(codingRuleService.createCode(CodingRuleEnum.EDUCATION_SUBSIDY_FLOW.getKey(), null));
+        dto.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
 
         educationSubsidyService.addOrEdit(dto);
 
@@ -45,7 +46,7 @@ public class EducationSubsidyFlow extends FlowDelegate {
     public void end(Long flowId, Long businessId, JSONObject submitData) {
         educationSubsidyService.update(q -> q
                 .eq(EducationSubsidy::getId, businessId)
-                .set(EducationSubsidy::getStatus, FlowStatusEnum1.REJECT.getKey())
+                .set(EducationSubsidy::getStatus, FlowStatusEnum1.PASS.getKey())
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );

+ 73 - 0
hx-oa/src/main/java/com/fjhx/oa/flow/MedicalInsuranceFlow.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.medical.dto.MedicalInsuranceDto;
+import com.fjhx.oa.entity.medical.po.MedicalInsurance;
+import com.fjhx.oa.service.medical.impl.MedicalInsuranceServiceImpl;
+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 MedicalInsuranceFlow extends FlowDelegate {
+
+    @Autowired
+    private MedicalInsuranceServiceImpl medicalInsuranceService;
+    @Autowired
+    private CodingRuleService codingRuleService;
+
+    @Override
+    public String getFlowKey() {
+        return "medical_insurance_flow";
+    }
+
+    @Override
+    public Long start(Long flowId, JSONObject submitData) {
+        MedicalInsuranceDto dto = submitData.toJavaObject(MedicalInsuranceDto.class);
+        dto.setFlowId(flowId);
+        dto.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
+        dto.setCode(codingRuleService.createCode(CodingRuleEnum.MEDICAL_INSURANCE.getKey(), null));
+
+        medicalInsuranceService.addOrEdit(dto);
+
+        return dto.getId();
+    }
+
+    @Override
+    public void end(Long flowId, Long businessId, JSONObject submitData) {
+        medicalInsuranceService.update(q -> q
+                .eq(MedicalInsurance::getId, businessId)
+                .set(MedicalInsurance::getStatus, FlowStatusEnum1.PASS.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) {
+        medicalInsuranceService.update(q -> q
+                .eq(MedicalInsurance::getId, businessId)
+                .set(MedicalInsurance::getStatus, FlowStatusEnum1.REJECT.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
+    @Override
+    public void cancellation(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        medicalInsuranceService.cancellation(businessId);
+    }
+}

+ 26 - 0
hx-oa/src/main/java/com/fjhx/oa/mapper/medical/MedicalInsuranceMapper.java

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

+ 11 - 3
hx-oa/src/main/java/com/fjhx/oa/service/education/impl/EducationSubsidyServiceImpl.java

@@ -5,6 +5,7 @@ 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.file.utils.ObsFileUtil;
 import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.flow.service.flow.FlowExampleService;
@@ -15,10 +16,12 @@ 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.fjhx.tenant.utils.DeptUstil;
 import com.ruoyi.common.core.domain.BasePo;
 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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,7 +55,7 @@ public class EducationSubsidyServiceImpl extends ServiceImpl<EducationSubsidyMap
         wrapper.orderByDesc("es", EducationSubsidy::getId);
         Page<EducationSubsidyVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<EducationSubsidyVo> records = page.getRecords();
-        setDetail(records);
+        setInfo(records);
         return page;
     }
 
@@ -60,23 +63,28 @@ public class EducationSubsidyServiceImpl extends ServiceImpl<EducationSubsidyMap
     public EducationSubsidyVo detail(Long id) {
         EducationSubsidy EducationSubsidy = this.getById(id);
         EducationSubsidyVo result = BeanUtil.toBean(EducationSubsidy, EducationSubsidyVo.class);
-        setDetail(Arrays.asList(result));
+        setInfo(Arrays.asList(result));
 
         return result;
     }
 
-    void setDetail(List<EducationSubsidyVo> records) {
+    void setInfo(List<EducationSubsidyVo> records) {
         if (ObjectUtil.isEmpty(records)) {
             return;
         }
         educationConfigService.attributeAssign(records, EducationSubsidyVo::getEducationId, (item, education) -> {
             item.setEducationName(education.getName());
         });
+
+        UserUtil.assignmentNickName(records, EducationSubsidyVo::getCreateUser, EducationSubsidyVo::setCreateUserName);
+        DeptUstil.assignmentNickName(records, EducationSubsidyVo::getDeptId, EducationSubsidyVo::setDeptName);
+        DeptUstil.assignmentNickName(records, EducationSubsidyVo::getCompanyId, EducationSubsidyVo::setCompanyName);
     }
 
     @Override
     public void addOrEdit(EducationSubsidyDto educationSubsidyDto) {
         this.saveOrUpdate(educationSubsidyDto);
+        ObsFileUtil.editFile(educationSubsidyDto.getFileList(), educationSubsidyDto.getId());
     }
 
     @Override

+ 42 - 0
hx-oa/src/main/java/com/fjhx/oa/service/medical/MedicalInsuranceService.java

@@ -0,0 +1,42 @@
+package com.fjhx.oa.service.medical;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.medical.dto.MedicalInsuranceDto;
+import com.fjhx.oa.entity.medical.dto.MedicalInsuranceSelectDto;
+import com.fjhx.oa.entity.medical.po.MedicalInsurance;
+import com.fjhx.oa.entity.medical.vo.MedicalInsuranceVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 医保申请 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-04-08
+ */
+public interface MedicalInsuranceService extends BaseService<MedicalInsurance> {
+
+    /**
+     * 医保申请分页
+     */
+    Page<MedicalInsuranceVo> getPage(MedicalInsuranceSelectDto dto);
+
+    /**
+     * 医保申请明细
+     */
+    MedicalInsuranceVo detail(Long id);
+
+    /**
+     * 医保申请新增
+     */
+    void addOrEdit(MedicalInsuranceDto medicalInsuranceDto);
+
+    /**
+     * 医保申请删除
+     */
+    void delete(Long id);
+
+    void cancellation(Long businessId);
+}

+ 106 - 0
hx-oa/src/main/java/com/fjhx/oa/service/medical/impl/MedicalInsuranceServiceImpl.java

@@ -0,0 +1,106 @@
+package com.fjhx.oa.service.medical.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.medical.dto.MedicalInsuranceDto;
+import com.fjhx.oa.entity.medical.dto.MedicalInsuranceSelectDto;
+import com.fjhx.oa.entity.medical.po.MedicalInsurance;
+import com.fjhx.oa.entity.medical.vo.MedicalInsuranceVo;
+import com.fjhx.oa.mapper.medical.MedicalInsuranceMapper;
+import com.fjhx.oa.service.medical.MedicalInsuranceService;
+import com.fjhx.tenant.utils.DeptUstil;
+import com.ruoyi.common.core.domain.BasePo;
+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.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 MedicalInsuranceServiceImpl extends ServiceImpl<MedicalInsuranceMapper, MedicalInsurance> implements MedicalInsuranceService {
+
+    @Autowired
+    private FlowExampleService flowExampleService;
+
+    @Override
+    public Page<MedicalInsuranceVo> getPage(MedicalInsuranceSelectDto dto) {
+        IWrapper<MedicalInsurance> wrapper = getWrapper();
+
+        wrapper.keyword(dto.getKeyword(), new SqlField("mi", MedicalInsurance::getCode));
+
+        wrapper.orderByDesc("mi", MedicalInsurance::getId);
+        Page<MedicalInsuranceVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<MedicalInsuranceVo> records = page.getRecords();
+        setInfo(records);
+        return page;
+    }
+
+    @Override
+    public MedicalInsuranceVo detail(Long id) {
+        MedicalInsurance medicalInsurance = this.getById(id);
+        MedicalInsuranceVo result = BeanUtil.toBean(medicalInsurance, MedicalInsuranceVo.class);
+
+        setInfo(Arrays.asList(result));
+        return result;
+    }
+
+    void setInfo(List<MedicalInsuranceVo> records) {
+        if (ObjectUtil.isEmpty(records)) {
+            return;
+        }
+        UserUtil.assignmentNickName(records, MedicalInsuranceVo::getCreateUser, MedicalInsuranceVo::setCreateUserName);
+        DeptUstil.assignmentNickName(records, MedicalInsuranceVo::getDeptId, MedicalInsuranceVo::setDeptName);
+        DeptUstil.assignmentNickName(records, MedicalInsuranceVo::getCompanyId, MedicalInsuranceVo::setCompanyName);
+    }
+
+    @Override
+    public void addOrEdit(MedicalInsuranceDto medicalInsuranceDto) {
+        this.saveOrUpdate(medicalInsuranceDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    @Override
+    public void cancellation(Long businessId) {
+        MedicalInsurance byId = getById(businessId);
+        this.update(q -> q
+                .eq(MedicalInsurance::getId, businessId)
+                .set(MedicalInsurance::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())
+        );
+    }
+
+}

+ 3 - 1
hx-oa/src/main/resources/mapper/education/EducationSubsidyMapper.xml

@@ -13,7 +13,9 @@
                es.create_user,
                es.create_time,
                es.update_user,
-               es.update_time
+               es.update_time,
+               es.flow_id,
+               es.status
         from education_subsidy es
             ${ew.customSqlSegment}
     </select>

+ 27 - 0
hx-oa/src/main/resources/mapper/medical/MedicalInsuranceMapper.xml

@@ -0,0 +1,27 @@
+<?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.medical.MedicalInsuranceMapper">
+    <select id="getPage" resultType="com.fjhx.oa.entity.medical.vo.MedicalInsuranceVo">
+        select mi.id,
+               mi.apply_time,
+               mi.dept_id,
+               mi.company_id,
+               mi.position,
+               mi.entry_time,
+               mi.regular_time,
+               mi.apply_item,
+               mi.cost_bearing,
+               mi.deduction_method,
+               mi.remark,
+               mi.create_user,
+               mi.create_time,
+               mi.update_user,
+               mi.update_time,
+               mi.code,
+               mi.status,
+               mi.flow_id
+        from medical_insurance mi
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>