From 0e3ae79352d3ee37940a0fc34797257b7c2eef5e Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 4 Jul 2024 03:17:36 +0800 Subject: [PATCH] md --- .../EmisCustomerSettleBillController.java | 118 ------ .../web/emis/EmisSettleBillController.java | 134 +++++++ .../web/emis/EmisSettleSubBillController.java | 134 +++++++ .../EmisSettleSubBillFeeitemController.java | 134 +++++++ .../emis/domain/EmisCustomerSettleBill.java | 118 ------ .../erp/emis/domain/EmisSettleBill.java | 119 ++++++ .../erp/emis/domain/EmisSettleSubBill.java | 84 +++++ .../emis/domain/EmisSettleSubBillFeeitem.java | 55 +++ .../mapper/EmisCustomerSettleBillMapper.java | 70 ---- .../erp/emis/mapper/EmisSettleBillMapper.java | 80 +++++ .../EmisSettleSubBillFeeitemMapper.java | 80 +++++ .../emis/mapper/EmisSettleSubBillMapper.java | 80 +++++ .../IEmisCustomerSettleBillService.java | 69 ---- .../emis/service/IEmisSettleBillService.java | 78 ++++ .../IEmisSettleSubBillFeeitemService.java | 78 ++++ .../service/IEmisSettleSubBillService.java | 78 ++++ .../EmisCustomerSettleBillServiceImpl.java | 104 ------ .../impl/EmisSettleBillServiceImpl.java | 117 ++++++ .../EmisSettleSubBillFeeitemServiceImpl.java | 117 ++++++ .../impl/EmisSettleSubBillServiceImpl.java | 117 ++++++ .../mapper/EmisCustomerSettleBillMapper.xml | 287 --------------- .../resources/mapper/EmisSettleBillMapper.xml | 338 ++++++++++++++++++ .../mapper/EmisSettleSubBillFeeitemMapper.xml | 142 ++++++++ .../mapper/EmisSettleSubBillMapper.xml | 231 ++++++++++++ 24 files changed, 2196 insertions(+), 766 deletions(-) delete mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerSettleBillController.java create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillFeeitemController.java delete mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerSettleBill.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBillFeeitem.java delete mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerSettleBillMapper.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillFeeitemMapper.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java delete mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerSettleBillService.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillFeeitemService.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java delete mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerSettleBillServiceImpl.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillFeeitemServiceImpl.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java delete mode 100644 emis-biz/src/main/resources/mapper/EmisCustomerSettleBillMapper.xml create mode 100644 emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml create mode 100644 emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml create mode 100644 emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerSettleBillController.java deleted file mode 100644 index 7e4ec8d2b..000000000 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerSettleBillController.java +++ /dev/null @@ -1,118 +0,0 @@ - -/** - * @Project: emis - * @Title: EmisCustomerSettleBillController.java - * @author linfso - * @date 2024-04-24 05:05:22 - * @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.EmisCustomerSettleBill; -import com.xdadan.erp.emis.service.IEmisCustomerSettleBillService; - -/** - * 快递用户结算账单Controller - * - * @author linfso - * @date 2024-04-24 05:05:22 - */ -@RestController -@RequestMapping("/emis/emisCustomerSettleBill") -public class EmisCustomerSettleBillController extends EmisBaseController -{ - @Autowired - private IEmisCustomerSettleBillService emisCustomerSettleBillService; - - /** - * 查询快递用户结算账单列表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCustomerSettleBill:list')") - @GetMapping("/list") - public TableDataInfo list(EmisCustomerSettleBill emisCustomerSettleBill) - { - startPage(); - List list = emisCustomerSettleBillService.selectEmisCustomerSettleBillList(emisCustomerSettleBill); - return getDataTable(list); - } - - /** - * 导出快递用户结算账单列表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCustomerSettleBill:export')") - @Log(title = "快递用户结算账单", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, EmisCustomerSettleBill emisCustomerSettleBill) - { - List list = emisCustomerSettleBillService.selectEmisCustomerSettleBillList(emisCustomerSettleBill); - ExcelUtil util = new ExcelUtil(EmisCustomerSettleBill.class); - util.exportExcel(response, list, "快递用户结算账单数据"); - } - - /** - * 获取快递用户结算账单详细信息 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCustomerSettleBill:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(emisCustomerSettleBillService.selectEmisCustomerSettleBillById(id)); - } - - /** - * 新增快递用户结算账单 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCustomerSettleBill:add')") - @Log(title = "快递用户结算账单", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody EmisCustomerSettleBill emisCustomerSettleBill) - { - return toAjax(emisCustomerSettleBillService.insertEmisCustomerSettleBill(emisCustomerSettleBill)); - } - - /** - * 修改快递用户结算账单 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCustomerSettleBill:edit')") - @Log(title = "快递用户结算账单", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody EmisCustomerSettleBill emisCustomerSettleBill) - { - return toAjax(emisCustomerSettleBillService.updateEmisCustomerSettleBill(emisCustomerSettleBill)); - } - - /** - * 删除快递用户结算账单 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCustomerSettleBill:remove')") - @Log(title = "快递用户结算账单", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(emisCustomerSettleBillService.deleteEmisCustomerSettleBillByIds(ids)); - } -} diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java new file mode 100644 index 000000000..9d929b63f --- /dev/null +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -0,0 +1,134 @@ + +/** + * @Project: emis + * @Title: EmisSettleBillController.java + * @author linfso + * @date 2024-07-03 18:54:51 + * @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.EmisSettleBill; +import com.xdadan.erp.emis.service.IEmisSettleBillService; + +/** + * 结算总账单Controller + * + * @author linfso + * @date 2024-07-03 18:54:51 + */ +@RestController +@RequestMapping("/emis/emisSettleBill") +public class EmisSettleBillController extends BaseController +{ + @Autowired + private IEmisSettleBillService emisSettleBillService; + + /** + * 查询结算总账单列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleBill:list')") + @GetMapping("/list") + public TableDataInfo list(EmisSettleBill emisSettleBill) + { + startPage(); + List list = emisSettleBillService.selectEmisSettleBillList(emisSettleBill); + return getDataTable(list); + } + + + /** + * 检查是否重复 + * + * @param emisSettleBill + * @return 数量 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleBill:list')") + @GetMapping("/checkUnique") + public AjaxResult checkUnique(EmisSettleBill emisSettleBill) + { + int cnt=emisSettleBillService.checkUnique(emisSettleBill); + return AjaxResult.success("检查成功",cnt); + } + + + /** + * 导出结算总账单列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleBill:export')") + @Log(title = "结算总账单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EmisSettleBill emisSettleBill) + { + List list = emisSettleBillService.selectEmisSettleBillList(emisSettleBill); + ExcelUtil util = new ExcelUtil(EmisSettleBill.class); + util.exportExcel(response, list, "结算总账单数据"); + } + + /** + * 获取结算总账单详细信息 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleBill:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(emisSettleBillService.selectEmisSettleBillById(id)); + } + + /** + * 新增结算总账单 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleBill:add')") + @Log(title = "结算总账单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EmisSettleBill emisSettleBill) + { + return toAjax(emisSettleBillService.insertEmisSettleBill(emisSettleBill)); + } + + /** + * 修改结算总账单 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleBill:edit')") + @Log(title = "结算总账单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EmisSettleBill emisSettleBill) + { + return toAjax(emisSettleBillService.updateEmisSettleBill(emisSettleBill)); + } + + /** + * 删除结算总账单 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleBill:remove')") + @Log(title = "结算总账单", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(emisSettleBillService.deleteEmisSettleBillByIds(ids)); + } +} diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java new file mode 100644 index 000000000..32d7fd016 --- /dev/null +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java @@ -0,0 +1,134 @@ + +/** + * @Project: emis + * @Title: EmisSettleSubBillController.java + * @author linfso + * @date 2024-07-03 18:54:52 + * @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.EmisSettleSubBill; +import com.xdadan.erp.emis.service.IEmisSettleSubBillService; + +/** + * 结算子账单Controller + * + * @author linfso + * @date 2024-07-03 18:54:52 + */ +@RestController +@RequestMapping("/emis/emisSettleSubBill") +public class EmisSettleSubBillController extends BaseController +{ + @Autowired + private IEmisSettleSubBillService emisSettleSubBillService; + + /** + * 查询结算子账单列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:list')") + @GetMapping("/list") + public TableDataInfo list(EmisSettleSubBill emisSettleSubBill) + { + startPage(); + List list = emisSettleSubBillService.selectEmisSettleSubBillList(emisSettleSubBill); + return getDataTable(list); + } + + + /** + * 检查是否重复 + * + * @param emisSettleSubBill + * @return 数量 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:list')") + @GetMapping("/checkUnique") + public AjaxResult checkUnique(EmisSettleSubBill emisSettleSubBill) + { + int cnt=emisSettleSubBillService.checkUnique(emisSettleSubBill); + return AjaxResult.success("检查成功",cnt); + } + + + /** + * 导出结算子账单列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:export')") + @Log(title = "结算子账单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EmisSettleSubBill emisSettleSubBill) + { + List list = emisSettleSubBillService.selectEmisSettleSubBillList(emisSettleSubBill); + ExcelUtil util = new ExcelUtil(EmisSettleSubBill.class); + util.exportExcel(response, list, "结算子账单数据"); + } + + /** + * 获取结算子账单详细信息 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(emisSettleSubBillService.selectEmisSettleSubBillById(id)); + } + + /** + * 新增结算子账单 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:add')") + @Log(title = "结算子账单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EmisSettleSubBill emisSettleSubBill) + { + return toAjax(emisSettleSubBillService.insertEmisSettleSubBill(emisSettleSubBill)); + } + + /** + * 修改结算子账单 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:edit')") + @Log(title = "结算子账单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EmisSettleSubBill emisSettleSubBill) + { + return toAjax(emisSettleSubBillService.updateEmisSettleSubBill(emisSettleSubBill)); + } + + /** + * 删除结算子账单 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:remove')") + @Log(title = "结算子账单", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(emisSettleSubBillService.deleteEmisSettleSubBillByIds(ids)); + } +} diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillFeeitemController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillFeeitemController.java new file mode 100644 index 000000000..f134bd503 --- /dev/null +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillFeeitemController.java @@ -0,0 +1,134 @@ + +/** + * @Project: emis + * @Title: EmisSettleSubBillFeeitemController.java + * @author linfso + * @date 2024-07-03 18:54:53 + * @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.EmisSettleSubBillFeeitem; +import com.xdadan.erp.emis.service.IEmisSettleSubBillFeeitemService; + +/** + * 子账单费用明细Controller + * + * @author linfso + * @date 2024-07-03 18:54:53 + */ +@RestController +@RequestMapping("/emis/emisSettleSubBillFeeitem") +public class EmisSettleSubBillFeeitemController extends BaseController +{ + @Autowired + private IEmisSettleSubBillFeeitemService emisSettleSubBillFeeitemService; + + /** + * 查询子账单费用明细列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBillFeeitem:list')") + @GetMapping("/list") + public TableDataInfo list(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem) + { + startPage(); + List list = emisSettleSubBillFeeitemService.selectEmisSettleSubBillFeeitemList(emisSettleSubBillFeeitem); + return getDataTable(list); + } + + + /** + * 检查是否重复 + * + * @param emisSettleSubBillFeeitem + * @return 数量 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBillFeeitem:list')") + @GetMapping("/checkUnique") + public AjaxResult checkUnique(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem) + { + int cnt=emisSettleSubBillFeeitemService.checkUnique(emisSettleSubBillFeeitem); + return AjaxResult.success("检查成功",cnt); + } + + + /** + * 导出子账单费用明细列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBillFeeitem:export')") + @Log(title = "子账单费用明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EmisSettleSubBillFeeitem emisSettleSubBillFeeitem) + { + List list = emisSettleSubBillFeeitemService.selectEmisSettleSubBillFeeitemList(emisSettleSubBillFeeitem); + ExcelUtil util = new ExcelUtil(EmisSettleSubBillFeeitem.class); + util.exportExcel(response, list, "子账单费用明细数据"); + } + + /** + * 获取子账单费用明细详细信息 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBillFeeitem:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(emisSettleSubBillFeeitemService.selectEmisSettleSubBillFeeitemById(id)); + } + + /** + * 新增子账单费用明细 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBillFeeitem:add')") + @Log(title = "子账单费用明细", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EmisSettleSubBillFeeitem emisSettleSubBillFeeitem) + { + return toAjax(emisSettleSubBillFeeitemService.insertEmisSettleSubBillFeeitem(emisSettleSubBillFeeitem)); + } + + /** + * 修改子账单费用明细 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBillFeeitem:edit')") + @Log(title = "子账单费用明细", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EmisSettleSubBillFeeitem emisSettleSubBillFeeitem) + { + return toAjax(emisSettleSubBillFeeitemService.updateEmisSettleSubBillFeeitem(emisSettleSubBillFeeitem)); + } + + /** + * 删除子账单费用明细 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBillFeeitem:remove')") + @Log(title = "子账单费用明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(emisSettleSubBillFeeitemService.deleteEmisSettleSubBillFeeitemByIds(ids)); + } +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerSettleBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerSettleBill.java deleted file mode 100644 index 9a96927cf..000000000 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerSettleBill.java +++ /dev/null @@ -1,118 +0,0 @@ -/** - * @Project: emis - * @Title: EmisCustomerSettleBill.java - * @author linfso - * @date 2024-04-24 05:05:21 - * @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 EmisCustomerSettleBill - * @Description 快递用户结算账单 - * @author linfso - * @date 2024-04-24 05:05:21 - */ - @Data -public class EmisCustomerSettleBill extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /* id */ - private Long id; - /* 结算账单编号 */ - private String settleBillNo; - /* 结算账期时间范围 */ - private String settleDateScope; - /* 账单月份 202402 */ - private String settleBillMonth; - /* 付款状态 1-已付款 2部分付款 3-未付款 */ - private String payStatus; - /* 应收款金额 */ - private String recMoney; - /* 已收款金额 */ - private String recedMoney; - /* 客户用户ID */ - private String userId; - /* 客户编码 */ - private String customerCode; - /* 客户名称 */ - private String customerName; - /* 结算站点代码 */ - private String siteCode; - /* 结算站点名称 */ - private String siteName; - /* 是否核销 */ - private String blConfirm; - /* 运单号 */ - private String billCodeDesc; - /* 安全金额 */ - private String satisfyMoney; - /* 允许金额 */ - private String allowanceMoney; - /* 抵扣金额 */ - private String deductionMoney; - /* 其他金额 */ - private String otherMoney; - /* 安全原因 */ - private String satisfyReason; - /* 允许原因 */ - private String allowanceReason; - /* 抵扣原因 */ - private String deductionReason; - /* 其他原因 */ - private String otherReason; - /* 开票状态 1-已开票 2-未开票 3-部分开票 */ - private String openBillStatus; - /* 核销状态 */ - private String blConfirmName; - /* 总票数 */ - private String sendPieceSum; - /* 总件数 */ - private String pieceNumber; - /* 总重量 */ - private String feeWeight; - /* 合计金额 */ - private String sendMoneySum; - /* 月结编号 */ - private String monthlyKnotCode; - /* 未结数量 */ - private String uncollectedAmount; - /* 退款金额 */ - private String refundAmount; - /* 创建人 */ - private String createMan; - /* 创建人代码 */ - private String createManCode; - /* 确认日期 */ - private String confirmDate; - /* 确认站点 */ - private String confirmSite; - /* 未确认日期 */ - private String unConfirmDate; - /* 未确认人 */ - private String unConfirmMan; - /* 未确认站点 */ - private String unConfirmSite; - /* 退款金额 */ - private String refundMoney; - /* 确认人 */ - private String confirmMan; - - -} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java new file mode 100644 index 000000000..d558d2ef7 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java @@ -0,0 +1,119 @@ +/** + * @Project: emis + * @Title: EmisSettleBill.java + * @author linfso + * @date 2024-07-03 18:54:51 + * @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 EmisSettleBill + * @Description 结算总账单 + * @author linfso + * @date 2024-07-03 18:54:51 + */ + @Data +public class EmisSettleBill extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /* id */ + private Long id; + /* 总结算账单编号 */ + private String settleBillNo; + /* 结算账单名称 */ + private String settleBillName; + /* 结算账单类型 1-现金 2-月结 */ + private String settleType; + /* 结算开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date settleStartDate; + /* 结算结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date settleEndDate; + /* 账单月份 202402 */ + private String billMonth; + /* 应收款金额 */ + private BigDecimal recMoney; + /* 已收款金额 */ + private BigDecimal recedMoney; + /* 月结编号 */ + private String custNo; + /* 客户编码 */ + private String customerCode; + /* 客户名称 */ + private String customerName; + /* 结算站点代码 */ + private String siteCode; + /* 结算站点名称 */ + private String siteName; + /* 安全金额 */ + private BigDecimal satisfyMoney; + /* 允许金额 */ + private BigDecimal allowanceMoney; + /* 抵扣金额 */ + private BigDecimal deductionMoney; + /* 其他金额 */ + private BigDecimal otherMoney; + /* 安全原因 */ + private String satisfyReason; + /* 允许原因 */ + private String allowanceReason; + /* 抵扣原因 */ + private String deductionReason; + /* 其他原因 */ + private String otherReason; + /* 开票状态 0-未开票 1-已开票 2-部分开票 */ + private String openBillStatus; + /* 付款状态 0-未付款 1-已付款 2-部分付款 */ + private String paymentStatus; + /* 总票数 */ + private Integer sendPieceSum; + /* 总件数 */ + private Integer pieceNumber; + /* 总重量 */ + private BigDecimal feeWeight; + /* 未结数量 */ + private BigDecimal uncollectedAmount; + /* 合计金额 */ + private BigDecimal sendMoneySum; + /* 退款数量 */ + private BigDecimal refundAmount; + /* 退款金额 */ + private BigDecimal refundMoney; + /* 财务确认状态 0-待确认 1-已确认 2-驳回 */ + private String blConfirm; + /* 财务确认日期 */ + private String confirmDate; + /* 财务确认站点 */ + private String confirmSite; + /* 财务确认人 */ + private String confirmManCode; + /* 站点确认状态 0-待确认 1-已确认 2-驳回 */ + private String blSiteConfirm; + /* 财务确认备注 */ + private String confirmNote; + /* 站点确认日期 */ + private String siteConfirmDate; + /* 站点确认人 */ + private String siteConfirmManCode; + /* 网点确认备注 */ + private String siteConfirmNote; + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java new file mode 100644 index 000000000..06d99c376 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java @@ -0,0 +1,84 @@ +/** + * @Project: emis + * @Title: EmisSettleSubBill.java + * @author linfso + * @date 2024-07-03 18:54:52 + * @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 EmisSettleSubBill + * @Description 结算子账单 + * @author linfso + * @date 2024-07-03 18:54:52 + */ + @Data +public class EmisSettleSubBill extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /* id */ + private Long id; + /* 分账单号 */ + private String billNo; + /* 父账单号 */ + private String parentBillNo; + /* 总结算账单号 */ + private String settleBillNo; + /* 运单号 */ + private String billCode; + /* 出账时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date billDate; + /* 账单费用 */ + private BigDecimal billFee; + /* 费用币种 */ + private String currency; + /* 结算账单类型 1-现金 2-月结 */ + private String settleType; + /* 是否已拆单 0-否 1-是 */ + private String blSplit; + /* 账单月份 202402 */ + private String billMonth; + /* 月结编号 */ + private String custNo; + /* 客户编码 */ + private String customerCode; + /* 客户名称 */ + private String customerName; + /* 财务确认状态 0-待确认 1-已确认 2-驳回 */ + private String blConfirm; + /* 财务确认日期 */ + private String confirmDate; + /* 财务确认站点 */ + private String confirmSite; + /* 财务确认人 */ + private String confirmManCode; + /* 站点确认状态 0-待确认 1-已确认 2-驳回 */ + private String blSiteConfirm; + /* 财务确认备注 */ + private String confirmNote; + /* 站点确认日期 */ + private String siteConfirmDate; + /* 站点确认人 */ + private String siteConfirmManCode; + /* 网点确认备注 */ + private String siteConfirmNote; + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBillFeeitem.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBillFeeitem.java new file mode 100644 index 000000000..8d1047140 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBillFeeitem.java @@ -0,0 +1,55 @@ +/** + * @Project: emis + * @Title: EmisSettleSubBillFeeitem.java + * @author linfso + * @date 2024-07-03 18:54:53 + * @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 EmisSettleSubBillFeeitem + * @Description 子账单费用明细 + * @author linfso + * @date 2024-07-03 18:54:53 + */ + @Data +public class EmisSettleSubBillFeeitem extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /* id */ + private Long id; + /* 子账单号 */ + private String subBillNo; + /* 运单号 */ + private String billCode; + /* 费用编码 */ + private String feeCode; + /* 费用名称 */ + private String feeName; + /* 账单费用 */ + private BigDecimal billFee; + /* 原始费用 */ + private BigDecimal origFee; + /* 费用币种 */ + private String currency; + /* 排序 */ + private Integer orderNum; + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerSettleBillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerSettleBillMapper.java deleted file mode 100644 index ee17713dd..000000000 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerSettleBillMapper.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * @Project: emis - * @Title: EmisCustomerSettleBillMapper.java - * @author linfso - * @date 2024-04-24 05:05:21 - * @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.EmisCustomerSettleBill; -/** - * @ClassName EmisCustomerSettleBillMapper - * @Description

快递用户结算账单 Mapper 接口

- * @author linfso - * @date 2024-04-24 05:05:21 - */ -public interface EmisCustomerSettleBillMapper extends BaseMapper -{ - /** - * 主键查询 - * @param id - * @return - */ - public EmisCustomerSettleBill selectEmisCustomerSettleBillById(Long id); - - /** - * 查询列表 - * - * @param emisCustomerSettleBill - * @return 集合 - */ - public List selectEmisCustomerSettleBillList(EmisCustomerSettleBill emisCustomerSettleBill); - - /** - * 新增 - * - * @param emisCustomerSettleBill - * @return - */ - public int insertEmisCustomerSettleBill(EmisCustomerSettleBill emisCustomerSettleBill); - - /** - * 修改 - * - * @param emisCustomerSettleBill - * @return - */ - public int updateEmisCustomerSettleBill(EmisCustomerSettleBill emisCustomerSettleBill); - - /** - * 删除 - * - * @param id 主键 - * @return 结果 - */ - public int deleteEmisCustomerSettleBillById(Long id); - - /** - * 批量删除 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteEmisCustomerSettleBillByIds(Long[] ids); -} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java new file mode 100644 index 000000000..5ca193db4 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java @@ -0,0 +1,80 @@ +/** + * @Project: emis + * @Title: EmisSettleBillMapper.java + * @author linfso + * @date 2024-07-03 18:54:51 + * @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.EmisSettleBill; +/** + * @ClassName EmisSettleBillMapper + * @Description

结算总账单 Mapper 接口

+ * @author linfso + * @date 2024-07-03 18:54:51 + */ +public interface EmisSettleBillMapper extends BaseMapper +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisSettleBill selectEmisSettleBillById(Long id); + + /** + * 查询列表 + * + * @param emisSettleBill + * @return 集合 + */ + public List selectEmisSettleBillList(EmisSettleBill emisSettleBill); + + + /** + * 检查是否重复 + * + * @param emisSettleBill + * @return 数量 + */ + public int checkUnique(EmisSettleBill emisSettleBill); + + + /** + * 新增 + * + * @param emisSettleBill + * @return + */ + public int insertEmisSettleBill(EmisSettleBill emisSettleBill); + + /** + * 修改 + * + * @param emisSettleBill + * @return + */ + public int updateEmisSettleBill(EmisSettleBill emisSettleBill); + + /** + * 删除 + * + * @param id 主键 + * @return 结果 + */ + public int deleteEmisSettleBillById(Long id); + + /** + * 批量删除 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEmisSettleBillByIds(Long[] ids); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillFeeitemMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillFeeitemMapper.java new file mode 100644 index 000000000..67a7a4087 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillFeeitemMapper.java @@ -0,0 +1,80 @@ +/** + * @Project: emis + * @Title: EmisSettleSubBillFeeitemMapper.java + * @author linfso + * @date 2024-07-03 18:54:53 + * @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.EmisSettleSubBillFeeitem; +/** + * @ClassName EmisSettleSubBillFeeitemMapper + * @Description

子账单费用明细 Mapper 接口

+ * @author linfso + * @date 2024-07-03 18:54:53 + */ +public interface EmisSettleSubBillFeeitemMapper extends BaseMapper +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisSettleSubBillFeeitem selectEmisSettleSubBillFeeitemById(Long id); + + /** + * 查询列表 + * + * @param emisSettleSubBillFeeitem + * @return 集合 + */ + public List selectEmisSettleSubBillFeeitemList(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem); + + + /** + * 检查是否重复 + * + * @param emisSettleSubBillFeeitem + * @return 数量 + */ + public int checkUnique(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem); + + + /** + * 新增 + * + * @param emisSettleSubBillFeeitem + * @return + */ + public int insertEmisSettleSubBillFeeitem(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem); + + /** + * 修改 + * + * @param emisSettleSubBillFeeitem + * @return + */ + public int updateEmisSettleSubBillFeeitem(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem); + + /** + * 删除 + * + * @param id 主键 + * @return 结果 + */ + public int deleteEmisSettleSubBillFeeitemById(Long id); + + /** + * 批量删除 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEmisSettleSubBillFeeitemByIds(Long[] ids); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java new file mode 100644 index 000000000..8f522d58b --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java @@ -0,0 +1,80 @@ +/** + * @Project: emis + * @Title: EmisSettleSubBillMapper.java + * @author linfso + * @date 2024-07-03 18:54:52 + * @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.EmisSettleSubBill; +/** + * @ClassName EmisSettleSubBillMapper + * @Description

结算子账单 Mapper 接口

+ * @author linfso + * @date 2024-07-03 18:54:52 + */ +public interface EmisSettleSubBillMapper extends BaseMapper +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisSettleSubBill selectEmisSettleSubBillById(Long id); + + /** + * 查询列表 + * + * @param emisSettleSubBill + * @return 集合 + */ + public List selectEmisSettleSubBillList(EmisSettleSubBill emisSettleSubBill); + + + /** + * 检查是否重复 + * + * @param emisSettleSubBill + * @return 数量 + */ + public int checkUnique(EmisSettleSubBill emisSettleSubBill); + + + /** + * 新增 + * + * @param emisSettleSubBill + * @return + */ + public int insertEmisSettleSubBill(EmisSettleSubBill emisSettleSubBill); + + /** + * 修改 + * + * @param emisSettleSubBill + * @return + */ + public int updateEmisSettleSubBill(EmisSettleSubBill emisSettleSubBill); + + /** + * 删除 + * + * @param id 主键 + * @return 结果 + */ + public int deleteEmisSettleSubBillById(Long id); + + /** + * 批量删除 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEmisSettleSubBillByIds(Long[] ids); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerSettleBillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerSettleBillService.java deleted file mode 100644 index ce9966d61..000000000 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerSettleBillService.java +++ /dev/null @@ -1,69 +0,0 @@ - /** - * @Project: emis - * @Title: EmisCustomerSettleBillService.java - * @author linfso - * @date 2024-04-24 05:05:22 - * @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.EmisCustomerSettleBill; - -/** - * @ClassName EmisCustomerSettleBillService - * @Description 快递用户结算账单 - * @author linfso - * @date 2024-04-24 05:05:22 - */ -public interface IEmisCustomerSettleBillService -{ - /** - * 主键查询 - * @param id - * @return - */ - public EmisCustomerSettleBill selectEmisCustomerSettleBillById(Long id); - - /** - * 查询快递用户结算账单列表 - * - * @param emisCustomerSettleBill 快递用户结算账单 - * @return 快递用户结算账单集合 - */ - public List selectEmisCustomerSettleBillList(EmisCustomerSettleBill emisCustomerSettleBill); - - /** - * 新增快递用户结算账单 - * - * @param emisCustomerSettleBill 快递用户结算账单 - * @return 结果 - */ - public int insertEmisCustomerSettleBill(EmisCustomerSettleBill emisCustomerSettleBill); - - /** - * 修改快递用户结算账单 - * - * @param emisCustomerSettleBill 快递用户结算账单 - * @return 结果 - */ - public int updateEmisCustomerSettleBill(EmisCustomerSettleBill emisCustomerSettleBill); - - /** - * 批量删除快递用户结算账单 - * - * @param ids 需要删除的快递用户结算账单主键集合 - * @return 结果 - */ - public int deleteEmisCustomerSettleBillByIds(Long[] ids); - - /** - * 删除快递用户结算账单信息 - * - * @param id 快递用户结算账单主键 - * @return 结果 - */ - public int deleteEmisCustomerSettleBillById(Long id); -} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java new file mode 100644 index 000000000..10a77c87f --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java @@ -0,0 +1,78 @@ + /** + * @Project: emis + * @Title: EmisSettleBillService.java + * @author linfso + * @date 2024-07-03 18:54:51 + * @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.EmisSettleBill; + +/** + * @ClassName EmisSettleBillService + * @Description 结算总账单 + * @author linfso + * @date 2024-07-03 18:54:51 + */ +public interface IEmisSettleBillService +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisSettleBill selectEmisSettleBillById(Long id); + + /** + * 查询结算总账单列表 + * + * @param emisSettleBill 结算总账单 + * @return 结算总账单集合 + */ + public List selectEmisSettleBillList(EmisSettleBill emisSettleBill); + + + /** + * 检查是否重复 + * + * @param emisSettleBill + * @return 数量 + */ + public int checkUnique(EmisSettleBill emisSettleBill); + + /** + * 新增结算总账单 + * + * @param emisSettleBill 结算总账单 + * @return 结果 + */ + public int insertEmisSettleBill(EmisSettleBill emisSettleBill); + + /** + * 修改结算总账单 + * + * @param emisSettleBill 结算总账单 + * @return 结果 + */ + public int updateEmisSettleBill(EmisSettleBill emisSettleBill); + + /** + * 批量删除结算总账单 + * + * @param ids 需要删除的结算总账单主键集合 + * @return 结果 + */ + public int deleteEmisSettleBillByIds(Long[] ids); + + /** + * 删除结算总账单信息 + * + * @param id 结算总账单主键 + * @return 结果 + */ + public int deleteEmisSettleBillById(Long id); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillFeeitemService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillFeeitemService.java new file mode 100644 index 000000000..dbc351040 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillFeeitemService.java @@ -0,0 +1,78 @@ + /** + * @Project: emis + * @Title: EmisSettleSubBillFeeitemService.java + * @author linfso + * @date 2024-07-03 18:54:53 + * @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.EmisSettleSubBillFeeitem; + +/** + * @ClassName EmisSettleSubBillFeeitemService + * @Description 子账单费用明细 + * @author linfso + * @date 2024-07-03 18:54:53 + */ +public interface IEmisSettleSubBillFeeitemService +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisSettleSubBillFeeitem selectEmisSettleSubBillFeeitemById(Long id); + + /** + * 查询子账单费用明细列表 + * + * @param emisSettleSubBillFeeitem 子账单费用明细 + * @return 子账单费用明细集合 + */ + public List selectEmisSettleSubBillFeeitemList(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem); + + + /** + * 检查是否重复 + * + * @param emisSettleSubBillFeeitem + * @return 数量 + */ + public int checkUnique(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem); + + /** + * 新增子账单费用明细 + * + * @param emisSettleSubBillFeeitem 子账单费用明细 + * @return 结果 + */ + public int insertEmisSettleSubBillFeeitem(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem); + + /** + * 修改子账单费用明细 + * + * @param emisSettleSubBillFeeitem 子账单费用明细 + * @return 结果 + */ + public int updateEmisSettleSubBillFeeitem(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem); + + /** + * 批量删除子账单费用明细 + * + * @param ids 需要删除的子账单费用明细主键集合 + * @return 结果 + */ + public int deleteEmisSettleSubBillFeeitemByIds(Long[] ids); + + /** + * 删除子账单费用明细信息 + * + * @param id 子账单费用明细主键 + * @return 结果 + */ + public int deleteEmisSettleSubBillFeeitemById(Long id); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java new file mode 100644 index 000000000..73b9bd8a8 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java @@ -0,0 +1,78 @@ + /** + * @Project: emis + * @Title: EmisSettleSubBillService.java + * @author linfso + * @date 2024-07-03 18:54:52 + * @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.EmisSettleSubBill; + +/** + * @ClassName EmisSettleSubBillService + * @Description 结算子账单 + * @author linfso + * @date 2024-07-03 18:54:52 + */ +public interface IEmisSettleSubBillService +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisSettleSubBill selectEmisSettleSubBillById(Long id); + + /** + * 查询结算子账单列表 + * + * @param emisSettleSubBill 结算子账单 + * @return 结算子账单集合 + */ + public List selectEmisSettleSubBillList(EmisSettleSubBill emisSettleSubBill); + + + /** + * 检查是否重复 + * + * @param emisSettleSubBill + * @return 数量 + */ + public int checkUnique(EmisSettleSubBill emisSettleSubBill); + + /** + * 新增结算子账单 + * + * @param emisSettleSubBill 结算子账单 + * @return 结果 + */ + public int insertEmisSettleSubBill(EmisSettleSubBill emisSettleSubBill); + + /** + * 修改结算子账单 + * + * @param emisSettleSubBill 结算子账单 + * @return 结果 + */ + public int updateEmisSettleSubBill(EmisSettleSubBill emisSettleSubBill); + + /** + * 批量删除结算子账单 + * + * @param ids 需要删除的结算子账单主键集合 + * @return 结果 + */ + public int deleteEmisSettleSubBillByIds(Long[] ids); + + /** + * 删除结算子账单信息 + * + * @param id 结算子账单主键 + * @return 结果 + */ + public int deleteEmisSettleSubBillById(Long id); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerSettleBillServiceImpl.java deleted file mode 100644 index e40cb524f..000000000 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerSettleBillServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ - /** - * @Project: emis - * @Title: EmisCustomerSettleBillServiceImpl.java - * @author linfso - * @date 2024-04-24 05:05:22 - * @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.EmisCustomerSettleBill; -import com.xdadan.erp.emis.mapper.EmisCustomerSettleBillMapper; -import com.xdadan.erp.emis.service.IEmisCustomerSettleBillService; - -/** - * 快递用户结算账单Service业务层处理 - * - * @author linfso - * @date 2024-04-24 05:05:22 - */ -@Service -public class EmisCustomerSettleBillServiceImpl implements IEmisCustomerSettleBillService -{ - @Autowired - private EmisCustomerSettleBillMapper emisCustomerSettleBillMapper; - - /** - * 查询快递用户结算账单 - * - * @param id 快递用户结算账单主键 - * @return 快递用户结算账单 - */ - @Override - public EmisCustomerSettleBill selectEmisCustomerSettleBillById(Long id) - { - return emisCustomerSettleBillMapper.selectEmisCustomerSettleBillById(id); - } - - /** - * 查询快递用户结算账单列表 - * - * @param emisCustomerSettleBill 快递用户结算账单 - * @return 快递用户结算账单 - */ - @Override - public List selectEmisCustomerSettleBillList(EmisCustomerSettleBill emisCustomerSettleBill) - { - return emisCustomerSettleBillMapper.selectEmisCustomerSettleBillList(emisCustomerSettleBill); - } - - /** - * 新增快递用户结算账单 - * - * @param emisCustomerSettleBill 快递用户结算账单 - * @return 结果 - */ - @Override - public int insertEmisCustomerSettleBill(EmisCustomerSettleBill emisCustomerSettleBill) - { - return emisCustomerSettleBillMapper.insertEmisCustomerSettleBill(emisCustomerSettleBill); - } - - /** - * 修改快递用户结算账单 - * - * @param emisCustomerSettleBill 快递用户结算账单 - * @return 结果 - */ - @Override - public int updateEmisCustomerSettleBill(EmisCustomerSettleBill emisCustomerSettleBill) - { - return emisCustomerSettleBillMapper.updateEmisCustomerSettleBill(emisCustomerSettleBill); - } - - /** - * 批量删除快递用户结算账单 - * - * @param ids 需要删除的快递用户结算账单主键 - * @return 结果 - */ - @Override - public int deleteEmisCustomerSettleBillByIds(Long[] ids) - { - return emisCustomerSettleBillMapper.deleteEmisCustomerSettleBillByIds(ids); - } - - /** - * 删除快递用户结算账单信息 - * - * @param id 快递用户结算账单主键 - * @return 结果 - */ - @Override - public int deleteEmisCustomerSettleBillById(Long id) - { - return emisCustomerSettleBillMapper.deleteEmisCustomerSettleBillById(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 new file mode 100644 index 000000000..ff2208000 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -0,0 +1,117 @@ + /** + * @Project: emis + * @Title: EmisSettleBillServiceImpl.java + * @author linfso + * @date 2024-07-03 18:54:51 + * @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.EmisSettleBill; +import com.xdadan.erp.emis.mapper.EmisSettleBillMapper; +import com.xdadan.erp.emis.service.IEmisSettleBillService; + +/** + * 结算总账单Service业务层处理 + * + * @author linfso + * @date 2024-07-03 18:54:51 + */ +@Service +public class EmisSettleBillServiceImpl implements IEmisSettleBillService +{ + @Autowired + private EmisSettleBillMapper emisSettleBillMapper; + + /** + * 查询结算总账单 + * + * @param id 结算总账单主键 + * @return 结算总账单 + */ + @Override + public EmisSettleBill selectEmisSettleBillById(Long id) + { + return emisSettleBillMapper.selectEmisSettleBillById(id); + } + + + /** + * 查询结算总账单列表 + * + * @param emisSettleBill 结算总账单 + * @return 结算总账单 + */ + @Override + public List selectEmisSettleBillList(EmisSettleBill emisSettleBill) + { + return emisSettleBillMapper.selectEmisSettleBillList(emisSettleBill); + } + + /** + * 检查是否重复 + * + * @param emisSettleBill + * @return 数量 + */ + @Override + public int checkUnique(EmisSettleBill emisSettleBill) + { + return emisSettleBillMapper.checkUnique(emisSettleBill); + } + + /** + * 新增结算总账单 + * + * @param emisSettleBill 结算总账单 + * @return 结果 + */ + @Override + public int insertEmisSettleBill(EmisSettleBill emisSettleBill) + { + return emisSettleBillMapper.insertEmisSettleBill(emisSettleBill); + } + + /** + * 修改结算总账单 + * + * @param emisSettleBill 结算总账单 + * @return 结果 + */ + @Override + public int updateEmisSettleBill(EmisSettleBill emisSettleBill) + { + return emisSettleBillMapper.updateEmisSettleBill(emisSettleBill); + } + + /** + * 批量删除结算总账单 + * + * @param ids 需要删除的结算总账单主键 + * @return 结果 + */ + @Override + public int deleteEmisSettleBillByIds(Long[] ids) + { + return emisSettleBillMapper.deleteEmisSettleBillByIds(ids); + } + + /** + * 删除结算总账单信息 + * + * @param id 结算总账单主键 + * @return 结果 + */ + @Override + public int deleteEmisSettleBillById(Long id) + { + return emisSettleBillMapper.deleteEmisSettleBillById(id); + } + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillFeeitemServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillFeeitemServiceImpl.java new file mode 100644 index 000000000..418e7dfb7 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillFeeitemServiceImpl.java @@ -0,0 +1,117 @@ + /** + * @Project: emis + * @Title: EmisSettleSubBillFeeitemServiceImpl.java + * @author linfso + * @date 2024-07-03 18:54:53 + * @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.EmisSettleSubBillFeeitem; +import com.xdadan.erp.emis.mapper.EmisSettleSubBillFeeitemMapper; +import com.xdadan.erp.emis.service.IEmisSettleSubBillFeeitemService; + +/** + * 子账单费用明细Service业务层处理 + * + * @author linfso + * @date 2024-07-03 18:54:53 + */ +@Service +public class EmisSettleSubBillFeeitemServiceImpl implements IEmisSettleSubBillFeeitemService +{ + @Autowired + private EmisSettleSubBillFeeitemMapper emisSettleSubBillFeeitemMapper; + + /** + * 查询子账单费用明细 + * + * @param id 子账单费用明细主键 + * @return 子账单费用明细 + */ + @Override + public EmisSettleSubBillFeeitem selectEmisSettleSubBillFeeitemById(Long id) + { + return emisSettleSubBillFeeitemMapper.selectEmisSettleSubBillFeeitemById(id); + } + + + /** + * 查询子账单费用明细列表 + * + * @param emisSettleSubBillFeeitem 子账单费用明细 + * @return 子账单费用明细 + */ + @Override + public List selectEmisSettleSubBillFeeitemList(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem) + { + return emisSettleSubBillFeeitemMapper.selectEmisSettleSubBillFeeitemList(emisSettleSubBillFeeitem); + } + + /** + * 检查是否重复 + * + * @param emisSettleSubBillFeeitem + * @return 数量 + */ + @Override + public int checkUnique(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem) + { + return emisSettleSubBillFeeitemMapper.checkUnique(emisSettleSubBillFeeitem); + } + + /** + * 新增子账单费用明细 + * + * @param emisSettleSubBillFeeitem 子账单费用明细 + * @return 结果 + */ + @Override + public int insertEmisSettleSubBillFeeitem(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem) + { + return emisSettleSubBillFeeitemMapper.insertEmisSettleSubBillFeeitem(emisSettleSubBillFeeitem); + } + + /** + * 修改子账单费用明细 + * + * @param emisSettleSubBillFeeitem 子账单费用明细 + * @return 结果 + */ + @Override + public int updateEmisSettleSubBillFeeitem(EmisSettleSubBillFeeitem emisSettleSubBillFeeitem) + { + return emisSettleSubBillFeeitemMapper.updateEmisSettleSubBillFeeitem(emisSettleSubBillFeeitem); + } + + /** + * 批量删除子账单费用明细 + * + * @param ids 需要删除的子账单费用明细主键 + * @return 结果 + */ + @Override + public int deleteEmisSettleSubBillFeeitemByIds(Long[] ids) + { + return emisSettleSubBillFeeitemMapper.deleteEmisSettleSubBillFeeitemByIds(ids); + } + + /** + * 删除子账单费用明细信息 + * + * @param id 子账单费用明细主键 + * @return 结果 + */ + @Override + public int deleteEmisSettleSubBillFeeitemById(Long id) + { + return emisSettleSubBillFeeitemMapper.deleteEmisSettleSubBillFeeitemById(id); + } + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java new file mode 100644 index 000000000..00e3b28d3 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java @@ -0,0 +1,117 @@ + /** + * @Project: emis + * @Title: EmisSettleSubBillServiceImpl.java + * @author linfso + * @date 2024-07-03 18:54:52 + * @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.EmisSettleSubBill; +import com.xdadan.erp.emis.mapper.EmisSettleSubBillMapper; +import com.xdadan.erp.emis.service.IEmisSettleSubBillService; + +/** + * 结算子账单Service业务层处理 + * + * @author linfso + * @date 2024-07-03 18:54:52 + */ +@Service +public class EmisSettleSubBillServiceImpl implements IEmisSettleSubBillService +{ + @Autowired + private EmisSettleSubBillMapper emisSettleSubBillMapper; + + /** + * 查询结算子账单 + * + * @param id 结算子账单主键 + * @return 结算子账单 + */ + @Override + public EmisSettleSubBill selectEmisSettleSubBillById(Long id) + { + return emisSettleSubBillMapper.selectEmisSettleSubBillById(id); + } + + + /** + * 查询结算子账单列表 + * + * @param emisSettleSubBill 结算子账单 + * @return 结算子账单 + */ + @Override + public List selectEmisSettleSubBillList(EmisSettleSubBill emisSettleSubBill) + { + return emisSettleSubBillMapper.selectEmisSettleSubBillList(emisSettleSubBill); + } + + /** + * 检查是否重复 + * + * @param emisSettleSubBill + * @return 数量 + */ + @Override + public int checkUnique(EmisSettleSubBill emisSettleSubBill) + { + return emisSettleSubBillMapper.checkUnique(emisSettleSubBill); + } + + /** + * 新增结算子账单 + * + * @param emisSettleSubBill 结算子账单 + * @return 结果 + */ + @Override + public int insertEmisSettleSubBill(EmisSettleSubBill emisSettleSubBill) + { + return emisSettleSubBillMapper.insertEmisSettleSubBill(emisSettleSubBill); + } + + /** + * 修改结算子账单 + * + * @param emisSettleSubBill 结算子账单 + * @return 结果 + */ + @Override + public int updateEmisSettleSubBill(EmisSettleSubBill emisSettleSubBill) + { + return emisSettleSubBillMapper.updateEmisSettleSubBill(emisSettleSubBill); + } + + /** + * 批量删除结算子账单 + * + * @param ids 需要删除的结算子账单主键 + * @return 结果 + */ + @Override + public int deleteEmisSettleSubBillByIds(Long[] ids) + { + return emisSettleSubBillMapper.deleteEmisSettleSubBillByIds(ids); + } + + /** + * 删除结算子账单信息 + * + * @param id 结算子账单主键 + * @return 结果 + */ + @Override + public int deleteEmisSettleSubBillById(Long id) + { + return emisSettleSubBillMapper.deleteEmisSettleSubBillById(id); + } + +} diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerSettleBillMapper.xml deleted file mode 100644 index d1540d01a..000000000 --- a/emis-biz/src/main/resources/mapper/EmisCustomerSettleBillMapper.xml +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, settle_bill_no, settle_date_scope, settle_bill_month, pay_status, rec_money, reced_money, user_id, customer_code, customer_name, site_code, site_name, bl_confirm, bill_code_desc, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, bl_confirm_name, send_piece_sum, piece_number, fee_weight, send_money_sum, monthly_knot_code, uncollected_amount, refund_amount, create_man, create_man_code, confirm_date, confirm_site, un_confirm_date, un_confirm_man, un_confirm_site, refund_money, confirm_man, create_site, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_customer_settle_bill - - - - - - - - insert into emis_customer_settle_bill - - id, - settle_bill_no, - settle_date_scope, - settle_bill_month, - pay_status, - rec_money, - reced_money, - user_id, - customer_code, - customer_name, - site_code, - site_name, - bl_confirm, - bill_code_desc, - satisfy_money, - allowance_money, - deduction_money, - other_money, - satisfy_reason, - allowance_reason, - deduction_reason, - other_reason, - open_bill_status, - bl_confirm_name, - send_piece_sum, - piece_number, - fee_weight, - send_money_sum, - monthly_knot_code, - uncollected_amount, - refund_amount, - create_man, - create_man_code, - confirm_date, - confirm_site, - un_confirm_date, - un_confirm_man, - un_confirm_site, - refund_money, - confirm_man, - create_site, - create_site_code, - modify_site_code, - del_flag, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{id}, - #{settleBillNo}, - #{settleDateScope}, - #{settleBillMonth}, - #{payStatus}, - #{recMoney}, - #{recedMoney}, - #{userId}, - #{customerCode}, - #{customerName}, - #{siteCode}, - #{siteName}, - #{blConfirm}, - #{billCodeDesc}, - #{satisfyMoney}, - #{allowanceMoney}, - #{deductionMoney}, - #{otherMoney}, - #{satisfyReason}, - #{allowanceReason}, - #{deductionReason}, - #{otherReason}, - #{openBillStatus}, - #{blConfirmName}, - #{sendPieceSum}, - #{pieceNumber}, - #{feeWeight}, - #{sendMoneySum}, - #{monthlyKnotCode}, - #{uncollectedAmount}, - #{refundAmount}, - #{createMan}, - #{createManCode}, - #{confirmDate}, - #{confirmSite}, - #{unConfirmDate}, - #{unConfirmMan}, - #{unConfirmSite}, - #{refundMoney}, - #{confirmMan}, - #{createSite}, - #{createSiteCode}, - #{modifySiteCode}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update emis_customer_settle_bill - - settle_bill_no = #{settleBillNo}, - settle_date_scope = #{settleDateScope}, - settle_bill_month = #{settleBillMonth}, - pay_status = #{payStatus}, - rec_money = #{recMoney}, - reced_money = #{recedMoney}, - user_id = #{userId}, - customer_code = #{customerCode}, - customer_name = #{customerName}, - site_code = #{siteCode}, - site_name = #{siteName}, - bl_confirm = #{blConfirm}, - bill_code_desc = #{billCodeDesc}, - satisfy_money = #{satisfyMoney}, - allowance_money = #{allowanceMoney}, - deduction_money = #{deductionMoney}, - other_money = #{otherMoney}, - satisfy_reason = #{satisfyReason}, - allowance_reason = #{allowanceReason}, - deduction_reason = #{deductionReason}, - other_reason = #{otherReason}, - open_bill_status = #{openBillStatus}, - bl_confirm_name = #{blConfirmName}, - send_piece_sum = #{sendPieceSum}, - piece_number = #{pieceNumber}, - fee_weight = #{feeWeight}, - send_money_sum = #{sendMoneySum}, - monthly_knot_code = #{monthlyKnotCode}, - uncollected_amount = #{uncollectedAmount}, - refund_amount = #{refundAmount}, - create_man = #{createMan}, - create_man_code = #{createManCode}, - confirm_date = #{confirmDate}, - confirm_site = #{confirmSite}, - un_confirm_date = #{unConfirmDate}, - un_confirm_man = #{unConfirmMan}, - un_confirm_site = #{unConfirmSite}, - refund_money = #{refundMoney}, - confirm_man = #{confirmMan}, - create_site = #{createSite}, - create_site_code = #{createSiteCode}, - modify_site_code = #{modifySiteCode}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from emis_customer_settle_bill where id = #{id} - - - - delete from emis_customer_settle_bill where id in - - #{id} - - - \ No newline at end of file diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml new file mode 100644 index 000000000..29c37d8b0 --- /dev/null +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, settle_bill_no, settle_bill_name, settle_type, settle_start_date, settle_end_date, bill_month, rec_money, reced_money, cust_no, customer_code, customer_name, site_code, site_name, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, send_piece_sum, piece_number, fee_weight, uncollected_amount, send_money_sum, refund_amount, refund_money, bl_confirm, confirm_date, confirm_site, confirm_man_code, bl_site_confirm, confirm_note, site_confirm_date, site_confirm_man_code, site_confirm_note, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_bill + + + + + + + + + + insert into emis_settle_bill + + id, + settle_bill_no, + settle_bill_name, + settle_type, + settle_start_date, + settle_end_date, + bill_month, + rec_money, + reced_money, + cust_no, + customer_code, + customer_name, + site_code, + site_name, + satisfy_money, + allowance_money, + deduction_money, + other_money, + satisfy_reason, + allowance_reason, + deduction_reason, + other_reason, + open_bill_status, + payment_status, + send_piece_sum, + piece_number, + fee_weight, + uncollected_amount, + send_money_sum, + refund_amount, + refund_money, + bl_confirm, + confirm_date, + confirm_site, + confirm_man_code, + bl_site_confirm, + confirm_note, + site_confirm_date, + site_confirm_man_code, + site_confirm_note, + remark, + del_flag, + create_by, + create_time, + update_by, + update_time, + create_site, + update_site, + + + #{id}, + #{settleBillNo}, + #{settleBillName}, + #{settleType}, + #{settleStartDate}, + #{settleEndDate}, + #{billMonth}, + #{recMoney}, + #{recedMoney}, + #{custNo}, + #{customerCode}, + #{customerName}, + #{siteCode}, + #{siteName}, + #{satisfyMoney}, + #{allowanceMoney}, + #{deductionMoney}, + #{otherMoney}, + #{satisfyReason}, + #{allowanceReason}, + #{deductionReason}, + #{otherReason}, + #{openBillStatus}, + #{paymentStatus}, + #{sendPieceSum}, + #{pieceNumber}, + #{feeWeight}, + #{uncollectedAmount}, + #{sendMoneySum}, + #{refundAmount}, + #{refundMoney}, + #{blConfirm}, + #{confirmDate}, + #{confirmSite}, + #{confirmManCode}, + #{blSiteConfirm}, + #{confirmNote}, + #{siteConfirmDate}, + #{siteConfirmManCode}, + #{siteConfirmNote}, + #{remark}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{createSite}, + #{updateSite}, + + + + + update emis_settle_bill + + settle_bill_no = #{settleBillNo}, + settle_bill_name = #{settleBillName}, + settle_type = #{settleType}, + settle_start_date = #{settleStartDate}, + settle_end_date = #{settleEndDate}, + bill_month = #{billMonth}, + rec_money = #{recMoney}, + reced_money = #{recedMoney}, + cust_no = #{custNo}, + customer_code = #{customerCode}, + customer_name = #{customerName}, + site_code = #{siteCode}, + site_name = #{siteName}, + satisfy_money = #{satisfyMoney}, + allowance_money = #{allowanceMoney}, + deduction_money = #{deductionMoney}, + other_money = #{otherMoney}, + satisfy_reason = #{satisfyReason}, + allowance_reason = #{allowanceReason}, + deduction_reason = #{deductionReason}, + other_reason = #{otherReason}, + open_bill_status = #{openBillStatus}, + payment_status = #{paymentStatus}, + send_piece_sum = #{sendPieceSum}, + piece_number = #{pieceNumber}, + fee_weight = #{feeWeight}, + uncollected_amount = #{uncollectedAmount}, + send_money_sum = #{sendMoneySum}, + refund_amount = #{refundAmount}, + refund_money = #{refundMoney}, + bl_confirm = #{blConfirm}, + confirm_date = #{confirmDate}, + confirm_site = #{confirmSite}, + confirm_man_code = #{confirmManCode}, + bl_site_confirm = #{blSiteConfirm}, + confirm_note = #{confirmNote}, + site_confirm_date = #{siteConfirmDate}, + site_confirm_man_code = #{siteConfirmManCode}, + site_confirm_note = #{siteConfirmNote}, + remark = #{remark}, + 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_bill where id = #{id} + + + + delete from emis_settle_bill where id in + + #{id} + + + \ No newline at end of file diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml new file mode 100644 index 000000000..feccc67e2 --- /dev/null +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + select id, sub_bill_no, bill_code, fee_code, fee_name, bill_fee, orig_fee, currency, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_settle_sub_bill_feeitem + + + + + + + + + + insert into emis_settle_sub_bill_feeitem + + id, + sub_bill_no, + bill_code, + fee_code, + fee_name, + bill_fee, + orig_fee, + currency, + order_num, + del_flag, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{subBillNo}, + #{billCode}, + #{feeCode}, + #{feeName}, + #{billFee}, + #{origFee}, + #{currency}, + #{orderNum}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update emis_settle_sub_bill_feeitem + + sub_bill_no = #{subBillNo}, + bill_code = #{billCode}, + fee_code = #{feeCode}, + fee_name = #{feeName}, + bill_fee = #{billFee}, + orig_fee = #{origFee}, + currency = #{currency}, + order_num = #{orderNum}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from emis_settle_sub_bill_feeitem where id = #{id} + + + + delete from emis_settle_sub_bill_feeitem where id in + + #{id} + + + \ No newline at end of file diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml new file mode 100644 index 000000000..2763113fb --- /dev/null +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bill_month, cust_no, customer_code, customer_name, bl_confirm, confirm_date, confirm_site, confirm_man_code, bl_site_confirm, confirm_note, site_confirm_date, site_confirm_man_code, site_confirm_note, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill + + + + + + + + + + insert into emis_settle_sub_bill + + id, + bill_no, + parent_bill_no, + settle_bill_no, + bill_code, + bill_date, + bill_fee, + currency, + settle_type, + bl_split, + bill_month, + cust_no, + customer_code, + customer_name, + bl_confirm, + confirm_date, + confirm_site, + confirm_man_code, + bl_site_confirm, + confirm_note, + site_confirm_date, + site_confirm_man_code, + site_confirm_note, + del_flag, + create_by, + create_time, + update_by, + update_time, + create_site, + update_site, + + + #{id}, + #{billNo}, + #{parentBillNo}, + #{settleBillNo}, + #{billCode}, + #{billDate}, + #{billFee}, + #{currency}, + #{settleType}, + #{blSplit}, + #{billMonth}, + #{custNo}, + #{customerCode}, + #{customerName}, + #{blConfirm}, + #{confirmDate}, + #{confirmSite}, + #{confirmManCode}, + #{blSiteConfirm}, + #{confirmNote}, + #{siteConfirmDate}, + #{siteConfirmManCode}, + #{siteConfirmNote}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{createSite}, + #{updateSite}, + + + + + update emis_settle_sub_bill + + bill_no = #{billNo}, + parent_bill_no = #{parentBillNo}, + settle_bill_no = #{settleBillNo}, + bill_code = #{billCode}, + bill_date = #{billDate}, + bill_fee = #{billFee}, + currency = #{currency}, + settle_type = #{settleType}, + bl_split = #{blSplit}, + bill_month = #{billMonth}, + cust_no = #{custNo}, + customer_code = #{customerCode}, + customer_name = #{customerName}, + bl_confirm = #{blConfirm}, + confirm_date = #{confirmDate}, + confirm_site = #{confirmSite}, + confirm_man_code = #{confirmManCode}, + bl_site_confirm = #{blSiteConfirm}, + confirm_note = #{confirmNote}, + site_confirm_date = #{siteConfirmDate}, + site_confirm_man_code = #{siteConfirmManCode}, + site_confirm_note = #{siteConfirmNote}, + 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_sub_bill where id = #{id} + + + + delete from emis_settle_sub_bill where id in + + #{id} + + + \ No newline at end of file