费控流程添加

hx-account/src/main/java/com/fjhx/account/controller/cost/CostControlController.java

@@ -50,7 +50,7 @@ public class CostControlController {
      */
     @PostMapping("/add")
     public void add(@RequestBody CostControlDto costControlDto) {
-        costControlService.add(costControlDto);
+        costControlService.addOrEdit(costControlDto);
     }
 
     /**
@@ -71,12 +71,15 @@ public class CostControlController {
 
     /**
      * 费控删除
-     *
-     * @return
      */
     @PostMapping("/getFieldInfo")
     public JSONObject getFieldInfo() {
         return costControlService.getFieldInfo();
     }
 
+    @PostMapping("/cancellation")
+    public void cancellation(@RequestBody BaseSelectDto dto) {
+        costControlService.cancellation(dto.getId());
+    }
+
 }

hx-account/src/main/java/com/fjhx/account/entity/cost/dto/CostControlDetailDto.java

@@ -1,9 +1,12 @@
 package com.fjhx.account.entity.cost.dto;
 
 import com.fjhx.account.entity.cost.po.CostControlDetail;
+import com.fjhx.file.entity.ObsFile;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 费控明细新增编辑入参实体
  *
@@ -13,5 +16,13 @@ import lombok.Setter;
 @Getter
 @Setter
 public class CostControlDetailDto extends CostControlDetail {
+    /**
+     * 非发票附件 类型0
+     */
+    private List<ObsFile> fileList;
 
+    /**
+     * 发票附件 类型10
+     */
+    private List<ObsFile> invoiceFileList;
 }

hx-account/src/main/java/com/fjhx/account/entity/cost/dto/CostControlDto.java

@@ -4,6 +4,8 @@ import com.fjhx.account.entity.cost.po.CostControl;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 费控新增编辑入参实体
  *
@@ -14,4 +16,6 @@ import lombok.Setter;
 @Setter
 public class CostControlDto extends CostControl {
 
+    private List<CostControlDetailDto> costControlDetailList;
+
 }

hx-account/src/main/java/com/fjhx/account/entity/cost/po/CostControl.java

@@ -122,4 +122,18 @@ public class CostControl extends BasePo {
     @Label("开票税点")
     private String invoiceTaxPoint;
 
+    /**
+     * 付款账户id
+     */
+    private Long paymentAccountId;
+
+    /**
+     * 流程状态
+     */
+    private Integer status;
+    /**
+     * 流程id
+     */
+    private Long flowId;
+
 }

hx-account/src/main/java/com/fjhx/account/flow/CostControlFlow.java

@@ -0,0 +1,99 @@
+package com.fjhx.account.flow;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fjhx.account.entity.cost.dto.CostControlDto;
+import com.fjhx.account.entity.cost.po.CostControl;
+import com.fjhx.account.service.cost.CostControlService;
+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.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;
+
+/**
+ * 费控流程
+ *
+ * @author y
+ * @since 2024-03-19
+ */
+@Component
+public class CostControlFlow extends FlowDelegate {
+
+    @Autowired
+    private CostControlService costControlService;
+    @Autowired
+    private CodingRuleService codingRuleService;
+
+    @Override
+    public String getFlowKey() {
+        return "cost_control_flow";
+    }
+
+    /**
+     * 发起流程
+     */
+    @Override
+    public Long start(Long flowId, JSONObject submitData) {
+        CostControlDto costControlDto = submitData.toJavaObject(CostControlDto.class);
+        costControlDto.setFlowId(flowId);
+        costControlDto.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
+
+        costControlDto.setCode(codingRuleService.createCode(CodingRuleEnum.COST_CONTROL.getKey(), null));
+
+        //保存数据
+        costControlService.addOrEdit(costControlDto);
+
+        //回传数据给流程引擎
+        submitData.put("code", costControlDto.getCode());
+        submitData.put("amount", costControlDto.getAmount());
+
+        return costControlDto.getId();
+    }
+
+    /**
+     * 结束流程
+     */
+    @Override
+    public void end(Long flowId, Long businessId, JSONObject submitData) {
+        costControlService.update(q -> q
+                .eq(CostControl::getId, businessId)
+                .set(CostControl::getStatus, FlowStatusEnum1.PASS.getKey())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+                .set(BasePo::getUpdateTime, new Date())
+        );
+    }
+
+    /**
+     * 重新发起
+     */
+    @Override
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        CostControlDto costControlDto = submitData.toJavaObject(CostControlDto.class);
+        costControlService.addOrEdit(costControlDto);
+    }
+
+    /**
+     * 驳回
+     */
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        costControlService.update(q -> q
+                .eq(CostControl::getId, businessId)
+                .set(CostControl::getStatus, FlowStatusEnum1.REJECT.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
+    @Override
+    public void cancellation(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        costControlService.cancellation(businessId);
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/service/cost/CostControlService.java

@@ -32,7 +32,7 @@ public interface CostControlService extends BaseService<CostControl> {
     /**
      * 费控新增
      */
-    void add(CostControlDto costControlDto);
+    void addOrEdit(CostControlDto costControlDto);
 
     /**
      * 费控编辑
@@ -48,4 +48,6 @@ public interface CostControlService extends BaseService<CostControl> {
      * 获取字段列表
      */
     JSONObject getFieldInfo();
+
+    void cancellation(Long id);
 }

hx-account/src/main/java/com/fjhx/account/service/cost/impl/CostControlServiceImpl.java

@@ -3,8 +3,10 @@ package com.fjhx.account.service.cost.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
+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.account.entity.cost.dto.CostControlDetailDto;
 import com.fjhx.account.entity.cost.dto.CostControlDto;
 import com.fjhx.account.entity.cost.dto.CostControlSelectDto;
 import com.fjhx.account.entity.cost.po.CostControl;
@@ -15,17 +17,23 @@ import com.fjhx.account.mapper.cost.CostControlMapper;
 import com.fjhx.account.service.cost.CostControlDetailService;
 import com.fjhx.account.service.cost.CostControlService;
 import com.fjhx.common.controller.Label;
+import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.logistics.LogisticsCompanyInfoService;
+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.ruoyi.common.core.domain.BaseIdPo;
+import com.ruoyi.common.core.domain.BasePo;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -42,6 +50,8 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
     private LogisticsCompanyInfoService logisticsCompanyInfoService;
     @Autowired
     private CostControlDetailService costControlDetailService;
+    @Autowired
+    private FlowExampleService flowExampleService;
 
     @Override
     public Page<CostControlVo> getPage(CostControlSelectDto dto) {
@@ -80,8 +90,27 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
     }
 
     @Override
-    public void add(CostControlDto costControlDto) {
-        this.save(costControlDto);
+    @DSTransactional
+    public void addOrEdit(CostControlDto costControlDto) {
+        this.saveOrUpdate(costControlDto);
+
+        //保存明细信息
+        List<CostControlDetailDto> costControlDetailList = costControlDto.getCostControlDetailList();
+        if (ObjectUtil.isEmpty(costControlDetailList)) {
+            costControlDetailList = new ArrayList<>();
+        }
+
+        //删除无效数据
+        List<Long> idList = costControlDetailList.stream().map(BaseIdPo::getId).filter(Objects::nonNull).collect(Collectors.toList());
+        costControlDetailService.remove(q -> q.eq(CostControlDetail::getCostControlId, costControlDto.getId()).notIn(ObjectUtil.isNotEmpty(idList), BaseIdPo::getId, idList));
+        for (CostControlDetailDto costControlDetailDto : costControlDetailList) {
+            costControlDetailDto.setCostControlId(costControlDto.getId());
+            costControlDetailService.saveOrUpdate(costControlDetailDto);
+            //保存非发票附件
+            ObsFileUtil.editFile(costControlDetailDto.getFileList(), costControlDetailDto.getId(), 0);
+            //保存发票附件
+            ObsFileUtil.editFile(costControlDetailDto.getFileList(), costControlDetailDto.getId(), 10);
+        }
     }
 
     @Override
@@ -96,8 +125,6 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
 
     @Override
     public JSONObject getFieldInfo() {
-
-
         List<JSONObject> infoField = getField(CostControlVo.class);
         List<JSONObject> detailField = getField(CostControlDetailVo.class);
 
@@ -109,6 +136,26 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
         return json;
     }
 
+    @Override
+    public void cancellation(Long id) {
+        this.update(q -> q
+                .eq(CostControl::getId, id)
+                .set(CostControl::getStatus, FlowStatusEnum1.CANCELLATION.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+
+        //销毁审批中的流程
+        CostControl byId = getById(id);
+        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())
+        );
+    }
+
     private List<JSONObject> getField(Class cl) {
         //获取所有字段
         List<Field> fieldList = new ArrayList<>();

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

@@ -92,6 +92,15 @@ public enum CodingRuleEnum {
             getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
             getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
     )),
+
+    /**
+     * 费控
+     */
+    COST_CONTROL("cost_control", "费控", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "COST-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
     ;