From 385bfb96b897405c007b89f0ef098b228a08f1f6 Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Sat, 10 Jun 2023 01:29:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86;=20=E6=96=B0=E5=A2=9E=E5=90=88=E5=90=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 + .../controller/TowerContractController.java | 152 ++++++++++++++++++ .../TowerContractEquipmentController.java | 134 +++++++++++++++ .../TowerContractFileController.java | 139 ++++++++++++++++ .../controller/TowerCustomerController.java | 139 ++++++++++++++++ .../gxwebsoft/tower/entity/TowerContract.java | 93 +++++++++++ .../tower/entity/TowerContractEquipment.java | 77 +++++++++ .../tower/entity/TowerContractFile.java | 57 +++++++ .../gxwebsoft/tower/entity/TowerCustomer.java | 73 +++++++++ .../mapper/TowerContractEquipmentMapper.java | 37 +++++ .../tower/mapper/TowerContractFileMapper.java | 37 +++++ .../tower/mapper/TowerContractMapper.java | 38 +++++ .../tower/mapper/TowerCustomerMapper.java | 37 +++++ .../xml/TowerContractEquipmentMapper.xml | 74 +++++++++ .../mapper/xml/TowerContractFileMapper.xml | 50 ++++++ .../tower/mapper/xml/TowerContractMapper.xml | 77 +++++++++ .../tower/mapper/xml/TowerCustomerMapper.xml | 71 ++++++++ .../param/TowerContractEquipmentParam.java | 78 +++++++++ .../tower/param/TowerContractFileParam.java | 46 ++++++ .../tower/param/TowerContractParam.java | 85 ++++++++++ .../tower/param/TowerCustomerParam.java | 66 ++++++++ .../TowerContractEquipmentService.java | 42 +++++ .../service/TowerContractFileService.java | 42 +++++ .../tower/service/TowerContractService.java | 42 +++++ .../tower/service/TowerCustomerService.java | 42 +++++ .../TowerContractEquipmentServiceImpl.java | 47 ++++++ .../impl/TowerContractFileServiceImpl.java | 47 ++++++ .../impl/TowerContractServiceImpl.java | 47 ++++++ .../impl/TowerCustomerServiceImpl.java | 47 ++++++ .../gxwebsoft/generator/TowerGenerator.java | 8 +- .../generator/templates/controller.java.btl | 1 + 31 files changed, 1929 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractFileController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerCustomerController.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContract.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContractFile.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerCustomer.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractEquipmentMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractFileMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerCustomerMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractEquipmentMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFileMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerCustomerMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerContractEquipmentParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerContractFileParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerContractParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerCustomerParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractEquipmentService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractFileService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerCustomerService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractEquipmentServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFileServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerCustomerServiceImpl.java diff --git a/pom.xml b/pom.xml index 2e869b6..b9e965f 100644 --- a/pom.xml +++ b/pom.xml @@ -93,6 +93,13 @@ 3.4.1 + + + com.github.yulichang + mybatis-plus-join-boot-starter + 1.4.5 + + cn.hutool diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractController.java new file mode 100644 index 0000000..2c12f98 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerContractController.java @@ -0,0 +1,152 @@ +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.mapper.TowerContractMapper; +import com.gxwebsoft.tower.service.TowerContractService; +import com.gxwebsoft.tower.param.TowerContractParam; +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-08 22:36:47 + */ +@Api(tags = "合同存档管理") +@RestController +@RequestMapping("/api/tower/tower-contract") +public class TowerContractController extends BaseController { + @Resource + private TowerContractService towerContractService; + private TowerContractMapper towerContractMapper; + + @PreAuthorize("hasAuthority('tower:towerContract:list')") + @OperationLog + @ApiOperation("分页查询合同存档") + @GetMapping("/page") + public ApiResult> page(TowerContractParam param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(TowerContract.class) + .select(TowerProject::getProjectName) + .selectAs(TowerCustomer::getName, TowerContract::getCustomerName) + .selectAs(Company::getCompanyName, TowerContract::getCompanyName) + .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(towerContractService.page(page, wrapper)); + // 使用关联查询 + //return success(towerContractService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerContract:list')") + @OperationLog + @ApiOperation("查询全部合同存档") + @GetMapping() + public ApiResult> list(TowerContractParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerContractService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerContractService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerContract:list')") + @OperationLog + @ApiOperation("根据id查询合同存档") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerContractService.getById(id)); + // 使用关联查询 + //return success(towerContractService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerContract:save')") + @OperationLog + @ApiOperation("添加合同存档") + @PostMapping() + public ApiResult save(@RequestBody TowerContract towerContract) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerContract.setUserId(loginUser.getUserId()); + } + if (towerContractService.save(towerContract)) { + return success(towerContract.getContractId()); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:update')") + @OperationLog + @ApiOperation("修改合同存档") + @PutMapping() + public ApiResult update(@RequestBody TowerContract towerContract) { + if (towerContractService.updateById(towerContract)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:remove')") + @OperationLog + @ApiOperation("删除合同存档") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerContractService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:save')") + @OperationLog + @ApiOperation("批量添加合同存档") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerContractService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:update')") + @OperationLog + @ApiOperation("批量修改合同存档") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerContractService, "contract_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerContract:remove')") + @OperationLog + @ApiOperation("批量删除合同存档") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerContractService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java new file mode 100644 index 0000000..ac00495 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java @@ -0,0 +1,134 @@ +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.service.TowerContractEquipmentService; +import com.gxwebsoft.tower.entity.TowerContractEquipment; +import com.gxwebsoft.tower.param.TowerContractEquipmentParam; +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.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 合同设备清单控制器 + * + * @author 科技小王子 + * @since 2023-06-09 13:42:20 + */ +@Api(tags = "合同设备清单管理") +@RestController +@RequestMapping("/api/tower/tower-contract-equipment") +public class TowerContractEquipmentController extends BaseController { + @Resource + private TowerContractEquipmentService towerContractEquipmentService; + + @OperationLog + @ApiOperation("分页查询合同设备清单") + @GetMapping("/page") + public ApiResult> page(TowerContractEquipmentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerContractEquipmentService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(towerContractEquipmentService.pageRel(param)); + } + + @OperationLog + @ApiOperation("查询全部合同设备清单") + @GetMapping() + public ApiResult> list(TowerContractEquipmentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerContractEquipmentService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerContractEquipmentService.listRel(param)); + } + + @OperationLog + @ApiOperation("根据id查询合同设备清单") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerContractEquipmentService.getById(id)); + // 使用关联查询 + //return success(towerContractEquipmentService.getByIdRel(id)); + } + + @OperationLog + @ApiOperation("添加合同设备清单") + @PostMapping() + public ApiResult save(@RequestBody TowerContractEquipment towerContractEquipment) { + // 记录当前登录用户idfc vbnm,dxcybc yhguc + User loginUser = getLoginUser(); + if (loginUser != null) { + towerContractEquipment.setUserId(loginUser.getUserId()); + } + if (towerContractEquipmentService.save(towerContractEquipment)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @OperationLog + @ApiOperation("修改合同设备清单") + @PutMapping() + public ApiResult update(@RequestBody TowerContractEquipment towerContractEquipment) { + if (towerContractEquipmentService.updateById(towerContractEquipment)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @OperationLog + @ApiOperation("删除合同设备清单") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerContractEquipmentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @OperationLog + @ApiOperation("批量添加合同设备清单") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("contract_id", list.get(0).getContractId()); + towerContractEquipmentService.remove(queryWrapper); + if (towerContractEquipmentService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @OperationLog + @ApiOperation("批量修改合同设备清单") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerContractEquipmentService, "contract_equipment_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @OperationLog + @ApiOperation("批量删除合同设备清单") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerContractEquipmentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractFileController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractFileController.java new file mode 100644 index 0000000..a3eba54 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerContractFileController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.tower.controller; + +import com.alibaba.fastjson.JSON; +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.TowerContractFileService; +import com.gxwebsoft.tower.entity.TowerContractFile; +import com.gxwebsoft.tower.param.TowerContractFileParam; +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.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 合同附件控制器 + * + * @author 科技小王子 + * @since 2023-06-09 13:42:20 + */ +@Api(tags = "合同附件管理") +@RestController +@RequestMapping("/api/tower/tower-contract-file") +public class TowerContractFileController extends BaseController { + @Resource + private TowerContractFileService towerContractFileService; + + @OperationLog + @ApiOperation("分页查询合同附件") + @GetMapping("/page") + public ApiResult> page(TowerContractFileParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerContractFileService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(towerContractFileService.pageRel(param)); + } + + @OperationLog + @PreAuthorize("permitAll()") + @ApiOperation("查询全部合同附件") + @GetMapping() + public ApiResult> list(TowerContractFileParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerContractFileService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerContractFileService.listRel(param)); + } + + @OperationLog + @ApiOperation("根据id查询合同附件") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerContractFileService.getById(id)); + // 使用关联查询 + //return success(towerContractFileService.getByIdRel(id)); + } + + @OperationLog + @ApiOperation("添加合同附件") + @PostMapping() + public ApiResult save(@RequestBody TowerContractFile towerContractFile) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerContractFile.setUserId(loginUser.getUserId()); + } + if (towerContractFileService.save(towerContractFile)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @OperationLog + @ApiOperation("修改合同附件") + @PutMapping() + public ApiResult update(@RequestBody TowerContractFile towerContractFile) { + if (towerContractFileService.updateById(towerContractFile)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @OperationLog + @ApiOperation("删除合同附件") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerContractFileService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @OperationLog + @PreAuthorize("permitAll()") + @ApiOperation("批量添加合同附件") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("contract_id", list.get(0).getContractId()); + towerContractFileService.remove(queryWrapper); + if (towerContractFileService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @OperationLog + @ApiOperation("批量修改合同附件") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerContractFileService, "contract_file_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @OperationLog + @ApiOperation("批量删除合同附件") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerContractFileService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerCustomerController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerCustomerController.java new file mode 100644 index 0000000..c88432e --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerCustomerController.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.TowerCustomerService; +import com.gxwebsoft.tower.entity.TowerCustomer; +import com.gxwebsoft.tower.param.TowerCustomerParam; +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-08 21:04:27 + */ +@Api(tags = "客户管理管理") +@RestController +@RequestMapping("/api/tower/tower-customer") +public class TowerCustomerController extends BaseController { + @Resource + private TowerCustomerService towerCustomerService; + + @PreAuthorize("hasAuthority('tower:towerCustomer:list')") + @OperationLog + @ApiOperation("分页查询客户管理") + @GetMapping("/page") + public ApiResult> page(TowerCustomerParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerCustomerService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(towerCustomerService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerCustomer:list')") + @OperationLog + @ApiOperation("查询全部客户管理") + @GetMapping() + public ApiResult> list(TowerCustomerParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerCustomerService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerCustomerService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerCustomer:list')") + @OperationLog + @ApiOperation("根据id查询客户管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerCustomerService.getById(id)); + // 使用关联查询 + //return success(towerCustomerService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerCustomer:save')") + @OperationLog + @ApiOperation("添加客户管理") + @PostMapping() + public ApiResult save(@RequestBody TowerCustomer towerCustomer) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerCustomer.setUserId(loginUser.getUserId()); + } + if (towerCustomerService.save(towerCustomer)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerCustomer:update')") + @OperationLog + @ApiOperation("修改客户管理") + @PutMapping() + public ApiResult update(@RequestBody TowerCustomer towerCustomer) { + if (towerCustomerService.updateById(towerCustomer)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerCustomer:remove')") + @OperationLog + @ApiOperation("删除客户管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerCustomerService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerCustomer:save')") + @OperationLog + @ApiOperation("批量添加客户管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerCustomerService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerCustomer:update')") + @OperationLog + @ApiOperation("批量修改客户管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerCustomerService, "customer_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerCustomer:remove')") + @OperationLog + @ApiOperation("批量删除客户管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerCustomerService.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 new file mode 100644 index 0000000..d1cad27 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerContract.java @@ -0,0 +1,93 @@ +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-08 22:36:47 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerContract对象", description = "合同存档") +public class TowerContract implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "contract_id", type = IdType.AUTO) + private Integer contractId; + + @ApiModelProperty(value = "项目ID") + private Integer projectId; + + @ApiModelProperty(value = "出租单位") + private Integer companyId; + + @ApiModelProperty(value = "承租单位") + private Integer customerId; + + @ApiModelProperty(value = "业务负责人") + private String customerContact; + + @ApiModelProperty(value = "合同编号") + private String contactNumber; + + @ApiModelProperty(value = "签订日期") + private String signDate; + + @ApiModelProperty(value = "开始日期") + private String startDate; + + @ApiModelProperty(value = "截止日期") + private String endDate; + + @ApiModelProperty(value = "合同金额") + private BigDecimal contractAmount; + + @ApiModelProperty(value = "合同约定金额") + private BigDecimal contactAgreeAmount; + + @ApiModelProperty(value = "合同存档0未存档,1已存档") + private Boolean isInStock; + + @ApiModelProperty(value = "是否自动结算") + private Boolean autoSettle; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "已生成结算次数") + private Integer settleNum; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "修改时间") + private LocalDateTime updateTime; + + @TableField(exist = false) + private String projectName; + + @TableField(exist = false) + private String companyName; + + @TableField(exist = false) + private String customerName; +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java new file mode 100644 index 0000000..c367d40 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java @@ -0,0 +1,77 @@ +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-09 13:42:20 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerContractEquipment对象", description = "合同设备清单") +public class TowerContractEquipment implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "contract_equipment_id", type = IdType.AUTO) + private Integer contractEquipmentId; + + @ApiModelProperty(value = "合同ID") + private Integer contractId; + + @ApiModelProperty(value = "设备") + private String equipmentName; + + @ApiModelProperty(value = "型号") + private String equipmentModel; + + @ApiModelProperty(value = "签订数量") + private Integer num; + + @ApiModelProperty(value = "计划租期(月)") + private Integer planRentMonth; + + @ApiModelProperty(value = "租金") + private BigDecimal rentAmount; + + @ApiModelProperty(value = "进退场费") + private BigDecimal inOutAmount; + + @ApiModelProperty(value = "劳务费") + private BigDecimal workerAmount; + + @ApiModelProperty(value = "其他费用") + private BigDecimal otherAmount; + + @ApiModelProperty(value = "预埋费") + private BigDecimal preBuryAmount; + + 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/TowerContractFile.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractFile.java new file mode 100644 index 0000000..fa949d1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerContractFile.java @@ -0,0 +1,57 @@ +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-09 13:42:20 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerContractFile对象", description = "合同附件") +public class TowerContractFile implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "contract_file_id", type = IdType.AUTO) + private Integer contractFileId; + + @ApiModelProperty(value = "合同id") + private Integer contractId; + + @ApiModelProperty(value = "文件路径") + private String path; + + @ApiModelProperty(value = "文件类型") + private String type; + + @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/TowerCustomer.java b/src/main/java/com/gxwebsoft/tower/entity/TowerCustomer.java new file mode 100644 index 0000000..cd6fdca --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerCustomer.java @@ -0,0 +1,73 @@ +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-08 21:04:27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerCustomer对象", description = "客户管理") +public class TowerCustomer implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "customer_id", type = IdType.AUTO) + private Integer customerId; + + @ApiModelProperty(value = "客户名称") + private String name; + + @ApiModelProperty(value = "全称") + private String fullName; + + @ApiModelProperty(value = "客户标识") + private String creditCode; + + @ApiModelProperty(value = "地址") + private String address; + + @ApiModelProperty(value = "联系人") + private String contact; + + @ApiModelProperty(value = "座机") + private String phone; + + @ApiModelProperty(value = "手机") + private String telPhone; + + private Integer sortNumber; + + @ApiModelProperty(value = "头像") + private String avatar; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Boolean deleted; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @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/TowerContractEquipmentMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractEquipmentMapper.java new file mode 100644 index 0000000..7760ab0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractEquipmentMapper.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.TowerContractEquipment; +import com.gxwebsoft.tower.param.TowerContractEquipmentParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 合同设备清单Mapper + * + * @author 科技小王子 + * @since 2023-06-09 13:42:20 + */ +public interface TowerContractEquipmentMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerContractEquipmentParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerContractEquipmentParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFileMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFileMapper.java new file mode 100644 index 0000000..bd8b79a --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFileMapper.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.TowerContractFile; +import com.gxwebsoft.tower.param.TowerContractFileParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 合同附件Mapper + * + * @author 科技小王子 + * @since 2023-06-09 13:42:20 + */ +public interface TowerContractFileMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerContractFileParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerContractFileParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractMapper.java new file mode 100644 index 0000000..d48e5be --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractMapper.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.TowerContract; +import com.gxwebsoft.tower.param.TowerContractParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 合同存档Mapper + * + * @author 科技小王子 + * @since 2023-06-08 22:36:47 + */ +public interface TowerContractMapper extends MPJBaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerContractParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerContractParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerCustomerMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerCustomerMapper.java new file mode 100644 index 0000000..fd74ed1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerCustomerMapper.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.TowerCustomer; +import com.gxwebsoft.tower.param.TowerCustomerParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 客户管理Mapper + * + * @author 科技小王子 + * @since 2023-06-08 21:04:27 + */ +public interface TowerCustomerMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerCustomerParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerCustomerParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractEquipmentMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractEquipmentMapper.xml new file mode 100644 index 0000000..232f7b9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractEquipmentMapper.xml @@ -0,0 +1,74 @@ + + + + + + + SELECT a.* + FROM tower_contract_equipment a + + + AND a.contract_equipment_id = #{param.contractEquipmentId} + + + AND a.contract_id = #{param.contractId} + + + AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%') + + + AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%') + + + AND a.num = #{param.num} + + + AND a.plan_rent_month = #{param.planRentMonth} + + + 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.pre_bury_amount = #{param.preBuryAmount} + + + 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/TowerContractFileMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFileMapper.xml new file mode 100644 index 0000000..90f9c33 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFileMapper.xml @@ -0,0 +1,50 @@ + + + + + + + SELECT a.* + FROM tower_contract_file a + + + AND a.contract_file_id = #{param.contractFileId} + + + AND a.contract_id = #{param.contractId} + + + AND a.path LIKE CONCAT('%', #{param.path}, '%') + + + AND a.type LIKE CONCAT('%', #{param.type}, '%') + + + 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/TowerContractMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml new file mode 100644 index 0000000..72a3c88 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml @@ -0,0 +1,77 @@ + + + + + + + SELECT a.* + FROM tower_contract a + + + AND a.contract_id = #{param.contractId} + + + AND a.project_id = #{param.projectId} + + + AND a.company_id = #{param.companyId} + + + AND a.customer_id = #{param.customerId} + + + AND a.customer_contact LIKE CONCAT('%', #{param.customerContact}, '%') + + + AND a.contact_number LIKE CONCAT('%', #{param.contactNumber}, '%') + + + AND a.sign_date LIKE CONCAT('%', #{param.signDate}, '%') + + + AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%') + + + AND a.end_date LIKE CONCAT('%', #{param.endDate}, '%') + + + AND a.contract_amount = #{param.contractAmount} + + + AND a.contact_agree_amount = #{param.contactAgreeAmount} + + + AND a.is_in_stock = #{param.isInStock} + + + AND a.auto_settle = #{param.autoSettle} + + + 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/TowerCustomerMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerCustomerMapper.xml new file mode 100644 index 0000000..2e538d9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerCustomerMapper.xml @@ -0,0 +1,71 @@ + + + + + + + SELECT a.* + FROM tower_customer a + + + AND a.customer_id = #{param.customerId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.full_name LIKE CONCAT('%', #{param.fullName}, '%') + + + AND a.credit_code LIKE CONCAT('%', #{param.creditCode}, '%') + + + AND a.address LIKE CONCAT('%', #{param.address}, '%') + + + AND a.contact LIKE CONCAT('%', #{param.contact}, '%') + + + AND a.phone LIKE CONCAT('%', #{param.phone}, '%') + + + AND a.tel_phone LIKE CONCAT('%', #{param.telPhone}, '%') + + + AND a.sort_number = #{param.sortNumber} + + + AND a.avatar LIKE CONCAT('%', #{param.avatar}, '%') + + + AND a.remark LIKE CONCAT('%', #{param.remark}, '%') + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.user_id = #{param.userId} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerContractEquipmentParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerContractEquipmentParam.java new file mode 100644 index 0000000..ad3a602 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerContractEquipmentParam.java @@ -0,0 +1,78 @@ +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-09 13:42:20 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerContractEquipmentParam对象", description = "合同设备清单查询参数") +public class TowerContractEquipmentParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer contractEquipmentId; + + @ApiModelProperty(value = "合同ID") + @QueryField(type = QueryType.EQ) + private Integer contractId; + + @ApiModelProperty(value = "设备") + private String equipmentName; + + @ApiModelProperty(value = "型号") + private String equipmentModel; + + @ApiModelProperty(value = "签订数量") + @QueryField(type = QueryType.EQ) + private Integer num; + + @ApiModelProperty(value = "计划租期(月)") + @QueryField(type = QueryType.EQ) + private Integer planRentMonth; + + @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; + + @ApiModelProperty(value = "预埋费") + @QueryField(type = QueryType.EQ) + private BigDecimal preBuryAmount; + + 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/TowerContractFileParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerContractFileParam.java new file mode 100644 index 0000000..d84617a --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerContractFileParam.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-09 13:42:20 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerContractFileParam对象", description = "合同附件查询参数") +public class TowerContractFileParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer contractFileId; + + @ApiModelProperty(value = "合同id") + @QueryField(type = QueryType.EQ) + private Integer contractId; + + @ApiModelProperty(value = "文件路径") + private String path; + + @ApiModelProperty(value = "文件类型") + private String type; + + @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/TowerContractParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerContractParam.java new file mode 100644 index 0000000..5ebf5b9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerContractParam.java @@ -0,0 +1,85 @@ +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-08 22:36:47 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerContractParam对象", description = "合同存档查询参数") +public class TowerContractParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer contractId; + + @ApiModelProperty(value = "项目ID") + @QueryField(type = QueryType.EQ) + private Integer projectId; + + @ApiModelProperty(value = "出租单位") + @QueryField(type = QueryType.EQ) + private Integer companyId; + + @ApiModelProperty(value = "承租单位") + @QueryField(type = QueryType.EQ) + private Integer customerId; + + @ApiModelProperty(value = "业务负责人") + private String customerContact; + + @ApiModelProperty(value = "合同编号") + private String contactNumber; + + @ApiModelProperty(value = "签订日期") + private String signDate; + + @ApiModelProperty(value = "开始日期") + private String startDate; + + @ApiModelProperty(value = "截止日期") + private String endDate; + + @ApiModelProperty(value = "合同金额") + @QueryField(type = QueryType.EQ) + private BigDecimal contractAmount; + + @ApiModelProperty(value = "合同约定金额") + @QueryField(type = QueryType.EQ) + private BigDecimal contactAgreeAmount; + + @ApiModelProperty(value = "合同存档0未存档,1已存档") + @QueryField(type = QueryType.EQ) + private Boolean isInStock; + + @ApiModelProperty(value = "是否自动结算") + @QueryField(type = QueryType.EQ) + private Boolean autoSettle; + + @ApiModelProperty(value = "已生成结算次数") + @QueryField(type = QueryType.EQ) + private Integer settleNum; + + @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/TowerCustomerParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerCustomerParam.java new file mode 100644 index 0000000..431f17a --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerCustomerParam.java @@ -0,0 +1,66 @@ +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-08 21:04:27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerCustomerParam对象", description = "客户管理查询参数") +public class TowerCustomerParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer customerId; + + @ApiModelProperty(value = "客户名称") + private String name; + + @ApiModelProperty(value = "全称") + private String fullName; + + @ApiModelProperty(value = "客户标识") + private String creditCode; + + @ApiModelProperty(value = "地址") + private String address; + + @ApiModelProperty(value = "联系人") + private String contact; + + @ApiModelProperty(value = "座机") + private String phone; + + @ApiModelProperty(value = "手机") + private String telPhone; + + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "头像") + private String avatar; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Boolean deleted; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractEquipmentService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractEquipmentService.java new file mode 100644 index 0000000..1998245 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerContractEquipmentService.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.TowerContractEquipment; +import com.gxwebsoft.tower.param.TowerContractEquipmentParam; + +import java.util.List; + +/** + * 合同设备清单Service + * + * @author 科技小王子 + * @since 2023-06-09 13:42:20 + */ +public interface TowerContractEquipmentService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerContractEquipmentParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerContractEquipmentParam param); + + /** + * 根据id查询 + * + * @param contractEquipmentId + * @return TowerContractEquipment + */ + TowerContractEquipment getByIdRel(Integer contractEquipmentId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractFileService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractFileService.java new file mode 100644 index 0000000..ae0057b --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerContractFileService.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.TowerContractFile; +import com.gxwebsoft.tower.param.TowerContractFileParam; + +import java.util.List; + +/** + * 合同附件Service + * + * @author 科技小王子 + * @since 2023-06-09 13:42:20 + */ +public interface TowerContractFileService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerContractFileParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerContractFileParam param); + + /** + * 根据id查询 + * + * @param contractFileId + * @return TowerContractFile + */ + TowerContractFile getByIdRel(Integer contractFileId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractService.java new file mode 100644 index 0000000..282a4cd --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerContractService.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.TowerContract; +import com.gxwebsoft.tower.param.TowerContractParam; + +import java.util.List; + +/** + * 合同存档Service + * + * @author 科技小王子 + * @since 2023-06-08 22:36:47 + */ +public interface TowerContractService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerContractParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerContractParam param); + + /** + * 根据id查询 + * + * @param contractId + * @return TowerContract + */ + TowerContract getByIdRel(Integer contractId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerCustomerService.java b/src/main/java/com/gxwebsoft/tower/service/TowerCustomerService.java new file mode 100644 index 0000000..e3790e9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerCustomerService.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.TowerCustomer; +import com.gxwebsoft.tower.param.TowerCustomerParam; + +import java.util.List; + +/** + * 客户管理Service + * + * @author 科技小王子 + * @since 2023-06-08 21:04:27 + */ +public interface TowerCustomerService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerCustomerParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerCustomerParam param); + + /** + * 根据id查询 + * + * @param customerId + * @return TowerCustomer + */ + TowerCustomer getByIdRel(Integer customerId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractEquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractEquipmentServiceImpl.java new file mode 100644 index 0000000..ce73fdd --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractEquipmentServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerContractEquipmentMapper; +import com.gxwebsoft.tower.service.TowerContractEquipmentService; +import com.gxwebsoft.tower.entity.TowerContractEquipment; +import com.gxwebsoft.tower.param.TowerContractEquipmentParam; +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-09 13:42:20 + */ +@Service +public class TowerContractEquipmentServiceImpl extends ServiceImpl implements TowerContractEquipmentService { + + @Override + public PageResult pageRel(TowerContractEquipmentParam 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(TowerContractEquipmentParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerContractEquipment getByIdRel(Integer contractEquipmentId) { + TowerContractEquipmentParam param = new TowerContractEquipmentParam(); + param.setContractEquipmentId(contractEquipmentId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFileServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFileServiceImpl.java new file mode 100644 index 0000000..19652b1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFileServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerContractFileMapper; +import com.gxwebsoft.tower.service.TowerContractFileService; +import com.gxwebsoft.tower.entity.TowerContractFile; +import com.gxwebsoft.tower.param.TowerContractFileParam; +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-09 13:42:20 + */ +@Service +public class TowerContractFileServiceImpl extends ServiceImpl implements TowerContractFileService { + + @Override + public PageResult pageRel(TowerContractFileParam 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(TowerContractFileParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerContractFile getByIdRel(Integer contractFileId) { + TowerContractFileParam param = new TowerContractFileParam(); + param.setContractFileId(contractFileId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractServiceImpl.java new file mode 100644 index 0000000..7792908 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerContractMapper; +import com.gxwebsoft.tower.service.TowerContractService; +import com.gxwebsoft.tower.entity.TowerContract; +import com.gxwebsoft.tower.param.TowerContractParam; +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-08 22:36:47 + */ +@Service +public class TowerContractServiceImpl extends ServiceImpl implements TowerContractService { + + @Override + public PageResult pageRel(TowerContractParam 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(TowerContractParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerContract getByIdRel(Integer contractId) { + TowerContractParam param = new TowerContractParam(); + param.setContractId(contractId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerCustomerServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerCustomerServiceImpl.java new file mode 100644 index 0000000..c038ff5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerCustomerServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerCustomerMapper; +import com.gxwebsoft.tower.service.TowerCustomerService; +import com.gxwebsoft.tower.entity.TowerCustomer; +import com.gxwebsoft.tower.param.TowerCustomerParam; +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-08 21:04:27 + */ +@Service +public class TowerCustomerServiceImpl extends ServiceImpl implements TowerCustomerService { + + @Override + public PageResult pageRel(TowerCustomerParam 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(TowerCustomerParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerCustomer getByIdRel(Integer customerId) { + TowerCustomerParam param = new TowerCustomerParam(); + param.setCustomerId(customerId); + 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 fc245db..93ac45d 100644 --- a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java @@ -22,8 +22,8 @@ import java.util.Map; */ public class TowerGenerator { // 输出位置 -// private static final String OUTPUT_LOCATION = System.getProperty("user.dir"); - private static final String OUTPUT_LOCATION = "D:/codegen"; // 不想生成到项目中可以写磁盘路径 + private static final String OUTPUT_LOCATION = System.getProperty("user.dir"); +// private static final String OUTPUT_LOCATION = ""; // 不想生成到项目中可以写磁盘路径 // 输出目录 private static final String OUTPUT_DIR = "/src/main/java"; // 作者名称 @@ -46,7 +46,9 @@ public class TowerGenerator { // "tower_accessory" // "tower_project", // "tower_model" - "tower_fall" +// "tower_contract", + "tower_contract_equipment", + "tower_contract_file" }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{ diff --git a/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl b/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl index eb3f274..2dac425 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl @@ -14,6 +14,7 @@ package ${package.Controller}; <% if(isNotEmpty(superControllerClassPackage)) { %> import ${superControllerClassPackage}; <% } %> +import ${cfg.packageName!}.common.system.entity.User; import ${cfg.packageName!}.${package.ModuleName}.service.${entity}Service; import ${cfg.packageName!}.${package.ModuleName}.entity.${entity}; import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param;