ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
@@ -1,87 +1,58 @@ package com.ruoyi.web.controller.project; package com.ruoyi.project.controller; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import com.ruoyi.common.utils.bean.DtoConversionUtils; import com.ruoyi.project.domain.Reimbursementpayee; import com.ruoyi.project.domain.ServiceReimbursementpayeeShared; import com.ruoyi.project.service.IServiceReimbursementpayeeSharedService; 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; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.project.domain.ServiceReimbursementpayee; import com.ruoyi.project.service.IServiceReimbursementpayeeService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; /** * 差旅报销付款信息Controller * * * @author ruoyi * @date 2023-04-20 * @date 2023-05-10 */ @Api("差旅报销付款信息") @RestController @RequestMapping("/project/reimbursementpayee") public class ServiceReimbursementpayeeController extends BaseController { public class ServiceReimbursementpayeeController extends BaseController { @Autowired private IServiceReimbursementpayeeService serviceReimbursementpayeeService; @Autowired private IServiceReimbursementpayeeSharedService serviceReimbursementpayeeSharedService; /** * 查询差旅报销付款信息列表 */ @ApiOperation("查询差旅报销付款信息列表") @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:list')") //@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:list')") @GetMapping("/list") public TableDataInfo list(ServiceReimbursementpayee serviceReimbursementpayee) { public TableDataInfo list(ServiceReimbursementpayee serviceReimbursementpayee) { startPage(); List<ServiceReimbursementpayee> list = serviceReimbursementpayeeService.queryList(serviceReimbursementpayee); 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()); reimbursementpayee.setCol_money(list.get(i).getAmount()); reimbursementpayees.add(reimbursementpayee); } return getDataTable(reimbursementpayees); return getDataTable(list); } /** * 导出差旅报销付款信息列表 */ @ApiOperation("导出差旅报销付款信息列表") @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:export')") //@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:export')") @Log(title = "差旅报销付款信息", businessType = BusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(ServiceReimbursementpayee serviceReimbursementpayee) { public AjaxResult export(ServiceReimbursementpayee serviceReimbursementpayee) { List<ServiceReimbursementpayee> list = serviceReimbursementpayeeService.queryList(serviceReimbursementpayee); ExcelUtil<ServiceReimbursementpayee> util = new ExcelUtil<ServiceReimbursementpayee>(ServiceReimbursementpayee.class); return util.exportExcel(list, "差旅报销付款信息数据"); @@ -91,63 +62,23 @@ * 获取差旅报销付款信息详细信息 */ @ApiOperation("获取差旅报销付款信息详细信息") @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:query')") //@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { public AjaxResult getInfo(@PathVariable("id") String id) { return AjaxResult.success(serviceReimbursementpayeeService.getById(id)); } /** * 新增或修改差旅报销付款信息 */ @ApiOperation("新增或修改差旅报销付款信息") @PostMapping("/addOrUpdateRBpayee") public AjaxResult addOrUpdateRBpayee(@RequestBody List<Reimbursementpayee> reimbursementPayees) { List<ServiceReimbursementpayee> payees = new ArrayList<>(); List<ServiceReimbursementpayeeShared> payeeSareds = new ArrayList<>(); for (Reimbursementpayee reimbursementPayee : reimbursementPayees) { //封装支付数据 ServiceReimbursementpayee payee = new ServiceReimbursementpayee(); payee.setRbid(reimbursementPayee.getRbid()); payee.setPersonname(reimbursementPayee.getCol_personname()); payee.setPersontype(reimbursementPayee.getCol_personType()); payee.setBankname(reimbursementPayee.getCol_bank()); payee.setBankcardno(reimbursementPayee.getCol_accounts()); payee.setPaiddate(reimbursementPayee.getCol_date()); payee.setRemark(reimbursementPayee.getCol_illustrate()); payee.setId(reimbursementPayee.getId()); payee.setAmount(reimbursementPayee.getCol_money()); //封装支付分享数据 ServiceReimbursementpayeeShared payeeShared = new ServiceReimbursementpayeeShared(); payeeShared.setRbid(reimbursementPayee.getRbid()); payeeShared.setPersonname(reimbursementPayee.getCol_personname()); payeeShared.setPersontype(reimbursementPayee.getCol_personType()); payeeShared.setBankname(reimbursementPayee.getCol_bank()); payeeShared.setBankcardno(reimbursementPayee.getCol_accounts()); payeeShared.setPaiddate(reimbursementPayee.getCol_date()); payeeShared.setRemark(reimbursementPayee.getCol_illustrate()); payeeShared.setId(reimbursementPayee.getId()); payeeShared.setAmount(reimbursementPayee.getCol_money()); payees.add(payee); payeeSareds.add(payeeShared); } boolean b = false; b = serviceReimbursementpayeeService.saveOrUpdateBatch(payees); b = serviceReimbursementpayeeSharedService.saveOrUpdateBatch(payeeSareds); return toAjax(b); } /** * 新增差旅报销付款信息 */ @ApiOperation("新增差旅报销付款信息") @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:add')") //@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:add')") @Log(title = "差旅报销付款信息", businessType = BusinessType.INSERT) @PostMapping @RepeatSubmit public AjaxResult add(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee) { public AjaxResult add(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee) { return toAjax(serviceReimbursementpayeeService.save(serviceReimbursementpayee)); } @@ -155,11 +86,12 @@ * 修改差旅报销付款信息 */ @ApiOperation("修改差旅报销付款信息") @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:edit')") //@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:edit')") @Log(title = "差旅报销付款信息", businessType = BusinessType.UPDATE) @PutMapping @RepeatSubmit public AjaxResult edit(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee) { @RepeatSubmit public AjaxResult edit(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee) { return toAjax(serviceReimbursementpayeeService.updateById(serviceReimbursementpayee)); } @@ -167,10 +99,11 @@ * 删除差旅报销付款信息 */ @ApiOperation("删除差旅报销付款信息") @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:remove')") //@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:remove')") @Log(title = "差旅报销付款信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { public AjaxResult remove(@PathVariable String[] ids) { return toAjax(serviceReimbursementpayeeService.removeByIds(Arrays.asList(ids))); } } ruoyi-admin/src/main/resources/application.yml
@@ -9,10 +9,10 @@ # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） #开发环境 profile: D:/YYJQ/OPO/WEB/Upload #医院环境 #profile: E:/YYJQ/OPO/WEB/Upload # 开发环境 profile: D:/lihusoft/OPO/WEB/Upload # 医院环境 #profile: E:/OPO/WEB/Upload # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数组计算 char 字符验证 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java
@@ -2,9 +2,6 @@ import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -18,7 +15,7 @@ * 差旅报销付款信息对象 service_reimbursementpayee * * @author ruoyi * @date 2023-04-20 * @date 2023-05-10 */ @Data @ApiModel("差旅报销付款信息") @@ -30,7 +27,7 @@ @ApiModelProperty("主键ID") //数据库自增改成@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO) private Long id; private String id; /** 资金申请主表ID */ @ApiModelProperty("资金申请主表ID") @@ -72,10 +69,6 @@ @Excel(name = "联系电话") private String phone; /** 备注 */ @ApiModelProperty("备注") private String remark; /** 与捐赠者关系 根据字典sys_FamilyRelation */ @ApiModelProperty("与捐赠者关系 根据字典sys_FamilyRelation") @Excel(name = "与捐赠者关系 根据字典sys_FamilyRelation") @@ -83,8 +76,8 @@ /** 付款日期 */ @ApiModelProperty("付款日期") @TableField(fill = FieldFill.DEFAULT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "付款日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date paiddate; /** 上传标志 */ ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementpayeeMapper.java
@@ -2,19 +2,18 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; import com.ruoyi.project.domain.ServiceReimbursementEo; import com.ruoyi.project.domain.ServiceReimbursementpayee; import java.util.List; /** * 差旅报销付款信息Mapper接口 * * * @author ruoyi * @date 2023-04-20 * @date 2023-05-10 */ public interface ServiceReimbursementpayeeMapper extends BaseMapper<ServiceReimbursementpayee> { public interface ServiceReimbursementpayeeMapper extends BaseMapper<ServiceReimbursementpayee> { /** * 查询差旅报销付款信息列表 * @@ -23,13 +22,11 @@ */ public List<ServiceReimbursementpayee> selectServiceReimbursementpayeeList(ServiceReimbursementpayee serviceReimbursementpayee); /** * 获取报销支付信息 * * @param serviceReimbursementEo * @return */ public List<ServiceReimbursementpayee> getReimbursementpayeeInfo(ServiceReimbursementEo serviceReimbursementEo); } ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceReimbursementpayeeService.java
@@ -1,15 +1,16 @@ package com.ruoyi.project.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.project.domain.ServiceReimbursementEo; import com.ruoyi.project.domain.ServiceReimbursementpayee; import java.util.List; /** * 差旅报销付款信息Service接口 * * @author ruoyi * @date 2023-04-20 * @date 2023-05-10 */ public interface IServiceReimbursementpayeeService extends IService<ServiceReimbursementpayee> { ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementpayeeServiceImpl.java
@@ -1,35 +1,30 @@ package com.ruoyi.project.service.impl; import java.util.List; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.project.domain.ServiceReimbursementEo; import com.ruoyi.project.domain.ServiceReimbursementpayeeShared; import org.springframework.beans.factory.annotation.Autowired; 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 java.util.ArrayList; import java.util.Map; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.project.mapper.ServiceReimbursementpayeeMapper; import com.ruoyi.project.domain.ServiceReimbursementEo; import com.ruoyi.project.domain.ServiceReimbursementpayee; import com.ruoyi.project.mapper.ServiceReimbursementpayeeMapper; import com.ruoyi.project.service.IServiceReimbursementpayeeService; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** * 差旅报销付款信息Service业务层处理 * * @author ruoyi * @date 2023-04-20 * @date 2023-05-10 */ @Service public class ServiceReimbursementpayeeServiceImpl extends ServiceImpl<ServiceReimbursementpayeeMapper, ServiceReimbursementpayee> implements IServiceReimbursementpayeeService { @Autowired private ServiceReimbursementpayeeMapper serviceReimbursementpayeeMapper; /** * 查询差旅报销付款信息列表 @@ -86,5 +81,4 @@ } return serviceReimbursementpayeeMapper.getReimbursementpayeeInfo(serviceReimbursementEo); } } ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementpayeeMapper.xml
@@ -1,70 +1,50 @@ <?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"> PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.project.mapper.ServiceReimbursementpayeeMapper"> <resultMap type="ServiceReimbursementpayee" id="ServiceReimbursementpayeeResult"> <result property="id" column="id"/> <result property="rbid" column="rbid"/> <result property="orderno" column="orderno"/> <result property="persontype" column="persontype"/> <result property="personname" column="personname"/> <result property="bankname" column="bankname"/> <result property="bankcardno" column="bankcardno"/> <result property="amount" column="amount"/> <result property="phone" column="phone"/> <result property="familyrelations" column="familyrelations"/> <result property="paiddate" column="paiddate"/> <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"/> <result property="uploadflag" column="uploadflag"/> <result property="uploadtime" column="uploadtime"/> <result property="id" column="id" /> <result property="rbid" column="rbid" /> <result property="orderno" column="orderno" /> <result property="persontype" column="persontype" /> <result property="personname" column="personname" /> <result property="bankname" column="bankname" /> <result property="bankcardno" column="bankcardno" /> <result property="amount" column="amount" /> <result property="phone" column="phone" /> <result property="familyrelations" column="familyrelations" /> <result property="paiddate" column="paiddate" /> <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" /> <result property="uploadflag" column="uploadflag" /> <result property="uploadtime" column="uploadtime" /> </resultMap> <sql id="selectServiceReimbursementpayeeVo"> select id, rbid, orderno, persontype, personname, bankname, bankcardno, amount, phone, familyrelations, paiddate, remark, del_flag, create_by, create_time, update_by, update_time, uploadflag, uploadtime from service_reimbursementpayee select id, rbid, orderno, persontype, personname, bankname, bankcardno, amount, phone, familyrelations, paiddate, remark, del_flag, create_by, create_time, update_by, update_time, uploadflag, uploadtime from service_reimbursementpayee </sql> <select id="selectServiceReimbursementpayeeList" parameterType="ServiceReimbursementpayee" resultMap="ServiceReimbursementpayeeResult"> <select id="selectServiceReimbursementpayeeList" parameterType="ServiceReimbursementpayee" resultMap="ServiceReimbursementpayeeResult"> <include refid="selectServiceReimbursementpayeeVo"/> <where> <if test="rbid != null ">and rbid = #{rbid}</if> <if test="orderno != null ">and orderno = #{orderno}</if> <if test="persontype != null and persontype != ''">and persontype = #{persontype}</if> <if test="personname != null and personname != ''">and personname like concat('%', #{personname}, '%')</if> <if test="bankname != null and bankname != ''">and bankname like concat('%', #{bankname}, '%')</if> <if test="bankcardno != null and bankcardno != ''">and bankcardno = #{bankcardno}</if> <if test="amount != null ">and amount = #{amount}</if> <if test="phone != null and phone != ''">and phone = #{phone}</if> <if test="familyrelations != null and familyrelations != ''">and familyrelations = #{familyrelations}</if> <if test="paiddate != null ">and paiddate = #{paiddate}</if> <if test="uploadflag != null and uploadflag != ''">and uploadflag = #{uploadflag}</if> <if test="uploadtime != null ">and uploadtime = #{uploadtime}</if> <if test="rbid != null "> and rbid = #{rbid}</if> <if test="orderno != null "> and orderno = #{orderno}</if> <if test="persontype != null and persontype != ''"> and persontype = #{persontype}</if> <if test="personname != null and personname != ''"> and personname like concat('%', #{personname}, '%')</if> <if test="bankname != null and bankname != ''"> and bankname like concat('%', #{bankname}, '%')</if> <if test="bankcardno != null and bankcardno != ''"> and bankcardno = #{bankcardno}</if> <if test="amount != null "> and amount = #{amount}</if> <if test="phone != null and phone != ''"> and phone = #{phone}</if> <if test="familyrelations != null and familyrelations != ''"> and familyrelations = #{familyrelations}</if> <if test="paiddate != null "> and paiddate = #{paiddate}</if> <if test="uploadflag != null and uploadflag != ''"> and uploadflag = #{uploadflag}</if> <if test="uploadtime != null "> and uploadtime = #{uploadtime}</if> </where> </select> @@ -88,5 +68,4 @@ ORDER BY a.id desc </select> </mapper>
