个人电子发票申请

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

@@ -156,6 +156,14 @@ public enum CodingRuleEnum {
             getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
     )),
 
+    /**
+     * 个人电子发票申请
+     */
+    PERSONAL_INVOICE("personal_invoice", "个人电子发票申请", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "PEI-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
 
     ;
 

hx-oa/src/main/java/com/fjhx/oa/controller/activity/ActivityPriceInventoryController.java

@@ -68,4 +68,9 @@ public class ActivityPriceInventoryController {
         activityPriceInventoryService.delete(dto.getId());
     }
 
+    @PostMapping("/cancellation")
+    public void cancellation(@RequestBody BaseSelectDto dto) {
+        activityPriceInventoryService.cancellation(dto.getId());
+    }
+
 }

hx-oa/src/main/java/com/fjhx/oa/controller/personal/PersonalInvoiceController.java

@@ -0,0 +1,76 @@
+package com.fjhx.oa.controller.personal;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.personal.dto.PersonalInvoiceDto;
+import com.fjhx.oa.entity.personal.dto.PersonalInvoiceSelectDto;
+import com.fjhx.oa.entity.personal.vo.PersonalInvoiceVo;
+import com.fjhx.oa.service.personal.PersonalInvoiceService;
+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-11
+ */
+@RestController
+@RequestMapping("/personalInvoice")
+public class PersonalInvoiceController {
+
+    @Autowired
+    private PersonalInvoiceService personalInvoiceService;
+
+    /**
+     * 个人电子发票申请分页
+     */
+    @PostMapping("/page")
+    public Page<PersonalInvoiceVo> page(@RequestBody PersonalInvoiceSelectDto dto) {
+        return personalInvoiceService.getPage(dto);
+    }
+
+    /**
+     * 个人电子发票申请明细
+     */
+    @PostMapping("/detail")
+    public PersonalInvoiceVo detail(@RequestBody BaseSelectDto dto) {
+        return personalInvoiceService.detail(dto.getId());
+    }
+
+    /**
+     * 个人电子发票申请新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody PersonalInvoiceDto personalInvoiceDto) {
+        personalInvoiceService.addOrEdit(personalInvoiceDto);
+    }
+
+    /**
+     * 个人电子发票申请编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody PersonalInvoiceDto personalInvoiceDto) {
+        personalInvoiceService.addOrEdit(personalInvoiceDto);
+    }
+
+    /**
+     * 个人电子发票申请删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        personalInvoiceService.delete(dto.getId());
+    }
+
+    @PostMapping("/cancellation")
+    public void cancellation(@RequestBody BaseSelectDto dto) {
+        personalInvoiceService.cancellation(dto.getId());
+    }
+
+}

hx-oa/src/main/java/com/fjhx/oa/entity/personal/dto/PersonalInvoiceDto.java

@@ -0,0 +1,20 @@
+package com.fjhx.oa.entity.personal.dto;
+
+import com.fjhx.file.entity.ObsFile;
+import com.fjhx.oa.entity.personal.po.PersonalInvoice;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 个人电子发票申请新增编辑入参实体
+ *
+ * @author
+ * @since 2024-04-11
+ */
+@Getter
+@Setter
+public class PersonalInvoiceDto extends PersonalInvoice {
+    private List<ObsFile> fileList;
+}

hx-oa/src/main/java/com/fjhx/oa/entity/personal/dto/PersonalInvoiceSelectDto.java

@@ -0,0 +1,22 @@
+package com.fjhx.oa.entity.personal.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 个人电子发票申请列表查询入参实体
+ *
+ * @author
+ * @since 2024-04-11
+ */
+@Getter
+@Setter
+public class PersonalInvoiceSelectDto extends BaseSelectDto {
+
+    /**
+     * 审批状态
+     */
+    private Integer status;
+
+}

hx-oa/src/main/java/com/fjhx/oa/entity/personal/po/PersonalInvoice.java

@@ -0,0 +1,57 @@
+package com.fjhx.oa.entity.personal.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-11
+ */
+@Getter
+@Setter
+@TableName("personal_invoice")
+public class PersonalInvoice extends BasePo {
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date applyTime;
+
+    /**
+     * 审批状态
+     */
+    private Integer status;
+
+    /**
+     * 流程id
+     */
+    private Long flowId;
+
+    /**
+     * 编号
+     */
+    private String code;
+
+    /**
+     * 发票金额
+     */
+    private Long amount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 公司id
+     */
+    private Long companyId;
+
+}

hx-oa/src/main/java/com/fjhx/oa/entity/personal/vo/PersonalInvoiceVo.java

@@ -0,0 +1,19 @@
+package com.fjhx.oa.entity.personal.vo;
+
+import com.fjhx.oa.entity.personal.po.PersonalInvoice;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 个人电子发票申请列表查询返回值实体
+ *
+ * @author
+ * @since 2024-04-11
+ */
+@Getter
+@Setter
+public class PersonalInvoiceVo extends PersonalInvoice {
+
+    private String createUserName;
+
+}

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

@@ -0,0 +1,74 @@
+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.personal.dto.PersonalInvoiceDto;
+import com.fjhx.oa.entity.personal.po.PersonalInvoice;
+import com.fjhx.oa.service.personal.PersonalInvoiceService;
+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 PersonalInvoiceFlow extends FlowDelegate {
+
+    @Autowired
+    private PersonalInvoiceService personalInvoiceService;
+    @Autowired
+    private CodingRuleService codingRuleService;
+
+    @Override
+    public String getFlowKey() {
+        return "personal_invoice_flow";
+    }
+
+    @Override
+    public Long start(Long flowId, JSONObject submitData) {
+        PersonalInvoiceDto dto = submitData.toJavaObject(PersonalInvoiceDto.class);
+        dto.setFlowId(flowId);
+
+        dto.setCode(codingRuleService.createCode(CodingRuleEnum.PERSONAL_INVOICE.getKey(), null));
+        dto.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
+
+        personalInvoiceService.addOrEdit(dto);
+
+        return dto.getId();
+    }
+
+    @Override
+    public void end(Long flowId, Long businessId, JSONObject submitData) {
+        personalInvoiceService.update(q -> q
+                .eq(PersonalInvoice::getId, businessId)
+                .set(PersonalInvoice::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) {
+        personalInvoiceService.update(q -> q
+                .eq(PersonalInvoice::getId, businessId)
+                .set(PersonalInvoice::getStatus, FlowStatusEnum1.REJECT.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
+    @Override
+    public void cancellation(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        personalInvoiceService.cancellation(businessId);
+    }
+}

hx-oa/src/main/java/com/fjhx/oa/mapper/personal/PersonalInvoiceMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.oa.mapper.personal;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.personal.po.PersonalInvoice;
+import com.fjhx.oa.entity.personal.vo.PersonalInvoiceVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 个人电子发票申请 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-04-11
+ */
+public interface PersonalInvoiceMapper extends BaseMapper<PersonalInvoice> {
+
+    /**
+     * 个人电子发票申请分页
+     */
+    Page<PersonalInvoiceVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<PersonalInvoice> wrapper);
+
+}

hx-oa/src/main/java/com/fjhx/oa/service/personal/PersonalInvoiceService.java

@@ -0,0 +1,42 @@
+package com.fjhx.oa.service.personal;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.personal.dto.PersonalInvoiceDto;
+import com.fjhx.oa.entity.personal.dto.PersonalInvoiceSelectDto;
+import com.fjhx.oa.entity.personal.po.PersonalInvoice;
+import com.fjhx.oa.entity.personal.vo.PersonalInvoiceVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 个人电子发票申请 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-04-11
+ */
+public interface PersonalInvoiceService extends BaseService<PersonalInvoice> {
+
+    /**
+     * 个人电子发票申请分页
+     */
+    Page<PersonalInvoiceVo> getPage(PersonalInvoiceSelectDto dto);
+
+    /**
+     * 个人电子发票申请明细
+     */
+    PersonalInvoiceVo detail(Long id);
+
+    /**
+     * 个人电子发票申请新增
+     */
+    void addOrEdit(PersonalInvoiceDto personalInvoiceDto);
+
+    /**
+     * 个人电子发票申请删除
+     */
+    void delete(Long id);
+
+    void cancellation(Long businessId);
+}

hx-oa/src/main/java/com/fjhx/oa/service/personal/impl/PersonalInvoiceServiceImpl.java

@@ -0,0 +1,117 @@
+package com.fjhx.oa.service.personal.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+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.common.utils.AuthorityUtils;
+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;
+import com.fjhx.oa.entity.personal.dto.PersonalInvoiceDto;
+import com.fjhx.oa.entity.personal.dto.PersonalInvoiceSelectDto;
+import com.fjhx.oa.entity.personal.po.PersonalInvoice;
+import com.fjhx.oa.entity.personal.vo.PersonalInvoiceVo;
+import com.fjhx.oa.mapper.personal.PersonalInvoiceMapper;
+import com.fjhx.oa.service.personal.PersonalInvoiceService;
+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-11
+ */
+@Service
+public class PersonalInvoiceServiceImpl extends ServiceImpl<PersonalInvoiceMapper, PersonalInvoice> implements PersonalInvoiceService {
+
+    @Autowired
+    private FlowExampleService flowExampleService;
+
+    @Override
+    public Page<PersonalInvoiceVo> getPage(PersonalInvoiceSelectDto dto) {
+        IWrapper<PersonalInvoice> wrapper = getWrapper();
+
+        //权限过滤
+        AuthorityUtils.cofAuthority("pi", PersonalInvoice::getCompanyId, wrapper);
+
+        wrapper.keyword(dto.getKeyword(),
+                new SqlField("pi", PersonalInvoice::getCode),
+                new SqlField("pi", PersonalInvoice::getAmount),
+                new SqlField("pi", PersonalInvoice::getRemark)
+        );
+        wrapper.eq("su", PersonalInvoice::getStatus, dto.getStatus());
+
+        wrapper.orderByDesc("pi", PersonalInvoice::getId);
+        Page<PersonalInvoiceVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<PersonalInvoiceVo> records = page.getRecords();
+        setInfo(records);
+        return page;
+    }
+
+    @Override
+    public PersonalInvoiceVo detail(Long id) {
+        PersonalInvoice personalInvoice = this.getById(id);
+        PersonalInvoiceVo result = BeanUtil.toBean(personalInvoice, PersonalInvoiceVo.class);
+        setInfo(Arrays.asList(result));
+        return result;
+    }
+
+    private void setInfo(List<PersonalInvoiceVo> records) {
+        if (ObjectUtil.isEmpty(records)) {
+            return;
+        }
+        UserUtil.assignmentNickName(records, PersonalInvoiceVo::getCreateUser, PersonalInvoiceVo::setCreateUserName);
+    }
+
+    @DSTransactional
+    @Override
+    public void addOrEdit(PersonalInvoiceDto dto) {
+        dto.setCompanyId(SecurityUtils.getCompanyId());
+        this.saveOrUpdate(dto);
+        ObsFileUtil.saveFile(dto.getFileList(), dto.getId());
+    }
+
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    @Override
+    public void cancellation(Long businessId) {
+        PersonalInvoice byId = getById(businessId);
+        this.update(q -> q
+                .eq(PersonalInvoice::getId, businessId)
+                .set(PersonalInvoice::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())
+        );
+    }
+
+}

hx-oa/src/main/resources/mapper/personal/PersonalInvoiceMapper.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.personal.PersonalInvoiceMapper">
+    <select id="getPage" resultType="com.fjhx.oa.entity.personal.vo.PersonalInvoiceVo">
+        select pi.id,
+               pi.apply_time,
+               pi.status,
+               pi.flow_id,
+               pi.code,
+               pi.amount,
+               pi.remark,
+               pi.company_id,
+               pi.create_user,
+               pi.create_time,
+               pi.update_user,
+               pi.update_time
+        from personal_invoice pi
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>