liusheng
2023-12-04 926b0e68e108d0866d79c1a366e3d14d1cebac4b
代码提交
已修改10个文件
256 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java 224 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -496,7 +496,6 @@
            serviceFundflowrule.setApplytype(serviceFund.getApplytype());
            serviceFundflowrule.setCheckuserno(loginUser.getUsername());
            log.info("serviceFundController---checkFund---queryList的入参值serviceFundflowrule:{}", serviceFundflowrule);
            List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
            if (serviceFundflowrules == null || serviceFundflowrules.stream().count() == 0) {
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -233,230 +233,6 @@
        return error();
    }
//    public int addReiSharedDatd(ServiceReimbursement serviceReimbursement, int nType) {
//        //remShare = ;
//        ServiceReimbursementShared remShare = new ServiceReimbursementShared();
//        if (nType == 1) {
//            // remShare = new ServiceReimbursementShared();
//            remShare.setReimid(serviceReimbursement.getId());
//        } else //modify
//        {
//            List<ServiceReimbursementShared> remlist = serviceReimbursementServiceShare.getRemShareInfoByRemId(serviceReimbursement.getId());
//            if (!CollectionUtils.isEmpty(remlist)) remShare = remlist.get(0);
//        }
//
//        remShare.setUserno(serviceReimbursement.getUserno());
//        remShare.setUsername(serviceReimbursement.getUsername());
//        remShare.setTravelers(serviceReimbursement.getTravelers());
//        remShare.setIdcardtype(serviceReimbursement.getIdcardtype());
//        remShare.setIdcardno(serviceReimbursement.getIdcardno());
//        remShare.setPhone(serviceReimbursement.getPhone());
//        remShare.setDepositbank(serviceReimbursement.getDepositbank());
//        remShare.setBankcardno(serviceReimbursement.getBankcardno());
//        remShare.setBranchbankname(serviceReimbursement.getBranchbankname());
//        remShare.setAnnexbankcard(serviceReimbursement.getAnnexbankcard());
//        remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
//        //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
//        // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));
//
//        Double nTemp = serviceReimbursement.getAmountrequested();
//        if (nTemp == null) nTemp = 0d;
//        remShare.setAmountrequested(BigDecimal.valueOf(nTemp));
//
//        nTemp = serviceReimbursement.getPrepaidamount();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));
//
//        remShare.setInvoicecount(serviceReimbursement.getInvoicecount());
//        remShare.setAttachcount(serviceReimbursement.getAttachcount());
//        remShare.setManagerno(serviceReimbursement.getManagerno());
//        remShare.setManagername(serviceReimbursement.getManagername());
//        remShare.setDeptmentno(serviceReimbursement.getDeptmentno());
//        remShare.setDeptmentname(serviceReimbursement.getDeptmentname());
//        remShare.setOpochecker(serviceReimbursement.getOpochecker());
//        remShare.setFinvicepresident(serviceReimbursement.getFinvicepresident());
//        remShare.setBusvicepresident(serviceReimbursement.getBusvicepresident());
//        remShare.setOfficedirector(serviceReimbursement.getOfficedirector());
//        remShare.setFinancedirector(serviceReimbursement.getFinancedirector());
//        remShare.setFinancechecher(serviceReimbursement.getFinancechecher());
//        remShare.setInfoid(serviceReimbursement.getInfoid());
//        remShare.setDonorno(serviceReimbursement.getDonorno());
//
//        remShare.setDonorname(serviceReimbursement.getDonorname());
//        remShare.setReason(serviceReimbursement.getReason());
//        remShare.setRecordstatus(serviceReimbursement.getRecordstatus());
//        remShare.setUploadflag(serviceReimbursement.getUploadflag());
//        remShare.setUploadtime(serviceReimbursement.getUploadtime());
//
//        nTemp = serviceReimbursement.getTotalamount();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setTotalamount(BigDecimal.valueOf(nTemp));
//
//        remShare.setBigstrmoney(serviceReimbursement.getBigstrmoney());
//        remShare.setFlowlevel(serviceReimbursement.getFlowlevel());
//        remShare.setCosttype(serviceReimbursement.getCosttype());
//        remShare.setCosttypename(serviceReimbursement.getCosttypename());
//        remShare.setFileurl(serviceReimbursement.getAnnexfiles());
//        remShare.setDonorbank(serviceReimbursement.getDonorbank());
//        remShare.setDonorbankcard(serviceReimbursement.getDonorbankcard());
//        remShare.setDonorremark(serviceReimbursement.getDonorremark());
//
//        nTemp = serviceReimbursement.getDonoramount();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setDonoramount(nTemp);
//        remShare.setDonorrelatives(serviceReimbursement.getDonorrelatives());
//        //remShare.setOaid(serviceReimbursement.getOaid());
//        //remShare.setDonorno(serviceReimbursement.getDonorno());
//
//        boolean bRet = false;
//        if (nType == 1) {
//            bRet = serviceReimbursementServiceShare.save(remShare);
//        } else {
//            //remShare.setId(serviceReimbursement.);
//            bRet = serviceReimbursementServiceShare.updateById(remShare);
//        }
//
//        //if(!bRet) return -1;
//        String strMutfileUrl = remShare.getFileurl();
//        //有附件时才调用第三方进行上传
//        if (strMutfileUrl == null) return 0;
//        if (strMutfileUrl.isEmpty()) return 0;
//
//        try {
//            uploadOAFileAndUpdateDb(remShare);
//        } catch (Exception e) {
//            logger.error("调用第三方接口出错!");
//            e.printStackTrace();
//        }
//
//        //此处保存成功后要上传OA,保存返回值
//
//        return 0;
//    }
//    int uploadOAFileAndUpdateDb(ServiceReimbursementShared remShare) {
//        //上传OA文件
//        //String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3";
//        String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";
//        //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token";
//        //上传文件成功后,去更新相关的数据库
//
//
//        Map<String, Object> map = new HashMap<String, Object>();
//        map.put("userName", "opo");
//        map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
//        map.put("loginName", "demo3");
//
//        JSONObject jsonObj = new JSONObject(map);
//
//        System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
//        String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());//
//        //String strRes = HttpClientKit.postMsg(strUrl,jsonObj);//得到返回的token?
//
//        JSONObject json1 = JSONObject.parseObject(strRes);
//        strRes = json1.get("id").toString();
//
//        ///if(strRes.isEmpty() || "" == strRes) return -1;// 为空代表失败
//
//        //下面需求调用文件的接口,调用成功返回后,得到filename和fileid 用这二个值去更新数据
//
//        String filePath = RuoYiConfig.getUploadPath();
//        String strMutfileUrl = remShare.getFileurl();//可能存在多个地址,以,分开
//
//        String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
//        //String strFUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/attachment?token="+strRes;
//        //strFUrl = String.format(strFUrl, strRes);
//
//        /*File test = null;
//        File file = new File("E:\\YYJQ\\OPO\\WEB\\Upload\\upload\\2023\\02\\17");
//        if (file.exists() && file.isDirectory()) {
//            // 获取所有盲盒文件夹
//            File[] ones = file.listFiles();
//            for (File one : ones) {
//                test = one;
//            }
//        }*/
//
//        String filename = "";
//        String fileid = "";
//
//        String[] urlArray = strMutfileUrl.split(",");
//        for (int i = 0; i < urlArray.length; i++) {
//            String strOneFileName = urlArray[i];
//            String strTemp = strOneFileName.substring(15);
//            String strFile = filePath + strTemp;
//            //FileUploadUtils.getAbsoluteFile(filePath,strOneFileName);
//            String struploadResult = "";
//            File filetest = new File(strFile);
//            try {
//                struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
//            } catch (Exception e) {
//                e.printStackTrace();
//            }
//
//
//            /*CloseableHttpClient httpClient = HttpClients.createDefault();
//            //创建post方法连接实例,在post方法中传入待连接地址
//            HttpPost httpPost = new HttpPost(strFUrl);
//            CloseableHttpResponse response = null;
//
//            String struploadResult = "";
//            try {
//                //设置请求参数(类似html页面中name属性)
//                MultipartEntityBuilder entity = MultipartEntityBuilder.create();
//                //entity.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
//                entity.setCharset(Charset.forName("UTF-8"));
//
//                byte[] fileBytes = Files.readAllBytes(Paths.get(strFile));
//                if (fileBytes != null) {
//                    //内容类型,用于定义网络文件的类型和网页的编码,决定文件接收方将以什么形式、什么编码读取这个文件
//                    ContentType OCTEC_STREAM = ContentType.create("application/octet-stream", Charset.forName("UTF-8"));
//                    //添加文件
//                    entity.addBinaryBody("file", fileBytes, OCTEC_STREAM, strTemp);
//                }
//
//                httpPost.setEntity(entity.build());
//                //发起请求,并返回请求响应
//                response = httpClient.execute(httpPost);
//                struploadResult = EntityUtils.toString(response.getEntity(), "utf-8");
//            }
//            catch (Exception e)
//            {
//                e.printStackTrace();
//            }*/
//
//            //String strFRes = HttpClientKit.postMsg(strFUrl,jsonFObj);
//            if (struploadResult == null) return 0;
//            if (struploadResult.isEmpty()) return 0;
//
//            JSONObject jsonR = JSONObject.parseObject(struploadResult);
//
//            JSONArray jsonArr = jsonR.getJSONArray("atts");
//            for (int j = 0; j < jsonArr.size(); j++) {
//                JSONObject jsonRet = jsonArr.getJSONObject(j);
//                String name1 = jsonRet.get("filename").toString();
//                String id1 = jsonRet.get("fileUrl").toString();
//                filename += name1;
//                fileid += id1;
//                if (i != urlArray.length - 1) {
//                    filename += ",";
//                    fileid += ",";
//                }
//            }
//
//        }
//
////        long nId = remShare.getId();
////        remShare.setId(nId);
////        remShare.setFilename(filename);
////        remShare.setFileid(fileid);
////        boolean bRet = serviceReimbursementServiceShare.updateById(remShare);
////        if (!bRet) return -1;
//
//        return 0;
//    }
    /**
     * 差旅费上报
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
@@ -162,10 +162,14 @@
        if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getAnnexfilesList())) {
            //对前端传过来的数组,进行JSON序列化,并赋值给Annexfiles
            serviceReimbursementdetail.setAnnexfiles(JSON.toJSONString(serviceReimbursementdetailVO.getAnnexfilesList()));
        } else {
            serviceReimbursementdetail.setAnnexfiles(null);
        }
        if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getInvoicefilesList())) {
            //对前端传过来的数组,进行JSON序列化,并赋值给Invoicefiles
            serviceReimbursementdetail.setInvoicefiles(JSON.toJSONString(serviceReimbursementdetailVO.getInvoicefilesList()));
        } else {
            serviceReimbursementdetail.setInvoicefiles(null);
        }
        return toAjax(serviceReimbursementdetailService.updateById(serviceReimbursementdetail));
    }
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -23,7 +23,7 @@
    /**
     * 默认大小 50M
     */
    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
    public static final long DEFAULT_MAX_SIZE = 500 * 1024 * 1024;
    /**
     * 默认的文件名最大长度 100
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
@@ -4,6 +4,8 @@
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -335,12 +337,14 @@
     * 附件文件地址
     */
    @ApiModelProperty("附件文件地址")
    @TableField(value = "annexfiles",updateStrategy = FieldStrategy.IGNORED)
    private String annexfiles;
    /**
     * 附件文件地址
     */
    /** 发票附件 */
    @TableField(value = "invoicefiles",updateStrategy =FieldStrategy.IGNORED)
    @ApiModelProperty("发票附件")
    @Excel(name = "发票附件")
    private String invoicefiles;
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.domain;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
@@ -336,6 +338,7 @@
     * 附件文件地址
     */
    @ApiModelProperty("附件文件地址")
    @TableField(value = "annexfiles",updateStrategy = FieldStrategy.IGNORED)
    private String annexfiles;
    /**
@@ -348,6 +351,7 @@
     * 附件文件地址
     */
    @ApiModelProperty("发票文件地址")
    @TableField(value = "invoicefiles",updateStrategy = FieldStrategy.IGNORED)
    private String invoicefiles;
    /**
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.domain;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
@@ -152,6 +154,7 @@
     */
    @ApiModelProperty("附件表")
    @Excel(name = "附件表")
    @TableField(value = "annexfiles",updateStrategy = FieldStrategy.IGNORED)
    private String annexfiles;
    /**
@@ -159,6 +162,7 @@
     */
    @ApiModelProperty("发票附件表")
    @Excel(name = "发票附件表")
    @TableField(value = "invoicefiles",updateStrategy = FieldStrategy.IGNORED)
    private String invoicefiles;
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailVO.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.domain;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
@@ -151,6 +153,7 @@
     */
    @ApiModelProperty("附件表")
    @Excel(name = "附件表")
    @TableField(value = "annexfiles",updateStrategy = FieldStrategy.IGNORED)
    private String annexfiles;
    /**
@@ -168,6 +171,7 @@
     */
    @ApiModelProperty("发票附件表")
    @Excel(name = "发票附件表")
    @TableField(value = "invoicefiles",updateStrategy = FieldStrategy.IGNORED)
    private String invoicefiles;
    /**
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -145,6 +145,7 @@
        //判断一下,share表是否已经存在了
        Map<String, Object> map = new HashMap<>();
        map.put("serfunid", id);
        map.put("del_flag", 0);
        List<ServiceFundShared> serviceFundSharedList = serviceFundSharedMapper.selectByMap(map);
        if (!CollectionUtils.isEmpty(serviceFundSharedList)) {
            return true;
@@ -712,9 +713,13 @@
            //將附件转成json
            if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
                serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
            } else {
                serviceFunddetailVO.setAnnexfiles(null);
            }
            if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoicefilesList())) {
                serviceFunddetailVO.setInvoicefiles(JSON.toJSONString(serviceFunddetailVO.getInvoicefilesList()));
            } else {
                serviceFunddetailVO.setInvoicefiles(null);
            }
            ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -274,7 +274,6 @@
        //用于临时保存已经算好的"费用详情数据"
        List<ServiceFunddetail> temporarySave = new ArrayList<>();
        //保存总税前金额(用于更新fund表里的)
        BigDecimal pretaxcost = BigDecimal.valueOf(0.00);
        for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
@@ -286,6 +285,9 @@
                } else {
                    serviceFunddetail.setAmount(serviceFunddetail.getTaxedamount());
                }
                //公司的申请金额也要加进去
                pretaxcost = pretaxcost.add(BigDecimal.valueOf(serviceFunddetail.getAmount()));
                serviceFunddetail.setTaxamount(0.0);
                logger.info("serviceFunddetail更新后的数据 : {}", serviceFunddetail);
                boolean b = this.updateById(serviceFunddetail);