“代码提交”

liusheng

2023-04-27 0ea6562494682740c8c948658cd3e32769d81c9a

“代码提交”

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,123 @@
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.BaseTravelcity;
import com.ruoyi.project.service.IBaseTravelcityService;
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-04-23
 */
@Api("差旅城市和补贴标准")
@RestController
@RequestMapping("/project/travelcity")
public class BaseTravelcityController extends BaseController
{
    @Autowired
    private IBaseTravelcityService baseTravelcityService;

    /**
     * æŸ¥è¯¢å·®æ—…城市和补贴标准列表
     */
    @ApiOperation("查询差旅城市和补贴标准列表")
    @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
    @GetMapping("/list")
    public TableDataInfo list(BaseTravelcity baseTravelcity)
    {
        startPage();
        List<BaseTravelcity> list = baseTravelcityService.queryList(baseTravelcity);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºå·®æ—…城市和补贴标准列表
     */
    @ApiOperation("导出差旅城市和补贴标准列表")
    @PreAuthorize("@ss.hasPermi('project:travelcity:export')")
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseTravelcity baseTravelcity)
    {
        List<BaseTravelcity> list = baseTravelcityService.queryList(baseTravelcity);
        ExcelUtil<BaseTravelcity> util = new ExcelUtil<BaseTravelcity>(BaseTravelcity.class);
        return util.exportExcel(list, "差旅城市和补贴标准数据");
    }

    /**
     * èŽ·å–差旅城市和补贴标准详细信息
     */
    @ApiOperation("获取差旅城市和补贴标准详细信息")
    @PreAuthorize("@ss.hasPermi('project:travelcity:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return AjaxResult.success(baseTravelcityService.getById(id));
    }

    /**
     * æ–°å¢žå·®æ—…城市和补贴标准
     */
    @ApiOperation("新增差旅城市和补贴标准")
    @PreAuthorize("@ss.hasPermi('project:travelcity:add')")
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseTravelcity baseTravelcity)
    {
        return toAjax(baseTravelcityService.save(baseTravelcity));
    }

    /**
     * ä¿®æ”¹å·®æ—…城市和补贴标准
     */
    @ApiOperation("修改差旅城市和补贴标准")
    @PreAuthorize("@ss.hasPermi('project:travelcity:edit')")
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody BaseTravelcity baseTravelcity)
    {
        return toAjax(baseTravelcityService.updateById(baseTravelcity));
    }

    /**
     * åˆ é™¤å·®æ—…城市和补贴标准
     */
    @ApiOperation("删除差旅城市和补贴标准")
    @PreAuthorize("@ss.hasPermi('project:travelcity:remove')")
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(baseTravelcityService.removeByIds(Arrays.asList(ids)));
    }


    /**
     * æ ¹æ®åŒºåŸŸèŽ·å–伙食补助、公杂要补助
     */
    @ApiOperation("根据区域获取补助")
   // @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
    @GetMapping("/getSubsidy/{cityCode}")
    public AjaxResult getSubsidy(@PathVariable String cityCode)
    {
        BaseTravelcity baseTravelcity=baseTravelcityService.getSubsidy(cityCode);
        return AjaxResult.success(baseTravelcity);
    }
}

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

@@ -663,6 +663,23 @@
    }

    /**
     * ä¿®æ”¹æŠ¥é”€ç”³è¯·
     */
    @ApiOperation("修改报销申请")
    //@PreAuthorize("@ss.hasPermi('project:reimbursement:edit')")
    @Log(title = "审核费用", businessType = BusinessType.OTHER)
    @PostMapping("/editMoney")
    public AjaxResult editMoney(@RequestBody List<ReimbursementService> serviceReimbursement)
    {
        boolean b= serviceReimbursementService.updateById(null);
        if(b)
        {
            addReiSharedDatd(null,2);
        }
        return toAjax(b);
    }

    /**
     * åˆ é™¤æŠ¥é”€ç”³è¯·
     */
    @ApiOperation("删除报销申请")

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

@@ -104,6 +104,28 @@
     */
    @ApiOperation("修改报销申请明细")
    //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
    @Log(title = "修改申请明细", businessType = BusinessType.UPDATE)
    @PostMapping("/updateRDlList")
    public AjaxResult updateRDlList(@RequestBody List<ServiceReimbursementdetail> serviceReimbursementdetails)
    {
        for (ServiceReimbursementdetail serviceReimbursementdetail:serviceReimbursementdetails) {

            if(serviceReimbursementdetail.getId()!=null) {
                serviceReimbursementdetailService.updateById(serviceReimbursementdetail);
            }else {
                //如果ID为空，则要新增
                add(serviceReimbursementdetail);
            }
        }
      //  return toAjax("null");
        return null;
    }

    /**
     * ä¿®æ”¹æŠ¥é”€ç”³è¯·æ˜Žç»†
     */
    @ApiOperation("修改报销申请明细")
    //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
    @Log(title = "报销申请明细", businessType = BusinessType.UPDATE)
    @PutMapping
    //@RepeatSubmit

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

@@ -1,11 +1,19 @@
package com.ruoyi.project.controller;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import com.ruoyi.project.domain.ReimbursementService;
import com.ruoyi.project.domain.Reimbursementpayee;
import io.netty.util.internal.ObjectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -48,7 +56,20 @@
    {
        startPage();
        List<ServiceReimbursementpayee> list = serviceReimbursementpayeeService.queryList(serviceReimbursementpayee);
        return getDataTable(list);
        List<Reimbursementpayee> reimbursementpayees=new ArrayList<>();
        for(int i=0;i<list.size();i++){
            Reimbursementpayee reimbursementpayee=new Reimbursementpayee();
            reimbursementpayee.setCol_personname(list.get(i).getPersonname());
            reimbursementpayee.setCol_personType(list.get(i).getPersontype());
            reimbursementpayee.setCol_accounts(list.get(i).getBankcardno());
            reimbursementpayee.setCol_date(list.get(i).getPaiddate());
            reimbursementpayee.setCol_illustrate(list.get(i).getRemark());
            reimbursementpayee.setId(list.get(i).getId());
            reimbursementpayee.setRbid(list.get(i).getRbid());
            reimbursementpayee.setCol_bank(list.get(i).getBankname());
            reimbursementpayees.add(reimbursementpayee);
        }
        return getDataTable(reimbursementpayees);
    }

    /**
@@ -80,6 +101,40 @@
     * æ–°å¢žå·®æ—…报销付款信息
     */
    @ApiOperation("新增差旅报销付款信息")
    @PostMapping("/addOrUpdateRBpayee")
    public AjaxResult addOrUpdateRBpayee(@RequestBody List<Reimbursementpayee> reimbursementPayees)
    {
        List<ServiceReimbursementpayee> addserviceReimbursementpayees=new ArrayList<>();
        List<ServiceReimbursementpayee> updateserviceReimbursementpayees=new ArrayList<>();
        for (Reimbursementpayee reimbursementPayee:reimbursementPayees) {
            ServiceReimbursementpayee serviceReimbursementpayee=new ServiceReimbursementpayee();
            serviceReimbursementpayee.setRbid(reimbursementPayee.getRbid());
            serviceReimbursementpayee.setPersonname(reimbursementPayee.getCol_personname());
            serviceReimbursementpayee.setPersontype(reimbursementPayee.getCol_personType());
            serviceReimbursementpayee.setBankname(reimbursementPayee.getCol_bank());
            serviceReimbursementpayee.setBankcardno(reimbursementPayee.getCol_accounts());
            serviceReimbursementpayee.setPaiddate(reimbursementPayee.getCol_date());
            serviceReimbursementpayee.setRemark(reimbursementPayee.getCol_illustrate());
            serviceReimbursementpayee.setId(reimbursementPayee.getId());
            if(ObjectUtils.isEmpty(reimbursementPayee.getId())){
                addserviceReimbursementpayees.add(serviceReimbursementpayee);
            }else {
                updateserviceReimbursementpayees.add(serviceReimbursementpayee);
            }
        }
        boolean b = false;
        if(!CollectionUtils.isEmpty(addserviceReimbursementpayees)){
            b = serviceReimbursementpayeeService.saveBatch(addserviceReimbursementpayees);
        }else {
            b = serviceReimbursementpayeeService.updateBatchById(updateserviceReimbursementpayees);
        }
        return toAjax(b);
    }

    /**
     * æ–°å¢žå·®æ—…报销付款信息
     */
    @ApiOperation("新增差旅报销付款信息")
    @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:add')")
    @Log(title = "差旅报销付款信息", businessType = BusinessType.INSERT)
    @PostMapping

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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;

/**
 * å·®æ—…城市和补贴标准对象 base_travelcity
 * 
 * @author ruoyi
 * @date 2023-04-23
 */
@Data
@ApiModel("差旅城市和补贴标准")
public class BaseTravelcity 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 citycode;

    /** åŸŽå¸‚名称 */
    @ApiModelProperty("城市名称")
    @Excel(name = "城市名称")
    private String cityname;

    /** çœä»½ */
    @ApiModelProperty("省份")
    @Excel(name = "省份")
    private String province;

    /** äº¤é€šè¡¥è´´é‡‘额 */
    @ApiModelProperty("交通补贴金额")
    @Excel(name = "交通补贴金额")
    private BigDecimal transport;

    /** ä½å®¿è¡¥è´´é‡‘额 */
    @ApiModelProperty("住宿补贴金额")
    @Excel(name = "住宿补贴金额")
    private BigDecimal hotel;

    /** å…¬ç ¸è´¹è¡¥è´´é‡‘额 */
    @ApiModelProperty("公砸费补贴金额")
    @Excel(name = "公砸费补贴金额")
    private BigDecimal others;

    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "公砸费补贴金额")
    private BigDecimal food;

}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,232 @@
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.util.Date;

/**
 * æŠ¥é”€ç”³è¯·å¯¹è±¡ service_reimbursement
 * 
 * @author ruoyi
 * @date 2022-01-24
 */
@Data
@ApiModel("报销申请")
public class ReimbursementService 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;

    /** è¯ä»¶ç±»åž‹ æ ¹æ®å­—å…¸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 Double amountrequested;

    /** é¢„支费用 */
    @ApiModelProperty("预支费用")
    @Excel(name = "预支费用")
    private Double 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 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 String travelers;

    @ApiModelProperty("出差事由")
    private String reason;

    @ApiModelProperty("捐献者姓名")
    private String donorname;

    @ApiModelProperty("总金额")
    private Double totalamount;

    @ApiModelProperty("总金额的大写")
    private String bigstrmoney;

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

    private String remark;

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


    /** è´¹ç”¨å½’属：0：其他人员；1：专职人员；2：协调员；3：专家；4：捐献者家属 */
    @ApiModelProperty("费用归属")
    private String costtype;

    /** è´¹ç”¨å½’属描述 */
    @ApiModelProperty("费用归属描述")
    private String costtypename;

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

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

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

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

    @ApiModelProperty("捐献家属人数")
    private String personname2;

    @ApiModelProperty("aaaa")
    private String destination2;
    
}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,75 @@
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_reimbursementpayee
 * 
 * @author ruoyi
 * @date 2023-04-20
 */
@Data
@ApiModel("差旅报销付款信息")
public class Reimbursementpayee extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** ä¸»é”®ID */
    @ApiModelProperty("主键ID")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /** èµ„金申请主表ID */
    @ApiModelProperty("资金申请主表ID")
    @Excel(name = "资金申请主表ID")
    private Long rbid;

    /** é¡ºåºå· */
    @ApiModelProperty("顺序号")
    @Excel(name = "顺序号")
    private Long orderno;

    /** äººå‘˜ç±»åˆ«ï¼ˆå­—典表：sys_travelexpensebelong）：0：其他人员；1：专职人员；2：协调员；3：专家；4：捐献者家属 */
    @ApiModelProperty("人员类别（字典表：sys_travelexpensebelong）：0：其他人员；1：专职人员；2：协调员；3：专家；4：捐献者家属")
    @Excel(name = "人员类别", readConverterExp = "字=典表：sys_travelexpensebelong")
    private String col_personType;

    /** æ”¶ç›Šäººå§“名 å®¶å±žæˆ–专家 */
    @ApiModelProperty("收益人姓名 å®¶å±žæˆ–专家")
    @Excel(name = "收益人姓名 å®¶å±žæˆ–专家")
    private String col_personname;

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

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

    /** è§£é‡Šè¯´æ˜Ž */
    @ApiModelProperty("解释说明")
    @Excel(name = "解释说明")
    private String col_illustrate;

    /** ä»˜æ¬¾æ—¥æœŸ */
    @ApiModelProperty("付款日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "付款日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date col_date;

}


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

@@ -160,5 +160,8 @@

    private Integer orderno;

    private String persontype;
    private String personname;

}


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

@@ -10,4 +10,10 @@
    private String reportNo;

    private String reportName;

    private String depositbank;

    private String branchbankname;

    private String bankcardno;
}

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

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


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

import java.util.List;

/**
 * å·®æ—…城市和补贴标准Mapper接口
 * 
 * @author ruoyi
 * @date 2023-04-23
 */
public interface BaseTravelcityMapper extends BaseMapper<BaseTravelcity>
{
    /**
     * æŸ¥è¯¢å·®æ—…城市和补贴标准列表
     *
     * @param baseTravelcity å·®æ—…城市和补贴标准
     * @return å·®æ—…城市和补贴标准集合
     */
    public List<BaseTravelcity> selectBaseTravelcityList(BaseTravelcity baseTravelcity);
}

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

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

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

import java.util.List;

/**
 * å·®æ—…城市和补贴标准Service接口
 * 
 * @author ruoyi
 * @date 2023-04-23
 */
public interface IBaseTravelcityService extends IService<BaseTravelcity>
{

    /**
     * æŸ¥è¯¢å·®æ—…城市和补贴标准列表
     * 
     * @param baseTravelcity å·®æ—…城市和补贴标准
     * @return å·®æ—…城市和补贴标准集合
     */
    public List<BaseTravelcity> queryList(BaseTravelcity baseTravelcity);

    /**
     *  æ ¹æ®åŒºåŸŸèŽ·å–伙食补助、公杂要补助
     */
    public BaseTravelcity getSubsidy(String cityCode);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,68 @@
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.BaseTravelcity;
import com.ruoyi.project.mapper.BaseTravelcityMapper;
import com.ruoyi.project.service.IBaseTravelcityService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * å·®æ—…城市和补贴标准Service业务层处理
 * 
 * @author ruoyi
 * @date 2023-04-23
 */
@Service
public class BaseTravelcityServiceImpl extends ServiceImpl<BaseTravelcityMapper, BaseTravelcity> implements IBaseTravelcityService 
{


    /**
     * æŸ¥è¯¢å·®æ—…城市和补贴标准列表
     * 
     * @param baseTravelcity å·®æ—…城市和补贴标准
     * @return å·®æ—…城市和补贴标准
     */
    @Override
    public List<BaseTravelcity> queryList(BaseTravelcity baseTravelcity) {
        LambdaQueryWrapper<BaseTravelcity> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(baseTravelcity.getCitycode())){
            wrappers.eq(BaseTravelcity::getCitycode ,baseTravelcity.getCitycode());
        }
        if (StringUtils.isNotBlank(baseTravelcity.getCityname())){
            wrappers.like(BaseTravelcity::getCityname ,baseTravelcity.getCityname());
        }
        if (StringUtils.isNotBlank(baseTravelcity.getProvince())){
            wrappers.eq(BaseTravelcity::getProvince ,baseTravelcity.getProvince());
        }
        if (baseTravelcity.getTransport() != null){
            wrappers.eq(BaseTravelcity::getTransport ,baseTravelcity.getTransport());
        }
        if (baseTravelcity.getHotel() != null){
            wrappers.eq(BaseTravelcity::getHotel ,baseTravelcity.getHotel());
        }
        if (baseTravelcity.getOthers() != null){
            wrappers.eq(BaseTravelcity::getOthers ,baseTravelcity.getOthers());
        }
        if (baseTravelcity.getFood() != null){
            wrappers.eq(BaseTravelcity::getFood ,baseTravelcity.getFood());
        }
        return this.list(wrappers);
    }

    @Override
    public BaseTravelcity getSubsidy(String cityCode) {
        LambdaQueryWrapper<BaseTravelcity> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(cityCode)){
            wrappers.eq(BaseTravelcity::getCitycode ,cityCode);
        }
        BaseTravelcity baseTravelcity =  this.getOne(wrappers);
        return baseTravelcity;
    }

}

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

@@ -62,6 +62,9 @@
            r.setId(s.getId());
            r.setReportNo(s.getUserno());
            r.setReportName(s.getUsername());
            r.setBankcardno(s.getBankcardno());
            r.setDepositbank(s.getDepositbank());
            r.setBranchbankname(s.getBranchbankname());
            list.add(r);
        }


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
<?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.BaseTravelcityMapper">
    
    <resultMap type="BaseTravelcity" id="BaseTravelcityResult">
        <result property="id"    column="id"    />
        <result property="citycode"    column="citycode"    />
        <result property="cityname"    column="cityname"    />
        <result property="province"    column="province"    />
        <result property="transport"    column="transport"    />
        <result property="hotel"    column="hotel"    />
        <result property="others"    column="others"    />
        <result property="food"    column="food"    />
        <result property="remark"    column="remark"    />
        <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"    />
    </resultMap>

    <sql id="selectBaseTravelcityVo">
        select id, citycode, cityname, province, transport, hotel, others, food, remark, del_flag, create_by, create_time, update_by, update_time from base_travelcity
    </sql>

    <select id="selectBaseTravelcityList" parameterType="BaseTravelcity" resultMap="BaseTravelcityResult">
        <include refid="selectBaseTravelcityVo"/>
        <where>
            <if test="citycode != null  and citycode != ''"> and citycode = #{citycode}</if>
            <if test="cityname != null  and cityname != ''"> and cityname like concat('%', #{cityname}, '%')</if>
            <if test="province != null  and province != ''"> and province = #{province}</if>
            <if test="transport != null "> and transport = #{transport}</if>
            <if test="hotel != null "> and hotel = #{hotel}</if>
            <if test="others != null "> and others = #{others}</if>
            <if test="food != null "> and food = #{food}</if>
        </where>
    </select>

</mapper>

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

@@ -41,7 +41,7 @@
    </resultMap>

    <sql id="selectServiceReimbursementdetailVo">
        select ID, RBID, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType, CityFee, HotelExpense, InvoiceCount, AttachCount, OtherExpense, FoodExpenses, FoodAllowance, AnnexFiles, remark, del_flag, create_by, create_time, update_by, update_time, upload_flag, upload_time, travelprovince, travelprovincename, travelcity, travelcityname, traveltown, traveltownname, otherfeeamount, otherfeedesc, OrderNo from service_reimbursementdetail
        select ID, RBID, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType, CityFee, HotelExpense, InvoiceCount, AttachCount, OtherExpense, FoodExpenses, FoodAllowance, AnnexFiles, remark, del_flag, create_by, create_time, update_by, update_time, upload_flag, upload_time, travelprovince, travelprovincename, travelcity, travelcityname, traveltown, traveltownname, otherfeeamount, otherfeedesc, OrderNo,personname,persontype from service_reimbursementdetail
    </sql>

    <select id="selectServiceReimbursementdetailList" parameterType="ServiceReimbursementdetail" resultMap="ServiceReimbursementdetailResult">