From 8307a166890c02e0cdbb2cc8f9ff528ab843a046 Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Mon, 12 Jun 2023 01:32:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=88=E5=90=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86;=20=E6=96=B0=E5=A2=9E=E7=BB=93=E7=AE=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TowerContractEquipmentController.java | 10 +- ...owerContractSettleEquipmentController.java | 149 +++++++++++++++++ .../TowerContractSettleRuleController.java | 149 +++++++++++++++++ .../controller/TowerSettleController.java | 158 ++++++++++++++++++ .../TowerSettleDetailController.java | 142 ++++++++++++++++ .../gxwebsoft/tower/entity/TowerContract.java | 6 + .../entity/TowerContractSettleEquipment.java | 76 +++++++++ .../tower/entity/TowerContractSettleRule.java | 53 ++++++ .../gxwebsoft/tower/entity/TowerSettle.java | 77 +++++++++ .../tower/entity/TowerSettleDetail.java | 87 ++++++++++ .../TowerContractSettleEquipmentMapper.java | 37 ++++ .../mapper/TowerContractSettleRuleMapper.java | 37 ++++ .../tower/mapper/TowerSettleDetailMapper.java | 37 ++++ .../tower/mapper/TowerSettleMapper.java | 37 ++++ .../tower/mapper/xml/TowerContractMapper.xml | 6 + .../TowerContractSettleEquipmentMapper.xml | 74 ++++++++ .../xml/TowerContractSettleRuleMapper.xml | 50 ++++++ .../mapper/xml/TowerSettleDetailMapper.xml | 83 +++++++++ .../tower/mapper/xml/TowerSettleMapper.xml | 62 +++++++ .../tower/param/TowerContractParam.java | 8 + .../TowerContractSettleEquipmentParam.java | 75 +++++++++ .../param/TowerContractSettleRuleParam.java | 46 +++++ .../tower/param/TowerSettleDetailParam.java | 86 ++++++++++ .../tower/param/TowerSettleParam.java | 61 +++++++ .../TowerContractSettleEquipmentService.java | 42 +++++ .../TowerContractSettleRuleService.java | 42 +++++ .../service/TowerSettleDetailService.java | 42 +++++ .../tower/service/TowerSettleService.java | 42 +++++ ...werContractSettleEquipmentServiceImpl.java | 47 ++++++ .../TowerContractSettleRuleServiceImpl.java | 47 ++++++ .../impl/TowerSettleDetailServiceImpl.java | 47 ++++++ .../service/impl/TowerSettleServiceImpl.java | 47 ++++++ src/main/resources/application-prod.yml | 2 +- src/main/resources/application.yml | 2 +- .../gxwebsoft/generator/TowerGenerator.java | 5 +- 35 files changed, 1964 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleEquipmentController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleRuleController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerSettleController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerSettleDetailController.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleEquipment.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleRule.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerSettleDetail.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleEquipmentMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleRuleMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerSettleDetailMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerSettleMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleEquipmentMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleRuleMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleDetailMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerContractSettleEquipmentParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerContractSettleRuleParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerSettleDetailParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerSettleParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractSettleEquipmentService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractSettleRuleService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerSettleDetailService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerSettleService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleEquipmentServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleRuleServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleDetailServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleServiceImpl.java diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java index ac00495..8856443 100644 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; +import java.util.Map; /** * 合同设备清单控制器 @@ -46,8 +47,11 @@ public class TowerContractEquipmentController extends BaseController { @OperationLog @ApiOperation("查询全部合同设备清单") @GetMapping() - public ApiResult> list(TowerContractEquipmentParam param) { - PageParam page = new PageParam<>(param); + public ApiResult> list(@RequestParam Map params) { + 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())); // 使用关联查询 @@ -70,7 +74,7 @@ public class TowerContractEquipmentController extends BaseController { // 记录当前登录用户idfc vbnm,dxcybc yhguc User loginUser = getLoginUser(); if (loginUser != null) { - towerContractEquipment.setUserId(loginUser.getUserId()); + towerContractEquipment.setUserId(loginUser.getUserId()); } if (towerContractEquipmentService.save(towerContractEquipment)) { return success("添加成功"); diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleEquipmentController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleEquipmentController.java new file mode 100644 index 0000000..527ca58 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleEquipmentController.java @@ -0,0 +1,149 @@ +package com.gxwebsoft.tower.controller; + +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.tower.entity.TowerContractSettleRule; +import com.gxwebsoft.tower.service.TowerContractSettleEquipmentService; +import com.gxwebsoft.tower.entity.TowerContractSettleEquipment; +import com.gxwebsoft.tower.param.TowerContractSettleEquipmentParam; +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; +import java.util.Map; +import java.util.Objects; + +/** + * 合同结算设备控制器 + * + * @author 科技小王子 + * @since 2023-06-10 16:52:12 + */ +@Api(tags = "合同结算设备管理") +@RestController +@RequestMapping("/api/tower/tower-contract-settle-equipment") +public class TowerContractSettleEquipmentController extends BaseController { + @Resource + private TowerContractSettleEquipmentService towerContractSettleEquipmentService; + + @PreAuthorize("hasAuthority('tower:towerContract:list')") + @OperationLog + @ApiOperation("分页查询合同结算设备") + @GetMapping("/page") + public ApiResult> page(TowerContractSettleEquipmentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerContractSettleEquipmentService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(towerContractSettleEquipmentService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerContract:list')") + @OperationLog + @ApiOperation("查询全部合同结算设备") + @GetMapping() + public ApiResult> list(@RequestParam Map param) { + int contractId = Integer.parseInt(param.get("contractId")); + TowerContractSettleEquipmentParam towerContractSettleEquipmentParam = new TowerContractSettleEquipmentParam(); + towerContractSettleEquipmentParam.setContractId(contractId); + PageParam page = new PageParam<>(towerContractSettleEquipmentParam); + page.setDefaultOrder("create_time desc"); + return success(towerContractSettleEquipmentService.list(page.getOrderWrapper())); + // 使用关联查询 +// return success(null); + } + + @PreAuthorize("hasAuthority('tower:towerContract:list')") + @OperationLog + @ApiOperation("根据id查询合同结算设备") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerContractSettleEquipmentService.getById(id)); + // 使用关联查询 + //return success(towerContractSettleEquipmentService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerContract:save')") + @OperationLog + @ApiOperation("添加合同结算设备") + @PostMapping() + public ApiResult save(@RequestBody TowerContractSettleEquipment towerContractSettleEquipment) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerContractSettleEquipment.setUserId(loginUser.getUserId()); + } + if (towerContractSettleEquipmentService.save(towerContractSettleEquipment)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:update')") + @OperationLog + @ApiOperation("修改合同结算设备") + @PutMapping() + public ApiResult update(@RequestBody TowerContractSettleEquipment towerContractSettleEquipment) { + if (towerContractSettleEquipmentService.updateById(towerContractSettleEquipment)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:remove')") + @OperationLog + @ApiOperation("删除合同结算设备") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerContractSettleEquipmentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:save')") + @OperationLog + @ApiOperation("批量添加合同结算设备") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("contract_id", list.get(0).getContractId()); + towerContractSettleEquipmentService.remove(queryWrapper); + if (towerContractSettleEquipmentService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:update')") + @OperationLog + @ApiOperation("批量修改合同结算设备") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerContractSettleEquipmentService, "contract_settle_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:remove')") + @OperationLog + @ApiOperation("批量删除合同结算设备") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerContractSettleEquipmentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleRuleController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleRuleController.java new file mode 100644 index 0000000..a2d9ccb --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleRuleController.java @@ -0,0 +1,149 @@ +package com.gxwebsoft.tower.controller; + +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.tower.entity.TowerContractFile; +import com.gxwebsoft.tower.param.TowerContractSettleEquipmentParam; +import com.gxwebsoft.tower.service.TowerContractSettleRuleService; +import com.gxwebsoft.tower.entity.TowerContractSettleRule; +import com.gxwebsoft.tower.param.TowerContractSettleRuleParam; +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; +import java.util.Map; + +/** + * 合同结算规则控制器 + * + * @author 科技小王子 + * @since 2023-06-11 13:48:42 + */ +@Api(tags = "合同结算规则管理") +@RestController +@RequestMapping("/api/tower/tower-contract-settle-rule") +public class TowerContractSettleRuleController extends BaseController { + @Resource + private TowerContractSettleRuleService towerContractSettleRuleService; + + @PreAuthorize("hasAuthority('tower:towerContract:list')") + @OperationLog + @ApiOperation("分页查询合同结算规则") + @GetMapping("/page") + public ApiResult> page(TowerContractSettleRuleParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerContractSettleRuleService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(towerContractSettleRuleService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerContract:list')") + @OperationLog + @ApiOperation("查询全部合同结算规则") + @GetMapping() + public ApiResult> list(@RequestParam Map param) { + int contractId = Integer.parseInt(param.get("contractId")); + TowerContractSettleRuleParam towerContractSettleRuleParam = new TowerContractSettleRuleParam(); + towerContractSettleRuleParam.setContractId(contractId); + PageParam page = new PageParam<>(towerContractSettleRuleParam); + page.setDefaultOrder("create_time desc"); + return success(towerContractSettleRuleService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerContractSettleRuleService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerContract:list')") + @OperationLog + @ApiOperation("根据id查询合同结算规则") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerContractSettleRuleService.getById(id)); + // 使用关联查询 + //return success(towerContractSettleRuleService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerContract:save')") + @OperationLog + @ApiOperation("添加合同结算规则") + @PostMapping() + public ApiResult save(@RequestBody TowerContractSettleRule towerContractSettleRule) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerContractSettleRule.setUserId(loginUser.getUserId()); + } + if (towerContractSettleRuleService.save(towerContractSettleRule)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:update')") + @OperationLog + @ApiOperation("修改合同结算规则") + @PutMapping() + public ApiResult update(@RequestBody TowerContractSettleRule towerContractSettleRule) { + if (towerContractSettleRuleService.updateById(towerContractSettleRule)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:remove')") + @OperationLog + @ApiOperation("删除合同结算规则") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerContractSettleRuleService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:save')") + @OperationLog + @ApiOperation("批量添加合同结算规则") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("contract_id", list.get(0).getContractId()); + towerContractSettleRuleService.remove(queryWrapper); + if (towerContractSettleRuleService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:update')") + @OperationLog + @ApiOperation("批量修改合同结算规则") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerContractSettleRuleService, "contract_settle_rule_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:remove')") + @OperationLog + @ApiOperation("批量删除合同结算规则") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerContractSettleRuleService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerSettleController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerSettleController.java new file mode 100644 index 0000000..8880795 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerSettleController.java @@ -0,0 +1,158 @@ +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.Company; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.entity.*; +import com.gxwebsoft.tower.service.TowerSettleDetailService; +import com.gxwebsoft.tower.service.TowerSettleService; +import com.gxwebsoft.tower.param.TowerSettleParam; +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.ArrayList; +import java.util.List; + +/** + * 结算管理控制器 + * + * @author 科技小王子 + * @since 2023-06-11 19:19:10 + */ +@Api(tags = "结算管理管理") +@RestController +@RequestMapping("/api/tower/tower-settle") +public class TowerSettleController extends BaseController { + @Resource + private TowerSettleService towerSettleService; + private TowerSettleDetailService towerSettleDetailService; + + @PreAuthorize("hasAuthority('tower:towerSettle:list')") + @OperationLog + @ApiOperation("分页查询结算管理") + @GetMapping("/page") + public ApiResult> page(TowerSettleParam param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(TowerSettle.class) + .select(TowerProject::getProjectName) + .select(TowerContract::getContactNumber) + .leftJoin(TowerContract.class, TowerContract::getContractId, TowerSettle::getContractId) + .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerContract::getProjectId); + + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerSettleService.page(page, wrapper)); + // 使用关联查询 + //return success(towerSettleService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:list')") + @OperationLog + @ApiOperation("查询全部结算管理") + @GetMapping() + public ApiResult> list(TowerSettleParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerSettleService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerSettleService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:list')") + @OperationLog + @ApiOperation("根据id查询结算管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerSettleService.getById(id)); + // 使用关联查询 + //return success(towerSettleService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:save')") + @OperationLog + @ApiOperation("添加结算管理") + @PostMapping() + public ApiResult save(@RequestBody TowerSettle towerSettle) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerSettle.setUserId(loginUser.getUserId()); + } + if (towerSettleService.save(towerSettle)) { + return success(towerSettle.getSettleId()); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:update')") + @OperationLog + @ApiOperation("修改结算管理") + @PutMapping() + public ApiResult update(@RequestBody TowerSettle towerSettle) { + if (towerSettleService.updateById(towerSettle)) { + return success(towerSettle.getSettleId()); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:remove')") + @OperationLog + @ApiOperation("删除结算管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerSettleService.removeById(id)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("settle_id", id); + towerSettleDetailService.remove(queryWrapper); + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:save')") + @OperationLog + @ApiOperation("批量添加结算管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerSettleService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:update')") + @OperationLog + @ApiOperation("批量修改结算管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerSettleService, "settle_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:remove')") + @OperationLog + @ApiOperation("批量删除结算管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerSettleService.removeByIds(ids)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("settle_id", ids); + towerSettleDetailService.remove(queryWrapper); + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerSettleDetailController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerSettleDetailController.java new file mode 100644 index 0000000..c6fdd22 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerSettleDetailController.java @@ -0,0 +1,142 @@ +package com.gxwebsoft.tower.controller; + +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.tower.service.TowerSettleDetailService; +import com.gxwebsoft.tower.entity.TowerSettleDetail; +import com.gxwebsoft.tower.param.TowerSettleDetailParam; +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-11 19:13:12 + */ +@Api(tags = "合同结算详情管理") +@RestController +@RequestMapping("/api/tower/tower-settle-detail") +public class TowerSettleDetailController extends BaseController { + @Resource + private TowerSettleDetailService towerSettleDetailService; + + @PreAuthorize("hasAuthority('tower:towerSettle:list')") + @OperationLog + @ApiOperation("分页查询合同结算详情") + @GetMapping("/page") + public ApiResult> page(TowerSettleDetailParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerSettleDetailService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(towerSettleDetailService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:list')") + @OperationLog + @ApiOperation("查询全部合同结算详情") + @GetMapping() + public ApiResult> list(TowerSettleDetailParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerSettleDetailService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerSettleDetailService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:list')") + @OperationLog + @ApiOperation("根据id查询合同结算详情") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerSettleDetailService.getById(id)); + // 使用关联查询 + //return success(towerSettleDetailService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:save')") + @OperationLog + @ApiOperation("添加合同结算详情") + @PostMapping() + public ApiResult save(@RequestBody TowerSettleDetail towerSettleDetail) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerSettleDetail.setUserId(loginUser.getUserId()); + } + if (towerSettleDetailService.save(towerSettleDetail)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:update')") + @OperationLog + @ApiOperation("修改合同结算详情") + @PutMapping() + public ApiResult update(@RequestBody TowerSettleDetail towerSettleDetail) { + if (towerSettleDetailService.updateById(towerSettleDetail)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:remove')") + @OperationLog + @ApiOperation("删除合同结算详情") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerSettleDetailService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:save')") + @OperationLog + @ApiOperation("批量添加合同结算详情") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("settle_id", list.get(0).getSettleId()); + if (towerSettleDetailService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:update')") + @OperationLog + @ApiOperation("批量修改合同结算详情") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerSettleDetailService, "settle_detail_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSettle:remove')") + @OperationLog + @ApiOperation("批量删除合同结算详情") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerSettleDetailService.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 d1cad27..bbb60b7 100644 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerContract.java +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerContract.java @@ -73,6 +73,12 @@ public class TowerContract implements Serializable { @ApiModelProperty(value = "已生成结算次数") private Integer settleNum; + @ApiModelProperty(value = "结算方式") + private Integer settleMethod; + + @ApiModelProperty(value = "跨月结算日期") + private Integer extendMonthDate; + @ApiModelProperty(value = "租户id") private Integer tenantId; diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleEquipment.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleEquipment.java new file mode 100644 index 0000000..0fb0b72 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleEquipment.java @@ -0,0 +1,76 @@ +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-10 16:52:12 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerContractSettleEquipment对象", description = "合同结算设备") +public class TowerContractSettleEquipment implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "contract_settle_id", type = IdType.AUTO) + private Integer contractSettleId; + + private Integer contractId; + + @ApiModelProperty(value = "设备") + private String equipmentName; + + @ApiModelProperty(value = "型号") + private String equipmentModel; + + @ApiModelProperty(value = "出厂编号") + private String factoryNo; + + @ApiModelProperty(value = "设备编号") + private String equipmentNo; + + @ApiModelProperty(value = "计划租期(月)") + private Integer rentMonth; + + @ApiModelProperty(value = "租金(元)") + private BigDecimal rentAmount; + + @ApiModelProperty(value = "进退场费") + private BigDecimal inOutAmount; + + @ApiModelProperty(value = "劳务费") + private BigDecimal workerAmount; + + @ApiModelProperty(value = "其他费用") + private BigDecimal otherAmount; + + 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; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleRule.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleRule.java new file mode 100644 index 0000000..8046bdf --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleRule.java @@ -0,0 +1,53 @@ +package com.gxwebsoft.tower.entity; + +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-11 13:48:41 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerContractSettleRule对象", description = "合同结算规则") +public class TowerContractSettleRule implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "contract_settle_rule_id", type = IdType.AUTO) + private Integer contractSettleRuleId; + + @ApiModelProperty(value = "合同ID") + private Integer contractId; + + @ApiModelProperty(value = "结算开始日期") + private String startDate; + + @ApiModelProperty(value = "结算结束日期") + private String endDate; + + @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 new file mode 100644 index 0000000..f857aa5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java @@ -0,0 +1,77 @@ +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-11 19:19:10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerSettle对象", description = "结算管理") +public class TowerSettle implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "settle_id", type = IdType.AUTO) + private Integer settleId; + + @ApiModelProperty(value = "结算单号") + private String settleNo; + + @ApiModelProperty(value = "合同id") + private Integer contractId; + + @ApiModelProperty(value = "本期开始日期") + private String startDate; + + @ApiModelProperty(value = "本期结束日期") + private String endDate; + + @ApiModelProperty(value = "结算方式(0跨月;1自然月;2按日;3系数结算-跨月;4系数结算-自然月") + private Integer settleMethod; + + @ApiModelProperty(value = "跨月结算日期") + private Integer extendMonthDate; + + @ApiModelProperty(value = "结算状态(0未认证;1已认证;2已失效;)") + private Boolean status; + + @ApiModelProperty(value = "总额") + private Integer totalAmount; + + @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 projectName; + + @ApiModelProperty(value = "合同编号") + @TableField(exist = false) + private String contactNumber; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerSettleDetail.java b/src/main/java/com/gxwebsoft/tower/entity/TowerSettleDetail.java new file mode 100644 index 0000000..44e1935 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerSettleDetail.java @@ -0,0 +1,87 @@ +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-11 19:13:12 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerSettleDetail对象", description = "合同结算详情") +public class TowerSettleDetail implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "settle_detail_id", type = IdType.AUTO) + private Integer settleDetailId; + + @ApiModelProperty(value = "结算id") + private Integer settleId; + + @ApiModelProperty(value = "结算类型:0租金结算;1进退场费结算;2操作人员工资结算;3其他费用;4扣除项") + private Integer type; + + @ApiModelProperty(value = "费用类型") + private String settleCostType; + + @ApiModelProperty(value = "设备") + private String equipmentName; + + @ApiModelProperty(value = "型号") + private String equipmentModel; + + @ApiModelProperty(value = "出厂编号") + private String factoryNo; + + @ApiModelProperty(value = "结算开始日期") + private String startDate; + + @ApiModelProperty(value = "结算结束日期") + private String endDate; + + @ApiModelProperty(value = "月租金/月工资") + private BigDecimal monthAmount; + + @ApiModelProperty(value = "税率") + private BigDecimal taxRate; + + @ApiModelProperty(value = "进退场单价/单次费用") + private BigDecimal singleAmount; + + @ApiModelProperty(value = "进退场次数/次数") + private Integer num; + + @ApiModelProperty(value = "单位") + private String unit; + + @ApiModelProperty(value = "备注") + 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; + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleEquipmentMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleEquipmentMapper.java new file mode 100644 index 0000000..882242f --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleEquipmentMapper.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.TowerContractSettleEquipment; +import com.gxwebsoft.tower.param.TowerContractSettleEquipmentParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 合同结算设备Mapper + * + * @author 科技小王子 + * @since 2023-06-10 16:52:12 + */ +public interface TowerContractSettleEquipmentMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerContractSettleEquipmentParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerContractSettleEquipmentParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleRuleMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleRuleMapper.java new file mode 100644 index 0000000..6c4db99 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleRuleMapper.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.TowerContractSettleRule; +import com.gxwebsoft.tower.param.TowerContractSettleRuleParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 合同结算规则Mapper + * + * @author 科技小王子 + * @since 2023-06-11 13:48:41 + */ +public interface TowerContractSettleRuleMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerContractSettleRuleParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerContractSettleRuleParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerSettleDetailMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerSettleDetailMapper.java new file mode 100644 index 0000000..8cd3e32 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerSettleDetailMapper.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.TowerSettleDetail; +import com.gxwebsoft.tower.param.TowerSettleDetailParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 合同结算详情Mapper + * + * @author 科技小王子 + * @since 2023-06-11 19:13:12 + */ +public interface TowerSettleDetailMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerSettleDetailParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerSettleDetailParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerSettleMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerSettleMapper.java new file mode 100644 index 0000000..4f49d87 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerSettleMapper.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.TowerSettle; +import com.gxwebsoft.tower.param.TowerSettleParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 结算管理Mapper + * + * @author 科技小王子 + * @since 2023-06-11 19:19:10 + */ +public interface TowerSettleMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerSettleParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerSettleParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml index 72a3c88..dd42532 100644 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml @@ -46,6 +46,12 @@ AND a.auto_settle = #{param.autoSettle} + + AND a.settle_method = #{param.settleMethod} + + + AND a.extend_month_date = #{param.extendMonthDate} + AND a.user_id = #{param.userId} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleEquipmentMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleEquipmentMapper.xml new file mode 100644 index 0000000..579945e --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleEquipmentMapper.xml @@ -0,0 +1,74 @@ + + + + + + + SELECT a.* + FROM tower_contract_settle_equipment a + + + AND a.contract_settle_id = #{param.contractSettleId} + + + AND a.contract_id = #{param.contractId} + + + AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%') + + + AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%') + + + AND a.factory_no LIKE CONCAT('%', #{param.factoryNo}, '%') + + + AND a.equipment_no LIKE CONCAT('%', #{param.equipmentNo}, '%') + + + AND a.rent_month = #{param.rentMonth} + + + AND a.rent_amount = #{param.rentAmount} + + + AND a.in_out_amount = #{param.inOutAmount} + + + AND a.worker_amount = #{param.workerAmount} + + + AND a.other_amount = #{param.otherAmount} + + + 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/TowerContractSettleRuleMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleRuleMapper.xml new file mode 100644 index 0000000..78ad8c4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleRuleMapper.xml @@ -0,0 +1,50 @@ + + + + + + + SELECT a.* + FROM tower_contract_settle_rule a + + + AND a.contract_settle_rule_id = #{param.contractSettleRuleId} + + + AND a.contract_id = #{param.contractId} + + + AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%') + + + AND a.end_date LIKE CONCAT('%', #{param.endDate}, '%') + + + 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/TowerSettleDetailMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleDetailMapper.xml new file mode 100644 index 0000000..c068e62 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleDetailMapper.xml @@ -0,0 +1,83 @@ + + + + + + + SELECT a.* + FROM tower_settle_detail a + + + AND a.settle_detail_id = #{param.settleDetailId} + + + AND a.settle_id = #{param.settleId} + + + AND a.type = #{param.type} + + + AND a.settle_cost_type LIKE CONCAT('%', #{param.settleCostType}, '%') + + + AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%') + + + AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%') + + + AND a.factory_no LIKE CONCAT('%', #{param.factoryNo}, '%') + + + AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%') + + + AND a.end_date LIKE CONCAT('%', #{param.endDate}, '%') + + + AND a.month_amount = #{param.monthAmount} + + + AND a.tax_rate = #{param.taxRate} + + + AND a.single_amount = #{param.singleAmount} + + + AND a.num = #{param.num} + + + AND a.unit LIKE CONCAT('%', #{param.unit}, '%') + + + 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/TowerSettleMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleMapper.xml new file mode 100644 index 0000000..c91535f --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleMapper.xml @@ -0,0 +1,62 @@ + + + + + + + SELECT a.* + FROM tower_settle a + + + AND a.settle_id = #{param.settleId} + + + AND a.settle_no LIKE CONCAT('%', #{param.settleNo}, '%') + + + AND a.contract_id = #{param.contractId} + + + AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%') + + + AND a.end_date LIKE CONCAT('%', #{param.endDate}, '%') + + + AND a.settle_method = #{param.settleMethod} + + + AND a.extend_month_date = #{param.extendMonthDate} + + + 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/param/TowerContractParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerContractParam.java index 5ebf5b9..8d7beb6 100644 --- a/src/main/java/com/gxwebsoft/tower/param/TowerContractParam.java +++ b/src/main/java/com/gxwebsoft/tower/param/TowerContractParam.java @@ -70,6 +70,14 @@ public class TowerContractParam extends BaseParam { @QueryField(type = QueryType.EQ) private Boolean autoSettle; + @ApiModelProperty(value = "结算方式") + @QueryField(type = QueryType.EQ) + private Integer settleMethod; + + @ApiModelProperty(value = "跨月结算日期") + @QueryField(type = QueryType.EQ) + private Integer extendMonthDate; + @ApiModelProperty(value = "已生成结算次数") @QueryField(type = QueryType.EQ) private Integer settleNum; diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerContractSettleEquipmentParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerContractSettleEquipmentParam.java new file mode 100644 index 0000000..2128bed --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerContractSettleEquipmentParam.java @@ -0,0 +1,75 @@ +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-10 16:52:12 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerContractSettleEquipmentParam对象", description = "合同结算设备查询参数") +public class TowerContractSettleEquipmentParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer contractSettleId; + + @QueryField(type = QueryType.EQ) + private Integer contractId; + + @ApiModelProperty(value = "设备") + private String equipmentName; + + @ApiModelProperty(value = "型号") + private String equipmentModel; + + @ApiModelProperty(value = "出厂编号") + private String factoryNo; + + @ApiModelProperty(value = "设备编号") + private String equipmentNo; + + @ApiModelProperty(value = "计划租期(月)") + @QueryField(type = QueryType.EQ) + private Integer rentMonth; + + @ApiModelProperty(value = "租金(元)") + @QueryField(type = QueryType.EQ) + private BigDecimal rentAmount; + + @ApiModelProperty(value = "进退场费") + @QueryField(type = QueryType.EQ) + private BigDecimal inOutAmount; + + @ApiModelProperty(value = "劳务费") + @QueryField(type = QueryType.EQ) + private BigDecimal workerAmount; + + @ApiModelProperty(value = "其他费用") + @QueryField(type = QueryType.EQ) + private BigDecimal otherAmount; + + 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/TowerContractSettleRuleParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerContractSettleRuleParam.java new file mode 100644 index 0000000..4dae858 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerContractSettleRuleParam.java @@ -0,0 +1,46 @@ +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-11 13:48:41 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerContractSettleRuleParam对象", description = "合同结算规则查询参数") +public class TowerContractSettleRuleParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer contractSettleRuleId; + + @ApiModelProperty(value = "合同ID") + @QueryField(type = QueryType.EQ) + private Integer contractId; + + @ApiModelProperty(value = "结算开始日期") + private String startDate; + + @ApiModelProperty(value = "结算结束日期") + private String endDate; + + @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/TowerSettleDetailParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerSettleDetailParam.java new file mode 100644 index 0000000..b2fe3e3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerSettleDetailParam.java @@ -0,0 +1,86 @@ +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-11 19:13:12 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerSettleDetailParam对象", description = "合同结算详情查询参数") +public class TowerSettleDetailParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer settleDetailId; + + @ApiModelProperty(value = "结算id") + @QueryField(type = QueryType.EQ) + private Integer settleId; + + @ApiModelProperty(value = "结算类型:0租金结算;1进退场费结算;2操作人员工资结算;3其他费用;4扣除项") + @QueryField(type = QueryType.EQ) + private Boolean type; + + @ApiModelProperty(value = "费用类型") + private String settleCostType; + + @ApiModelProperty(value = "设备") + private String equipmentName; + + @ApiModelProperty(value = "型号") + private String equipmentModel; + + @ApiModelProperty(value = "出厂编号") + private String factoryNo; + + @ApiModelProperty(value = "结算开始日期") + private String startDate; + + @ApiModelProperty(value = "结算结束日期") + private String endDate; + + @ApiModelProperty(value = "月租金/月工资") + @QueryField(type = QueryType.EQ) + private BigDecimal monthAmount; + + @ApiModelProperty(value = "税率") + @QueryField(type = QueryType.EQ) + private Integer taxRate; + + @ApiModelProperty(value = "进退场单价/单次费用") + @QueryField(type = QueryType.EQ) + private BigDecimal singleAmount; + + @ApiModelProperty(value = "进退场次数/次数") + @QueryField(type = QueryType.EQ) + private Integer num; + + @ApiModelProperty(value = "单位") + private String unit; + + @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/TowerSettleParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerSettleParam.java new file mode 100644 index 0000000..87f19e6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerSettleParam.java @@ -0,0 +1,61 @@ +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-11 19:19:10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerSettleParam对象", description = "结算管理查询参数") +public class TowerSettleParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer settleId; + + @ApiModelProperty(value = "结算单号") + private String settleNo; + + @ApiModelProperty(value = "合同id") + @QueryField(type = QueryType.EQ) + private Integer contractId; + + @ApiModelProperty(value = "本期开始日期") + private String startDate; + + @ApiModelProperty(value = "本期结束日期") + private String endDate; + + @ApiModelProperty(value = "结算方式(0跨月;1自然月;2按日;3系数结算-跨月;4系数结算-自然月") + @QueryField(type = QueryType.EQ) + private Boolean settleMethod; + + @ApiModelProperty(value = "跨月结算日期") + @QueryField(type = QueryType.EQ) + private Integer extendMonthDate; + + @ApiModelProperty(value = "结算状态(0未认证;1已认证;2已失效;)") + @QueryField(type = QueryType.EQ) + private Boolean 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/service/TowerContractSettleEquipmentService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractSettleEquipmentService.java new file mode 100644 index 0000000..d38306e --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerContractSettleEquipmentService.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.TowerContractSettleEquipment; +import com.gxwebsoft.tower.param.TowerContractSettleEquipmentParam; + +import java.util.List; + +/** + * 合同结算设备Service + * + * @author 科技小王子 + * @since 2023-06-10 16:52:12 + */ +public interface TowerContractSettleEquipmentService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerContractSettleEquipmentParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerContractSettleEquipmentParam param); + + /** + * 根据id查询 + * + * @param contractSettleId + * @return TowerContractSettleEquipment + */ + TowerContractSettleEquipment getByIdRel(Integer contractSettleId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractSettleRuleService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractSettleRuleService.java new file mode 100644 index 0000000..de76cea --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerContractSettleRuleService.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.TowerContractSettleRule; +import com.gxwebsoft.tower.param.TowerContractSettleRuleParam; + +import java.util.List; + +/** + * 合同结算规则Service + * + * @author 科技小王子 + * @since 2023-06-11 13:48:41 + */ +public interface TowerContractSettleRuleService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerContractSettleRuleParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerContractSettleRuleParam param); + + /** + * 根据id查询 + * + * @param contractSettleRuleId + * @return TowerContractSettleRule + */ + TowerContractSettleRule getByIdRel(Integer contractSettleRuleId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerSettleDetailService.java b/src/main/java/com/gxwebsoft/tower/service/TowerSettleDetailService.java new file mode 100644 index 0000000..753237e --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerSettleDetailService.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.TowerSettleDetail; +import com.gxwebsoft.tower.param.TowerSettleDetailParam; + +import java.util.List; + +/** + * 合同结算详情Service + * + * @author 科技小王子 + * @since 2023-06-11 19:13:12 + */ +public interface TowerSettleDetailService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerSettleDetailParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerSettleDetailParam param); + + /** + * 根据id查询 + * + * @param settleDetailId + * @return TowerSettleDetail + */ + TowerSettleDetail getByIdRel(Integer settleDetailId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerSettleService.java b/src/main/java/com/gxwebsoft/tower/service/TowerSettleService.java new file mode 100644 index 0000000..b49d4ea --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerSettleService.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.TowerSettle; +import com.gxwebsoft.tower.param.TowerSettleParam; + +import java.util.List; + +/** + * 结算管理Service + * + * @author 科技小王子 + * @since 2023-06-11 19:19:10 + */ +public interface TowerSettleService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerSettleParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerSettleParam param); + + /** + * 根据id查询 + * + * @param settleId + * @return TowerSettle + */ + TowerSettle getByIdRel(Integer settleId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleEquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleEquipmentServiceImpl.java new file mode 100644 index 0000000..a5c4522 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleEquipmentServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerContractSettleEquipmentMapper; +import com.gxwebsoft.tower.service.TowerContractSettleEquipmentService; +import com.gxwebsoft.tower.entity.TowerContractSettleEquipment; +import com.gxwebsoft.tower.param.TowerContractSettleEquipmentParam; +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-10 16:52:12 + */ +@Service +public class TowerContractSettleEquipmentServiceImpl extends ServiceImpl implements TowerContractSettleEquipmentService { + + @Override + public PageResult pageRel(TowerContractSettleEquipmentParam 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(TowerContractSettleEquipmentParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerContractSettleEquipment getByIdRel(Integer contractSettleId) { + TowerContractSettleEquipmentParam param = new TowerContractSettleEquipmentParam(); + param.setContractSettleId(contractSettleId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleRuleServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleRuleServiceImpl.java new file mode 100644 index 0000000..4691635 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleRuleServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerContractSettleRuleMapper; +import com.gxwebsoft.tower.service.TowerContractSettleRuleService; +import com.gxwebsoft.tower.entity.TowerContractSettleRule; +import com.gxwebsoft.tower.param.TowerContractSettleRuleParam; +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-11 13:48:41 + */ +@Service +public class TowerContractSettleRuleServiceImpl extends ServiceImpl implements TowerContractSettleRuleService { + + @Override + public PageResult pageRel(TowerContractSettleRuleParam 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(TowerContractSettleRuleParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerContractSettleRule getByIdRel(Integer contractSettleRuleId) { + TowerContractSettleRuleParam param = new TowerContractSettleRuleParam(); + param.setContractSettleRuleId(contractSettleRuleId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleDetailServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleDetailServiceImpl.java new file mode 100644 index 0000000..d7a4902 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleDetailServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerSettleDetailMapper; +import com.gxwebsoft.tower.service.TowerSettleDetailService; +import com.gxwebsoft.tower.entity.TowerSettleDetail; +import com.gxwebsoft.tower.param.TowerSettleDetailParam; +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-11 19:13:12 + */ +@Service +public class TowerSettleDetailServiceImpl extends ServiceImpl implements TowerSettleDetailService { + + @Override + public PageResult pageRel(TowerSettleDetailParam 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(TowerSettleDetailParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerSettleDetail getByIdRel(Integer settleDetailId) { + TowerSettleDetailParam param = new TowerSettleDetailParam(); + param.setSettleDetailId(settleDetailId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleServiceImpl.java new file mode 100644 index 0000000..642a61b --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerSettleMapper; +import com.gxwebsoft.tower.service.TowerSettleService; +import com.gxwebsoft.tower.entity.TowerSettle; +import com.gxwebsoft.tower.param.TowerSettleParam; +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-11 19:19:10 + */ +@Service +public class TowerSettleServiceImpl extends ServiceImpl implements TowerSettleService { + + @Override + public PageResult pageRel(TowerSettleParam 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(TowerSettleParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerSettle getByIdRel(Integer settleId) { + TowerSettleParam param = new TowerSettleParam(); + param.setSettleId(settleId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 6dff251..f464be9 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -21,6 +21,6 @@ logging: # 框架配置 config: # 生产环境接口 - server-url: https://server.gxwebsoft.com/api + server-url: http://1.14.159.185:10040 upload-path: /www/wwwroot/file.ws/ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index fe48330..05b7705 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ # 端口 server: - port: 9090 + port: 10041 # 多环境配置 spring: diff --git a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java index 93ac45d..d4e2044 100644 --- a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java @@ -47,8 +47,9 @@ public class TowerGenerator { // "tower_project", // "tower_model" // "tower_contract", - "tower_contract_equipment", - "tower_contract_file" +// "tower_contract_equipment", + "tower_settle", +// "tower_settle_detail", }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{