yxh

yxh

2023-04-07 323e4e535e3539d9aa49aecaa25c46ed00c2c9dd

yxh

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

@@ -1,14 +1,20 @@
package com.ruoyi.web.controller.project;

import java.io.*;
import java.text.SimpleDateFormat;
import java.util.*;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
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.poi.ExcelUtil;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.service.*;
@@ -18,23 +24,13 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Options;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.bind.annotation.*;

import java.io.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;

import static com.ruoyi.web.controller.project.ServiceReimbursementController.convert;

@@ -66,6 +62,9 @@

    @Autowired
    private IServiceSystemmessageService ServiceSystemmessage;

    @Autowired
    private IServiceFundSharedService fundServiceShare;


    public ServiceFundController() {
@@ -202,7 +201,239 @@
    {
        boolean b = serviceFundService.save(serviceFund);
        Long id = serviceFund.getId();
        if(b)
        {
            addReiSharedDatd(serviceFund,1);
        }
        return AjaxResult.success(id);
    }


    public  int addReiSharedDatd(ServiceFund serviceFund,int nType)
    {
        //remShare = ;
        ServiceFundShared remShare = null;
        if(nType == 1)
        {
            remShare = new ServiceFundShared();
            remShare.setSerfunid(serviceFund.getId());
        }
        else //modify
        {
            List<ServiceFundShared> remlist = fundServiceShare.getFundShareInfoById(serviceFund.getId());
            if(remlist!=null)
                remShare =remlist.get(0);
        }

        remShare.setDonorno(serviceFund.getDonorno());
        remShare.setDonorname(serviceFund.getDonorname());
        remShare.setUserno(serviceFund.getUserno());
        remShare.setUsername(serviceFund.getUsername());
        remShare.setUnitname(serviceFund.getUnitname());
        remShare.setUnitno(serviceFund.getUnitno());
        remShare.setUnituserno(serviceFund.getUnituserno());
        remShare.setPhone(serviceFund.getPhone());
        remShare.setAnnexbankcard(serviceFund.getAnnexbankcard());
        remShare.setAnnexregistform(serviceFund.getAnnexregistform());
        Double nTemp= serviceFund.getPretaxcost();
        if( nTemp == null) nTemp = 0d;
        remShare.setPretaxcost(BigDecimal.valueOf(nTemp));
        //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
        // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));

        nTemp= serviceFund.getTaxedcost();
        if( nTemp == null) nTemp = 0d;
        remShare.setTaxedcost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getTotalcost();
        if( nTemp == null) nTemp = 0d;
        remShare.setTotalcost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getExpertcost();
        if(nTemp == null) nTemp = 0.0;
        remShare.setExpertcost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getEthicscost();
        if(nTemp == null) nTemp = 0.0;
        remShare.setEthicscost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getMedicalcost();
        if(nTemp == null) nTemp = 0.0;
        remShare.setMedicalcost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getFamilycost();
        if(nTemp == null) nTemp = 0.0;
        remShare.setFamilycost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getAftercarecost();
        if(nTemp == null) nTemp = 0.0;
        remShare.setAftercarecost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getAmountrequested();
        if(nTemp == null) nTemp = 0.0;
        remShare.setAmountrequested(BigDecimal.valueOf(nTemp));


        remShare.setApplytype(serviceFund.getApplytype());

        nTemp = serviceFund.getPrepaidamount();
        if(nTemp == null) nTemp = 0.0;
        remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));

        remShare.setInvoicecount(serviceFund.getInvoicecount());
        remShare.setAttachcount(serviceFund.getAttachcount());
        remShare.setManagerno(serviceFund.getManagerno());
        remShare.setManagername(serviceFund.getManagername());
        remShare.setDeptmentno(serviceFund.getDeptmentno());
        remShare.setDeptmentname(serviceFund.getDeptmentname());
        remShare.setOpochecker(serviceFund.getOpochecker());
        remShare.setFinvicepresident(serviceFund.getFinvicepresident());
        remShare.setBusvicepresident(serviceFund.getBusvicepresident());
        remShare.setOfficedirector(serviceFund.getOfficedirector());
        remShare.setFinancedirector(serviceFund.getFinancedirector());
        remShare.setFinancechecher(serviceFund.getFinancechecher());
        //remShare.setIsdistribute(serviceFund.getIsdistribute());
        remShare.setRecordstatus(serviceFund.getRecordstatus());
        remShare.setUploadflag(serviceFund.getUploadflag());
        remShare.setUploadtime(serviceFund.getUploadtime());
        long nLevel = serviceFund.getFlowlevel();
        remShare.setFlowlevel(nLevel);

        remShare.setInfoid(serviceFund.getInfoid());

        //remShare.setOaid(serviceReimbursement.getOaid());
        //remShare.setDonorno(serviceReimbursement.getDonorno());

        boolean bRet = false;
        if(nType==1)
        {
            bRet = fundServiceShare.save(remShare);
        }
        else
        {
            //remShare.setId(serviceReimbursement.);
            bRet = fundServiceShare.updateById(remShare);
        }

        //if(!bRet) return -1;
        String strMutfileUrl = remShare.getAnnexbankcard();
        //有附件时才调用第三方进行上传
        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(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;
    }

    /**
@@ -217,6 +448,10 @@
    {
        boolean b = serviceFundService.save(serviceFundVO);
        Long id = serviceFundVO.getId();
        if(b)
        {
            addReiSharedDatd(serviceFundVO,1);
        }
        List<ServiceFunddetail> serviceFunddetails=serviceFundVO.getServiceFunddetails();
        serviceFunddetails.forEach(item->item.setFundid(id));
        serviceFunddetailService.saveBatch(serviceFunddetails);
@@ -351,7 +586,12 @@
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceFund serviceFund)
    {
        return toAjax(serviceFundService.updateById(serviceFund));
        boolean bret = serviceFundService.updateById(serviceFund);
        if(bret)
        {
            addReiSharedDatd(serviceFund,2);
        }
        return toAjax(bret);
    }

    /**

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

@@ -18,18 +18,15 @@
import java.util.Arrays;
import java.util.List;

//import com.ruoyi.project.domain.ServiceFundShared;
//import com.ruoyi.project.service.IServiceFundSharedService;

/**
 * 费用申请主Controller
 * 
 * @author ruoyi
 * @date 2023-01-10
 * @date 2023-03-27
 */
@Api("费用申请主")
@RestController
@RequestMapping("/project/shared")
@RequestMapping("/system/shared")
public class ServiceFundSharedController extends BaseController
{
    @Autowired

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

@@ -1,29 +1,22 @@
package com.ruoyi.web.controller.project;

import java.util.Arrays;
import java.util.List;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceOrganallocation;
import com.ruoyi.project.service.IServiceOrganallocationService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;


/**
 * 器官分配Controller

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

@@ -239,6 +239,7 @@
        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();
@@ -278,7 +279,16 @@
        remShare.setFlowlevel(serviceReimbursement.getFlowlevel());
        remShare.setCosttype(serviceReimbursement.getCosttype());
        remShare.setCosttypename(serviceReimbursement.getCosttypename());
        remShare.setFileurl(serviceReimbursement.getFileurl());
        remShare.setFileurl(serviceReimbursement.getAnnexfiles());
        remShare.setDonorbank(serviceReimbursement.getDonorbank());
        remShare.setDonorbankcard(serviceReimbursement.getDonorbankcard());
        remShare.setDonorremark(serviceReimbursement.getDonorremark());
        remShare.setDonorpayee(serviceReimbursement.getDonorpayee());

        //nTemp = serviceReimbursement.getDonoramount();
        //if(nTemp == null) nTemp = 0.0;
        remShare.setDonoramount(serviceReimbursement.getDonoramount());
        remShare.setDonorrelatives(serviceReimbursement.getDonorrelatives());
        //remShare.setOaid(serviceReimbursement.getOaid());
        //remShare.setDonorno(serviceReimbursement.getDonorno());

@@ -345,7 +355,7 @@
         String filePath = RuoYiConfig.getUploadPath();
         String strMutfileUrl = remShare.getFileurl();//可能存在多个地址，以,分开

        String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=%s"+strRes;
        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);


 ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,12 +6,12 @@
        druid:
            # 主库数据源
            master:
                # 客户环境
                # 医院环境
                #url: jdbc:mysql://129.88.242.37:3308/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                #username: JQ
                #password: Jqserver88

                # 测试环境
                # 开发环境
                url: jdbc:mysql://116.62.18.175:6002/lihuopo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                username: opo
                password: opo@2022

 ruoyi-admin/src/main/resources/application.yml

@@ -9,9 +9,10 @@
  # 实例演示开关
  demoEnabled: true
  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
  #profile: C:/YYJQ/OPO/WEB/Upload
  profile: D:/YYJQ/OPO/WEB/Upload
  #profile: E:/YYJQ/OPO/WEB/Upload
  #开发环境
  #profile: D:/YYJQ/OPO/WEB/Upload
  #医院环境
  profile: E:/YYJQ/OPO/WEB/Upload
  # 获取ip地址开关
  addressEnabled: false
  # 验证码类型 math 数组计算 char 字符验证
@@ -67,15 +68,15 @@
      enabled: ALWAYS
  # redis 配置
  redis:
    # 地址、密码、端口（默认为6379）：客户环境
    #host: 129.88.242.37
    #port: 6379
    #password: jqserver
    # 地址、密码、端口（默认为6379）：医院环境
    host: 129.88.242.37
    password: jqserver
    port: 6379

    # 地址、密码、端口（默认为6379）：测试环境
    host: 116.62.18.175
    password: Smartor
    port: 6020
    # 地址、密码、端口（默认为6379）：开发环境
    #host: 116.62.18.175
    #password: Smartor
    #port: 6020

    # 数据库索引
    database: 0

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

@@ -1,4 +1,3 @@
//package com.ruoyi.system.domain;
package com.ruoyi.project.domain;

import com.baomidou.mybatisplus.annotation.IdType;
@@ -17,7 +16,7 @@
 * 费用申请主对象 service_fund_shared
 * 
 * @author ruoyi
 * @date 2023-01-10
 * @date 2023-03-27
 */
@Data
@ApiModel("费用申请主")
@@ -253,5 +252,9 @@
    @Excel(name = "财务接口返回的文件名称")
    private String fileid;

    @ApiModelProperty("serverfund的ID")
    @Excel(name = "记录状态")
    private long serfunid;

}


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

@@ -9,6 +9,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
@@ -210,5 +211,22 @@
    @ApiModelProperty("费用归属描述")
    private String costtypename;

    @ApiModelProperty("捐献家属银行")
    private String donorbank;

    @ApiModelProperty("捐献家属银行卡号")
    private String donorbankcard;

    @ApiModelProperty("捐献家属费用说明")
    private String donorremark;

    @ApiModelProperty("捐献家属费用金额")
    private BigDecimal donoramount;

    @ApiModelProperty("捐献家属人数")
    private Integer donorrelatives;
    @ApiModelProperty("捐献家属收款人")
    private String donorpayee;

}


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

@@ -247,5 +247,23 @@
    @ApiModelProperty("删除标识")
    private Long delFlag;

    @ApiModelProperty("捐献家属银行")
    private String donorbank;

    @ApiModelProperty("捐献家属银行卡号")
    private String donorbankcard;

    @ApiModelProperty("捐献家属费用说明")
    private String donorremark;

    @ApiModelProperty("捐献家属费用金额")
    private BigDecimal donoramount;

    @ApiModelProperty("捐献家属人数")
    private Integer donorrelatives;

    @ApiModelProperty("捐献家属收款人")
    private String donorpayee;

}


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

@@ -1,19 +1,16 @@
//package com.ruoyi.system.mapper;
package com.ruoyi.project.mapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceFundShared;

import java.util.List;

//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//import com.ruoyi.system.domain.ServiceFundShared;

/**
 * 费用申请主Mapper接口
 * 
 * @author ruoyi
 * @date 2023-01-10
 * @date 2023-03-27
 */
public interface ServiceFundSharedMapper extends BaseMapper<ServiceFundShared>
{
@@ -24,4 +21,6 @@
     * @return 费用申请主集合
     */
    public List<ServiceFundShared> selectServiceFundSharedList(ServiceFundShared serviceFundShared);

    List<ServiceFundShared> getFundShareInfoById(Long fundid);
}

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

@@ -9,7 +9,7 @@
 * 费用申请主Service接口
 * 
 * @author ruoyi
 * @date 2023-01-10
 * @date 2023-03-27
 */
public interface IServiceFundSharedService extends IService<ServiceFundShared>
{
@@ -21,4 +21,5 @@
     * @return 费用申请主集合
     */
    public List<ServiceFundShared> queryList(ServiceFundShared serviceFundShared);
    List<ServiceFundShared> getFundShareInfoById(Long fundid);
}

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

@@ -7,6 +7,7 @@
import com.ruoyi.project.domain.ServiceFundShared;
import com.ruoyi.project.mapper.ServiceFundSharedMapper;
import com.ruoyi.project.service.IServiceFundSharedService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -15,12 +16,15 @@
 * 费用申请主Service业务层处理
 * 
 * @author ruoyi
 * @date 2023-01-10
 * @date 2023-03-27
 */
@Service
public class ServiceFundSharedServiceImpl extends ServiceImpl<ServiceFundSharedMapper, ServiceFundShared> implements IServiceFundSharedService 
{


    @Autowired
    ServiceFundSharedMapper serviceFundSharedMapper;

    /**
     * 查询费用申请主列表
@@ -166,4 +170,10 @@
        return this.list(wrappers);
    }

    @Override
    public  List<ServiceFundShared> getFundShareInfoById(Long fundid)
    {
        return serviceFundSharedMapper.getFundShareInfoById(fundid);
        // return  null;
    }
}

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

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.ServiceFundSharedMapper">
<mapper namespace="com.ruoyi.project.mapper.ServiceFundSharedMapper">
    
    <resultMap type="ServiceFundShared" id="ServiceFundSharedResult">
        <result property="id"    column="ID"    />
@@ -59,9 +59,14 @@
    </resultMap>

    <sql id="selectServiceFundSharedVo">
        select ID, InfoID, DonorNo, DonorName, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, UnitName, UnitNo, UnitUserNo, Phone, AnnexBankCard, AnnexRegistForm, PretaxCost, TaxedCost, TotalCost, ProcurementCost, ExpertCost, EthicsCost, MedicalCost, FamilyCost, AftercareCost, AmountRequested, ApplyType, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, Remark, Isdistribute, RecordStatus, uploadflag, uploadtime, FlowLevel, oaid, oabdzt, filename, fileid from service_fund_shared
        select ID, InfoID, DonorNo, DonorName, create_by, create_time, update_by, update_time, UserNo, UserName, UnitName, UnitNo, UnitUserNo, Phone, AnnexBankCard, AnnexRegistForm, PretaxCost, TaxedCost, TotalCost, ProcurementCost, ExpertCost, EthicsCost, MedicalCost, FamilyCost, AftercareCost, AmountRequested, ApplyType, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, Remark, Isdistribute, RecordStatus, uploadflag, uploadtime, FlowLevel, oaid, oabdzt, filename, fileid,serfunid from service_fund_shared
    </sql>

    <select id="getFundShareInfoById" resultType="com.ruoyi.project.domain.ServiceFundShared" resultMap="ServiceFundSharedResult">
        <include refid="selectServiceFundSharedVo"/>
        where serfunid = #{fundid}
    </select>

    <select id="selectServiceFundSharedList" parameterType="ServiceFundShared" resultMap="ServiceFundSharedResult">
        <include refid="selectServiceFundSharedVo"/>
        <where>

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

@@ -50,10 +50,16 @@
        <result property="costtype"    column="costtype"    />
        <result property="costtypename"    column="costtypename"    />
        <result property="fileurl"    column="fileurl"    />
        <result property="donorpayee"    column="donorpayee"    />
        <result property="donorbank"    column="donorbank"    />
        <result property="donorbankcard"    column="donorbankcard"    />
        <result property="donorremark"    column="donorremark"    />
        <result property="donoramount"    column="donoramount"    />
        <result property="donorrelatives"    column="donorrelatives"    />
    </resultMap>

    <sql id="selectServiceReimbursementVo">
        select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, remark, RecordStatus, uploadflag, uploadtime, Travelers, DonorName, Reason, FlowLevel, costtype, costtypename,fileurl from service_reimbursement
        select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, remark, RecordStatus, uploadflag, uploadtime, Travelers, DonorName, Reason, FlowLevel, costtype, costtypename,fileurl,donorbank,donorbankcard,donorremark, donoramount,donorrelatives,donorpayee from service_reimbursement
    </sql>

    <select id="selectServiceReimbursementList" parameterType="ServiceReimbursement" resultMap="ServiceReimbursementResult">

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

@@ -54,10 +54,16 @@
        <result property="filename"    column="filename"    />
        <result property="fileid"    column="fileid"    />
        <result property="reimid"    column="reimid"    />
        <result property="donorpayee"    column="donorpayee"    />
        <result property="donorbank"    column="donorbank"    />
        <result property="donorbankcard"    column="donorbankcard"    />
        <result property="donorremark"    column="donorremark"    />
        <result property="donoramount"    column="donoramount"    />
        <result property="donorrelatives"    column="donorrelatives"    />
    </resultMap>

    <sql id="selectServiceReimbursementSharedVo">
        select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, Travelers, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, DonorName, Reason, remark, RecordStatus, uploadflag, uploadtime, totalAmount, bigStrMoney, FlowLevel, costtype, costtypename, oaid, oabdzt, filename, fileid,reimid from service_reimbursement_shared
        select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, Travelers, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, DonorName, Reason, remark, RecordStatus, uploadflag, uploadtime, totalAmount, bigStrMoney, FlowLevel, costtype, costtypename, oaid, oabdzt, filename, fileid,reimid ,donorbank,donorbankcard,donorremark,donoramount,donorrelatives,donorpayee from service_reimbursement_shared
    </sql>

    <select id="getRemShareInfoByRemId" resultType="com.ruoyi.project.domain.ServiceReimbursementShared" resultMap="ServiceReimbursementSharedResult">