From 40af6e50fe99d888df7afcbafcf029df6fe46ea0 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 5 May 2025 08:34:08 +0800 Subject: [PATCH] md --- .../emis/EmisSettlePayBillRelController.java | 134 ++++++++++++++++++ .../erp/emis/domain/EmisSettlePayBillRel.java | 43 ++++++ .../mapper/EmisSettlePayBillRelMapper.java | 80 +++++++++++ .../service/IEmisSettlePayBillRelService.java | 78 ++++++++++ .../impl/EmisSettleBillServiceImpl.java | 2 + .../impl/EmisSettlePayBillRelServiceImpl.java | 117 +++++++++++++++ .../mapper/EmisSettlePayBillRelMapper.xml | 111 +++++++++++++++ 7 files changed, 565 insertions(+) create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayBillRelController.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayBillRel.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayBillRelMapper.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayBillRelService.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayBillRelServiceImpl.java create mode 100644 emis-biz/src/main/resources/mapper/EmisSettlePayBillRelMapper.xml diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayBillRelController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayBillRelController.java new file mode 100644 index 000000000..cfc5a864f --- /dev/null +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayBillRelController.java @@ -0,0 +1,134 @@ + +/** + * @Project: emis + * @Title: EmisSettlePayBillRelController.java + * @author linfso + * @date 2025-05-05 08:31:36 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

付款账单关联表 控制器

+ */ + +package com.xdadan.erp.web.emis; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.xdadan.erp.common.annotation.Log; +import com.xdadan.erp.common.core.controller.BaseController; +import com.xdadan.erp.common.core.domain.AjaxResult; +import com.xdadan.erp.common.core.page.TableDataInfo; +import com.xdadan.erp.common.enums.BusinessType; +import com.xdadan.erp.common.utils.StringUtils; +import com.xdadan.erp.common.utils.poi.ExcelUtil; + +import com.xdadan.erp.emis.domain.EmisSettlePayBillRel; +import com.xdadan.erp.emis.service.IEmisSettlePayBillRelService; + +/** + * 付款账单关联表Controller + * + * @author linfso + * @date 2025-05-05 08:31:36 + */ +@RestController +@RequestMapping("/emis/emisSettlePayBillRel") +public class EmisSettlePayBillRelController extends BaseController +{ + @Autowired + private IEmisSettlePayBillRelService emisSettlePayBillRelService; + + /** + * 查询付款账单关联表列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettlePayBillRel:list')") + @GetMapping("/list") + public TableDataInfo list(EmisSettlePayBillRel emisSettlePayBillRel) + { + startPage(); + List list = emisSettlePayBillRelService.selectEmisSettlePayBillRelList(emisSettlePayBillRel); + return getDataTable(list); + } + + + /** + * 检查是否重复 + * + * @param emisSettlePayBillRel + * @return 数量 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettlePayBillRel:list')") + @GetMapping("/checkUnique") + public AjaxResult checkUnique(EmisSettlePayBillRel emisSettlePayBillRel) + { + int cnt=emisSettlePayBillRelService.checkUnique(emisSettlePayBillRel); + return AjaxResult.success("检查成功",cnt); + } + + + /** + * 导出付款账单关联表列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettlePayBillRel:export')") + @Log(title = "付款账单关联表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EmisSettlePayBillRel emisSettlePayBillRel) + { + List list = emisSettlePayBillRelService.selectEmisSettlePayBillRelList(emisSettlePayBillRel); + ExcelUtil util = new ExcelUtil(EmisSettlePayBillRel.class); + util.exportExcel(response, list, "付款账单关联表数据"); + } + + /** + * 获取付款账单关联表详细信息 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettlePayBillRel:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(emisSettlePayBillRelService.selectEmisSettlePayBillRelById(id)); + } + + /** + * 新增付款账单关联表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettlePayBillRel:add')") + @Log(title = "付款账单关联表", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EmisSettlePayBillRel emisSettlePayBillRel) + { + return toAjax(emisSettlePayBillRelService.insertEmisSettlePayBillRel(emisSettlePayBillRel)); + } + + /** + * 修改付款账单关联表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettlePayBillRel:edit')") + @Log(title = "付款账单关联表", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EmisSettlePayBillRel emisSettlePayBillRel) + { + return toAjax(emisSettlePayBillRelService.updateEmisSettlePayBillRel(emisSettlePayBillRel)); + } + + /** + * 删除付款账单关联表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettlePayBillRel:remove')") + @Log(title = "付款账单关联表", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(emisSettlePayBillRelService.deleteEmisSettlePayBillRelByIds(ids)); + } +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayBillRel.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayBillRel.java new file mode 100644 index 000000000..812e1f7ac --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayBillRel.java @@ -0,0 +1,43 @@ +/** + * @Project: emis + * @Title: EmisSettlePayBillRel.java + * @author linfso + * @date 2025-05-05 08:31:36 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

付款账单关联表 实体类

+ */ + +package com.xdadan.erp.emis.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.xdadan.erp.common.annotation.Excel; +import com.xdadan.erp.common.core.domain.BaseEntity; +import com.xdadan.erp.common.core.domain.TreeEntity; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + + +/** + * @ClassName EmisSettlePayBillRel + * @Description 付款账单关联表 + * @author linfso + * @date 2025-05-05 08:31:36 + */ + @Data +public class EmisSettlePayBillRel extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /* id */ + private Long id; + /* 支付序号 */ + private String payId; + /* 账单号编号 */ + private String settleBillNo; + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayBillRelMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayBillRelMapper.java new file mode 100644 index 000000000..4a52ea8a6 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayBillRelMapper.java @@ -0,0 +1,80 @@ +/** + * @Project: emis + * @Title: EmisSettlePayBillRelMapper.java + * @author linfso + * @date 2025-05-05 08:31:36 + * @Copyright: ShangHai Doitinfo 2022 All rights reserved. + * @version v1.0 + * @Description:

付款账单关联表 Mapper 接口

+ * Warning : This file is generate by ai tools,don't edit!!! + */ +package com.xdadan.erp.emis.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xdadan.erp.emis.domain.EmisSettlePayBillRel; +/** + * @ClassName EmisSettlePayBillRelMapper + * @Description

付款账单关联表 Mapper 接口

+ * @author linfso + * @date 2025-05-05 08:31:36 + */ +public interface EmisSettlePayBillRelMapper extends BaseMapper +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisSettlePayBillRel selectEmisSettlePayBillRelById(Long id); + + /** + * 查询列表 + * + * @param emisSettlePayBillRel + * @return 集合 + */ + public List selectEmisSettlePayBillRelList(EmisSettlePayBillRel emisSettlePayBillRel); + + + /** + * 检查是否重复 + * + * @param emisSettlePayBillRel + * @return 数量 + */ + public int checkUnique(EmisSettlePayBillRel emisSettlePayBillRel); + + + /** + * 新增 + * + * @param emisSettlePayBillRel + * @return + */ + public int insertEmisSettlePayBillRel(EmisSettlePayBillRel emisSettlePayBillRel); + + /** + * 修改 + * + * @param emisSettlePayBillRel + * @return + */ + public int updateEmisSettlePayBillRel(EmisSettlePayBillRel emisSettlePayBillRel); + + /** + * 删除 + * + * @param id 主键 + * @return 结果 + */ + public int deleteEmisSettlePayBillRelById(Long id); + + /** + * 批量删除 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEmisSettlePayBillRelByIds(Long[] ids); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayBillRelService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayBillRelService.java new file mode 100644 index 000000000..9aab8df2c --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayBillRelService.java @@ -0,0 +1,78 @@ + /** + * @Project: emis + * @Title: EmisSettlePayBillRelService.java + * @author linfso + * @date 2025-05-05 08:31:36 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

付款账单关联表 服务类接口

+ */ +package com.xdadan.erp.emis.service; + +import java.util.List; +import com.xdadan.erp.emis.domain.EmisSettlePayBillRel; + +/** + * @ClassName EmisSettlePayBillRelService + * @Description 付款账单关联表 + * @author linfso + * @date 2025-05-05 08:31:36 + */ +public interface IEmisSettlePayBillRelService +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisSettlePayBillRel selectEmisSettlePayBillRelById(Long id); + + /** + * 查询付款账单关联表列表 + * + * @param emisSettlePayBillRel 付款账单关联表 + * @return 付款账单关联表集合 + */ + public List selectEmisSettlePayBillRelList(EmisSettlePayBillRel emisSettlePayBillRel); + + + /** + * 检查是否重复 + * + * @param emisSettlePayBillRel + * @return 数量 + */ + public int checkUnique(EmisSettlePayBillRel emisSettlePayBillRel); + + /** + * 新增付款账单关联表 + * + * @param emisSettlePayBillRel 付款账单关联表 + * @return 结果 + */ + public int insertEmisSettlePayBillRel(EmisSettlePayBillRel emisSettlePayBillRel); + + /** + * 修改付款账单关联表 + * + * @param emisSettlePayBillRel 付款账单关联表 + * @return 结果 + */ + public int updateEmisSettlePayBillRel(EmisSettlePayBillRel emisSettlePayBillRel); + + /** + * 批量删除付款账单关联表 + * + * @param ids 需要删除的付款账单关联表主键集合 + * @return 结果 + */ + public int deleteEmisSettlePayBillRelByIds(Long[] ids); + + /** + * 删除付款账单关联表信息 + * + * @param id 付款账单关联表主键 + * @return 结果 + */ + public int deleteEmisSettlePayBillRelById(Long id); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index a0fcaa136..7d9439a31 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -591,6 +591,8 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS if (sumMoney.compareTo(subBill.getBillFee()) >= 0) { openBillStatusDesc="已开票"; updEmisSettleSubBill.setOpenBillStatus("1"); + // 更新每一单的开票状态 + emisSettleSubBillMapper.updateOpenBillStatus(updEmisSettleSubBill); } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayBillRelServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayBillRelServiceImpl.java new file mode 100644 index 000000000..965d3e690 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayBillRelServiceImpl.java @@ -0,0 +1,117 @@ + /** + * @Project: emis + * @Title: EmisSettlePayBillRelServiceImpl.java + * @author linfso + * @date 2025-05-05 08:31:36 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

付款账单关联表 实体类

+ */ + +package com.xdadan.erp.emis.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.xdadan.erp.emis.domain.EmisSettlePayBillRel; +import com.xdadan.erp.emis.mapper.EmisSettlePayBillRelMapper; +import com.xdadan.erp.emis.service.IEmisSettlePayBillRelService; + +/** + * 付款账单关联表Service业务层处理 + * + * @author linfso + * @date 2025-05-05 08:31:36 + */ +@Service +public class EmisSettlePayBillRelServiceImpl implements IEmisSettlePayBillRelService +{ + @Autowired + private EmisSettlePayBillRelMapper emisSettlePayBillRelMapper; + + /** + * 查询付款账单关联表 + * + * @param id 付款账单关联表主键 + * @return 付款账单关联表 + */ + @Override + public EmisSettlePayBillRel selectEmisSettlePayBillRelById(Long id) + { + return emisSettlePayBillRelMapper.selectEmisSettlePayBillRelById(id); + } + + + /** + * 查询付款账单关联表列表 + * + * @param emisSettlePayBillRel 付款账单关联表 + * @return 付款账单关联表 + */ + @Override + public List selectEmisSettlePayBillRelList(EmisSettlePayBillRel emisSettlePayBillRel) + { + return emisSettlePayBillRelMapper.selectEmisSettlePayBillRelList(emisSettlePayBillRel); + } + + /** + * 检查是否重复 + * + * @param emisSettlePayBillRel + * @return 数量 + */ + @Override + public int checkUnique(EmisSettlePayBillRel emisSettlePayBillRel) + { + return emisSettlePayBillRelMapper.checkUnique(emisSettlePayBillRel); + } + + /** + * 新增付款账单关联表 + * + * @param emisSettlePayBillRel 付款账单关联表 + * @return 结果 + */ + @Override + public int insertEmisSettlePayBillRel(EmisSettlePayBillRel emisSettlePayBillRel) + { + return emisSettlePayBillRelMapper.insertEmisSettlePayBillRel(emisSettlePayBillRel); + } + + /** + * 修改付款账单关联表 + * + * @param emisSettlePayBillRel 付款账单关联表 + * @return 结果 + */ + @Override + public int updateEmisSettlePayBillRel(EmisSettlePayBillRel emisSettlePayBillRel) + { + return emisSettlePayBillRelMapper.updateEmisSettlePayBillRel(emisSettlePayBillRel); + } + + /** + * 批量删除付款账单关联表 + * + * @param ids 需要删除的付款账单关联表主键 + * @return 结果 + */ + @Override + public int deleteEmisSettlePayBillRelByIds(Long[] ids) + { + return emisSettlePayBillRelMapper.deleteEmisSettlePayBillRelByIds(ids); + } + + /** + * 删除付款账单关联表信息 + * + * @param id 付款账单关联表主键 + * @return 结果 + */ + @Override + public int deleteEmisSettlePayBillRelById(Long id) + { + return emisSettlePayBillRelMapper.deleteEmisSettlePayBillRelById(id); + } + +} diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayBillRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayBillRelMapper.xml new file mode 100644 index 000000000..76febe7ff --- /dev/null +++ b/emis-biz/src/main/resources/mapper/EmisSettlePayBillRelMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + select id, pay_id, settle_bill_no, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_pay_bill_rel + + + + + + + + + + insert into emis_settle_pay_bill_rel + + id, + pay_id, + settle_bill_no, + del_flag, + create_by, + create_time, + update_by, + update_time, + create_site, + update_site, + + + #{id}, + #{payId}, + #{settleBillNo}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{createSite}, + #{updateSite}, + + + + + update emis_settle_pay_bill_rel + + pay_id = #{payId}, + settle_bill_no = #{settleBillNo}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + create_site = #{createSite}, + update_site = #{updateSite}, + + where id = #{id} + + + + delete from emis_settle_pay_bill_rel where id = #{id} + + + + delete from emis_settle_pay_bill_rel where id in + + #{id} + + + \ No newline at end of file