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

@@ -331,97 +331,97 @@
//    }


    int uploadOAFileAndUpdateDb(ServiceFundShared 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.getAnnexbankcard();//可能存在多个地址，以,分开

        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();
            }


            //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 = fundServiceShare.updateById(remShare);
        if (!bRet) return -1;

        return 0;
    }
//    int uploadOAFileAndUpdateDb(ServiceFundShared 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.getAnnexbankcard();//可能存在多个地址，以,分开
//
//        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();
//            }
//
//
//            //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 = fundServiceShare.updateById(remShare);
//        if (!bRet) return -1;
//
//        return 0;
//    }

    /**
     * 新增费用汇总

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

@@ -315,127 +315,127 @@
//    }


    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;
    }
//    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/resources/application.yml

@@ -128,7 +128,7 @@
# Swagger配置
swagger:
  # 是否开启swagger
  enabled: true
  enabled: false
  # 请求前缀
  pathMapping: /


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

@@ -262,5 +262,60 @@
    @ApiModelProperty("捐献家属人数")
    private Integer donorrelatives;

    @Override
    public String toString() {
        return "ServiceReimbursementShared{" +
                "id=" + id +
                ", userno='" + userno + '\'' +
                ", username='" + username + '\'' +
                ", travelers='" + travelers + '\'' +
                ", idcardtype='" + idcardtype + '\'' +
                ", idcardno='" + idcardno + '\'' +
                ", phone='" + phone + '\'' +
                ", depositbank='" + depositbank + '\'' +
                ", bankcardno='" + bankcardno + '\'' +
                ", branchbankname='" + branchbankname + '\'' +
                ", annexbankcard='" + annexbankcard + '\'' +
                ", annexfiles='" + annexfiles + '\'' +
                ", amountrequested=" + amountrequested +
                ", prepaidamount=" + prepaidamount +
                ", invoicecount=" + invoicecount +
                ", attachcount=" + attachcount +
                ", managerno='" + managerno + '\'' +
                ", managername='" + managername + '\'' +
                ", deptmentno='" + deptmentno + '\'' +
                ", deptmentname='" + deptmentname + '\'' +
                ", opochecker='" + opochecker + '\'' +
                ", finvicepresident='" + finvicepresident + '\'' +
                ", busvicepresident='" + busvicepresident + '\'' +
                ", officedirector='" + officedirector + '\'' +
                ", financedirector='" + financedirector + '\'' +
                ", financechecher='" + financechecher + '\'' +
                ", infoid=" + infoid +
                ", donorno='" + donorno + '\'' +
                ", donorname='" + donorname + '\'' +
                ", reason='" + reason + '\'' +
                ", recordstatus=" + recordstatus +
                ", uploadflag='" + uploadflag + '\'' +
                ", uploadtime=" + uploadtime +
                ", totalamount=" + totalamount +
                ", bigstrmoney='" + bigstrmoney + '\'' +
                ", flowlevel=" + flowlevel +
                ", costtype='" + costtype + '\'' +
                ", costtypename='" + costtypename + '\'' +
                ", oaid='" + oaid + '\'' +
                ", oabdzt='" + oabdzt + '\'' +
                ", fileurl='" + fileurl + '\'' +
                ", filename='" + filename + '\'' +
                ", fileid='" + fileid + '\'' +
                ", reimid=" + reimid +
                ", delFlag=" + delFlag +
                ", donorbank='" + donorbank + '\'' +
                ", donorbankcard='" + donorbankcard + '\'' +
                ", donorremark='" + donorremark + '\'' +
                ", donoramount=" + donoramount +
                ", donorrelatives=" + donorrelatives +
                '}';
    }
}


 ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseExpertfeetypeMapper.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import com.ruoyi.project.domain.BaseExpertfeetype;
import org.apache.ibatis.annotations.Mapper;

/**
 * 专家费用Mapper接口
@@ -11,6 +12,7 @@
 * @author ruoyi
 * @date 2022-04-19
 */
@Mapper
public interface BaseExpertfeetypeMapper extends BaseMapper<BaseExpertfeetype>
{
    /**

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java

@@ -3,17 +3,18 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceFundShared;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * 费用申请主Mapper接口
 * 
 *
 * @author ruoyi
 * @date 2023-03-27
 */
public interface ServiceFundSharedMapper extends BaseMapper<ServiceFundShared>
{
@Mapper
public interface ServiceFundSharedMapper extends BaseMapper<ServiceFundShared> {
    /**
     * 查询费用申请主列表
     *

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailSharedMapper.java

@@ -2,17 +2,20 @@


import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;

import com.ruoyi.project.domain.ServiceFunddetailShared;
import org.apache.ibatis.annotations.Mapper;

/**
 * 费用申请明细Mapper接口
 * 
 *
 * @author ruoyi
 * @date 2023-04-20
 */
public interface ServiceFunddetailSharedMapper extends BaseMapper<ServiceFunddetailShared>
{
@Mapper
public interface ServiceFunddetailSharedMapper extends BaseMapper<ServiceFunddetailShared> {
    /**
     * 查询费用申请明细列表
     *

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementMapper.java

@@ -2,21 +2,24 @@


import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;

import com.ruoyi.project.domain.ServiceReimbursement;
import com.ruoyi.project.domain.ServiceReimbursementEo;
import com.ruoyi.project.domain.dto.ServiceReimbursementDto;
import com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * 报销申请Mapper接口
 * 
 *
 * @author ruoyi
 * @date 2022-01-24
 */
public interface ServiceReimbursementMapper extends BaseMapper<ServiceReimbursement>
{
@Mapper
public interface ServiceReimbursementMapper extends BaseMapper<ServiceReimbursement> {
    /**
     * 查询报销申请列表
     *
@@ -29,14 +32,13 @@

    List<ServiceReimbursement> selectSearchList(ServiceReimbursementDto serviceReimbursementdto);

    List<SpFinancialExpensesReimbursementOut> getListBypower(@Param("PAUSERNO")  String PAUSERNO,@Param("PAFUNDTYPE")  Integer PAFUNDTYPE,@Param("PAAPPLICANT")  String PAAPPLICANT,@Param("PAAPPLICATIONBEGTIME")   String PAAPPLICATIONBEGTIME,@Param("PAAPPLICATIONENDTIME")   String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT")   String PADEPARTMENT,@Param("CHECKFLAG")   Integer CHECKFLAG,@Param("APPLYTYPE")   Integer APPLYTYPE);
    List<SpFinancialExpensesReimbursementOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE);

    List<ServiceReimbursement> getInfoByInfoId(Long infoid);

    List<ServiceReimbursement> getInfoByInfoIdRelatives(Long infoid);

    /**
     *
     * @param serviceReimbursementEo
     * @return
     */

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementdetailMapper.java

@@ -2,17 +2,20 @@


import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;

import com.ruoyi.project.domain.ServiceReimbursementdetail;
import org.apache.ibatis.annotations.Mapper;

/**
 * 报销申请明细Mapper接口
 * 
 *
 * @author ruoyi
 * @date 2022-01-24
 */
public interface ServiceReimbursementdetailMapper extends BaseMapper<ServiceReimbursementdetail>
{
@Mapper
public interface ServiceReimbursementdetailMapper extends BaseMapper<ServiceReimbursementdetail> {
    /**
     * 查询报销申请明细列表
     *

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementdetailSharedMapper.java

@@ -2,17 +2,20 @@


import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;

import com.ruoyi.project.domain.ServiceReimbursementdetailShared;
import org.apache.ibatis.annotations.Mapper;

/**
 * 报销申请明细Mapper接口
 * 
 *
 * @author ruoyi
 * @date 2023-04-20
 */
public interface ServiceReimbursementdetailSharedMapper extends BaseMapper<ServiceReimbursementdetailShared>
{
@Mapper
public interface ServiceReimbursementdetailSharedMapper extends BaseMapper<ServiceReimbursementdetailShared> {
    /**
     * 查询报销申请明细列表
     *

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementpayeeMapper.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceReimbursementEo;
import com.ruoyi.project.domain.ServiceReimbursementpayee;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

@@ -13,6 +14,7 @@
 * @author ruoyi
 * @date 2023-05-10
 */
@Mapper
public interface ServiceReimbursementpayeeMapper extends BaseMapper<ServiceReimbursementpayee> {
    /**
     * 查询差旅报销付款信息列表

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementpayeeSharedMapper.java

@@ -2,17 +2,20 @@


import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;

import com.ruoyi.project.domain.ServiceReimbursementpayeeShared;
import org.apache.ibatis.annotations.Mapper;

/**
 * 差旅报销付款信息Mapper接口
 * 
 *
 * @author ruoyi
 * @date 2023-04-20
 */
public interface ServiceReimbursementpayeeSharedMapper extends BaseMapper<ServiceReimbursementpayeeShared>
{
@Mapper
public interface ServiceReimbursementpayeeSharedMapper extends BaseMapper<ServiceReimbursementpayeeShared> {
    /**
     * 查询差旅报销付款信息列表
     *

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

@@ -1,10 +1,15 @@
package com.ruoyi.project.service.impl;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.utils.HttpClientKit;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
@@ -108,7 +113,8 @@
        serviceFundShared.setSerfunid(serviceFundShared.getId());
        serviceFundShared.setId(null);
        sharedService.save(serviceFundShared);

        //数据发送给财务
        uploadOAFileAndUpdateDb(serviceFundShared);
        //fundId为主表的ID
        Map<String, Object> columnMap = new HashMap<>();
        columnMap.put("fundid", id);
@@ -638,5 +644,96 @@
        return count;
    }

    int uploadOAFileAndUpdateDb(ServiceFundShared 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.getAnnexbankcard();//可能存在多个地址，以,分开

        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();
            }


            //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 = sharedService.updateById(remShare);
        if (!bRet) return -1;

        return 0;
    }

}

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

@@ -1,8 +1,13 @@
package com.ruoyi.project.service.impl;

import java.io.File;
import java.util.HashMap;
import java.util.List;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.utils.HttpClientKit;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.dto.ServiceReimbursementDto;
@@ -11,6 +16,7 @@
import com.ruoyi.project.service.IServiceReimbursementSharedService;
import com.ruoyi.project.service.IServiceReimbursementdetailSharedService;
import com.ruoyi.project.service.IServiceReimbursementpayeeSharedService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -29,6 +35,7 @@
 * @author ruoyi
 * @date 2022-01-24
 */
@Slf4j
@Service
public class ServiceReimbursementServiceImpl extends ServiceImpl<ServiceReimbursementMapper, ServiceReimbursement> implements IServiceReimbursementService {

@@ -125,7 +132,8 @@
        List<ServiceReimbursementpayeeShared> serviceReimbursementpayeeShareds = DtoConversionUtils.sourceToTarget(serviceReimbursementpayees, ServiceReimbursementpayeeShared.class);
        //将组装好的数据插入到分享表中
        sharedService.save(serviceReimbursementShared);

        //上传OA文件
        uploadOAFileAndUpdateDb(serviceReimbursementShared);
        //将serviceReimbursementdetail表里的id赋值给Rdid; 将serviceReimbursementShared里的ID赋值给RBID,并将serviceReimbursementdetailShared表里的id置空，由数据库重新生成
        for (int i = 0; i < details.size(); i++) {
            serviceReimbursementdetailShareds.get(i).setRdid(serviceReimbursementdetailShareds.get(i).getId());
@@ -171,4 +179,128 @@
    }


    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 strMutfileUrl = remShare.getAnnexfiles();
        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);
        log.info("remShare的数据为 : {}:", remShare.toString());
        boolean bRet = sharedService.updateById(remShare);
        if (!bRet) return -1;

        return 0;
    }


}

 ruoyi-project/src/main/resources/mapper/project/BaseOrganizationMapper.xml

@@ -35,10 +35,12 @@
        <result property="communityname"    column="CommunityName"    />
        <result property="countycode"    column="CountyCode"    />
        <result property="countyname"    column="CountyName"    />
        <result property="bankname"    column="bankname"    />
        <result property="bankaccount"    column="bankaccount"    />
    </resultMap>

    <sql id="selectBaseOrganizationVo">
        select ID, OrganizationName, OrganizationID, LogoUrl, RegisterTime, RegisterAddress, OfficePlace, LegalPerson, ContactPerson, ContactNumber, Introduction, OrganizationType, HospitalNature, RegionalLevel, MedicalCode, del_flag, create_by, create_time, update_by, update_time, Province, ProvinceName, City, CityName, Town, TownName, Community, CommunityName, CountyCode, CountyName from base_organization
        select ID, OrganizationName, OrganizationID, LogoUrl, RegisterTime, RegisterAddress, OfficePlace, LegalPerson, ContactPerson, ContactNumber, Introduction, OrganizationType, HospitalNature, RegionalLevel, MedicalCode, del_flag, create_by, create_time, update_by, update_time, Province, ProvinceName, City, CityName, Town, TownName, Community, CommunityName, CountyCode, CountyName,bankname,bankaccount from base_organization
    </sql>

    <select id="selectBaseOrganizationList" parameterType="BaseOrganization" resultMap="BaseOrganizationResult">