Default Changelist

yxh

2023-03-13 28c168589258f36b31fdb39add938e564804b3b1

Default Changelist

 pom.xml

@@ -219,6 +219,12 @@
                <version>${ruoyi.version}</version>
            </dependency>

            <dependency>
                <groupId>org.apache.httpcomponents</groupId>
                <artifactId>httpcore</artifactId>
                <version>4.4.10</version>
            </dependency>


        </dependencies>
    </dependencyManagement>
@@ -237,6 +243,25 @@

    <dependencies>

        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
            <version>4.5</version>
        </dependency>

        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpmime</artifactId>
            <version>4.5</version>
        </dependency>

        <dependency>
            <groupId>commons-httpclient</groupId>
            <artifactId>commons-httpclient</artifactId>
            <version>3.1</version>
        </dependency>

    </dependencies>

    <build>

 ruoyi-admin/pom.xml

@@ -24,6 +24,7 @@
            <optional>true</optional> <!-- è¡¨ç¤ºä¾èµ–不会传递 -->
        </dependency>


        <!-- swagger3-->
        <dependency>
            <groupId>io.springfox</groupId>
@@ -78,6 +79,12 @@
            <version>2.3.30</version>
        </dependency>

        <dependency>
        <groupId>org.apache.httpcomponents</groupId>
        <artifactId>httpclient</artifactId>
        <version>4.5.12</version>
        </dependency>

    </dependencies>

    <build>

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -1,7 +1,12 @@
package com.ruoyi.web.controller.common;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.framework.config.ServerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,13 +15,9 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.framework.config.ServerConfig;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * é€šç”¨è¯·æ±‚处理
@@ -64,7 +65,7 @@
    }

    /**
     * é€šç”¨ä¸Šä¼ è¯·æ±‚
     * é€šç”¨ä¸Šä¼ è¯·æ±‚,type ä¸º0 ä»£è¡¨æ˜¯å·®æ—…报销，为1代表费用申请,其它值不变
     */
    @PostMapping("/common/upload")
    public AjaxResult uploadFile(MultipartFile file) throws Exception
@@ -87,6 +88,7 @@
        }
    }


    /**
     * æœ¬åœ°èµ„源通用下载
     */

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

@@ -1,49 +1,36 @@
package com.ruoyi.web.controller.project;

import java.io.*;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

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.domain.entity.SysDept;
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.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.project.domain.ServiceDonateannex;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceExternalpersonService;
import com.ruoyi.system.mapper.SysDeptMapper;
import freemarker.core.XMLOutputFormat;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
//import javafx.scene.input.DataFormat;
import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.web.bind.annotation.*;
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.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import freemarker.template.Configuration;

import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.crypto.Data;
import java.io.*;
import java.text.SimpleDateFormat;
import java.util.*;

//import javafx.scene.input.DataFormat;


/**
@@ -166,8 +153,8 @@


        serviceDonatebaseinfo.setDonorno(bh);
        serviceDonatebaseinfo.setDeptid(user.getDeptId());
        serviceDonatebaseinfo.setDeptname(sysDeptMapper.getDeptNameByDeptId(user.getDeptId()));
        //serviceDonatebaseinfo.setDeptid(user.getDeptId());
        //serviceDonatebaseinfo.setDeptname(sysDeptMapper.getDeptNameByDeptId(user.getDeptId()));

        return toAjax(serviceDonatebaseinfoService.save(serviceDonatebaseinfo));
    }

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

@@ -1,40 +1,30 @@
package com.ruoyi.web.controller.project;

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

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
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.enums.OrganEnum;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
import com.ruoyi.project.service.IServiceDonateorganService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.omg.CORBA.INTERNAL;
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.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import freemarker.template.Configuration;
import org.springframework.web.bind.annotation.*;

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


/**

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,113 @@
package com.ruoyi.web.controller.project;

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.ServiceFundShared;
import com.ruoyi.project.service.IServiceFundSharedService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

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
 */
@Api("费用申请主")
@RestController
@RequestMapping("/project/shared")
public class ServiceFundSharedController extends BaseController
{
    @Autowired
    private IServiceFundSharedService serviceFundSharedService;

    /**
     * æŸ¥è¯¢è´¹ç”¨ç”³è¯·ä¸»åˆ—表
     */
    @ApiOperation("查询费用申请主列表")
    @PreAuthorize("@ss.hasPermi('system:shared:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceFundShared serviceFundShared)
    {
        startPage();
        List<ServiceFundShared> list = serviceFundSharedService.queryList(serviceFundShared);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºè´¹ç”¨ç”³è¯·ä¸»åˆ—表
     */
    @ApiOperation("导出费用申请主列表")
    @PreAuthorize("@ss.hasPermi('system:shared:export')")
    @Log(title = "费用申请主", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceFundShared serviceFundShared)
    {
        List<ServiceFundShared> list = serviceFundSharedService.queryList(serviceFundShared);
        ExcelUtil<ServiceFundShared> util = new ExcelUtil<ServiceFundShared>(ServiceFundShared.class);
        return util.exportExcel(list, "费用申请主数据");
    }

    /**
     * èŽ·å–费用申请主详细信息
     */
    @ApiOperation("获取费用申请主详细信息")
    @PreAuthorize("@ss.hasPermi('system:shared:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return AjaxResult.success(serviceFundSharedService.getById(id));
    }

    /**
     * æ–°å¢žè´¹ç”¨ç”³è¯·ä¸»
     */
    @ApiOperation("新增费用申请主")
    @PreAuthorize("@ss.hasPermi('system:shared:add')")
    @Log(title = "费用申请主", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceFundShared serviceFundShared)
    {
        return toAjax(serviceFundSharedService.save(serviceFundShared));
    }

    /**
     * ä¿®æ”¹è´¹ç”¨ç”³è¯·ä¸»
     */
    @ApiOperation("修改费用申请主")
    @PreAuthorize("@ss.hasPermi('system:shared:edit')")
    @Log(title = "费用申请主", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceFundShared serviceFundShared)
    {
        return toAjax(serviceFundSharedService.updateById(serviceFundShared));
    }

    /**
     * åˆ é™¤è´¹ç”¨ç”³è¯·ä¸»
     */
    @ApiOperation("删除费用申请主")
    @PreAuthorize("@ss.hasPermi('system:shared:remove')")
    @Log(title = "费用申请主", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceFundSharedService.removeByIds(Arrays.asList(ids)));
    }
}

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

@@ -1,49 +1,44 @@
package com.ruoyi.web.controller.project;

import java.io.*;
import java.text.DecimalFormat;
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.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.dto.ServiceReimbursementDto;
import com.ruoyi.project.domain.vo.CheckFundVO;
import com.ruoyi.project.domain.vo.SpFinancialExpensesIn;
import com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut;
import com.ruoyi.project.service.*;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.ArrayUtils;
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 freemarker.template.Configuration;
import org.springframework.web.bind.annotation.*;

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



/**
 * æŠ¥é”€ç”³è¯·Controller
@@ -58,6 +53,9 @@
{
    @Autowired
    private IServiceReimbursementService serviceReimbursementService;

    @Autowired
    private IServiceReimbursementSharedService serviceReimbursementServiceShare;

    @Autowired
    private IServiceReimbursementdetailService serviceReimbursementdetailService;
@@ -204,9 +202,246 @@
    @Options(useGeneratedKeys = true, keyProperty = "id")
    public AjaxResult add(@RequestBody ServiceReimbursement serviceReimbursement)
    {

        boolean b = serviceReimbursementService.save(serviceReimbursement);
        if(b)
        {
            addReiSharedDatd(serviceReimbursement,1);
        }
        Long id = serviceReimbursement.getId();
        return AjaxResult.success(id);
    }

    public  int addReiSharedDatd(ServiceReimbursement serviceReimbursement,int nType)
    {
        //remShare = ;
        ServiceReimbursementShared remShare = null;
        if(nType == 1)
       {
            remShare = new ServiceReimbursementShared();
            remShare.setReimid(serviceReimbursement.getId());
        }
        else //modify
        {
            List<ServiceReimbursementShared> remlist = serviceReimbursementServiceShare.getRemShareInfoByRemId(serviceReimbursement.getId());
            if(remlist!=null)
                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.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.getFileurl());
        //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=%s"+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;
    }

    /**
@@ -227,12 +462,12 @@

            if(!postids.contains(2))
            {
                serviceReimbursement.setFlowlevel(1);
                serviceReimbursement.setFlowlevel(1L);
                serviceReimbursement.setRecordstatus(2);
            }
            else
            {
                serviceReimbursement.setFlowlevel(0);
                serviceReimbursement.setFlowlevel(0L);
                serviceReimbursement.setRecordstatus(0);
            }

@@ -295,7 +530,7 @@
            }
            Integer CheckFlag=0;
            Integer RecordStatus=serviceReimbursement.getRecordstatus();
            Integer FlowLevel=serviceReimbursement.getFlowlevel();
            Integer FlowLevel = Integer.valueOf(serviceReimbursement.getFlowlevel().toString());
            Integer OriginalFlowLevel=FlowLevel;
            if(checkFundVO.getFlowconclusion()==1)
            {
@@ -329,7 +564,7 @@
            }

            serviceReimbursement.setRecordstatus(RecordStatus);
            serviceReimbursement.setFlowlevel(FlowLevel);
            serviceReimbursement.setFlowlevel(Long.valueOf(FlowLevel.toString()));

            ServiceFundflow serviceFundflow=new ServiceFundflow();
            SysUser user = loginUser.getUser();
@@ -410,7 +645,12 @@
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceReimbursement serviceReimbursement)
    {
        return toAjax(serviceReimbursementService.updateById(serviceReimbursement));
        boolean b= serviceReimbursementService.updateById(serviceReimbursement);
        if(b)
        {
            addReiSharedDatd(serviceReimbursement,2);
        }
        return toAjax(b);
    }

    /**

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,110 @@
package com.ruoyi.web.controller.project;

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.ServiceReimbursementShared;
import com.ruoyi.project.service.IServiceReimbursementSharedService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

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

/**
 * æŠ¥é”€ç”³è¯·Controller
 * 
 * @author ruoyi
 * @date 2023-01-10
 */
@Api("报销申请")
@RestController
@RequestMapping("/project/reimshared")
public class ServiceReimbursementSharedController extends BaseController
{
    @Autowired
    private IServiceReimbursementSharedService serviceReimbursementSharedService;

    /**
     * æŸ¥è¯¢æŠ¥é”€ç”³è¯·åˆ—表
     */
    @ApiOperation("查询报销申请列表")
    //@PreAuthorize("@ss.hasPermi('system:shared:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceReimbursementShared serviceReimbursementShared)
    {
        startPage();
        List<ServiceReimbursementShared> list = serviceReimbursementSharedService.queryList(serviceReimbursementShared);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæŠ¥é”€ç”³è¯·åˆ—表
     */
    @ApiOperation("导出报销申请列表")
    //@PreAuthorize("@ss.hasPermi('system:shared:export')")
    @Log(title = "报销申请", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceReimbursementShared serviceReimbursementShared)
    {
        List<ServiceReimbursementShared> list = serviceReimbursementSharedService.queryList(serviceReimbursementShared);
        ExcelUtil<ServiceReimbursementShared> util = new ExcelUtil<ServiceReimbursementShared>(ServiceReimbursementShared.class);
        return util.exportExcel(list, "报销申请数据");
    }

    /**
     * èŽ·å–报销申请详细信息
     */
    @ApiOperation("获取报销申请详细信息")
    //@PreAuthorize("@ss.hasPermi('system:shared:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return AjaxResult.success(serviceReimbursementSharedService.getById(id));
    }

    /**
     * æ–°å¢žæŠ¥é”€ç”³è¯·
     */
    @ApiOperation("新增报销申请")
    //@PreAuthorize("@ss.hasPermi('system:shared:add')")
    @Log(title = "报销申请", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceReimbursementShared serviceReimbursementShared)
    {
        return toAjax(serviceReimbursementSharedService.save(serviceReimbursementShared));
    }

    /**
     * ä¿®æ”¹æŠ¥é”€ç”³è¯·
     */
    @ApiOperation("修改报销申请")
    //@PreAuthorize("@ss.hasPermi('system:shared:edit')")
    @Log(title = "报销申请", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceReimbursementShared serviceReimbursementShared)
    {
        return toAjax(serviceReimbursementSharedService.updateById(serviceReimbursementShared));
    }

    /**
     * åˆ é™¤æŠ¥é”€ç”³è¯·
     */
    @ApiOperation("删除报销申请")
    @PreAuthorize("@ss.hasPermi('system:shared:remove')")
    @Log(title = "报销申请", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceReimbursementSharedService.removeByIds(Arrays.asList(ids)));
    }
}

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

@@ -6,15 +6,18 @@
        druid:
            # ä¸»åº“数据源
            master:
                #url: jdbc:mysql://47.118.79.3:3308/opozj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                #username: JQ
                #password: DQt1solAOB&=
                #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://172.29.9.23:3306/oposvr?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                #url: jdbc:mysql://47.118.79.3:3308/opozj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                #username: JQ
                #password: DQt1solAOB&=
                url: jdbc:mysql://172.29.74.70:3306/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                username: sendo
                password: sendohill
                #url: jdbc:mysql://192.168.2.98:3306/opo-v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                #username: root
                #password: 1
            # ä»Žåº“数据源
            slave:
                # ä»Žæ•°æ®æºå¼€å…³/默认关闭

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

@@ -11,8 +11,8 @@
  # æ–‡ä»¶è·¯å¾„ ç¤ºä¾‹ï¼ˆ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
  #profile: /Users/dongshicun/IdeaProjects/JQ.OPO/testDoc/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 å­—符验证
@@ -71,7 +71,6 @@
    # åœ°å€
    host: 47.118.79.3
    #host: 129.88.242.37
    #host: 127.0.0.1

    # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
    port: 6379

 ruoyi-common/pom.xml

@@ -135,6 +135,10 @@
            <version>1.6.2</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
        </dependency>
    </dependencies>

</project>

 ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpClientKit.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,166 @@
package com.ruoyi.common.utils;

import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.constant.HttpStatus;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.RequestEntity;
import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.entity.mime.HttpMultipartMode;
import org.apache.http.entity.mime.MultipartEntity;
import org.apache.http.entity.mime.content.FileBody;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicHeader;
import org.apache.http.protocol.HTTP;

import java.io.BufferedReader;
import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.Charset;

public class HttpClientKit {

    public static String post(String url, JSONObject json) {

        CloseableHttpClient client = HttpClients.createDefault();
        HttpPost post = new HttpPost(url);

        post.setHeader("Content-Type", "application/json");
        post.addHeader("Authorization", "Basic YWRtaW46");
        String result = "";

        try {

            StringEntity s = new StringEntity(json.toString(), "utf-8");
            s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,
                    "application/json"));
            post.setEntity(s);

            // å‘送请求
            HttpResponse httpResponse = client.execute(post);

            // èŽ·å–响应输入流
            InputStream inStream = httpResponse.getEntity().getContent();
            BufferedReader reader = new BufferedReader(new InputStreamReader(
                    inStream, "utf-8"));
            StringBuilder strber = new StringBuilder();
            String line = null;
            while ((line = reader.readLine()) != null)
                strber.append(line + "\n");
            inStream.close();

            result = strber.toString();
            System.out.println(result);

            if (httpResponse.getStatusLine().getStatusCode() == HttpStatus.SUCCESS) {
                // System.out.println("请求服务器成功，做相应处理");
            } else {
                System.out.println("请求服务端失败");
            }
        } catch (Exception e) {
            System.out.println("请求异常");
            throw new RuntimeException(e);
        }
        finally {
            //client.
        }
        return result;
    }

    public static String sendPostWithFile(File lrcFile, String urlStr) throws Exception {
        String BOUNDARY = java.util.UUID.randomUUID().toString();
        MultipartEntity multipartEntity = new MultipartEntity(HttpMultipartMode.BROWSER_COMPATIBLE, "--------------------" + BOUNDARY, Charset.defaultCharset());
        multipartEntity.addPart("lyricsUpload", new FileBody(lrcFile));    //lyricsUpload文件名
        HttpPost request = new HttpPost(urlStr);    //远程接口
        request.setEntity(multipartEntity);
        request.addHeader("Content-Type", "multipart/form-data; boundary=--------------------" + BOUNDARY);

        DefaultHttpClient httpClient = new DefaultHttpClient();
        HttpResponse response = httpClient.execute(request);
        InputStream is = response.getEntity().getContent();
        BufferedReader in = new BufferedReader(new InputStreamReader(is));
        StringBuffer buffer = new StringBuffer();
        String line = "";
        while ((line = in.readLine()) != null) {
            buffer.append(line);
        }
        //Flogger.info("发送消息收到的返回：" + buffer.toString());
        String remark = "";
        return  buffer.toString();
       // org.json.JSONObject JSONObject = new org.json.JSONObject(buffer.toString());
    }
    public  static  String postOpr(String url,String json)
    {
        //HttpClient httpClient = new HttpClient();
        org.apache.commons.httpclient.HttpClient httpClient = new org.apache.commons.httpclient.HttpClient();
        PostMethod httpPost = new PostMethod(url);
        httpPost.setRequestHeader("Content-Type","application/json;charset=utf-8");

        try
        {
            RequestEntity entity = new StringRequestEntity(json,"Content-Type","UTF-8");
            httpPost.setRequestEntity(entity);
            httpClient.executeMethod(httpPost);

            return  httpPost.getResponseBodyAsString();
        }
        catch (Exception e)
        {
            e.printStackTrace();
        }
        return  "";
    }
    public static String postMsg(String url, JSONObject json) {

        CloseableHttpClient client = HttpClients.createDefault();
        HttpPost post = new HttpPost(url);

        post.setHeader("Content-Type", "application/json");
        //post.addHeader("Authorization", "Basic YWRtaW46");
        //post.addHeader("ApiKey", "hswl");
        post.addHeader("PostMethod", "POST");
        String result = "";

        try {

            StringEntity s = new StringEntity(json.toJSONString(), "utf-8");
            s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,
                    "application/json"));
            post.setEntity(s);

            // å‘送请求
            HttpResponse httpResponse = client.execute(post);

            // èŽ·å–响应输入流
            InputStream inStream = httpResponse.getEntity().getContent();
            BufferedReader reader = new BufferedReader(new InputStreamReader(
                    inStream, "utf-8"));
            StringBuilder strber = new StringBuilder();
            String line = null;
            while ((line = reader.readLine()) != null)
                strber.append(line + "\n");
            inStream.close();

            result = strber.toString();
            System.out.println(result);

            if (httpResponse.getStatusLine().getStatusCode() == HttpStatus.SUCCESS) {
                //System.out.println("请求服务器成功，做相应处理");
            } else {
                System.out.println("请求服务端失败");
            }
        } catch (Exception e) {
            System.out.println("请求异常");
            throw new RuntimeException(e);
        }
        finally {
            //client.
        }
        return result;
    }
}

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -52,7 +52,7 @@
    public CorsFilter corsFilter()
    {
        CorsConfiguration config = new CorsConfiguration();
        // config.setAllowCredentials(true);20230302
        config.setAllowCredentials(true);
        // è®¾ç½®è®¿é—®æºåœ°å€
        config.addAllowedOriginPattern("*");
        // è®¾ç½®è®¿é—®æºè¯·æ±‚头

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

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

import java.util.Date;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * æçŒ®åŸºç¡€å¯¹è±¡ service_donatebaseinfo
@@ -355,8 +355,21 @@

    private Long deptid;


    @ApiModelProperty("部门名称")
    @Excel(name = "部门名称")
    private String deptname;

    @ApiModelProperty("组长编码")
    @Excel(name = "组长编码")
    private String leaderno;
    
    @ApiModelProperty("组长名称")
    @Excel(name = "组长名称")
    private String leadername;

    @ApiModelProperty("业务地区")
    @Excel(name = "业务地区")
    private String businessarea;


}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,257 @@
//package com.ruoyi.system.domain;
package com.ruoyi.project.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

/**
 * è´¹ç”¨ç”³è¯·ä¸»å¯¹è±¡ service_fund_shared
 * 
 * @author ruoyi
 * @date 2023-01-10
 */
@Data
@ApiModel("费用申请主")
public class ServiceFundShared extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /** å…³è”service_donatebaseinfo表的ID */
    @ApiModelProperty("关联service_donatebaseinfo表的ID")
    @Excel(name = "关联service_donatebaseinfo表的ID")
    private Long infoid;

    /** æçŒ®è€…编号 */
    @ApiModelProperty("捐献者编号")
    @Excel(name = "捐献者编号")
    private String donorno;

    /** æçŒ®è€…姓名 */
    @ApiModelProperty("捐献者姓名")
    @Excel(name = "捐献者姓名")
    private String donorname;

    /** ç”³è¯·äººç¼–号 */
    @ApiModelProperty("申请人编号")
    @Excel(name = "申请人编号")
    private String userno;

    /** ç”³è¯·äººå§“名 */
    @ApiModelProperty("申请人姓名")
    @Excel(name = "申请人姓名")
    private String username;

    /** å·¥ä½œå•ä½ */
    @ApiModelProperty("工作单位")
    @Excel(name = "工作单位")
    private String unitname;

    /** å·¥ä½œå•ä½ç¼–号 */
    @ApiModelProperty("工作单位编号")
    @Excel(name = "工作单位编号")
    private String unitno;

    /** å·¥ä½œå•ä½ç”¨æˆ·ç¼–号 */
    @ApiModelProperty("工作单位用户编号")
    @Excel(name = "工作单位用户编号")
    private String unituserno;

    /** å®¶å±žè”系电话 */
    @ApiModelProperty("家属联系电话")
    @Excel(name = "家属联系电话")
    private String phone;

    /** é“¶è¡Œå¡ç…§ç‰‡è·¯å¾„ å¤šä¸ªç”¨;分开 */
    @ApiModelProperty("银行卡照片路径 å¤šä¸ªç”¨;分开")
    @Excel(name = "银行卡照片路径 å¤šä¸ªç”¨;分开")
    private String annexbankcard;

    /** ç™»è®°è¡¨ç…§ç‰‡è·¯å¾„ å¤šä¸ªç”¨;分开 */
    @ApiModelProperty("登记表照片路径 å¤šä¸ªç”¨;分开")
    @Excel(name = "登记表照片路径 å¤šä¸ªç”¨;分开")
    private String annexregistform;

    /** ç¨Žå‰é‡‘额合计 */
    @ApiModelProperty("税前金额合计")
    @Excel(name = "税前金额合计")
    private BigDecimal pretaxcost;

    /** ç¨ŽåŽé‡‘额合计 */
    @ApiModelProperty("税后金额合计")
    @Excel(name = "税后金额合计")
    private BigDecimal taxedcost;

    /** è´¹ç”¨æ€»é‡‘额 */
    @ApiModelProperty("费用总金额")
    @Excel(name = "费用总金额")
    private BigDecimal totalcost;

    /** èŽ·å–专家总费用 */
    @ApiModelProperty("获取专家总费用")
    //数据库自增改成@TableId(type = IdType.AUTO)
    //@TableId(type = IdType.AUTO)
    private BigDecimal procurementcost;

    /** ä¸“家费用总金额 */
    @ApiModelProperty("专家费用总金额")
    @Excel(name = "专家费用总金额")
    private BigDecimal expertcost;

    /** ä¼¦ç†å®¡æŸ¥è´¹ç”¨æ€»é‡‘额 */
    @ApiModelProperty("伦理审查费用总金额")
    @Excel(name = "伦理审查费用总金额")
    private BigDecimal ethicscost;

    /** æçŒ®è€…医学成本总金额 */
    @ApiModelProperty("捐献者医学成本总金额")
    @Excel(name = "捐献者医学成本总金额")
    private BigDecimal medicalcost;

    /** æçŒ®è€…家属食宿费总金额 */
    @ApiModelProperty("捐献者家属食宿费总金额")
    @Excel(name = "捐献者家属食宿费总金额")
    private BigDecimal familycost;

    /** æçŒ®è€…善后成本总金额 */
    @ApiModelProperty("捐献者善后成本总金额")
    @Excel(name = "捐献者善后成本总金额")
    private BigDecimal aftercarecost;

    /** ç”³è¯·é‡‘额 */
    @ApiModelProperty("申请金额")
    @Excel(name = "申请金额")
    private BigDecimal amountrequested;

    /** èµ„金类别 è§å­—å…¸sys_ConsolationType */
    @ApiModelProperty("资金类别 è§å­—å…¸sys_ConsolationType")
    @Excel(name = "资金类别 è§å­—å…¸sys_ConsolationType")
    private String applytype;

    /** é¢„支费用 */
    @ApiModelProperty("预支费用")
    @Excel(name = "预支费用")
    private BigDecimal prepaidamount;

    /** å‘票张数 */
    @ApiModelProperty("发票张数")
    @Excel(name = "发票张数")
    private Long invoicecount;

    /** é™„件数 */
    @ApiModelProperty("附件数")
    @Excel(name = "附件数")
    private Long attachcount;

    /** éƒ¨é—¨ä¸»ç®¡å·¥å· */
    @ApiModelProperty("部门主管工号")
    @Excel(name = "部门主管工号")
    private String managerno;

    /** éƒ¨é—¨ä¸»ç®¡åå­— */
    @ApiModelProperty("部门主管名字")
    @Excel(name = "部门主管名字")
    private String managername;

    /** éƒ¨é—¨ç¼–号 */
    @ApiModelProperty("部门编号")
    @Excel(name = "部门编号")
    private String deptmentno;

    /** éƒ¨é—¨åç§° */
    @ApiModelProperty("部门名称")
    @Excel(name = "部门名称")
    private String deptmentname;

    /** ä¸­å¿ƒç­¾å­— */
    @ApiModelProperty("中心签字")
    @Excel(name = "中心签字")
    private String opochecker;

    /** è´¢åŠ¡å‰¯é™¢é•¿ç­¾å­— */
    @ApiModelProperty("财务副院长签字")
    @Excel(name = "财务副院长签字")
    private String finvicepresident;

    /** ä¸šåŠ¡å‰¯é™¢é•¿ç­¾å­— */
    @ApiModelProperty("业务副院长签字")
    @Excel(name = "业务副院长签字")
    private String busvicepresident;

    /** åŠžå…¬å®¤ä¸»ä»»ç­¾å­— */
    @ApiModelProperty("办公室主任签字")
    @Excel(name = "办公室主任签字")
    private String officedirector;

    /** è´¢åŠ¡å®¤ä¸»ä»»ç­¾å­— */
    @ApiModelProperty("财务室主任签字")
    @Excel(name = "财务室主任签字")
    private String financedirector;

    /** è´¢åŠ¡å®¡æ ¸ */
    @ApiModelProperty("财务审核")
    @Excel(name = "财务审核")
    private String financechecher;

    /** å‘放状态 */
    @ApiModelProperty("发放状态")
    @Excel(name = "发放状态")
    private String isdistribute;

    /** è®°å½•çŠ¶æ€ */
    @ApiModelProperty("记录状态")
    @Excel(name = "记录状态")
    private Integer recordstatus;

    /** ä¸Šä¼ æ ‡å¿— */
    @ApiModelProperty("上传标志")
    @Excel(name = "上传标志")
    private String uploadflag;

    /** ä¸Šä¼ æ—¶é—´ */
    @ApiModelProperty("上传时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date uploadtime;

    /** å½“前审核级别 å¤„于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等 */
    @ApiModelProperty("当前审核级别 å¤„于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等")
    @Excel(name = "当前审核级别 å¤„于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等")
    private Long flowlevel;

    /** å¯¹æŽ¥ç³»ç»Ÿè¡¨å•id */
    @ApiModelProperty("对接系统表单id")
    @Excel(name = "对接系统表单id")
    private String oaid;

    /** å¯¹æŽ¥ç³»ç»Ÿè¡¨å•çŠ¶æ€ */
    @ApiModelProperty("对接系统表单状态")
    @Excel(name = "对接系统表单状态")
    private String oabdzt;

    /** è´¢åŠ¡æŽ¥å£è¿”回的文件名称 */
    @ApiModelProperty("财务接口返回的文件名称")
    @Excel(name = "财务接口返回的文件名称")
    private String filename;

    /** è´¢åŠ¡æŽ¥å£è¿”回的文件名称 */
    @ApiModelProperty("财务接口返回的文件名称")
    @Excel(name = "财务接口返回的文件名称")
    private String fileid;

}


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

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

import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * æŠ¥é”€ç”³è¯·å¯¹è±¡ service_reimbursement
@@ -191,12 +191,15 @@
    @ApiModelProperty("总金额的大写")
    private String bigstrmoney;

    /** é™„件地址，add by yangjb 20221124 */
    @ApiModelProperty("附件地址")
    private String fileurl;

    private String remark;

    /** å½“前审核级别 å¤„于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等 */
    @ApiModelProperty("当前审核级别")
    private int flowlevel;
    private Long flowlevel;


    /** è´¹ç”¨å½’属：0：其他人员；1：专职人员；2：协调员；3：专家；4：捐献者家属 */

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,251 @@
package com.ruoyi.project.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

/**
 * æŠ¥é”€ç”³è¯·å¯¹è±¡ service_reimbursement_shared
 * 
 * @author ruoyi
 * @date 2023-01-10
 */
@Data
@ApiModel("报销申请")
public class ServiceReimbursementShared extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /** æŠ¥é”€äººç¼–号 */
    @ApiModelProperty("报销人编号")
    @Excel(name = "报销人编号")
    private String userno;

    /** æŠ¥é”€äººå§“名 */
    @ApiModelProperty("报销人姓名")
    @Excel(name = "报销人姓名")
    private String username;

    /** å‡ºå·®äººå‘˜ */
    @ApiModelProperty("出差人员")
    @Excel(name = "出差人员")
    private String travelers;

    /** è¯ä»¶ç±»åž‹ æ ¹æ®å­—å…¸sys_IDType */
    @ApiModelProperty("证件类型 æ ¹æ®å­—å…¸sys_IDType")
    @Excel(name = "证件类型 æ ¹æ®å­—å…¸sys_IDType")
    private String idcardtype;

    /** è¯ä»¶å·ç  */
    @ApiModelProperty("证件号码")
    @Excel(name = "证件号码")
    private String idcardno;

    /** è”系电话 */
    @ApiModelProperty("联系电话")
    @Excel(name = "联系电话")
    private String phone;

    /** å¼€æˆ·é“¶è¡Œ */
    @ApiModelProperty("开户银行")
    @Excel(name = "开户银行")
    private String depositbank;

    /** å¡å· */
    @ApiModelProperty("卡号")
    @Excel(name = "卡号")
    private String bankcardno;

    /** åˆ†è¡Œåç§° */
    @ApiModelProperty("分行名称")
    @Excel(name = "分行名称")
    private String branchbankname;

    /** é“¶è¡Œå¡ç…§ç‰‡è·¯å¾„ å¤šä¸ªç”¨;分开 */
    @ApiModelProperty("银行卡照片路径 å¤šä¸ªç”¨;分开")
    @Excel(name = "银行卡照片路径 å¤šä¸ªç”¨;分开")
    private String annexbankcard;

    /** é™„件路径 å¤šä¸ªç”¨;分开 */
    @ApiModelProperty("附件路径 å¤šä¸ªç”¨;分开")
    @Excel(name = "附件路径 å¤šä¸ªç”¨;分开")
    private String annexfiles;

    /** ç”³è¯·é‡‘额 */
    @ApiModelProperty("申请金额")
    @Excel(name = "申请金额")
    private BigDecimal amountrequested;

    /** é¢„支费用 */
    @ApiModelProperty("预支费用")
    @Excel(name = "预支费用")
    private BigDecimal prepaidamount;

    /** å‘票张数 */
    @ApiModelProperty("发票张数")
    @Excel(name = "发票张数")
    private Long invoicecount;

    /** é™„件数 */
    @ApiModelProperty("附件数")
    @Excel(name = "附件数")
    private Long attachcount;

    /** éƒ¨é—¨ä¸»ç®¡å·¥å· */
    @ApiModelProperty("部门主管工号")
    @Excel(name = "部门主管工号")
    private String managerno;

    /** éƒ¨é—¨ä¸»ç®¡åå­— */
    @ApiModelProperty("部门主管名字")
    @Excel(name = "部门主管名字")
    private String managername;

    /** éƒ¨é—¨ç¼–号 */
    @ApiModelProperty("部门编号")
    @Excel(name = "部门编号")
    private String deptmentno;

    /** éƒ¨é—¨åç§° */
    @ApiModelProperty("部门名称")
    @Excel(name = "部门名称")
    private String deptmentname;

    /** ä¸­å¿ƒç­¾å­— */
    @ApiModelProperty("中心签字")
    @Excel(name = "中心签字")
    private String opochecker;

    /** è´¢åŠ¡å‰¯é™¢é•¿ç­¾å­— */
    @ApiModelProperty("财务副院长签字")
    @Excel(name = "财务副院长签字")
    private String finvicepresident;

    /** ä¸šåŠ¡å‰¯é™¢é•¿ç­¾å­— */
    @ApiModelProperty("业务副院长签字")
    @Excel(name = "业务副院长签字")
    private String busvicepresident;

    /** åŠžå…¬å®¤ä¸»ä»»ç­¾å­— */
    @ApiModelProperty("办公室主任签字")
    @Excel(name = "办公室主任签字")
    private String officedirector;

    /** è´¢åŠ¡å®¤ä¸»ä»»ç­¾å­— */
    @ApiModelProperty("财务室主任签字")
    @Excel(name = "财务室主任签字")
    private String financedirector;

    /** è´¢åŠ¡å®¡æ ¸ */
    @ApiModelProperty("财务审核")
    @Excel(name = "财务审核")
    private String financechecher;

    /** å…³è”service_donatebaseinfo表的ID */
    @ApiModelProperty("关联service_donatebaseinfo表的ID")
    @Excel(name = "关联service_donatebaseinfo表的ID")
    private Long infoid;

    /** æçŒ®è€…编号 */
    @ApiModelProperty("捐献者编号")
    @Excel(name = "捐献者编号")
    private String donorno;

    /** æçŒ®è€…姓名 */
    @ApiModelProperty("捐献者姓名")
    @Excel(name = "捐献者姓名")
    private String donorname;

    /** äº‹ç”± */
    @ApiModelProperty("事由")
    @Excel(name = "事由")
    private String reason;

    /** è®°å½•çŠ¶æ€ è¯¦è§å­—å…¸sys_travelexpensestatus */
    @ApiModelProperty("记录状态 è¯¦è§å­—å…¸sys_travelexpensestatus")
    @Excel(name = "记录状态 è¯¦è§å­—å…¸sys_travelexpensestatus")
    private Integer recordstatus;

    /** ä¸Šä¼ æ ‡å¿— */
    @ApiModelProperty("上传标志")
    @Excel(name = "上传标志")
    private String uploadflag;

    /** ä¸Šä¼ æ—¶é—´ */
    @ApiModelProperty("上传时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date uploadtime;

    /** æ€»é‡‘额 */
    @ApiModelProperty("总金额")
    @Excel(name = "总金额")
    private BigDecimal totalamount;

    /** æ€»é‡‘额的大写 */
    @ApiModelProperty("总金额的大写")
    @Excel(name = "总金额的大写")
    private String bigstrmoney;

    /** å½“前审核级别 å¤„于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等 */
    @ApiModelProperty("当前审核级别 å¤„于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等")
    @Excel(name = "当前审核级别 å¤„于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等")
    private Long flowlevel;

    /** è´¹ç”¨å½’属（字典表：sys_travelexpensebelong）：0：其他人员；1：专职人员；2：协调员；3：专家；4：捐献者家属 */
    @ApiModelProperty("费用归属（字典表：sys_travelexpensebelong）：0：其他人员；1：专职人员；2：协调员；3：专家；4：捐献者家属")
    @Excel(name = "费用归属", readConverterExp = "字=典表：sys_travelexpensebelong")
    private String costtype;

    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "费用归属", readConverterExp = "$column.readConverterExp()")
    private String costtypename;

    /** å¯¹æŽ¥ç³»ç»Ÿçš„表单id */
    @ApiModelProperty("对接系统的表单id")
    @Excel(name = "对接系统的表单id")
    private String oaid;

    /** å¯¹æŽ¥ç³»ç»Ÿçš„表单状态 */
    @ApiModelProperty("对接系统的表单状态")
    @Excel(name = "对接系统的表单状态")
    private String oabdzt;

    /** é™„件地址，add by yangjb 20230109 */
    @ApiModelProperty("附件地址")
    private String fileurl;

    /** è´¢åŠ¡æŽ¥å£è¿”回的文件名称 */
    @ApiModelProperty("财务接口返回的文件名称")
    @Excel(name = "财务接口返回的文件名称")
    private String filename;

    /** è´¢åŠ¡æŽ¥å£è¿”回的文件名称 */
    @ApiModelProperty("财务接口返回的文件名称")
    @Excel(name = "财务接口返回的文件名称")
    private String fileid;

    /** service reimbursement的主键 */
    @ApiModelProperty("service reimbursement的id")
    private Long reimid;

    @ApiModelProperty("删除标识")
    private Long delFlag;

}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateOrganVO.java

@@ -70,4 +70,24 @@
    private Date update_time;
    private String abandonreason;
    private String reallocationreason;
    private String leaderno;
    private String leadername;
    private String businessarea;
    private String gainHospitalname;

    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date startorgangettime;

    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endorgangettime;

    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date starttransplanttime;

    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endtransplanttime;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
//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
 */
public interface ServiceFundSharedMapper extends BaseMapper<ServiceFundShared>
{
    /**
     * æŸ¥è¯¢è´¹ç”¨ç”³è¯·ä¸»åˆ—表
     *
     * @param serviceFundShared è´¹ç”¨ç”³è¯·ä¸»
     * @return è´¹ç”¨ç”³è¯·ä¸»é›†åˆ
     */
    public List<ServiceFundShared> selectServiceFundSharedList(ServiceFundShared serviceFundShared);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.ruoyi.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceReimbursementShared;

import java.util.List;



/**
 * æŠ¥é”€ç”³è¯·Mapper接口
 * 
 * @author ruoyi
 * @date 2023-01-10
 */
public interface ServiceReimbursementSharedMapper extends BaseMapper<ServiceReimbursementShared>
{
    /**
     * æŸ¥è¯¢æŠ¥é”€ç”³è¯·åˆ—表
     *
     * @param serviceReimbursementShared æŠ¥é”€ç”³è¯·
     * @return æŠ¥é”€ç”³è¯·é›†åˆ
     */
    public List<ServiceReimbursementShared> selectServiceReimbursementSharedList(ServiceReimbursementShared serviceReimbursementShared);

    List<ServiceReimbursementShared> getRemShareInfoByRemId(Long RemId);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.project.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceFundShared;

import java.util.List;

/**
 * è´¹ç”¨ç”³è¯·ä¸»Service接口
 * 
 * @author ruoyi
 * @date 2023-01-10
 */
public interface IServiceFundSharedService extends IService<ServiceFundShared>
{

    /**
     * æŸ¥è¯¢è´¹ç”¨ç”³è¯·ä¸»åˆ—表
     * 
     * @param serviceFundShared è´¹ç”¨ç”³è¯·ä¸»
     * @return è´¹ç”¨ç”³è¯·ä¸»é›†åˆ
     */
    public List<ServiceFundShared> queryList(ServiceFundShared serviceFundShared);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.ruoyi.project.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceReimbursementShared;

import java.util.List;

/**
 * æŠ¥é”€ç”³è¯·Service接口
 * 
 * @author ruoyi
 * @date 2023-01-10
 */
public interface IServiceReimbursementSharedService extends IService<ServiceReimbursementShared>
{

    /**
     * æŸ¥è¯¢æŠ¥é”€ç”³è¯·åˆ—表
     * 
     * @param serviceReimbursementShared æŠ¥é”€ç”³è¯·
     * @return æŠ¥é”€ç”³è¯·é›†åˆ
     */
    public List<ServiceReimbursementShared> queryList(ServiceReimbursementShared serviceReimbursementShared);
    List<ServiceReimbursementShared> getRemShareInfoByRemId(Long remeid);
}

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

@@ -1,27 +1,20 @@
package com.ruoyi.project.service.impl;

import java.sql.Time;
import java.text.SimpleDateFormat;
import java.util.*;

import com.ruoyi.common.core.domain.entity.BasePrcaddressDict;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.IServiceDonateorganService;
import com.ruoyi.system.mapper.SysDictDataMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

/**
 * æçŒ®å™¨å®˜ç®¡ç†Service业务层处理
@@ -338,6 +331,7 @@
        int countDBCD = 0;
        for(ServiceDonateorgan l : list){
            Long InfoId = l.getInfoid();

            String category = serviceDonationwitnessMapper.getDonationCategoryByInfoId(InfoId);
            if(category != null && category.equals("DBD")){
                countDBD += 1;

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,169 @@
package com.ruoyi.project.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceFundShared;
import com.ruoyi.project.mapper.ServiceFundSharedMapper;
import com.ruoyi.project.service.IServiceFundSharedService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * è´¹ç”¨ç”³è¯·ä¸»Service业务层处理
 * 
 * @author ruoyi
 * @date 2023-01-10
 */
@Service
public class ServiceFundSharedServiceImpl extends ServiceImpl<ServiceFundSharedMapper, ServiceFundShared> implements IServiceFundSharedService 
{


    /**
     * æŸ¥è¯¢è´¹ç”¨ç”³è¯·ä¸»åˆ—表
     * 
     * @param serviceFundShared è´¹ç”¨ç”³è¯·ä¸»
     * @return è´¹ç”¨ç”³è¯·ä¸»
     */
    @Override
    public List<ServiceFundShared> queryList(ServiceFundShared serviceFundShared) {
        LambdaQueryWrapper<ServiceFundShared> wrappers = Wrappers.lambdaQuery();
        if (serviceFundShared.getInfoid() != null){
            wrappers.eq(ServiceFundShared::getInfoid ,serviceFundShared.getInfoid());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getDonorno())){
            wrappers.eq(ServiceFundShared::getDonorno ,serviceFundShared.getDonorno());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getDonorname())){
            wrappers.like(ServiceFundShared::getDonorname ,serviceFundShared.getDonorname());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getUserno())){
            wrappers.eq(ServiceFundShared::getUserno ,serviceFundShared.getUserno());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getUsername())){
            wrappers.like(ServiceFundShared::getUsername ,serviceFundShared.getUsername());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getUnitname())){
            wrappers.like(ServiceFundShared::getUnitname ,serviceFundShared.getUnitname());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getUnitno())){
            wrappers.eq(ServiceFundShared::getUnitno ,serviceFundShared.getUnitno());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getUnituserno())){
            wrappers.eq(ServiceFundShared::getUnituserno ,serviceFundShared.getUnituserno());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getPhone())){
            wrappers.eq(ServiceFundShared::getPhone ,serviceFundShared.getPhone());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getAnnexbankcard())){
            wrappers.eq(ServiceFundShared::getAnnexbankcard ,serviceFundShared.getAnnexbankcard());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getAnnexregistform())){
            wrappers.eq(ServiceFundShared::getAnnexregistform ,serviceFundShared.getAnnexregistform());
        }
        if (serviceFundShared.getPretaxcost() != null){
            wrappers.eq(ServiceFundShared::getPretaxcost ,serviceFundShared.getPretaxcost());
        }
        if (serviceFundShared.getTaxedcost() != null){
            wrappers.eq(ServiceFundShared::getTaxedcost ,serviceFundShared.getTaxedcost());
        }
        if (serviceFundShared.getTotalcost() != null){
            wrappers.eq(ServiceFundShared::getTotalcost ,serviceFundShared.getTotalcost());
        }
        if (serviceFundShared.getExpertcost() != null){
            wrappers.eq(ServiceFundShared::getExpertcost ,serviceFundShared.getExpertcost());
        }
        if (serviceFundShared.getEthicscost() != null){
            wrappers.eq(ServiceFundShared::getEthicscost ,serviceFundShared.getEthicscost());
        }
        if (serviceFundShared.getMedicalcost() != null){
            wrappers.eq(ServiceFundShared::getMedicalcost ,serviceFundShared.getMedicalcost());
        }
        if (serviceFundShared.getFamilycost() != null){
            wrappers.eq(ServiceFundShared::getFamilycost ,serviceFundShared.getFamilycost());
        }
        if (serviceFundShared.getAftercarecost() != null){
            wrappers.eq(ServiceFundShared::getAftercarecost ,serviceFundShared.getAftercarecost());
        }
        if (serviceFundShared.getAmountrequested() != null){
            wrappers.eq(ServiceFundShared::getAmountrequested ,serviceFundShared.getAmountrequested());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getApplytype())){
            wrappers.eq(ServiceFundShared::getApplytype ,serviceFundShared.getApplytype());
        }
        if (serviceFundShared.getPrepaidamount() != null){
            wrappers.eq(ServiceFundShared::getPrepaidamount ,serviceFundShared.getPrepaidamount());
        }
        if (serviceFundShared.getInvoicecount() != null){
            wrappers.eq(ServiceFundShared::getInvoicecount ,serviceFundShared.getInvoicecount());
        }
        if (serviceFundShared.getAttachcount() != null){
            wrappers.eq(ServiceFundShared::getAttachcount ,serviceFundShared.getAttachcount());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getManagerno())){
            wrappers.eq(ServiceFundShared::getManagerno ,serviceFundShared.getManagerno());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getManagername())){
            wrappers.like(ServiceFundShared::getManagername ,serviceFundShared.getManagername());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getDeptmentno())){
            wrappers.eq(ServiceFundShared::getDeptmentno ,serviceFundShared.getDeptmentno());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getDeptmentname())){
            wrappers.like(ServiceFundShared::getDeptmentname ,serviceFundShared.getDeptmentname());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getOpochecker())){
            wrappers.eq(ServiceFundShared::getOpochecker ,serviceFundShared.getOpochecker());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())){
            wrappers.eq(ServiceFundShared::getFinvicepresident ,serviceFundShared.getFinvicepresident());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())){
            wrappers.eq(ServiceFundShared::getBusvicepresident ,serviceFundShared.getBusvicepresident());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getOfficedirector())){
            wrappers.eq(ServiceFundShared::getOfficedirector ,serviceFundShared.getOfficedirector());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getFinancedirector())){
            wrappers.eq(ServiceFundShared::getFinancedirector ,serviceFundShared.getFinancedirector());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getFinancechecher())){
            wrappers.eq(ServiceFundShared::getFinancechecher ,serviceFundShared.getFinancechecher());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getRemark())){
            wrappers.eq(ServiceFundShared::getRemark ,serviceFundShared.getRemark());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getIsdistribute())){
            wrappers.eq(ServiceFundShared::getIsdistribute ,serviceFundShared.getIsdistribute());
        }
        if (serviceFundShared.getRecordstatus() != null){
            wrappers.eq(ServiceFundShared::getRecordstatus ,serviceFundShared.getRecordstatus());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getUploadflag())){
            wrappers.eq(ServiceFundShared::getUploadflag ,serviceFundShared.getUploadflag());
        }
        if (serviceFundShared.getUploadtime() != null){
            wrappers.eq(ServiceFundShared::getUploadtime ,serviceFundShared.getUploadtime());
        }
        if (serviceFundShared.getFlowlevel() != null){
            wrappers.eq(ServiceFundShared::getFlowlevel ,serviceFundShared.getFlowlevel());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getOaid())){
            wrappers.eq(ServiceFundShared::getOaid ,serviceFundShared.getOaid());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getOabdzt())){
            wrappers.eq(ServiceFundShared::getOabdzt ,serviceFundShared.getOabdzt());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getFilename())){
            wrappers.like(ServiceFundShared::getFilename ,serviceFundShared.getFilename());
        }
        if (StringUtils.isNotBlank(serviceFundShared.getFileid())){
            wrappers.eq(ServiceFundShared::getFileid ,serviceFundShared.getFileid());
        }
        return this.list(wrappers);
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,171 @@
package com.ruoyi.project.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceReimbursementShared;
import com.ruoyi.project.mapper.ServiceReimbursementSharedMapper;
import com.ruoyi.project.service.IServiceReimbursementSharedService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æŠ¥é”€ç”³è¯·Service业务层处理
 * 
 * @author ruoyi
 * @date 2023-01-10
 */
@Service
public class ServiceReimbursementSharedServiceImpl extends ServiceImpl<ServiceReimbursementSharedMapper, ServiceReimbursementShared> implements IServiceReimbursementSharedService 
{


    @Autowired
    ServiceReimbursementSharedMapper serviceReimbursementSharedMapper;

    /**
     * æŸ¥è¯¢æŠ¥é”€ç”³è¯·åˆ—表
     * 
     * @param serviceReimbursementShared æŠ¥é”€ç”³è¯·
     * @return æŠ¥é”€ç”³è¯·
     */
    @Override
    public List<ServiceReimbursementShared> queryList(ServiceReimbursementShared serviceReimbursementShared) {
        LambdaQueryWrapper<ServiceReimbursementShared> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(serviceReimbursementShared.getUserno())){
            wrappers.eq(ServiceReimbursementShared::getUserno ,serviceReimbursementShared.getUserno());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getUsername())){
            wrappers.like(ServiceReimbursementShared::getUsername ,serviceReimbursementShared.getUsername());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getTravelers())){
            wrappers.eq(ServiceReimbursementShared::getTravelers ,serviceReimbursementShared.getTravelers());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getIdcardtype())){
            wrappers.eq(ServiceReimbursementShared::getIdcardtype ,serviceReimbursementShared.getIdcardtype());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getIdcardno())){
            wrappers.eq(ServiceReimbursementShared::getIdcardno ,serviceReimbursementShared.getIdcardno());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getPhone())){
            wrappers.eq(ServiceReimbursementShared::getPhone ,serviceReimbursementShared.getPhone());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getDepositbank())){
            wrappers.eq(ServiceReimbursementShared::getDepositbank ,serviceReimbursementShared.getDepositbank());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getBankcardno())){
            wrappers.eq(ServiceReimbursementShared::getBankcardno ,serviceReimbursementShared.getBankcardno());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getBranchbankname())){
            wrappers.like(ServiceReimbursementShared::getBranchbankname ,serviceReimbursementShared.getBranchbankname());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getAnnexbankcard())){
            wrappers.eq(ServiceReimbursementShared::getAnnexbankcard ,serviceReimbursementShared.getAnnexbankcard());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getAnnexfiles())){
            wrappers.eq(ServiceReimbursementShared::getAnnexfiles ,serviceReimbursementShared.getAnnexfiles());
        }
        if (serviceReimbursementShared.getAmountrequested() != null){
            wrappers.eq(ServiceReimbursementShared::getAmountrequested ,serviceReimbursementShared.getAmountrequested());
        }
        if (serviceReimbursementShared.getPrepaidamount() != null){
            wrappers.eq(ServiceReimbursementShared::getPrepaidamount ,serviceReimbursementShared.getPrepaidamount());
        }
        if (serviceReimbursementShared.getInvoicecount() != null){
            wrappers.eq(ServiceReimbursementShared::getInvoicecount ,serviceReimbursementShared.getInvoicecount());
        }
        if (serviceReimbursementShared.getAttachcount() != null){
            wrappers.eq(ServiceReimbursementShared::getAttachcount ,serviceReimbursementShared.getAttachcount());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getManagerno())){
            wrappers.eq(ServiceReimbursementShared::getManagerno ,serviceReimbursementShared.getManagerno());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getManagername())){
            wrappers.like(ServiceReimbursementShared::getManagername ,serviceReimbursementShared.getManagername());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getDeptmentno())){
            wrappers.eq(ServiceReimbursementShared::getDeptmentno ,serviceReimbursementShared.getDeptmentno());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getDeptmentname())){
            wrappers.like(ServiceReimbursementShared::getDeptmentname ,serviceReimbursementShared.getDeptmentname());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getOpochecker())){
            wrappers.eq(ServiceReimbursementShared::getOpochecker ,serviceReimbursementShared.getOpochecker());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())){
            wrappers.eq(ServiceReimbursementShared::getFinvicepresident ,serviceReimbursementShared.getFinvicepresident());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getBusvicepresident())){
            wrappers.eq(ServiceReimbursementShared::getBusvicepresident ,serviceReimbursementShared.getBusvicepresident());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getOfficedirector())){
            wrappers.eq(ServiceReimbursementShared::getOfficedirector ,serviceReimbursementShared.getOfficedirector());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancedirector())){
            wrappers.eq(ServiceReimbursementShared::getFinancedirector ,serviceReimbursementShared.getFinancedirector());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancechecher())){
            wrappers.eq(ServiceReimbursementShared::getFinancechecher ,serviceReimbursementShared.getFinancechecher());
        }
        if (serviceReimbursementShared.getInfoid() != null){
            wrappers.eq(ServiceReimbursementShared::getInfoid ,serviceReimbursementShared.getInfoid());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getDonorno())){
            wrappers.eq(ServiceReimbursementShared::getDonorno ,serviceReimbursementShared.getDonorno());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getDonorname())){
            wrappers.like(ServiceReimbursementShared::getDonorname ,serviceReimbursementShared.getDonorname());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getReason())){
            wrappers.eq(ServiceReimbursementShared::getReason ,serviceReimbursementShared.getReason());
        }
        if (serviceReimbursementShared.getRecordstatus() != null){
            wrappers.eq(ServiceReimbursementShared::getRecordstatus ,serviceReimbursementShared.getRecordstatus());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getUploadflag())){
            wrappers.eq(ServiceReimbursementShared::getUploadflag ,serviceReimbursementShared.getUploadflag());
        }
        if (serviceReimbursementShared.getUploadtime() != null){
            wrappers.eq(ServiceReimbursementShared::getUploadtime ,serviceReimbursementShared.getUploadtime());
        }
        if (serviceReimbursementShared.getTotalamount() != null){
            wrappers.eq(ServiceReimbursementShared::getTotalamount ,serviceReimbursementShared.getTotalamount());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getBigstrmoney())){
            wrappers.eq(ServiceReimbursementShared::getBigstrmoney ,serviceReimbursementShared.getBigstrmoney());
        }
        if (serviceReimbursementShared.getFlowlevel() != null){
            wrappers.eq(ServiceReimbursementShared::getFlowlevel ,serviceReimbursementShared.getFlowlevel());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getCosttype())){
            wrappers.eq(ServiceReimbursementShared::getCosttype ,serviceReimbursementShared.getCosttype());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getCosttypename())){
            wrappers.like(ServiceReimbursementShared::getCosttypename ,serviceReimbursementShared.getCosttypename());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getOaid())){
            wrappers.eq(ServiceReimbursementShared::getOaid ,serviceReimbursementShared.getOaid());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getOabdzt())){
            wrappers.eq(ServiceReimbursementShared::getOabdzt ,serviceReimbursementShared.getOabdzt());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getFilename())){
            wrappers.like(ServiceReimbursementShared::getFilename ,serviceReimbursementShared.getFilename());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getFileid())){
            wrappers.eq(ServiceReimbursementShared::getFileid ,serviceReimbursementShared.getFileid());
        }
        return this.list(wrappers);
    }

    @Override
    public  List<ServiceReimbursementShared> getRemShareInfoByRemId(Long remeid)
    {
        return serviceReimbursementSharedMapper.getRemShareInfoByRemId(remeid);
       // return  null;
    }

}

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

@@ -87,6 +87,9 @@
        <result property="infophone"    column="infoPhone"    />
        <result property="deptid"    column="deptid"    />
        <result property="deptname"    column="deptname"    />
        <result property="leaderno"    column="leaderno"    />
        <result property="leadername"    column="leadername"    />
        <result property="businessarea"    column="businessarea"    />

    </resultMap>

@@ -180,6 +183,9 @@
            <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
            <if test="deptid != null "> and deptid = #{deptid}</if>
            <if test="deptname != null "> and deptname = #{deptname}</if>
            <if test="leaderno != null "> and leaderno = #{leaderno}</if>
            <if test="leadername != null "> and leadername = #{leadername}</if>
            <if test="businessarea != null "> and businessarea = #{businessarea}</if>
        </where>

        order by ReportTime desc

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

@@ -297,7 +297,10 @@
        `service_donateorgan`.`create_by` AS `create_by`,
        `service_donateorgan`.`create_time` AS `create_time`,
        `service_donateorgan`.`update_by` AS `update_by`,
        `service_donateorgan`.`update_time` AS `update_time`
        `service_donateorgan`.`update_time` AS `update_time`,
        `service_donatebaseinfo`.`leadername` AS `leadername`,
        `service_donatebaseinfo`.`leaderno` AS `leaderno`,
        `service_donatebaseinfo`.`businessarea` AS `businessarea`
    FROM
        (
            `service_donatebaseinfo`
@@ -317,6 +320,14 @@
            <if test="transplanthospitalno != null  and transplanthospitalno != ''"> and `service_donateorgan`.`TransplantHospitalNo` = #{transplanthospitalno}</if>
            <if test="transplanthospitalname != null  and transplanthospitalname != ''"> and `service_donateorgan`.`TransplantHospitalName` = #{transplanthospitalname}</if>
            <if test="organstate != null  and organstate != ''"> and `service_donateorgan`.`OrganState` = #{organstate}</if>
            <if test="reportername != null  and reportername != ''"> and `service_donatebaseinfo`.`ReporterName` = #{reportername}</if>
            <if test="leadername != null  and leadername != ''"> and `service_donatebaseinfo`.`leadername` = #{leadername}</if>
            <if test="leaderno != null  and leaderno != ''"> and `service_donatebaseinfo`.`leaderno` = #{leaderno}</if>
            <if test="businessarea != null  and businessarea != ''"> and `service_donatebaseinfo`.`businessarea` = #{businessarea}</if>
            <if test="gainHospitalname != null  and gainHospitalname != ''"> and `service_donateorgan`.`GainHospitalName` = #{gainHospitalname}</if>
            <if test="treatmenthospitalname != null  and treatmenthospitalname != ''"> and `service_donatebaseinfo`.`TreatmentHospitalName` = #{treatmenthospitalname}</if>
            <if test="startorgangettime != null  and endorgangettime != null "> and `service_donateorgan`.`OrganGetTime` >= #{startorgangettime} and `service_donateorgan`.`OrganGetTime`  &lt;=  #{endorgangettime} </if>
            <if test="starttransplanttime != null  and endtransplanttime != null  ">  and `service_donateorgan`.`TransplantTime` >= #{starttransplanttime} and  `service_donateorgan`.`TransplantTime` &lt;= #{endtransplanttime}</if>

        </where>
    </select>

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

@@ -173,7 +173,7 @@
    </select>
    <select id="getDonationCategoryByInfoId" resultType="java.lang.String">
        select DonationCategory from service_donationwitness
        where InfoID = #{infoId}
        where InfoID = #{infoId} and del_flag = 0
    </select>
    <select id="countNumber" resultType="java.lang.Integer">
        select count(*) from service_donationwitness

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!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">
    
    <resultMap type="ServiceFundShared" id="ServiceFundSharedResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />
        <result property="donorname"    column="DonorName"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="userno"    column="UserNo"    />
        <result property="username"    column="UserName"    />
        <result property="unitname"    column="UnitName"    />
        <result property="unitno"    column="UnitNo"    />
        <result property="unituserno"    column="UnitUserNo"    />
        <result property="phone"    column="Phone"    />
        <result property="annexbankcard"    column="AnnexBankCard"    />
        <result property="annexregistform"    column="AnnexRegistForm"    />
        <result property="pretaxcost"    column="PretaxCost"    />
        <result property="taxedcost"    column="TaxedCost"    />
        <result property="totalcost"    column="TotalCost"    />
        <result property="procurementcost"    column="ProcurementCost"    />
        <result property="expertcost"    column="ExpertCost"    />
        <result property="ethicscost"    column="EthicsCost"    />
        <result property="medicalcost"    column="MedicalCost"    />
        <result property="familycost"    column="FamilyCost"    />
        <result property="aftercarecost"    column="AftercareCost"    />
        <result property="amountrequested"    column="AmountRequested"    />
        <result property="applytype"    column="ApplyType"    />
        <result property="prepaidamount"    column="PrepaidAmount"    />
        <result property="invoicecount"    column="InvoiceCount"    />
        <result property="attachcount"    column="AttachCount"    />
        <result property="managerno"    column="ManagerNo"    />
        <result property="managername"    column="ManagerName"    />
        <result property="deptmentno"    column="DeptmentNo"    />
        <result property="deptmentname"    column="DeptmentName"    />
        <result property="opochecker"    column="OPOchecker"    />
        <result property="finvicepresident"    column="FinVicePresident"    />
        <result property="busvicepresident"    column="BusVicePresident"    />
        <result property="officedirector"    column="OfficeDirector"    />
        <result property="financedirector"    column="FinanceDirector"    />
        <result property="financechecher"    column="FinanceChecher"    />
        <result property="remark"    column="Remark"    />
        <result property="isdistribute"    column="Isdistribute"    />
        <result property="recordstatus"    column="RecordStatus"    />
        <result property="uploadflag"    column="uploadflag"    />
        <result property="uploadtime"    column="uploadtime"    />
        <result property="flowlevel"    column="FlowLevel"    />
        <result property="oaid"    column="oaid"    />
        <result property="oabdzt"    column="oabdzt"    />
        <result property="filename"    column="filename"    />
        <result property="fileid"    column="fileid"    />
    </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
    </sql>

    <select id="selectServiceFundSharedList" parameterType="ServiceFundShared" resultMap="ServiceFundSharedResult">
        <include refid="selectServiceFundSharedVo"/>
        <where>
            <if test="infoid != null "> and InfoID = #{infoid}</if>
            <if test="donorno != null  and donorno != ''"> and DonorNo = #{donorno}</if>
            <if test="donorname != null  and donorname != ''"> and DonorName like concat('%', #{donorname}, '%')</if>
            <if test="userno != null  and userno != ''"> and UserNo = #{userno}</if>
            <if test="username != null  and username != ''"> and UserName like concat('%', #{username}, '%')</if>
            <if test="unitname != null  and unitname != ''"> and UnitName like concat('%', #{unitname}, '%')</if>
            <if test="unitno != null  and unitno != ''"> and UnitNo = #{unitno}</if>
            <if test="unituserno != null  and unituserno != ''"> and UnitUserNo = #{unituserno}</if>
            <if test="phone != null  and phone != ''"> and Phone = #{phone}</if>
            <if test="annexbankcard != null  and annexbankcard != ''"> and AnnexBankCard = #{annexbankcard}</if>
            <if test="annexregistform != null  and annexregistform != ''"> and AnnexRegistForm = #{annexregistform}</if>
            <if test="pretaxcost != null "> and PretaxCost = #{pretaxcost}</if>
            <if test="taxedcost != null "> and TaxedCost = #{taxedcost}</if>
            <if test="totalcost != null "> and TotalCost = #{totalcost}</if>
            <if test="expertcost != null "> and ExpertCost = #{expertcost}</if>
            <if test="ethicscost != null "> and EthicsCost = #{ethicscost}</if>
            <if test="medicalcost != null "> and MedicalCost = #{medicalcost}</if>
            <if test="familycost != null "> and FamilyCost = #{familycost}</if>
            <if test="aftercarecost != null "> and AftercareCost = #{aftercarecost}</if>
            <if test="amountrequested != null "> and AmountRequested = #{amountrequested}</if>
            <if test="applytype != null  and applytype != ''"> and ApplyType = #{applytype}</if>
            <if test="prepaidamount != null "> and PrepaidAmount = #{prepaidamount}</if>
            <if test="invoicecount != null "> and InvoiceCount = #{invoicecount}</if>
            <if test="attachcount != null "> and AttachCount = #{attachcount}</if>
            <if test="managerno != null  and managerno != ''"> and ManagerNo = #{managerno}</if>
            <if test="managername != null  and managername != ''"> and ManagerName like concat('%', #{managername}, '%')</if>
            <if test="deptmentno != null  and deptmentno != ''"> and DeptmentNo = #{deptmentno}</if>
            <if test="deptmentname != null  and deptmentname != ''"> and DeptmentName like concat('%', #{deptmentname}, '%')</if>
            <if test="opochecker != null  and opochecker != ''"> and OPOchecker = #{opochecker}</if>
            <if test="finvicepresident != null  and finvicepresident != ''"> and FinVicePresident = #{finvicepresident}</if>
            <if test="busvicepresident != null  and busvicepresident != ''"> and BusVicePresident = #{busvicepresident}</if>
            <if test="officedirector != null  and officedirector != ''"> and OfficeDirector = #{officedirector}</if>
            <if test="financedirector != null  and financedirector != ''"> and FinanceDirector = #{financedirector}</if>
            <if test="financechecher != null  and financechecher != ''"> and FinanceChecher = #{financechecher}</if>
            <if test="remark != null  and remark != ''"> and Remark = #{remark}</if>
            <if test="isdistribute != null  and isdistribute != ''"> and Isdistribute = #{isdistribute}</if>
            <if test="recordstatus != null "> and RecordStatus = #{recordstatus}</if>
            <if test="uploadflag != null  and uploadflag != ''"> and uploadflag = #{uploadflag}</if>
            <if test="uploadtime != null "> and uploadtime = #{uploadtime}</if>
            <if test="flowlevel != null "> and FlowLevel = #{flowlevel}</if>
            <if test="oaid != null  and oaid != ''"> and oaid = #{oaid}</if>
            <if test="oabdzt != null  and oabdzt != ''"> and oabdzt = #{oabdzt}</if>
            <if test="filename != null  and filename != ''"> and filename like concat('%', #{filename}, '%')</if>
            <if test="fileid != null  and fileid != ''"> and fileid = #{fileid}</if>
        </where>
    </select>

</mapper>

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

@@ -49,10 +49,11 @@
        <result property="flowlevel"    column="FlowLevel"    />
        <result property="costtype"    column="costtype"    />
        <result property="costtypename"    column="costtypename"    />
        <result property="fileurl"    column="fileurl"    />
    </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 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 from service_reimbursement
    </sql>

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

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceReimbursementSharedMapper">
    
    <resultMap type="ServiceReimbursementShared" id="ServiceReimbursementSharedResult">
        <result property="id"    column="ID"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="userno"    column="UserNo"    />
        <result property="username"    column="UserName"    />
        <result property="travelers"    column="Travelers"    />
        <result property="idcardtype"    column="IDCardType"    />
        <result property="idcardno"    column="IDCardNo"    />
        <result property="phone"    column="Phone"    />
        <result property="depositbank"    column="DepositBank"    />
        <result property="bankcardno"    column="BankCardNo"    />
        <result property="branchbankname"    column="BranchBankName"    />
        <result property="annexbankcard"    column="AnnexBankCard"    />
        <result property="annexfiles"    column="AnnexFiles"    />
        <result property="amountrequested"    column="AmountRequested"    />
        <result property="prepaidamount"    column="PrepaidAmount"    />
        <result property="invoicecount"    column="InvoiceCount"    />
        <result property="attachcount"    column="AttachCount"    />
        <result property="managerno"    column="ManagerNo"    />
        <result property="managername"    column="ManagerName"    />
        <result property="deptmentno"    column="DeptmentNo"    />
        <result property="deptmentname"    column="DeptmentName"    />
        <result property="opochecker"    column="OPOchecker"    />
        <result property="finvicepresident"    column="FinVicePresident"    />
        <result property="busvicepresident"    column="BusVicePresident"    />
        <result property="officedirector"    column="OfficeDirector"    />
        <result property="financedirector"    column="FinanceDirector"    />
        <result property="financechecher"    column="FinanceChecher"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />
        <result property="donorname"    column="DonorName"    />
        <result property="reason"    column="Reason"    />
        <result property="remark"    column="remark"    />
        <result property="recordstatus"    column="RecordStatus"    />
        <result property="uploadflag"    column="uploadflag"    />
        <result property="uploadtime"    column="uploadtime"    />
        <result property="totalamount"    column="totalAmount"    />
        <result property="bigstrmoney"    column="bigStrMoney"    />
        <result property="flowlevel"    column="FlowLevel"    />
        <result property="costtype"    column="costtype"    />
        <result property="costtypename"    column="costtypename"    />
        <result property="oaid"    column="oaid"    />
        <result property="oabdzt"    column="oabdzt"    />
        <result property="filename"    column="filename"    />
        <result property="fileid"    column="fileid"    />
        <result property="reimid"    column="reimid"    />
    </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
    </sql>

    <select id="getRemShareInfoByRemId" resultType="com.ruoyi.project.domain.ServiceReimbursementShared" resultMap="ServiceReimbursementSharedResult">
        <include refid="selectServiceReimbursementSharedVo"/>
        where reimid = #{RemId}
    </select>

    <select id="selectServiceReimbursementSharedList" parameterType="ServiceReimbursementShared" resultMap="ServiceReimbursementSharedResult">
        <include refid="selectServiceReimbursementSharedVo"/>
        <where>
            <if test="userno != null  and userno != ''"> and UserNo = #{userno}</if>
            <if test="username != null  and username != ''"> and UserName like concat('%', #{username}, '%')</if>
            <if test="travelers != null  and travelers != ''"> and Travelers = #{travelers}</if>
            <if test="idcardtype != null  and idcardtype != ''"> and IDCardType = #{idcardtype}</if>
            <if test="idcardno != null  and idcardno != ''"> and IDCardNo = #{idcardno}</if>
            <if test="phone != null  and phone != ''"> and Phone = #{phone}</if>
            <if test="depositbank != null  and depositbank != ''"> and DepositBank = #{depositbank}</if>
            <if test="bankcardno != null  and bankcardno != ''"> and BankCardNo = #{bankcardno}</if>
            <if test="branchbankname != null  and branchbankname != ''"> and BranchBankName like concat('%', #{branchbankname}, '%')</if>
            <if test="annexbankcard != null  and annexbankcard != ''"> and AnnexBankCard = #{annexbankcard}</if>
            <if test="annexfiles != null  and annexfiles != ''"> and AnnexFiles = #{annexfiles}</if>
            <if test="amountrequested != null "> and AmountRequested = #{amountrequested}</if>
            <if test="prepaidamount != null "> and PrepaidAmount = #{prepaidamount}</if>
            <if test="invoicecount != null "> and InvoiceCount = #{invoicecount}</if>
            <if test="attachcount != null "> and AttachCount = #{attachcount}</if>
            <if test="managerno != null  and managerno != ''"> and ManagerNo = #{managerno}</if>
            <if test="managername != null  and managername != ''"> and ManagerName like concat('%', #{managername}, '%')</if>
            <if test="deptmentno != null  and deptmentno != ''"> and DeptmentNo = #{deptmentno}</if>
            <if test="deptmentname != null  and deptmentname != ''"> and DeptmentName like concat('%', #{deptmentname}, '%')</if>
            <if test="opochecker != null  and opochecker != ''"> and OPOchecker = #{opochecker}</if>
            <if test="finvicepresident != null  and finvicepresident != ''"> and FinVicePresident = #{finvicepresident}</if>
            <if test="busvicepresident != null  and busvicepresident != ''"> and BusVicePresident = #{busvicepresident}</if>
            <if test="officedirector != null  and officedirector != ''"> and OfficeDirector = #{officedirector}</if>
            <if test="financedirector != null  and financedirector != ''"> and FinanceDirector = #{financedirector}</if>
            <if test="financechecher != null  and financechecher != ''"> and FinanceChecher = #{financechecher}</if>
            <if test="infoid != null "> and InfoID = #{infoid}</if>
            <if test="donorno != null  and donorno != ''"> and DonorNo = #{donorno}</if>
            <if test="donorname != null  and donorname != ''"> and DonorName like concat('%', #{donorname}, '%')</if>
            <if test="reason != null  and reason != ''"> and Reason = #{reason}</if>
            <if test="recordstatus != null "> and RecordStatus = #{recordstatus}</if>
            <if test="uploadflag != null  and uploadflag != ''"> and uploadflag = #{uploadflag}</if>
            <if test="uploadtime != null "> and uploadtime = #{uploadtime}</if>
            <if test="totalamount != null "> and totalAmount = #{totalamount}</if>
            <if test="bigstrmoney != null  and bigstrmoney != ''"> and bigStrMoney = #{bigstrmoney}</if>
            <if test="flowlevel != null "> and FlowLevel = #{flowlevel}</if>
            <if test="costtype != null  and costtype != ''"> and costtype = #{costtype}</if>
            <if test="costtypename != null  and costtypename != ''"> and costtypename like concat('%', #{costtypename}, '%')</if>
            <if test="oaid != null  and oaid != ''"> and oaid = #{oaid}</if>
            <if test="oabdzt != null  and oabdzt != ''"> and oabdzt = #{oabdzt}</if>
            <if test="filename != null  and filename != ''"> and filename like concat('%', #{filename}, '%')</if>
            <if test="fileid != null  and fileid != ''"> and fileid = #{fileid}</if>
        </where>
    </select>

</mapper>