From 71e28fd448ba6497fd63c265d8d333326d46882f Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Sun, 18 Jun 2023 11:02:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=B6=E6=AC=BE;=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E7=BB=93=E7=AE=97=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/system/entity/Company.java | 8 + .../shop/controller/CategoryController.java | 8 +- .../controller/TowerContractController.java | 1 - .../TowerContractEquipmentController.java | 12 +- .../TowerContractFinalSettleController.java | 150 ++++++++++++++ ...owerContractFinalSettleLostController.java | 139 +++++++++++++ .../controller/TowerIncomeController.java | 172 ++++++++++++++++ .../TowerIncomeEquipmentController.java | 157 ++++++++++++++ .../controller/TowerInvoicingController.java | 192 ++++++++++++++++++ .../TowerInvoicingSettleController.java | 152 ++++++++++++++ .../gxwebsoft/tower/entity/TowerContract.java | 15 ++ .../tower/entity/TowerContractEquipment.java | 14 ++ .../entity/TowerContractFinalSettle.java | 79 +++++++ .../entity/TowerContractFinalSettleLost.java | 57 ++++++ .../gxwebsoft/tower/entity/TowerIncome.java | 126 ++++++++++++ .../tower/entity/TowerIncomeEquipment.java | 54 +++++ .../tower/entity/TowerInvoicing.java | 110 ++++++++++ .../tower/entity/TowerInvoicingSettle.java | 54 +++++ .../gxwebsoft/tower/entity/TowerSettle.java | 2 +- .../mapper/TowerContractEquipmentMapper.java | 3 +- .../TowerContractFinalSettleLostMapper.java | 37 ++++ .../TowerContractFinalSettleMapper.java | 38 ++++ .../mapper/TowerIncomeEquipmentMapper.java | 38 ++++ .../tower/mapper/TowerIncomeMapper.java | 38 ++++ .../tower/mapper/TowerInvoicingMapper.java | 38 ++++ .../mapper/TowerInvoicingSettleMapper.java | 38 ++++ .../TowerContractFinalSettleLostMapper.xml | 53 +++++ .../xml/TowerContractFinalSettleMapper.xml | 56 +++++ .../mapper/xml/TowerIncomeEquipmentMapper.xml | 50 +++++ .../tower/mapper/xml/TowerIncomeMapper.xml | 80 ++++++++ .../tower/mapper/xml/TowerInvoicingMapper.xml | 68 +++++++ .../mapper/xml/TowerInvoicingSettleMapper.xml | 50 +++++ .../TowerContractFinalSettleLostParam.java | 54 +++++ .../param/TowerContractFinalSettleParam.java | 53 +++++ .../param/TowerIncomeEquipmentParam.java | 50 +++++ .../tower/param/TowerIncomeParam.java | 82 ++++++++ .../tower/param/TowerInvoicingParam.java | 68 +++++++ .../param/TowerInvoicingSettleParam.java | 50 +++++ .../tower/param/TowerRentRecordParam.java | 2 +- .../tower/param/TowerSettleParam.java | 2 +- .../TowerContractFinalSettleLostService.java | 42 ++++ .../TowerContractFinalSettleService.java | 42 ++++ .../service/TowerIncomeEquipmentService.java | 42 ++++ .../tower/service/TowerIncomeService.java | 42 ++++ .../tower/service/TowerInvoicingService.java | 42 ++++ .../service/TowerInvoicingSettleService.java | 42 ++++ ...werContractFinalSettleLostServiceImpl.java | 47 +++++ .../TowerContractFinalSettleServiceImpl.java | 47 +++++ .../impl/TowerIncomeEquipmentServiceImpl.java | 47 +++++ .../service/impl/TowerIncomeServiceImpl.java | 47 +++++ .../impl/TowerInvoicingServiceImpl.java | 47 +++++ .../impl/TowerInvoicingSettleServiceImpl.java | 47 +++++ .../gxwebsoft/generator/TowerGenerator.java | 10 +- 53 files changed, 2985 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleLostController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerIncomeController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerIncomeEquipmentController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingSettleController.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettle.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettleLost.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerIncome.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerIncomeEquipment.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerInvoicing.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerInvoicingSettle.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleLostMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeEquipmentMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingSettleMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleLostMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeEquipmentMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingSettleMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleLostParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerIncomeEquipmentParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerIncomeParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerInvoicingParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerInvoicingSettleParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleLostService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerIncomeEquipmentService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerIncomeService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerInvoicingService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerInvoicingSettleService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleLostServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeEquipmentServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingSettleServiceImpl.java diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Company.java b/src/main/java/com/gxwebsoft/common/system/entity/Company.java index 79bb787..bdff19e 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Company.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Company.java @@ -150,4 +150,12 @@ public class Company implements Serializable { @TableField(exist = false) private String tenantCode; + @ApiModelProperty(value = "收入单位") + @TableField(exist = false) + private String incomeCompanyName; + + @ApiModelProperty(value = "结算单位") + @TableField(exist = false) + private String settleCompanyName; + } diff --git a/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java b/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java index 9b313db..2e6bd28 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java @@ -1,5 +1,7 @@ package com.gxwebsoft.shop.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.shop.service.CategoryService; @@ -51,8 +53,12 @@ public class CategoryController extends BaseController { public ApiResult> list(CategoryParam param) { PageParam page = new PageParam<>(param); // page.setDefaultOrder("create_time desc"); + QueryWrapper wrapper = new QueryWrapper<>(); page.setDefaultOrder("sort_number"); - return success(categoryService.list(page.getOrderWrapper())); + if (param.getParentId() == -1){ + wrapper.ne("parent_id", "0"); + } + return success(categoryService.list(wrapper)); // 使用关联查询 //return success(categoryService.listRel(param)); } diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractController.java index 37ef4f2..fc68ea6 100644 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerContractController.java +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerContractController.java @@ -33,7 +33,6 @@ import java.util.List; public class TowerContractController extends BaseController { @Resource private TowerContractService towerContractService; - private TowerContractMapper towerContractMapper; @PreAuthorize("hasAuthority('tower:towerContract:list')") @OperationLog diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java index 8856443..7b79350 100644 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java @@ -1,9 +1,11 @@ package com.gxwebsoft.tower.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.tower.entity.TowerContractFile; +import com.gxwebsoft.tower.entity.TowerEquipment; import com.gxwebsoft.tower.service.TowerContractEquipmentService; import com.gxwebsoft.tower.entity.TowerContractEquipment; import com.gxwebsoft.tower.param.TowerContractEquipmentParam; @@ -48,12 +50,20 @@ public class TowerContractEquipmentController extends BaseController { @ApiOperation("查询全部合同设备清单") @GetMapping() public ApiResult> list(@RequestParam Map params) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(TowerContractEquipment.class) + .selectAs(TowerEquipment::getName, TowerEquipment::getEquipmentName) + .select(TowerEquipment::getFactoryNo) + .select(TowerEquipment::getEquipmentNo) + .select(TowerEquipment::getFilingNo) + .leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerContractEquipment::getEquipmentId); TowerContractEquipmentParam towerContractEquipmentParam = new TowerContractEquipmentParam(); int contractId = Integer.parseInt(params.get("contractId")); towerContractEquipmentParam.setContractId(contractId); + PageParam page = new PageParam<>(towerContractEquipmentParam); page.setDefaultOrder("create_time desc"); - return success(towerContractEquipmentService.list(page.getOrderWrapper())); + return success(towerContractEquipmentService.list(wrapper)); // 使用关联查询 //return success(towerContractEquipmentService.listRel(param)); } diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleController.java new file mode 100644 index 0000000..cef6e37 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleController.java @@ -0,0 +1,150 @@ +package com.gxwebsoft.tower.controller; + +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.Company; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.entity.*; +import com.gxwebsoft.tower.service.TowerContractFinalSettleService; +import com.gxwebsoft.tower.param.TowerContractFinalSettleParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 项目结算书控制器 + * + * @author 科技小王子 + * @since 2023-06-17 22:34:32 + */ +@Api(tags = "项目结算书管理") +@RestController +@RequestMapping("/api/tower/tower-contract-final-settle") +public class TowerContractFinalSettleController extends BaseController { + @Resource + private TowerContractFinalSettleService towerContractFinalSettleService; + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:list')") + @OperationLog + @ApiOperation("分页查询项目结算书") + @GetMapping("/page") + public ApiResult> page(TowerContractFinalSettleParam param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(TowerContractFinalSettle.class) + .select(TowerContract::getContactNumber) + .select(TowerContract::getTotalInvoicingAmount) + .select(TowerContract::getTotalIncomeAmount) + .select(TowerContract::getEndDate) + .select(Company::getCompanyName) + .leftJoin(TowerContract.class, TowerContract::getContractId, TowerContractFinalSettle::getContractId) + .leftJoin(Company.class, Company::getCompanyId, TowerContractFinalSettle::getSettleCompanyId); + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerContractFinalSettleService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(towerContractFinalSettleService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:list')") + @OperationLog + @ApiOperation("查询全部项目结算书") + @GetMapping() + public ApiResult> list(TowerContractFinalSettleParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerContractFinalSettleService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerContractFinalSettleService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:list')") + @OperationLog + @ApiOperation("根据id查询项目结算书") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerContractFinalSettleService.getById(id)); + // 使用关联查询 + //return success(towerContractFinalSettleService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:save')") + @OperationLog + @ApiOperation("添加项目结算书") + @PostMapping() + public ApiResult save(@RequestBody TowerContractFinalSettle towerContractFinalSettle) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerContractFinalSettle.setUserId(loginUser.getUserId()); + } + if (towerContractFinalSettleService.save(towerContractFinalSettle)) { + return success(towerContractFinalSettle.getContractFinalSettleId()); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:update')") + @OperationLog + @ApiOperation("修改项目结算书") + @PutMapping() + public ApiResult update(@RequestBody TowerContractFinalSettle towerContractFinalSettle) { + if (towerContractFinalSettleService.updateById(towerContractFinalSettle)) { + return success(towerContractFinalSettle.getContractFinalSettleId()); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:remove')") + @OperationLog + @ApiOperation("删除项目结算书") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerContractFinalSettleService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:save')") + @OperationLog + @ApiOperation("批量添加项目结算书") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerContractFinalSettleService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:update')") + @OperationLog + @ApiOperation("批量修改项目结算书") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerContractFinalSettleService, "contract_final_settle_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:remove')") + @OperationLog + @ApiOperation("批量删除项目结算书") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerContractFinalSettleService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleLostController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleLostController.java new file mode 100644 index 0000000..52dd37f --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleLostController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.tower.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.service.TowerContractFinalSettleLostService; +import com.gxwebsoft.tower.entity.TowerContractFinalSettleLost; +import com.gxwebsoft.tower.param.TowerContractFinalSettleLostParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 结算书缺失物品控制器 + * + * @author 科技小王子 + * @since 2023-06-18 00:52:41 + */ +@Api(tags = "结算书缺失物品管理") +@RestController +@RequestMapping("/api/tower/tower-contract-final-settle-lost") +public class TowerContractFinalSettleLostController extends BaseController { + @Resource + private TowerContractFinalSettleLostService towerContractFinalSettleLostService; + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:list')") + @OperationLog + @ApiOperation("分页查询结算书缺失物品") + @GetMapping("/page") + public ApiResult> page(TowerContractFinalSettleLostParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerContractFinalSettleLostService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(towerContractFinalSettleLostService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:list')") + @OperationLog + @ApiOperation("查询全部结算书缺失物品") + @GetMapping() + public ApiResult> list(TowerContractFinalSettleLostParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerContractFinalSettleLostService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerContractFinalSettleLostService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:list')") + @OperationLog + @ApiOperation("根据id查询结算书缺失物品") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerContractFinalSettleLostService.getById(id)); + // 使用关联查询 + //return success(towerContractFinalSettleLostService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:save')") + @OperationLog + @ApiOperation("添加结算书缺失物品") + @PostMapping() + public ApiResult save(@RequestBody TowerContractFinalSettleLost towerContractFinalSettleLost) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerContractFinalSettleLost.setUserId(loginUser.getUserId()); + } + if (towerContractFinalSettleLostService.save(towerContractFinalSettleLost)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:update')") + @OperationLog + @ApiOperation("修改结算书缺失物品") + @PutMapping() + public ApiResult update(@RequestBody TowerContractFinalSettleLost towerContractFinalSettleLost) { + if (towerContractFinalSettleLostService.updateById(towerContractFinalSettleLost)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:remove')") + @OperationLog + @ApiOperation("删除结算书缺失物品") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerContractFinalSettleLostService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:save')") + @OperationLog + @ApiOperation("批量添加结算书缺失物品") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerContractFinalSettleLostService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:update')") + @OperationLog + @ApiOperation("批量修改结算书缺失物品") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerContractFinalSettleLostService, "final_settle_lost_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:remove')") + @OperationLog + @ApiOperation("批量删除结算书缺失物品") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerContractFinalSettleLostService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerIncomeController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerIncomeController.java new file mode 100644 index 0000000..f2c3890 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerIncomeController.java @@ -0,0 +1,172 @@ +package com.gxwebsoft.tower.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.Company; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.entity.*; +import com.gxwebsoft.tower.service.TowerContractService; +import com.gxwebsoft.tower.service.TowerIncomeService; +import com.gxwebsoft.tower.param.TowerIncomeParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 收款管理控制器 + * + * @author 科技小王子 + * @since 2023-06-17 16:56:18 + */ +@Api(tags = "收款管理管理") +@RestController +@RequestMapping("/api/tower/tower-income") +public class TowerIncomeController extends BaseController { + @Resource + private TowerIncomeService towerIncomeService; + @Resource + private TowerContractService towerContractService; + + @PreAuthorize("hasAuthority('tower:towerIncome:list')") + @OperationLog + @ApiOperation("分页查询收款管理") + @GetMapping("/page") + public ApiResult> page(TowerIncomeParam param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(TowerIncome.class) + .select(TowerContract::getContactNumber) + .select(TowerContract::getTotalInvoicingAmount) + .select(TowerContract::getTotalIncomeAmount) + .select(TowerProject::getProjectName) + .selectAs(TowerCustomer::getName, TowerCustomer::getCustomerName) + .selectAs(Company::getCompanyName, Company::getIncomeCompanyName) + .leftJoin(TowerContract.class, TowerContract::getContractId, TowerIncome::getContractId) + .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerContract::getProjectId) + .leftJoin(TowerCustomer.class, TowerCustomer::getCustomerId, TowerContract::getCustomerId) + .leftJoin(Company.class, Company::getCompanyId, TowerIncome::getIncomeCompanyId); + + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerIncomeService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(towerIncomeService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:list')") + @OperationLog + @ApiOperation("查询全部收款管理") + @GetMapping() + public ApiResult> list(TowerIncomeParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerIncomeService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerIncomeService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:list')") + @OperationLog + @ApiOperation("根据id查询收款管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerIncomeService.getById(id)); + // 使用关联查询 + //return success(towerIncomeService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:save')") + @OperationLog + @ApiOperation("添加收款管理") + @PostMapping() + public ApiResult save(@RequestBody TowerIncome towerIncome) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerIncome.setUserId(loginUser.getUserId()); + } + if (towerIncomeService.save(towerIncome)) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(TowerContract::getContractId, towerIncome.getIncomeId()) + .setSql("`total_income_amount` = `total_income_amount` + " + towerIncome.getAmount()); + towerContractService.update(null, updateWrapper); + return success(towerIncome.getIncomeId()); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:update')") + @OperationLog + @ApiOperation("修改收款管理") + @PutMapping() + public ApiResult update(@RequestBody TowerIncome towerIncome) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("sum(`amount`) as `total_income_amount`"); + TowerIncome towerIncomeAll = towerIncomeService.getOne(queryWrapper); + + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(TowerContract::getContractId, towerIncome.getIncomeId()) + .set(TowerContract::getTotalIncomeAmount, towerIncomeAll.getTotalIncomeAmount()); + towerContractService.update(null, updateWrapper); + if (towerIncomeService.updateById(towerIncome)) { + return success(towerIncome.getIncomeId()); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:remove')") + @OperationLog + @ApiOperation("删除收款管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerIncomeService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:save')") + @OperationLog + @ApiOperation("批量添加收款管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerIncomeService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:update')") + @OperationLog + @ApiOperation("批量修改收款管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerIncomeService, "income_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:remove')") + @OperationLog + @ApiOperation("批量删除收款管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerIncomeService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerIncomeEquipmentController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerIncomeEquipmentController.java new file mode 100644 index 0000000..807daee --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerIncomeEquipmentController.java @@ -0,0 +1,157 @@ +package com.gxwebsoft.tower.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.yulichang.query.MPJLambdaQueryWrapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.entity.*; +import com.gxwebsoft.tower.service.TowerIncomeEquipmentService; +import com.gxwebsoft.tower.param.TowerIncomeEquipmentParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 收款设备费用分摊控制器 + * + * @author 科技小王子 + * @since 2023-06-17 17:06:39 + */ +@Api(tags = "收款设备费用分摊管理") +@RestController +@RequestMapping("/api/tower/tower-income-equipment") +public class TowerIncomeEquipmentController extends BaseController { + @Resource + private TowerIncomeEquipmentService towerIncomeEquipmentService; + + @PreAuthorize("hasAuthority('tower:towerIncome:list')") + @OperationLog + @ApiOperation("分页查询收款设备费用分摊") + @GetMapping("/page") + public ApiResult> page(TowerIncomeEquipmentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerIncomeEquipmentService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(towerIncomeEquipmentService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:list')") + @OperationLog + @ApiOperation("查询全部收款设备费用分摊") + @GetMapping() + public ApiResult> list(TowerIncomeEquipmentParam param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(TowerIncomeEquipment.class) + .select(TowerEquipment::getEquipmentName) + .selectAs(TowerEquipment::getModel, TowerEquipment::getEquipmentModel) + .select(TowerEquipment::getFilingNo) + .select(TowerEquipment::getFactoryNo) + .select(TowerEquipment::getEquipmentNo) + .select(TowerContractEquipment::getRentAmount) + .leftJoin(TowerContractEquipment.class, TowerContractEquipment::getEquipmentId, TowerIncomeEquipment::getEquipmentId) + .leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerContractEquipment::getEquipmentId); + + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerIncomeEquipmentService.list(wrapper)); + // 使用关联查询 + //return success(towerIncomeEquipmentService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:list')") + @OperationLog + @ApiOperation("根据id查询收款设备费用分摊") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerIncomeEquipmentService.getById(id)); + // 使用关联查询 + //return success(towerIncomeEquipmentService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:save')") + @OperationLog + @ApiOperation("添加收款设备费用分摊") + @PostMapping() + public ApiResult save(@RequestBody TowerIncomeEquipment towerIncomeEquipment) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerIncomeEquipment.setUserId(loginUser.getUserId()); + } + if (towerIncomeEquipmentService.save(towerIncomeEquipment)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:update')") + @OperationLog + @ApiOperation("修改收款设备费用分摊") + @PutMapping() + public ApiResult update(@RequestBody TowerIncomeEquipment towerIncomeEquipment) { + if (towerIncomeEquipmentService.updateById(towerIncomeEquipment)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:remove')") + @OperationLog + @ApiOperation("删除收款设备费用分摊") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerIncomeEquipmentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:save')") + @OperationLog + @ApiOperation("批量添加收款设备费用分摊") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerIncomeEquipmentService.saveBatch(list)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("income_id", list.get(0).getIncomeId()); + towerIncomeEquipmentService.remove(queryWrapper); + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:update')") + @OperationLog + @ApiOperation("批量修改收款设备费用分摊") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerIncomeEquipmentService, "income_equipment_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerIncome:remove')") + @OperationLog + @ApiOperation("批量删除收款设备费用分摊") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerIncomeEquipmentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingController.java new file mode 100644 index 0000000..0f3bb17 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingController.java @@ -0,0 +1,192 @@ +package com.gxwebsoft.tower.controller; + +import com.alipay.api.domain.Contract; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.Company; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.entity.TowerContract; +import com.gxwebsoft.tower.entity.TowerCustomer; +import com.gxwebsoft.tower.entity.TowerProject; +import com.gxwebsoft.tower.mapper.TowerContractMapper; +import com.gxwebsoft.tower.service.TowerContractService; +import com.gxwebsoft.tower.service.TowerInvoicingService; +import com.gxwebsoft.tower.entity.TowerInvoicing; +import com.gxwebsoft.tower.param.TowerInvoicingParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.tower.service.impl.TowerContractServiceImpl; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 开票管理控制器 + * + * @author 科技小王子 + * @since 2023-06-17 12:47:08 + */ +@Api(tags = "开票管理管理") +@RestController +@RequestMapping("/api/tower/tower-invoicing") +public class TowerInvoicingController extends BaseController { + @Resource + private TowerInvoicingService towerInvoicingService; + @Resource + private TowerContractService towerContractService; + + @PreAuthorize("hasAuthority('tower:towerInvoicing:list')") + @OperationLog + @ApiOperation("分页查询开票管理") + @GetMapping("/page") + public ApiResult> page(TowerInvoicingParam param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(TowerInvoicing.class) + .select(TowerContract::getContactNumber) + .select(TowerContract::getSignDate) + .select(TowerContract::getTotalInvoicingAmount) + .select(TowerProject::getProjectName) + .selectAs(TowerCustomer::getName, TowerCustomer::getCustomerName) + .select(Company::getCompanyName) + .leftJoin(TowerContract.class, TowerContract::getContractId, TowerInvoicing::getContractId) + .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerContract::getProjectId) + .leftJoin(TowerCustomer.class, TowerCustomer::getCustomerId, TowerContract::getCustomerId) + .leftJoin(Company.class, Company::getCompanyId, TowerContract::getCompanyId); + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerInvoicingService.page(page, wrapper)); + // 使用关联查询 + //return success(towerInvoicingService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:list')") + @OperationLog + @ApiOperation("查询全部开票管理") + @GetMapping() + public ApiResult> list(TowerInvoicingParam param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(TowerInvoicing.class) + .selectAs(TowerContract::getContactNumber, TowerContract::getContractNumber) + .select(TowerContract::getContactNumber) + .select(TowerContract::getSignDate) + .select(TowerContract::getTotalInvoicingAmount) + .select(TowerProject::getProjectName) + .selectAs(TowerCustomer::getName, TowerCustomer::getCustomerName) + .select(Company::getCompanyName) + .leftJoin(TowerContract.class, TowerContract::getContractId, TowerInvoicing::getContractId) + .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerContract::getProjectId) + .leftJoin(TowerCustomer.class, TowerCustomer::getCustomerId, TowerContract::getCustomerId) + .leftJoin(Company.class, Company::getCompanyId, TowerContract::getCompanyId); + + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerInvoicingService.list(wrapper)); + // 使用关联查询 + //return success(towerInvoicingService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:list')") + @OperationLog + @ApiOperation("根据id查询开票管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerInvoicingService.getById(id)); + // 使用关联查询 + //return success(towerInvoicingService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:save')") + @OperationLog + @ApiOperation("添加开票管理") + @PostMapping() + public ApiResult save(@RequestBody TowerInvoicing towerInvoicing) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerInvoicing.setUserId(loginUser.getUserId()); + } + if (towerInvoicingService.save(towerInvoicing)) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(TowerContract::getContractId, towerInvoicing.getContractId()) + .setSql("`total_invoicing_amount` = `total_invoicing_amount` + " + towerInvoicing.getInvoicingAmount()); + towerContractService.update(null, updateWrapper); + return success(towerInvoicing.getInvoicingId()); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:update')") + @OperationLog + @ApiOperation("修改开票管理") + @PutMapping() + public ApiResult update(@RequestBody TowerInvoicing towerInvoicing) { + if (towerInvoicingService.updateById(towerInvoicing)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("contract_id", towerInvoicing.getContractId()) + .select("SUM(`invoicing_amount`) as `total_invoicing_amount`"); + TowerInvoicing towerInvoicingAll = towerInvoicingService.getOne(queryWrapper); + + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(TowerContract::getContractId, towerInvoicing.getContractId()); + updateWrapper.set(TowerContract::getTotalInvoicingAmount, towerInvoicingAll.getTotalInvoicingAmount()); + towerContractService.update(null, updateWrapper); + return success(towerInvoicing.getInvoicingId()); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:remove')") + @OperationLog + @ApiOperation("删除开票管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerInvoicingService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:save')") + @OperationLog + @ApiOperation("批量添加开票管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerInvoicingService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:update')") + @OperationLog + @ApiOperation("批量修改开票管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerInvoicingService, "invoicing_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:remove')") + @OperationLog + @ApiOperation("批量删除开票管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerInvoicingService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingSettleController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingSettleController.java new file mode 100644 index 0000000..677a93d --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingSettleController.java @@ -0,0 +1,152 @@ +package com.gxwebsoft.tower.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.entity.TowerLendingSettleList; +import com.gxwebsoft.tower.entity.TowerSettle; +import com.gxwebsoft.tower.service.TowerInvoicingSettleService; +import com.gxwebsoft.tower.entity.TowerInvoicingSettle; +import com.gxwebsoft.tower.param.TowerInvoicingSettleParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 开票结算单分摊控制器 + * + * @author 科技小王子 + * @since 2023-06-17 12:47:08 + */ +@Api(tags = "开票结算单分摊管理") +@RestController +@RequestMapping("/api/tower/tower-invoicing-settle") +public class TowerInvoicingSettleController extends BaseController { + @Resource + private TowerInvoicingSettleService towerInvoicingSettleService; + + @PreAuthorize("hasAuthority('tower:towerInvoicing:list')") + @OperationLog + @ApiOperation("分页查询开票结算单分摊") + @GetMapping("/page") + public ApiResult> page(TowerInvoicingSettleParam param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(TowerInvoicingSettle.class) + .select(TowerSettle::getSettleNo) + .select(TowerSettle::getStartDate) + .select(TowerSettle::getTotalAmount) + .leftJoin(TowerSettle.class, TowerSettle::getSettleId, TowerInvoicingSettle::getSettleId); + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerInvoicingSettleService.page(page, wrapper)); + // 使用关联查询 + //return success(towerInvoicingSettleService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:list')") + @OperationLog + @ApiOperation("查询全部开票结算单分摊") + @GetMapping() + public ApiResult> list(TowerInvoicingSettleParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerInvoicingSettleService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerInvoicingSettleService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:list')") + @OperationLog + @ApiOperation("根据id查询开票结算单分摊") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerInvoicingSettleService.getById(id)); + // 使用关联查询 + //return success(towerInvoicingSettleService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:save')") + @OperationLog + @ApiOperation("添加开票结算单分摊") + @PostMapping() + public ApiResult save(@RequestBody TowerInvoicingSettle towerInvoicingSettle) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerInvoicingSettle.setUserId(loginUser.getUserId()); + } + if (towerInvoicingSettleService.save(towerInvoicingSettle)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:update')") + @OperationLog + @ApiOperation("修改开票结算单分摊") + @PutMapping() + public ApiResult update(@RequestBody TowerInvoicingSettle towerInvoicingSettle) { + if (towerInvoicingSettleService.updateById(towerInvoicingSettle)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:remove')") + @OperationLog + @ApiOperation("删除开票结算单分摊") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerInvoicingSettleService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:save')") + @OperationLog + @ApiOperation("批量添加开票结算单分摊") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("invoicing_id", list.get(0).getInvoicingId()); + towerInvoicingSettleService.remove(queryWrapper); + if (towerInvoicingSettleService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:update')") + @OperationLog + @ApiOperation("批量修改开票结算单分摊") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerInvoicingSettleService, "invoicing_settle_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerInvoicing:remove')") + @OperationLog + @ApiOperation("批量删除开票结算单分摊") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerInvoicingSettleService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContract.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContract.java index bbb60b7..669575e 100644 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerContract.java +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerContract.java @@ -1,12 +1,17 @@ package com.gxwebsoft.tower.entity; import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; + import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.TableLogic; + import java.io.Serializable; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -42,6 +47,10 @@ public class TowerContract implements Serializable { @ApiModelProperty(value = "合同编号") private String contactNumber; + @ApiModelProperty(value = "合同编号") + @TableField(exist = false) + private String contractNumber; + @ApiModelProperty(value = "签订日期") private String signDate; @@ -79,6 +88,12 @@ public class TowerContract implements Serializable { @ApiModelProperty(value = "跨月结算日期") private Integer extendMonthDate; + @ApiModelProperty(value = "累计开票金额") + private BigDecimal totalInvoicingAmount; + + @ApiModelProperty(value = "累计收款金额") + private BigDecimal totalIncomeAmount; + @ApiModelProperty(value = "租户id") private Integer tenantId; diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java index 3289142..393b9f8 100644 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java @@ -2,6 +2,7 @@ package com.gxwebsoft.tower.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -33,8 +34,21 @@ public class TowerContractEquipment implements Serializable { private Integer equipmentId; @ApiModelProperty(value = "设备") + @TableField(exist = false) private String equipmentName; + @ApiModelProperty(value = "出厂编号") + @TableField(exist = false) + private String factoryNo; + + @ApiModelProperty(value = "设备编号") + @TableField(exist = false) + private String equipmentNo; + + @ApiModelProperty(value = "备案编号") + @TableField(exist = false) + private String filingNo; + @ApiModelProperty(value = "型号") private String equipmentModel; diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettle.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettle.java new file mode 100644 index 0000000..0889fe0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettle.java @@ -0,0 +1,79 @@ +package com.gxwebsoft.tower.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目结算书 + * + * @author 科技小王子 + * @since 2023-06-17 22:34:32 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerContractFinalSettle对象", description = "项目结算书") +public class TowerContractFinalSettle implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "contract_final_settle_id", type = IdType.AUTO) + private Integer contractFinalSettleId; + + @ApiModelProperty(value = "合同ID") + private Integer contractId; + + @ApiModelProperty(value = "结算单位") + private Integer settleCompanyId; + + @ApiModelProperty(value = "登记人员") + private String signName; + + @ApiModelProperty(value = "登记日期") + private String signDate; + + private String remark; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "修改时间") + private LocalDateTime updateTime; + + @ApiModelProperty(value = "合同编号") + @TableField(exist = false) + private String contactNumber; + + @ApiModelProperty(value = "开票金额") + @TableField(exist = false) + private String totalInvoicingAmount; + + @ApiModelProperty(value = "收入金额") + @TableField(exist = false) + private String totalIncomeAmount; + + @ApiModelProperty(value = "结算公司") + @TableField(exist = false) + private String companyName; + + @ApiModelProperty(value = "结算日期") + @TableField(exist = false) + private String endDate; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettleLost.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettleLost.java new file mode 100644 index 0000000..c063d05 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettleLost.java @@ -0,0 +1,57 @@ +package com.gxwebsoft.tower.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 结算书缺失物品 + * + * @author 科技小王子 + * @since 2023-06-18 00:52:41 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerContractFinalSettleLost对象", description = "结算书缺失物品") +public class TowerContractFinalSettleLost implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "final_settle_lost_id", type = IdType.AUTO) + private Integer finalSettleLostId; + + @ApiModelProperty(value = "结算书ID") + private Integer finalSettleId; + + @ApiModelProperty(value = "配机ID") + private Integer itemId; + + @ApiModelProperty(value = "赔偿金额") + private BigDecimal amount; + + @ApiModelProperty(value = "赔偿数量") + private Integer num; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "修改时间") + private LocalDateTime updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerIncome.java b/src/main/java/com/gxwebsoft/tower/entity/TowerIncome.java new file mode 100644 index 0000000..12041dd --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerIncome.java @@ -0,0 +1,126 @@ +package com.gxwebsoft.tower.entity; + +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; + +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.TableLogic; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 收款管理 + * + * @author 科技小王子 + * @since 2023-06-17 16:56:17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerIncome对象", description = "收款管理") +public class TowerIncome implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "income_id", type = IdType.AUTO) + private Integer incomeId; + + @ApiModelProperty(value = "合同ID") + private Integer contractId; + + @ApiModelProperty(value = "收款单号") + private String incomeNo; + + @ApiModelProperty(value = "收款日期") + private String incomeDate; + + @ApiModelProperty(value = "收款单位") + private Integer incomeCompanyId; + + @ApiModelProperty(value = "收款金额") + private BigDecimal amount; + + @ApiModelProperty(value = "总计收款金额") + @TableField(exist = false) + private BigDecimal totalIncomeAmount; + + @ApiModelProperty(value = "总计开票金额") + @TableField(exist = false) + private BigDecimal totalInvoicingAmount; + + @ApiModelProperty(value = "收款类型") + private String incomeType; + + @ApiModelProperty(value = "预计收款日期") + private String expectIncomeDate; + + @ApiModelProperty(value = "预计收款金额") + private BigDecimal expectIncomeAmount; + + @ApiModelProperty(value = "收款方式") + private String incomeMethod; + + @ApiModelProperty(value = "发票号") + private String invoicingNo; + + @ApiModelProperty(value = "登记人") + private String signName; + + @ApiModelProperty(value = "附件") + private String fileList; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "收款状态(0已收款1已作废)") + private Integer status; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "修改时间") + private LocalDateTime updateTime; + + @ApiModelProperty(value = "合同编号") + @TableField(exist = false) + private String contractNumber; + + @ApiModelProperty(value = "合同编号") + @TableField(exist = false) + private String contactNumber; + + @ApiModelProperty(value = "项目名称") + @TableField(exist = false) + private String projectName; + + @ApiModelProperty(value = "签订日期") + @TableField(exist = false) + private String signDate; + + @ApiModelProperty(value = "租赁单位") + @TableField(exist = false) + private String companyName; + + @ApiModelProperty(value = "承租单位") + @TableField(exist = false) + private String customerName; + + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerIncomeEquipment.java b/src/main/java/com/gxwebsoft/tower/entity/TowerIncomeEquipment.java new file mode 100644 index 0000000..04388dd --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerIncomeEquipment.java @@ -0,0 +1,54 @@ +package com.gxwebsoft.tower.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 收款设备费用分摊 + * + * @author 科技小王子 + * @since 2023-06-17 17:06:39 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerIncomeEquipment对象", description = "收款设备费用分摊") +public class TowerIncomeEquipment implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "income_equipment_id", type = IdType.AUTO) + private Integer incomeEquipmentId; + + @ApiModelProperty(value = "收款ID") + private Integer incomeId; + + @ApiModelProperty(value = "设备ID") + private Integer equipmentId; + + @ApiModelProperty(value = "分摊费用") + private BigDecimal shareAmount; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "修改时间") + private LocalDateTime updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerInvoicing.java b/src/main/java/com/gxwebsoft/tower/entity/TowerInvoicing.java new file mode 100644 index 0000000..cae51e4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerInvoicing.java @@ -0,0 +1,110 @@ +package com.gxwebsoft.tower.entity; + +import java.math.BigDecimal; + +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; + +import java.math.BigInteger; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.poi.hpsf.Decimal; + +/** + * 开票管理 + * + * @author 科技小王子 + * @since 2023-06-17 12:47:08 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerInvoicing对象", description = "开票管理") +public class TowerInvoicing implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "invoicing_id", type = IdType.AUTO) + private Integer invoicingId; + + @ApiModelProperty(value = "合同ID") + private Integer contractId; + + @ApiModelProperty(value = "开票日期") + private String invoicingDate; + + @ApiModelProperty(value = "开票单位") + private String invoicingCompany; + + @ApiModelProperty(value = "申请人") + private String requestName; + + @ApiModelProperty(value = "开票金额") + private BigDecimal invoicingAmount; + + @ApiModelProperty(value = "开票号") + private String invoicingNo; + + @ApiModelProperty(value = "登记人") + private String signName; + + @ApiModelProperty(value = "附件") + private String fileList; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "开票状态(0已开票1已作废)") + private Integer status; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "修改时间") + private LocalDateTime updateTime; + + @ApiModelProperty(value = "合同编号") + @TableField(exist = false) + private String contractNumber; + + @ApiModelProperty(value = "合同编号") + @TableField(exist = false) + private String contactNumber; + + @ApiModelProperty(value = "项目名称") + @TableField(exist = false) + private String projectName; + + @ApiModelProperty(value = "签订日期") + @TableField(exist = false) + private String signDate; + + @ApiModelProperty(value = "租赁单位") + @TableField(exist = false) + private String companyName; + + @ApiModelProperty(value = "承租单位") + @TableField(exist = false) + private String customerName; + + @ApiModelProperty(value = "累计开票金额") + @TableField(exist = false) + private BigDecimal totalInvoicingAmount; + + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerInvoicingSettle.java b/src/main/java/com/gxwebsoft/tower/entity/TowerInvoicingSettle.java new file mode 100644 index 0000000..26fda53 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerInvoicingSettle.java @@ -0,0 +1,54 @@ +package com.gxwebsoft.tower.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 开票结算单分摊 + * + * @author 科技小王子 + * @since 2023-06-17 12:47:08 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerInvoicingSettle对象", description = "开票结算单分摊") +public class TowerInvoicingSettle implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "invoicing_settle_id", type = IdType.AUTO) + private Integer invoicingSettleId; + + @ApiModelProperty(value = "开票ID") + private Integer invoicingId; + + @ApiModelProperty(value = "结算ID") + private Integer settleId; + + @ApiModelProperty(value = "分摊金额") + private BigDecimal shareAmount; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "修改时间") + private LocalDateTime updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java b/src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java index f857aa5..e007168 100644 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java @@ -45,7 +45,7 @@ public class TowerSettle implements Serializable { private Integer extendMonthDate; @ApiModelProperty(value = "结算状态(0未认证;1已认证;2已失效;)") - private Boolean status; + private Integer status; @ApiModelProperty(value = "总额") private Integer totalAmount; diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractEquipmentMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractEquipmentMapper.java index 7760ab0..e8e08cc 100644 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractEquipmentMapper.java +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractEquipmentMapper.java @@ -2,6 +2,7 @@ package com.gxwebsoft.tower.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; import com.gxwebsoft.tower.entity.TowerContractEquipment; import com.gxwebsoft.tower.param.TowerContractEquipmentParam; import org.apache.ibatis.annotations.Param; @@ -14,7 +15,7 @@ import java.util.List; * @author 科技小王子 * @since 2023-06-09 13:42:20 */ -public interface TowerContractEquipmentMapper extends BaseMapper { +public interface TowerContractEquipmentMapper extends MPJBaseMapper { /** * 分页查询 diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleLostMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleLostMapper.java new file mode 100644 index 0000000..7c4cdc2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleLostMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerContractFinalSettleLost; +import com.gxwebsoft.tower.param.TowerContractFinalSettleLostParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 结算书缺失物品Mapper + * + * @author 科技小王子 + * @since 2023-06-18 00:52:41 + */ +public interface TowerContractFinalSettleLostMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerContractFinalSettleLostParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerContractFinalSettleLostParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleMapper.java new file mode 100644 index 0000000..ed0fc15 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleMapper.java @@ -0,0 +1,38 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; +import com.gxwebsoft.tower.entity.TowerContractFinalSettle; +import com.gxwebsoft.tower.param.TowerContractFinalSettleParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 项目结算书Mapper + * + * @author 科技小王子 + * @since 2023-06-17 22:34:32 + */ +public interface TowerContractFinalSettleMapper extends MPJBaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerContractFinalSettleParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerContractFinalSettleParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeEquipmentMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeEquipmentMapper.java new file mode 100644 index 0000000..621b732 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeEquipmentMapper.java @@ -0,0 +1,38 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; +import com.gxwebsoft.tower.entity.TowerIncomeEquipment; +import com.gxwebsoft.tower.param.TowerIncomeEquipmentParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 收款设备费用分摊Mapper + * + * @author 科技小王子 + * @since 2023-06-17 17:06:39 + */ +public interface TowerIncomeEquipmentMapper extends MPJBaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerIncomeEquipmentParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerIncomeEquipmentParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeMapper.java new file mode 100644 index 0000000..cd19b56 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeMapper.java @@ -0,0 +1,38 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; +import com.gxwebsoft.tower.entity.TowerIncome; +import com.gxwebsoft.tower.param.TowerIncomeParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 收款管理Mapper + * + * @author 科技小王子 + * @since 2023-06-17 17:06:39 + */ +public interface TowerIncomeMapper extends MPJBaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerIncomeParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerIncomeParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingMapper.java new file mode 100644 index 0000000..0eed099 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingMapper.java @@ -0,0 +1,38 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; +import com.gxwebsoft.tower.entity.TowerInvoicing; +import com.gxwebsoft.tower.param.TowerInvoicingParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 开票管理Mapper + * + * @author 科技小王子 + * @since 2023-06-17 12:47:08 + */ +public interface TowerInvoicingMapper extends MPJBaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerInvoicingParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerInvoicingParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingSettleMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingSettleMapper.java new file mode 100644 index 0000000..3b2c16c --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingSettleMapper.java @@ -0,0 +1,38 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; +import com.gxwebsoft.tower.entity.TowerInvoicingSettle; +import com.gxwebsoft.tower.param.TowerInvoicingSettleParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 开票结算单分摊Mapper + * + * @author 科技小王子 + * @since 2023-06-17 12:47:08 + */ +public interface TowerInvoicingSettleMapper extends MPJBaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerInvoicingSettleParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerInvoicingSettleParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleLostMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleLostMapper.xml new file mode 100644 index 0000000..c3eca07 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleLostMapper.xml @@ -0,0 +1,53 @@ + + + + + + + SELECT a.* + FROM tower_contract_final_settle_lost a + + + AND a.final_settle_lost_id = #{param.finalSettleLostId} + + + AND a.final_settle_id = #{param.finalSettleId} + + + AND a.item_id = #{param.itemId} + + + AND a.amount = #{param.amount} + + + AND a.num = #{param.num} + + + AND a.user_id = #{param.userId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleMapper.xml new file mode 100644 index 0000000..b6ce2f8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleMapper.xml @@ -0,0 +1,56 @@ + + + + + + + SELECT a.* + FROM tower_contract_final_settle a + + + AND a.contract_final_settle_id = #{param.contractFinalSettleId} + + + AND a.contract_id = #{param.contractId} + + + AND a.settle_company_id = #{param.settleCompanyId} + + + AND a.sign_name LIKE CONCAT('%', #{param.signName}, '%') + + + AND a.sign_date LIKE CONCAT('%', #{param.signDate}, '%') + + + AND a.remark LIKE CONCAT('%', #{param.remark}, '%') + + + AND a.user_id = #{param.userId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeEquipmentMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeEquipmentMapper.xml new file mode 100644 index 0000000..9907c67 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeEquipmentMapper.xml @@ -0,0 +1,50 @@ + + + + + + + SELECT a.* + FROM tower_income_equipment a + + + AND a.income_equipment_id = #{param.incomeEquipmentId} + + + AND a.income_id = #{param.incomeId} + + + AND a.equipment_id = #{param.equipmentId} + + + AND a.share_amount = #{param.shareAmount} + + + AND a.user_id = #{param.userId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeMapper.xml new file mode 100644 index 0000000..4262944 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeMapper.xml @@ -0,0 +1,80 @@ + + + + + + + SELECT a.* + FROM tower_income a + + + AND a.income_id = #{param.incomeId} + + + AND a.contract_id = #{param.contractId} + + + AND a.income_no LIKE CONCAT('%', #{param.incomeNo}, '%') + + + AND a.income_date LIKE CONCAT('%', #{param.incomeDate}, '%') + + + AND a.income_company_id = #{param.incomeCompanyId} + + + AND a.amount = #{param.amount} + + + AND a.income_type LIKE CONCAT('%', #{param.incomeType}, '%') + + + AND a.expect_income_date LIKE CONCAT('%', #{param.expectIncomeDate}, '%') + + + AND a.expect_income_amount = #{param.expectIncomeAmount} + + + AND a.income_method LIKE CONCAT('%', #{param.incomeMethod}, '%') + + + AND a.invoicing_no LIKE CONCAT('%', #{param.invoicingNo}, '%') + + + AND a.file_list LIKE CONCAT('%', #{param.fileList}, '%') + + + AND a.remark LIKE CONCAT('%', #{param.remark}, '%') + + + AND a.status = #{param.status} + + + AND a.user_id = #{param.userId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingMapper.xml new file mode 100644 index 0000000..0c9fef2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingMapper.xml @@ -0,0 +1,68 @@ + + + + + + + SELECT a.* + FROM tower_invoicing a + + + AND a.invoicing_id = #{param.invoicingId} + + + AND a.contract_id = #{param.contractId} + + + AND a.invoicing_date LIKE CONCAT('%', #{param.invoicingDate}, '%') + + + AND a.invoicing_company LIKE CONCAT('%', #{param.invoicingCompany}, '%') + + + AND a.request_name LIKE CONCAT('%', #{param.requestName}, '%') + + + AND a.invoicing_amount = #{param.invoicingAmount} + + + AND a.invoicing_no LIKE CONCAT('%', #{param.invoicingNo}, '%') + + + AND a.file_list LIKE CONCAT('%', #{param.fileList}, '%') + + + AND a.remark LIKE CONCAT('%', #{param.remark}, '%') + + + AND a.status = #{param.status} + + + AND a.user_id = #{param.userId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingSettleMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingSettleMapper.xml new file mode 100644 index 0000000..7726288 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingSettleMapper.xml @@ -0,0 +1,50 @@ + + + + + + + SELECT a.* + FROM tower_invoicing_settle a + + + AND a.invoicing_settle_id = #{param.invoicingSettleId} + + + AND a.invoicing_id = #{param.invoicingId} + + + AND a.settle_id = #{param.settleId} + + + AND a.share_amount = #{param.shareAmount} + + + AND a.user_id = #{param.userId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleLostParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleLostParam.java new file mode 100644 index 0000000..70521b9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleLostParam.java @@ -0,0 +1,54 @@ +package com.gxwebsoft.tower.param; + +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 结算书缺失物品查询参数 + * + * @author 科技小王子 + * @since 2023-06-18 00:52:41 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerContractFinalSettleLostParam对象", description = "结算书缺失物品查询参数") +public class TowerContractFinalSettleLostParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer finalSettleLostId; + + @ApiModelProperty(value = "结算书ID") + @QueryField(type = QueryType.EQ) + private Integer finalSettleId; + + @ApiModelProperty(value = "配机ID") + @QueryField(type = QueryType.EQ) + private Integer itemId; + + @ApiModelProperty(value = "赔偿金额") + @QueryField(type = QueryType.EQ) + private BigDecimal amount; + + @ApiModelProperty(value = "赔偿数量") + @QueryField(type = QueryType.EQ) + private Integer num; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleParam.java new file mode 100644 index 0000000..804789f --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleParam.java @@ -0,0 +1,53 @@ +package com.gxwebsoft.tower.param; + +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目结算书查询参数 + * + * @author 科技小王子 + * @since 2023-06-17 22:34:32 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerContractFinalSettleParam对象", description = "项目结算书查询参数") +public class TowerContractFinalSettleParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer contractFinalSettleId; + + @ApiModelProperty(value = "合同ID") + @QueryField(type = QueryType.EQ) + private Integer contractId; + + @ApiModelProperty(value = "结算单位") + @QueryField(type = QueryType.EQ) + private Integer settleCompanyId; + + @ApiModelProperty(value = "登记人员") + private String signName; + + @ApiModelProperty(value = "登记日期") + private String signDate; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerIncomeEquipmentParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerIncomeEquipmentParam.java new file mode 100644 index 0000000..9ac3f74 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerIncomeEquipmentParam.java @@ -0,0 +1,50 @@ +package com.gxwebsoft.tower.param; + +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 收款设备费用分摊查询参数 + * + * @author 科技小王子 + * @since 2023-06-17 17:06:39 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerIncomeEquipmentParam对象", description = "收款设备费用分摊查询参数") +public class TowerIncomeEquipmentParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer incomeEquipmentId; + + @ApiModelProperty(value = "收款ID") + @QueryField(type = QueryType.EQ) + private Integer incomeId; + + @ApiModelProperty(value = "设备ID") + @QueryField(type = QueryType.EQ) + private Integer equipmentId; + + @ApiModelProperty(value = "分摊费用") + @QueryField(type = QueryType.EQ) + private BigDecimal shareAmount; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerIncomeParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerIncomeParam.java new file mode 100644 index 0000000..c71ee02 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerIncomeParam.java @@ -0,0 +1,82 @@ +package com.gxwebsoft.tower.param; + +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 收款管理查询参数 + * + * @author 科技小王子 + * @since 2023-06-17 17:06:39 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerIncomeParam对象", description = "收款管理查询参数") +public class TowerIncomeParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer incomeId; + + @ApiModelProperty(value = "合同ID") + @QueryField(type = QueryType.EQ) + private Integer contractId; + + @ApiModelProperty(value = "收款单号") + private String incomeNo; + + @ApiModelProperty(value = "收款日期") + private String incomeDate; + + @ApiModelProperty(value = "收款单位") + @QueryField(type = QueryType.EQ) + private Integer incomeCompanyId; + + @ApiModelProperty(value = "收款金额") + @QueryField(type = QueryType.EQ) + private BigDecimal amount; + + @ApiModelProperty(value = "收款类型") + private String incomeType; + + @ApiModelProperty(value = "预计收款日期") + private String expectIncomeDate; + + @ApiModelProperty(value = "预计收款金额") + @QueryField(type = QueryType.EQ) + private BigDecimal expectIncomeAmount; + + @ApiModelProperty(value = "收款方式") + private String incomeMethod; + + @ApiModelProperty(value = "发票号") + private String invoicingNo; + + @ApiModelProperty(value = "附件") + private String fileList; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "收款状态(0已收款1已作废)") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerInvoicingParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerInvoicingParam.java new file mode 100644 index 0000000..5fff76b --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerInvoicingParam.java @@ -0,0 +1,68 @@ +package com.gxwebsoft.tower.param; + +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 开票管理查询参数 + * + * @author 科技小王子 + * @since 2023-06-17 12:47:08 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerInvoicingParam对象", description = "开票管理查询参数") +public class TowerInvoicingParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer invoicingId; + + @ApiModelProperty(value = "合同ID") + @QueryField(type = QueryType.EQ) + private Integer contractId; + + @ApiModelProperty(value = "开票日期") + private String invoicingDate; + + @ApiModelProperty(value = "开票单位") + private String invoicingCompany; + + @ApiModelProperty(value = "申请人") + private String requestName; + + @ApiModelProperty(value = "开票金额") + @QueryField(type = QueryType.EQ) + private BigDecimal invoicingAmount; + + @ApiModelProperty(value = "开票号") + private String invoicingNo; + + @ApiModelProperty(value = "附件") + private String fileList; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "开票状态(0已开票1已作废)") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerInvoicingSettleParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerInvoicingSettleParam.java new file mode 100644 index 0000000..d4a8449 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerInvoicingSettleParam.java @@ -0,0 +1,50 @@ +package com.gxwebsoft.tower.param; + +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 开票结算单分摊查询参数 + * + * @author 科技小王子 + * @since 2023-06-17 12:47:08 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerInvoicingSettleParam对象", description = "开票结算单分摊查询参数") +public class TowerInvoicingSettleParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer invoicingSettleId; + + @ApiModelProperty(value = "开票ID") + @QueryField(type = QueryType.EQ) + private Integer invoicingId; + + @ApiModelProperty(value = "结算ID") + @QueryField(type = QueryType.EQ) + private Integer settleId; + + @ApiModelProperty(value = "分摊金额") + @QueryField(type = QueryType.EQ) + private BigDecimal shareAmount; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerRentRecordParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerRentRecordParam.java index a036283..f21df5e 100644 --- a/src/main/java/com/gxwebsoft/tower/param/TowerRentRecordParam.java +++ b/src/main/java/com/gxwebsoft/tower/param/TowerRentRecordParam.java @@ -64,7 +64,7 @@ public class TowerRentRecordParam extends BaseParam { @ApiModelProperty(value = "状态(0未起租1起租2中途报停3报停复工4拆卸停租)") @QueryField(type = QueryType.EQ) - private Boolean status; + private Integer status; @ApiModelProperty(value = "所有人") @QueryField(type = QueryType.EQ) diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerSettleParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerSettleParam.java index 87f19e6..1c2942b 100644 --- a/src/main/java/com/gxwebsoft/tower/param/TowerSettleParam.java +++ b/src/main/java/com/gxwebsoft/tower/param/TowerSettleParam.java @@ -48,7 +48,7 @@ public class TowerSettleParam extends BaseParam { @ApiModelProperty(value = "结算状态(0未认证;1已认证;2已失效;)") @QueryField(type = QueryType.EQ) - private Boolean status; + private Integer status; @ApiModelProperty(value = "所有人") @QueryField(type = QueryType.EQ) diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleLostService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleLostService.java new file mode 100644 index 0000000..7afaa1b --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleLostService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerContractFinalSettleLost; +import com.gxwebsoft.tower.param.TowerContractFinalSettleLostParam; + +import java.util.List; + +/** + * 结算书缺失物品Service + * + * @author 科技小王子 + * @since 2023-06-18 00:52:41 + */ +public interface TowerContractFinalSettleLostService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerContractFinalSettleLostParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerContractFinalSettleLostParam param); + + /** + * 根据id查询 + * + * @param finalSettleLostId + * @return TowerContractFinalSettleLost + */ + TowerContractFinalSettleLost getByIdRel(Integer finalSettleLostId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleService.java new file mode 100644 index 0000000..563eeeb --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerContractFinalSettle; +import com.gxwebsoft.tower.param.TowerContractFinalSettleParam; + +import java.util.List; + +/** + * 项目结算书Service + * + * @author 科技小王子 + * @since 2023-06-17 22:34:32 + */ +public interface TowerContractFinalSettleService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerContractFinalSettleParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerContractFinalSettleParam param); + + /** + * 根据id查询 + * + * @param contractFinalSettleId + * @return TowerContractFinalSettle + */ + TowerContractFinalSettle getByIdRel(Integer contractFinalSettleId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerIncomeEquipmentService.java b/src/main/java/com/gxwebsoft/tower/service/TowerIncomeEquipmentService.java new file mode 100644 index 0000000..4499494 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerIncomeEquipmentService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerIncomeEquipment; +import com.gxwebsoft.tower.param.TowerIncomeEquipmentParam; + +import java.util.List; + +/** + * 收款设备费用分摊Service + * + * @author 科技小王子 + * @since 2023-06-17 17:06:39 + */ +public interface TowerIncomeEquipmentService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerIncomeEquipmentParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerIncomeEquipmentParam param); + + /** + * 根据id查询 + * + * @param incomeEquipmentId + * @return TowerIncomeEquipment + */ + TowerIncomeEquipment getByIdRel(Integer incomeEquipmentId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerIncomeService.java b/src/main/java/com/gxwebsoft/tower/service/TowerIncomeService.java new file mode 100644 index 0000000..305e195 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerIncomeService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerIncome; +import com.gxwebsoft.tower.param.TowerIncomeParam; + +import java.util.List; + +/** + * 收款管理Service + * + * @author 科技小王子 + * @since 2023-06-17 17:06:39 + */ +public interface TowerIncomeService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerIncomeParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerIncomeParam param); + + /** + * 根据id查询 + * + * @param incomeId + * @return TowerIncome + */ + TowerIncome getByIdRel(Integer incomeId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerInvoicingService.java b/src/main/java/com/gxwebsoft/tower/service/TowerInvoicingService.java new file mode 100644 index 0000000..cff14f6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerInvoicingService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerInvoicing; +import com.gxwebsoft.tower.param.TowerInvoicingParam; + +import java.util.List; + +/** + * 开票管理Service + * + * @author 科技小王子 + * @since 2023-06-17 12:47:08 + */ +public interface TowerInvoicingService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerInvoicingParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerInvoicingParam param); + + /** + * 根据id查询 + * + * @param invoicingId + * @return TowerInvoicing + */ + TowerInvoicing getByIdRel(Integer invoicingId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerInvoicingSettleService.java b/src/main/java/com/gxwebsoft/tower/service/TowerInvoicingSettleService.java new file mode 100644 index 0000000..4bbed08 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerInvoicingSettleService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerInvoicingSettle; +import com.gxwebsoft.tower.param.TowerInvoicingSettleParam; + +import java.util.List; + +/** + * 开票结算单分摊Service + * + * @author 科技小王子 + * @since 2023-06-17 12:47:08 + */ +public interface TowerInvoicingSettleService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerInvoicingSettleParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerInvoicingSettleParam param); + + /** + * 根据id查询 + * + * @param invoicingSettleId + * @return TowerInvoicingSettle + */ + TowerInvoicingSettle getByIdRel(Integer invoicingSettleId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleLostServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleLostServiceImpl.java new file mode 100644 index 0000000..7527012 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleLostServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerContractFinalSettleLostMapper; +import com.gxwebsoft.tower.service.TowerContractFinalSettleLostService; +import com.gxwebsoft.tower.entity.TowerContractFinalSettleLost; +import com.gxwebsoft.tower.param.TowerContractFinalSettleLostParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 结算书缺失物品Service实现 + * + * @author 科技小王子 + * @since 2023-06-18 00:52:41 + */ +@Service +public class TowerContractFinalSettleLostServiceImpl extends ServiceImpl implements TowerContractFinalSettleLostService { + + @Override + public PageResult pageRel(TowerContractFinalSettleLostParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(TowerContractFinalSettleLostParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerContractFinalSettleLost getByIdRel(Integer finalSettleLostId) { + TowerContractFinalSettleLostParam param = new TowerContractFinalSettleLostParam(); + param.setFinalSettleLostId(finalSettleLostId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleServiceImpl.java new file mode 100644 index 0000000..984aa1f --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerContractFinalSettleMapper; +import com.gxwebsoft.tower.service.TowerContractFinalSettleService; +import com.gxwebsoft.tower.entity.TowerContractFinalSettle; +import com.gxwebsoft.tower.param.TowerContractFinalSettleParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 项目结算书Service实现 + * + * @author 科技小王子 + * @since 2023-06-17 22:34:32 + */ +@Service +public class TowerContractFinalSettleServiceImpl extends ServiceImpl implements TowerContractFinalSettleService { + + @Override + public PageResult pageRel(TowerContractFinalSettleParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(TowerContractFinalSettleParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerContractFinalSettle getByIdRel(Integer contractFinalSettleId) { + TowerContractFinalSettleParam param = new TowerContractFinalSettleParam(); + param.setContractFinalSettleId(contractFinalSettleId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeEquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeEquipmentServiceImpl.java new file mode 100644 index 0000000..aa06108 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeEquipmentServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerIncomeEquipmentMapper; +import com.gxwebsoft.tower.service.TowerIncomeEquipmentService; +import com.gxwebsoft.tower.entity.TowerIncomeEquipment; +import com.gxwebsoft.tower.param.TowerIncomeEquipmentParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 收款设备费用分摊Service实现 + * + * @author 科技小王子 + * @since 2023-06-17 17:06:39 + */ +@Service +public class TowerIncomeEquipmentServiceImpl extends ServiceImpl implements TowerIncomeEquipmentService { + + @Override + public PageResult pageRel(TowerIncomeEquipmentParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(TowerIncomeEquipmentParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerIncomeEquipment getByIdRel(Integer incomeEquipmentId) { + TowerIncomeEquipmentParam param = new TowerIncomeEquipmentParam(); + param.setIncomeEquipmentId(incomeEquipmentId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeServiceImpl.java new file mode 100644 index 0000000..f65f24b --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerIncomeMapper; +import com.gxwebsoft.tower.service.TowerIncomeService; +import com.gxwebsoft.tower.entity.TowerIncome; +import com.gxwebsoft.tower.param.TowerIncomeParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 收款管理Service实现 + * + * @author 科技小王子 + * @since 2023-06-17 17:06:39 + */ +@Service +public class TowerIncomeServiceImpl extends ServiceImpl implements TowerIncomeService { + + @Override + public PageResult pageRel(TowerIncomeParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(TowerIncomeParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerIncome getByIdRel(Integer incomeId) { + TowerIncomeParam param = new TowerIncomeParam(); + param.setIncomeId(incomeId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingServiceImpl.java new file mode 100644 index 0000000..8520edb --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerInvoicingMapper; +import com.gxwebsoft.tower.service.TowerInvoicingService; +import com.gxwebsoft.tower.entity.TowerInvoicing; +import com.gxwebsoft.tower.param.TowerInvoicingParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 开票管理Service实现 + * + * @author 科技小王子 + * @since 2023-06-17 12:47:08 + */ +@Service +public class TowerInvoicingServiceImpl extends ServiceImpl implements TowerInvoicingService { + + @Override + public PageResult pageRel(TowerInvoicingParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(TowerInvoicingParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerInvoicing getByIdRel(Integer invoicingId) { + TowerInvoicingParam param = new TowerInvoicingParam(); + param.setInvoicingId(invoicingId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingSettleServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingSettleServiceImpl.java new file mode 100644 index 0000000..9e64f57 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingSettleServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerInvoicingSettleMapper; +import com.gxwebsoft.tower.service.TowerInvoicingSettleService; +import com.gxwebsoft.tower.entity.TowerInvoicingSettle; +import com.gxwebsoft.tower.param.TowerInvoicingSettleParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 开票结算单分摊Service实现 + * + * @author 科技小王子 + * @since 2023-06-17 12:47:08 + */ +@Service +public class TowerInvoicingSettleServiceImpl extends ServiceImpl implements TowerInvoicingSettleService { + + @Override + public PageResult pageRel(TowerInvoicingSettleParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(TowerInvoicingSettleParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerInvoicingSettle getByIdRel(Integer invoicingSettleId) { + TowerInvoicingSettleParam param = new TowerInvoicingSettleParam(); + param.setInvoicingSettleId(invoicingSettleId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java index ccec0b6..ac1058c 100644 --- a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java @@ -51,8 +51,14 @@ public class TowerGenerator { // "tower_settle", // "tower_settle_detail", // "tower_history_settle", - "tower_lending", - "tower_lending_settle_list", +// "tower_lending", +// "tower_lending_settle_list", +// "tower_invoicing", +// "tower_invoicing_settle", +// "tower_income", +// "tower_income_equipment", +// "tower_contract_final_settle", + "tower_contract_final_settle_lost", }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{