功能修改

liusheng

2023-07-26 6e2e56de2850204f51642ee3f3b4aff2b04af87c

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

@@ -1,9 +1,5 @@
package com.ruoyi.web.controller.project;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
@@ -15,7 +11,6 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.HttpClientKit;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -32,18 +27,16 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.ibatis.annotations.Options;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import java.io.*;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;


@@ -464,7 +457,7 @@
            serviceReimbursementSharedService.save(serviceReimbursementShared);

            //将退回阶段设置成100
            serviceReimbursement.setBackflowlevel(100L);     
            serviceReimbursement.setBackflowlevel(100L);
            serviceReimbursement.setFlowlevel(100L);
            serviceReimbursement.setRecordstatus(0);
            serviceReimbursementService.updateById(serviceReimbursement);
@@ -771,24 +764,72 @@
            }
            map.put(key, otherMoney);
            list.add(map);
            // 不为专家或家属
            if (!key.equals("3") && !key.equals("4")) {
                //将上一次的清空
                FYXM1.delete(0, FYXM1.length());
                //再新增
                otherMoneyall = otherMoneyall.add(otherMoney);
                FYXM1.append("OPO工作人员" + ":" + otherMoneyall + " ");
            } else {
                if (flag == 0) {
                    key1 = key;
                    flag = 1;
                }
                if (key1 == key) {
                    FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                    allMoney = allMoney.add(otherMoney);
            // 不为专家或家属，key有可能是数字，有可能是汉字
            Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
            boolean matches = pattern.matcher(key).matches();
            if (matches) {
                if (!key.equals("3") && !key.equals("4")) {
                    //将上一次的清空
                    FYXM1.delete(0, FYXM1.length());
                    //再新增
                    otherMoneyall = otherMoneyall.add(otherMoney);
                    FYXM1.append("OP0 工作人员报销差旅费" + ":" + otherMoneyall + " ");
                } else {
                    FYXM3.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                    allMoney = allMoney.add(otherMoney);
                    if (flag == 0) {
                        key1 = key;
                        flag = 1;
                    }
                    if (key1 == key) {
                        if (key.equals("3")) {
//                        FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                            FYXM2.append("专家报销差旅费 :" + otherMoney);
                            allMoney = allMoney.add(otherMoney);
                        } else {
                            FYXM2.append("家属报销差旅费及误工费用 : " + otherMoney);
                            allMoney = allMoney.add(otherMoney);
                        }
                    } else {
                        if (key.equals("3")) {
//                        FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                            FYXM3.append("专家报销差旅费 :" + otherMoney);
                            allMoney = allMoney.add(otherMoney);
                        } else {
                            FYXM3.append("家属报销差旅费及误工费用 : " + otherMoney);
                            allMoney = allMoney.add(otherMoney);
                        }
                    }
                }
            } else {
                if (!key.equals("专家") && !key.equals("家属")) {
                    //将上一次的清空
                    FYXM1.delete(0, FYXM1.length());
                    //再新增
                    otherMoneyall = otherMoneyall.add(otherMoney);
                    FYXM1.append("OP0 工作人员报销差旅费" + ":" + otherMoneyall + " ");
                } else {
                    if (flag == 0) {
                        key1 = key;
                        flag = 1;
                    }
                    if (key1 == key) {
                        if (key.equals("专家")) {
//                        FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                            FYXM2.append("专家报销差旅费 :" + otherMoney);
                            allMoney = allMoney.add(otherMoney);
                        } else {
                            FYXM2.append("家属报销差旅费及误工费用 : " + otherMoney);
                            allMoney = allMoney.add(otherMoney);
                        }
                    } else {
                        if (key.equals("专家")) {
//                        FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
                            FYXM3.append("专家报销差旅费 :" + otherMoney);
                            allMoney = allMoney.add(otherMoney);
                        } else {
                            FYXM3.append("家属报销差旅费及误工费用 : " + otherMoney);
                            allMoney = allMoney.add(otherMoney);
                        }
                    }
                }
            }
        }