修改审批流程

liusheng

2023-11-03 b7cd70a1dc48f2cd2f5ed36d09f92c8ebcc62c8b

修改审批流程

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java

@@ -128,6 +128,20 @@
        return toAjax(serviceDonateorganService.save(serviceDonateorgan));
    }


    /**
     * æ–°å¢žæçŒ®å™¨å®˜ç®¡ç†
     */
    @ApiOperation("新增捐献器官信息")
    //@PreAuthorize("@ss.hasPermi('project:donateorgan:add')")
    @Log(title = "捐献器官管理", businessType = BusinessType.INSERT)
    @PostMapping("/addData")
    @RepeatSubmit
    public TableDataInfo addData(@RequestBody List<ServiceDonateorgan> serviceDonateorgans) {
        List<ServiceDonateorgan> serviceDonateorgans1 = serviceDonateorganService.saveData(serviceDonateorgans);
        return saveDataTable(serviceDonateorgans1);
    }

    /**
     * ä¿®æ”¹æçŒ®å™¨å®˜ç®¡ç†
     */

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -42,6 +42,7 @@
import java.io.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;

@@ -522,6 +523,16 @@
                    }
                }
                FlowLevel = FlowLevel + 1;

                if (serviceFund.getFlowlevel() == 1 && serviceFund.getBackflowlevel() == 100) {
                    log.info("财务退回再提交，出纳再次审批，之后提交到财务");
                    //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增
                    serviceFundService.addFundSharedInfo(serviceFund.getId());
                    serviceFund.setFlowlevel(100L);
                    serviceFund.setRecordstatus(99);
                    serviceFundService.updateById(serviceFund);
                    return AjaxResult.success();
                }
                //记录一下，下一级的审批，以便于下一级退回后，发起者提交时，能再提到当前审批层级
                serviceFund.setBackflowlevel(FlowLevel);
            } else {
@@ -626,12 +637,27 @@
            if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 199) {
                //将fund表的审核状态改成100
                sf.setBackflowlevel(100);

                //退回再提交，需要再到出纳那里
                sf.setFlowlevel(1L);
                sf.setRecordstatus(0);
                serviceFundService.updateById(sf);

                //往分享表里新增
                serviceFundService.addFundSharedInfo(serviceFund.getId());
//                //往分享表里新增
//                serviceFundService.addFundSharedInfo(serviceFund.getId());

                return success();
            } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 100) {
                //财务退回的数据再提交，到出纳那里没有过，再退回，导致backflowlevel是100,
                //退回再提交，需要再到出纳那里
                sf.setFlowlevel(1L);
                sf.setRecordstatus(2);
                serviceFundService.updateById(sf);
            } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 2) {
                //聂科退回的，也需要先到出纳那里
                sf.setFlowlevel(1L);
                sf.setRecordstatus(2);
                serviceFundService.updateById(sf);
            } else {

                Integer TotalLevel = 0;
@@ -1140,23 +1166,15 @@
        dataMap.put("YWZ", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
        dataMap.put("ZHUZANG", serviceFund.getManagername() == null ? "" : serviceFund.getManagername());

        dataMap.put("FYMC", LocalDate.now().getYear() + "å¹´" + LocalDate.now().getMonthValue() + "月人体器官获取服务管理中心工作人员绩效");

        String bz = "";
        int i = 0;
        if (!serviceFund.getApplytype().equals("5")) {
        for (ServiceFunddetail f : fd) {
            seqno++;
            Map<String, Object> map = new HashMap<String, Object>();
            map.put("seqno", seqno);
//            String fyxm = "";
//            fyxm += f.getItemname() == null ? "" : f.getItemname();
//            fyxm += f.getAmount() + "元";
//            //如果是医疗成本，则把银行卡加上每条明细的后面
//            if (serviceFund.getApplytype().equals("3")) {
//                fyxm += "(";
//                fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
//                fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
//                fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
//                fyxm += ")";
//            }

            //如果是医疗成本，则把银行卡加上每条明细的后面
            if (serviceFund.getApplytype().equals("3")) {
@@ -1176,6 +1194,7 @@
                bz += "<w:br/>";
            }


            String fyxm = "";
            fyxm += f.getItemname() == null ? "" : f.getItemname();
            fyxm += f.getAmount() + "元";
@@ -1185,6 +1204,29 @@
            map.put("FYXM", fyxm);
            newList.add(map);
        }
        } else {
            Map<String, Object> map = new HashMap<String, Object>();
            map.put("seqno", 1);
            String fyxm = "";
            fyxm += LocalDate.now().getYear() + "å¹´" + LocalDate.now().getMonthValue() + "月人体器官获取服务管理中心工作人员绩效,共计";
            fyxm += serviceFund.getPretaxcost() + "元";
            if (serviceFund.getPretaxcost() == null && serviceFund.getPretaxcost() == 0.0) {
                fyxm = "";
            }
            map.put("FYXM", fyxm);
            newList.add(map);
            Map<String, Object> objectObjectHashMap = new HashMap<>();
            objectObjectHashMap.put("seqno", 2);
            objectObjectHashMap.put("FYXM", "");
            newList.add(objectObjectHashMap);

            Map<String, Object> objectObjectHashMap2 = new HashMap<>();
            objectObjectHashMap2.put("seqno", 3);
            objectObjectHashMap2.put("FYXM", "");
            newList.add(objectObjectHashMap2);
        }


        //合并单元格
        checkList(newList);
        dataMap.put("items", newList);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java

@@ -467,17 +467,24 @@
        ServiceReimbursement serviceReimbursement = serviceReimbursementService.getById(checkFundVO.getFundid());
        //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了;
        if (!Objects.isNull(serviceReimbursement) && serviceReimbursement.getBackflowlevel() != null) {
//            if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) {
            if (serviceReimbursement.getBackflowlevel() == 199) {
            if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) {
//            if (serviceReimbursement.getBackflowlevel() == 199) {
                //将退回阶段设置成100
                serviceReimbursement.setBackflowlevel(100L);
                serviceReimbursement.setFlowlevel(100L);
                serviceReimbursement.setRecordstatus(0);
                //退回再提交，需要再到出纳那里
                serviceReimbursement.setFlowlevel(1L);
                serviceReimbursement.setRecordstatus(2);
                serviceReimbursementService.updateById(serviceReimbursement);

                //将修改的上报数据 æ–°å¢žä¸€æ¡
                serviceReimbursementService.addSharedData(checkFundVO.getFundid());
//                serviceReimbursementService.addSharedData(checkFundVO.getFundid());

                return success();
            } else if (serviceReimbursement.getBackflowlevel() == 2) {
                //聂科退回的，也需要走出纳那里
                serviceReimbursement.setFlowlevel(1L);
                serviceReimbursement.setRecordstatus(2);
                serviceReimbursementService.updateById(serviceReimbursement);
                return success();
            }
        }
@@ -573,12 +580,24 @@
                    //99 å–消
                    RecordStatus = 99;
                } else {

                    if (totalLevel == FlowLevel + 1) {
                        RecordStatus = 99;
                    } else {
                        RecordStatus = (FlowLevel + 1) * 2;
                    }
                }

                if (serviceReimbursement.getFlowlevel() == 1 && serviceReimbursement.getBackflowlevel() == 100) {
                    log.info("出差补贴被 è´¢åŠ¡é€€å›žå†æäº¤ï¼Œå‡ºçº³å†æ¬¡å®¡æ‰¹ï¼Œä¹‹åŽæäº¤åˆ°è´¢åŠ¡");
                    //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增
                    serviceReimbursementService.addSharedData(serviceReimbursement.getId());
                    serviceReimbursement.setFlowlevel(100L);
                    serviceReimbursement.setRecordstatus(99);
                    serviceReimbursementService.updateById(serviceReimbursement);
                    return AjaxResult.success();
                }

                FlowLevel = FlowLevel + 1;
                serviceReimbursement.setBackflowlevel(Long.valueOf(FlowLevel));
            } else {
@@ -596,6 +615,8 @@
                        FlowLevel = 0;
                    }
                }


            }

            serviceReimbursement.setRecordstatus(RecordStatus);

 ruoyi-admin/src/main/resources/template/¼¨Ð§·ÑÓÃÉêÇëµ¥.ftl

@@ -457,7 +457,7 @@
                                            <w:sz w:val="24"/>
                                            <w:szCs w:val="24"/>
                                        </w:rPr>
                                        <w:t>${JSR}</w:t>
                                        <w:t>${FYMC}</w:t>
                                    </w:r>
                                </w:p>
                            </w:tc>

 ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -90,6 +90,20 @@
        return rspData;
    }

    /**
     * å“åº”批量保存数据
     */
    @SuppressWarnings({ "rawtypes", "unchecked" })
    protected TableDataInfo saveDataTable(List<?> list)
    {
        TableDataInfo rspData = new TableDataInfo();
        rspData.setCode(HttpStatus.SUCCESS);
        rspData.setMsg("保存成功");
        rspData.setRows(list);
        rspData.setTotal(new PageInfo(list).getTotal());
        return rspData;
    }


    /**
     * å“åº”请求分页数据

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java

@@ -9,7 +9,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.poi.hpsf.Decimal;
import org.springframework.format.annotation.DateTimeFormat;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@@ -196,6 +198,8 @@
    private String applicantusername;

    @ApiModelProperty("申请时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
    private Date applicanttime;

    @ApiModelProperty("审核人编号")
@@ -278,6 +282,7 @@
    private String organchargeoperator;

    @ApiModelProperty("器官实际收到费用时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date organchargedate;

    @ApiModelProperty("器官实际收到费用")

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java

@@ -3,6 +3,7 @@
import java.math.BigDecimal;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -394,6 +395,7 @@
     */
    @ApiModelProperty("计算税费时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(exist = false)
    private Date taxTime;

    /**

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java

@@ -1,5 +1,8 @@
package com.ruoyi.project.domain;

import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.TableField;
@@ -63,7 +66,8 @@
     * ç”³è¯·æ—¶é—´
     */
    @ApiModelProperty("申请时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMH+08:00")
    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date applicanttime;


 ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java

@@ -71,5 +71,7 @@

    List<organInfoVO> getOrganCount(TimeVO timeVO);

    List<ServiceDonateorgan> saveData(List<ServiceDonateorgan> serviceDonateorgans);


}

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java

@@ -4,20 +4,25 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
import com.ruoyi.system.mapper.SysDictDataMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger;

/**
 * æçŒ®å™¨å®˜ç®¡ç†Service业务层处理
@@ -25,6 +30,7 @@
 * @author ruoyi
 * @date 2021-11-10
 */
@Slf4j
@Service
public class ServiceDonateorganServiceImpl extends ServiceImpl<ServiceDonateorganMapper, ServiceDonateorgan> implements IServiceDonateorganService {

@@ -61,6 +67,8 @@
    @Autowired
    private SysDictDataMapper dictDataMapper;

    @Autowired
    IServiceOrganallocationService serviceOrganallocationService;


    /**
@@ -736,6 +744,39 @@
        return l;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public List<ServiceDonateorgan> saveData(List<ServiceDonateorgan> serviceDonateorgans) {
        for (ServiceDonateorgan serviceDonateorgan : serviceDonateorgans) {
            String organNumber = serviceDonateorgan.getDonorno() + "." + serviceDonateorgan.getOrganno();
            if (StringUtils.isEmpty(serviceDonateorgan.getDonorno()) || StringUtils.isEmpty(serviceDonateorgan.getOrganno())) {
                throw new BaseException("新增时生成的编号为空,创建失败(请检查捐献者编号和器官类别)! ï¼š" + serviceDonateorgan.toString());
            } else {
                ServiceDonateorgan serviceDonateorgan1 = new ServiceDonateorgan();
                serviceDonateorgan1.setOrgannumber(organNumber);
                List<ServiceDonateorgan> listrecord = this.queryList(serviceDonateorgan);
                if (listrecord.size() > 0) {
                    continue;
                }
            }
            serviceDonateorgan.setOrgannumber(organNumber);
            log.info("serviceDonateorgan的数据为: {}", serviceDonateorgan);
            boolean save = this.save(serviceDonateorgan);


            //保存service_organallocation
            ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
            serviceOrganallocation.setAgeunit(serviceDonateorgan.getAgeunit());
            serviceOrganallocation.setApplicanttime(serviceDonateorgan.getApplicanttime());
            serviceOrganallocation.setIdcardno(serviceDonateorgan.getIdcardno());
            serviceOrganallocation.setIdcardtype(Long.valueOf(serviceDonateorgan.getIdcardtype()));
            serviceOrganallocation.setOrganid(serviceDonateorgan.getId());
            serviceOrganallocation.setOrgannumber(serviceDonateorgan.getOrgannumber());
            log.info("serviceOrganallocation的数据为: {}", serviceOrganallocation);
            serviceOrganallocationService.save(serviceOrganallocation);
        }
        return serviceDonateorgans;
    }


//    @Override

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java

@@ -267,13 +267,18 @@
        BigDecimal pretaxcost = BigDecimal.valueOf(0.00);
        for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
            if (StringUtils.isEmpty(serviceFunddetail.getIdcardno())) {
                logger.info("serviceFunddetail数据入参 ï¼š {}", serviceFunddetail);
                //如果身份证号为空，就不用查了，可能是医院的记录
                if (StringUtils.isEmpty(serviceFunddetail.getServicesscopename()) || !serviceFunddetail.getServicesscopename().contains("税后")) {
                    serviceFunddetail.setTaxedamount(serviceFunddetail.getAmount());
                } else {
                    serviceFunddetail.setAmount(serviceFunddetail.getTaxedamount());
                }
                this.updateById(serviceFunddetail);
                serviceFunddetail.setTaxamount(0.0);
                logger.info("serviceFunddetail更新后的数据 ï¼š {}", serviceFunddetail);
                boolean b = this.updateById(serviceFunddetail);
                logger.info("serviceFunddetail修改结果 ï¼š {}", b);
                continue;
            }

            //获取当月的第一天
@@ -290,6 +295,7 @@
            taxMoneyVO.setIDCard(serviceFunddetail.getIdcardno());
            //查出税前、税、税后的总额（不包含本次）
            TaxMoneySumEO taxSum = serviceFunddetailMapper.getTaxSum(taxMoneyVO);
            logger.info("查询的taxSum的值 ï¼š {}", taxSum);
            if (ObjectUtils.isEmpty(taxSum)) {
                taxSum = new TaxMoneySumEO();
            }
@@ -312,8 +318,10 @@
                    continue;
                }
            }
            logger.info("taxSum入参数据：{}", taxSum);

            if (StringUtils.isEmpty(serviceFunddetail.getServicesscopename()) || !serviceFunddetail.getServicesscopename().contains("税后")) {
                logger.info("计算税前信息开始：{}", serviceFunddetail);
                logger.info("taxSum入参数据：{}", taxSum);
                // å¦‚何税前金额不为空，用之前的”总税前金额“，加上当前”税前金额“
                BigDecimal newAmounts = BigDecimal.valueOf(taxSum.getAmounts()).add(BigDecimal.valueOf(serviceFunddetail.getAmount()));

@@ -324,19 +332,23 @@

                //计算本次的税后金额(本次的税前金额 - ç¨Žé‡‘)
                BigDecimal texdAfterNow = BigDecimal.valueOf(serviceFunddetail.getAmount()).subtract(taxAmountNow);
                logger.info("打印newAmounts：{},taxation:{},taxAmountNow:{},texdAfterNow:{}", newAmounts, taxation, taxAmountNow, texdAfterNow);

                //将循环的数据重新放到一个新对象中
                ServiceFunddetail serviceFunddetail3 = DtoConversionUtils.sourceToTarget(serviceFunddetail, ServiceFunddetail.class);
                serviceFunddetail3.setTaxamount(taxAmountNow.doubleValue());
                serviceFunddetail3.setTaxedamount(texdAfterNow.doubleValue());
                serviceFunddetail3.setTaxTime(new Date());
                logger.info("打印税前serviceFunddetail3数据 :{}", serviceFunddetail3);

                // å°†è¯¥æ¡æ•°æ®æ›´æ–°
                boolean b = this.updateById(serviceFunddetail3);
                logger.info("是否更新成功：{}入参数据：{}", b, serviceFunddetail3);
                pretaxcost = pretaxcost.add(BigDecimal.valueOf(serviceFunddetail.getAmount()));
                // æŠŠè¯¥æ•°æ®ï¼Œæ”¾åˆ°ä¸´æ—¶çš„集合中
                temporarySave.add(serviceFunddetail3);
            } else if (serviceFunddetail.getServicesscopename().contains("税后")) {
                logger.info("计算税后信息开始：{}", serviceFunddetail);
                logger.info("taxSum入参数据：{}", taxSum);
                //税后不为空, ç”¨ä¹‹å‰çš„”总税后金额“，加上当前”税后金额“
                BigDecimal newTaxedAmounts = BigDecimal.valueOf(taxSum.getTaxedAmounts()).add(BigDecimal.valueOf(serviceFunddetail.getTaxedamount()));

@@ -347,12 +359,14 @@

                //算出本次税金(本次税前 - æœ¬æ¬¡ç¨ŽåŽ)
                BigDecimal tax = amountNow.subtract(BigDecimal.valueOf(serviceFunddetail.getTaxedamount()));
                logger.info("打印newTaxedAmounts：{},taxationBefore:{},amountNow:{},tax:{}", newTaxedAmounts, taxationBefore, amountNow, tax);

                //将循环的数据重新放到一个新对象中
                ServiceFunddetail serviceFunddetail3 = DtoConversionUtils.sourceToTarget(serviceFunddetail, ServiceFunddetail.class);
                serviceFunddetail3.setAmount(amountNow.doubleValue());
                serviceFunddetail3.setTaxamount(tax.doubleValue());
                serviceFunddetail3.setTaxTime(new Date());
                logger.info("打印serviceFunddetail3:{}", serviceFunddetail3);
                // å°†è¯¥æ¡æ•°æ®æ›´æ–°
                updateById(serviceFunddetail3);
                pretaxcost = pretaxcost.add(BigDecimal.valueOf(serviceFunddetail3.getAmount()));

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -184,7 +184,10 @@
        for (ServiceFundShared serviceFundShared : serviceFundShareds) {
                if (StringUtils.isNotBlank(serviceFundShared.getOabdzt()) && serviceFundShared.getOabdzt().equals("已撤销")) {
                //如果有财务驳回信息说明是退回的
                String[] split = serviceFundShared.getCxrjyj().split("&");
                String[] split = null;
                if (StringUtils.isNotEmpty(serviceFundShared.getCxrjyj())) {
                    split = serviceFundShared.getCxrjyj().split("&");
                }
                String phone = serviceFundShared.getPhone();
                //将分享里的该数据删除
                serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId());