b2894lxlx/tuanwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善合同管理;

Browse Source 
新增结算管理
This commit is contained in:
b2894lxlx
2023-06-12 01:32:34 +08:00
parent 385bfb96b8
commit 8307a16689
35 changed files with 1964 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java
View File

@@ -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<TowerContractEquipment>> list(TowerContractEquipmentParam param) {
PageParam<TowerContractEquipment, TowerContractEquipmentParam> page = new PageParam<>(param);
public ApiResult<List<TowerContractEquipment>> list(@RequestParam Map<String, String> params) {
TowerContractEquipmentParam towerContractEquipmentParam = new TowerContractEquipmentParam();
int contractId = Integer.parseInt(params.get("contractId"));
towerContractEquipmentParam.setContractId(contractId);
PageParam<TowerContractEquipment, TowerContractEquipmentParam> 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("添加成功");

149
src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleEquipmentController.java Normal file
View File

@@ -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<PageResult<TowerContractSettleEquipment>> page(TowerContractSettleEquipmentParam param) {
PageParam<TowerContractSettleEquipment, TowerContractSettleEquipmentParam> 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<TowerContractSettleEquipment>> list(@RequestParam Map<String, String> param) {
int contractId = Integer.parseInt(param.get("contractId"));
TowerContractSettleEquipmentParam towerContractSettleEquipmentParam = new TowerContractSettleEquipmentParam();
towerContractSettleEquipmentParam.setContractId(contractId);
PageParam<TowerContractSettleEquipment, TowerContractSettleEquipmentParam> 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<TowerContractSettleEquipment> 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<TowerContractSettleEquipment> list) {
QueryWrapper<TowerContractSettleEquipment> 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<TowerContractSettleEquipment> 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<Integer> ids) {
if (towerContractSettleEquipmentService.removeByIds(ids)) {
return success("删除成功");
}
return fail("删除失败");
}
}

149
src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleRuleController.java Normal file
View File

@@ -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<PageResult<TowerContractSettleRule>> page(TowerContractSettleRuleParam param) {
PageParam<TowerContractSettleRule, TowerContractSettleRuleParam> 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<TowerContractSettleRule>> list(@RequestParam Map<String, String> param) {
int contractId = Integer.parseInt(param.get("contractId"));
TowerContractSettleRuleParam towerContractSettleRuleParam = new TowerContractSettleRuleParam();
towerContractSettleRuleParam.setContractId(contractId);
PageParam<TowerContractSettleRule, TowerContractSettleRuleParam> 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<TowerContractSettleRule> 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<TowerContractSettleRule> list) {
QueryWrapper<TowerContractSettleRule> 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<TowerContractSettleRule> 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<Integer> ids) {
if (towerContractSettleRuleService.removeByIds(ids)) {
return success("删除成功");
}
return fail("删除失败");
}
}

158
src/main/java/com/gxwebsoft/tower/controller/TowerSettleController.java Normal file
View File

@@ -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<PageResult<TowerSettle>> page(TowerSettleParam param) {
MPJLambdaWrapper<TowerSettle> 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<TowerSettle, TowerSettleParam> 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<TowerSettle>> list(TowerSettleParam param) {
PageParam<TowerSettle, TowerSettleParam> 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<TowerSettle> 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<TowerSettleDetail> 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<TowerSettle> list) {
if (towerSettleService.saveBatch(list)) {
return success("添加成功");
}
return fail("添加失败");
}
@PreAuthorize("hasAuthority('tower:towerSettle:update')")
@OperationLog
@ApiOperation("批量修改结算管理")
@PutMapping("/batch")
public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerSettle> 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<Integer> ids) {
if (towerSettleService.removeByIds(ids)) {
QueryWrapper<TowerSettleDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.in("settle_id", ids);
towerSettleDetailService.remove(queryWrapper);
return success("删除成功");
}
return fail("删除失败");
}
}

142
src/main/java/com/gxwebsoft/tower/controller/TowerSettleDetailController.java Normal file
View File

@@ -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<PageResult<TowerSettleDetail>> page(TowerSettleDetailParam param) {
PageParam<TowerSettleDetail, TowerSettleDetailParam> 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<TowerSettleDetail>> list(TowerSettleDetailParam param) {
PageParam<TowerSettleDetail, TowerSettleDetailParam> 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<TowerSettleDetail> 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<TowerSettleDetail> list) {
QueryWrapper<TowerSettleDetail> 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<TowerSettleDetail> 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<Integer> ids) {
if (towerSettleDetailService.removeByIds(ids)) {
return success("删除成功");
}
return fail("删除失败");
}
}

6
src/main/java/com/gxwebsoft/tower/entity/TowerContract.java
View File

@@ -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;

76
src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleEquipment.java Normal file
View File

@@ -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;
}

53
src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleRule.java Normal file
View File

@@ -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;
}

77
src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java Normal file
View File

@@ -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;
}

87
src/main/java/com/gxwebsoft/tower/entity/TowerSettleDetail.java Normal file
View File

@@ -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;
}

37
src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleEquipmentMapper.java Normal file
View File

@@ -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<TowerContractSettleEquipment> {
/**
* 分页查询
*
* @param page 分页对象
* @param param 查询参数
* @return List<TowerContractSettleEquipment>
*/
List<TowerContractSettleEquipment> selectPageRel(@Param("page") IPage<TowerContractSettleEquipment> page,
@Param("param") TowerContractSettleEquipmentParam param);
/**
* 查询全部
*
* @param param 查询参数
* @return List<User>
*/
List<TowerContractSettleEquipment> selectListRel(@Param("param") TowerContractSettleEquipmentParam param);
}

37
src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleRuleMapper.java Normal file
View File

@@ -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<TowerContractSettleRule> {
/**
* 分页查询
*
* @param page 分页对象
* @param param 查询参数
* @return List<TowerContractSettleRule>
*/
List<TowerContractSettleRule> selectPageRel(@Param("page") IPage<TowerContractSettleRule> page,
@Param("param") TowerContractSettleRuleParam param);
/**
* 查询全部
*
* @param param 查询参数
* @return List<User>
*/
List<TowerContractSettleRule> selectListRel(@Param("param") TowerContractSettleRuleParam param);
}

37
src/main/java/com/gxwebsoft/tower/mapper/TowerSettleDetailMapper.java Normal file
View File

@@ -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<TowerSettleDetail> {
/**
* 分页查询
*
* @param page 分页对象
* @param param 查询参数
* @return List<TowerSettleDetail>
*/
List<TowerSettleDetail> selectPageRel(@Param("page") IPage<TowerSettleDetail> page,
@Param("param") TowerSettleDetailParam param);
/**
* 查询全部
*
* @param param 查询参数
* @return List<User>
*/
List<TowerSettleDetail> selectListRel(@Param("param") TowerSettleDetailParam param);
}

37
src/main/java/com/gxwebsoft/tower/mapper/TowerSettleMapper.java Normal file
View File

@@ -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<TowerSettle> {
/**
* 分页查询
*
* @param page 分页对象
* @param param 查询参数
* @return List<TowerSettle>
*/
List<TowerSettle> selectPageRel(@Param("page") IPage<TowerSettle> page,
@Param("param") TowerSettleParam param);
/**
* 查询全部
*
* @param param 查询参数
* @return List<User>
*/
List<TowerSettle> selectListRel(@Param("param") TowerSettleParam param);
}

6
src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml
View File

@@ -46,6 +46,12 @@
<if test="param.autoSettle != null">
AND a.auto_settle = #{param.autoSettle}
</if>
<if test="param.settleMethod != null">
AND a.settle_method = #{param.settleMethod}
</if>
<if test="param.extendMonthDate != null">
AND a.extend_month_date = #{param.extendMonthDate}
</if>
<if test="param.userId != null">
AND a.user_id = #{param.userId}
</if>

74
src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleEquipmentMapper.xml Normal file
View File

@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gxwebsoft.tower.mapper.TowerContractSettleEquipmentMapper">
<!-- 关联查询sql -->
<sql id="selectSql">
SELECT a.*
FROM tower_contract_settle_equipment a
<where>
<if test="param.contractSettleId != null">
AND a.contract_settle_id = #{param.contractSettleId}
</if>
<if test="param.contractId != null">
AND a.contract_id = #{param.contractId}
</if>
<if test="param.equipmentName != null">
AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%')
</if>
<if test="param.equipmentModel != null">
AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%')
</if>
<if test="param.factoryNo != null">
AND a.factory_no LIKE CONCAT('%', #{param.factoryNo}, '%')
</if>
<if test="param.equipmentNo != null">
AND a.equipment_no LIKE CONCAT('%', #{param.equipmentNo}, '%')
</if>
<if test="param.rentMonth != null">
AND a.rent_month = #{param.rentMonth}
</if>
<if test="param.rentAmount != null">
AND a.rent_amount = #{param.rentAmount}
</if>
<if test="param.inOutAmount != null">
AND a.in_out_amount = #{param.inOutAmount}
</if>
<if test="param.workerAmount != null">
AND a.worker_amount = #{param.workerAmount}
</if>
<if test="param.otherAmount != null">
AND a.other_amount = #{param.otherAmount}
</if>
<if test="param.remark != null">
AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
</if>
<if test="param.userId != null">
AND a.user_id = #{param.userId}
</if>
<if test="param.deleted != null">
AND a.deleted = #{param.deleted}
</if>
<if test="param.deleted == null">
AND a.deleted = 0
</if>
<if test="param.createTimeStart != null">
AND a.create_time &gt;= #{param.createTimeStart}
</if>
<if test="param.createTimeEnd != null">
AND a.create_time &lt;= #{param.createTimeEnd}
</if>
</where>
</sql>
<!-- 分页查询 -->
<select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerContractSettleEquipment">
<include refid="selectSql"></include>
</select>
<!-- 查询全部 -->
<select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerContractSettleEquipment">
<include refid="selectSql"></include>
</select>
</mapper>

50
src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleRuleMapper.xml Normal file
View File

@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gxwebsoft.tower.mapper.TowerContractSettleRuleMapper">
<!-- 关联查询sql -->
<sql id="selectSql">
SELECT a.*
FROM tower_contract_settle_rule a
<where>
<if test="param.contractSettleRuleId != null">
AND a.contract_settle_rule_id = #{param.contractSettleRuleId}
</if>
<if test="param.contractId != null">
AND a.contract_id = #{param.contractId}
</if>
<if test="param.startDate != null">
AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%')
</if>
<if test="param.endDate != null">
AND a.end_date LIKE CONCAT('%', #{param.endDate}, '%')
</if>
<if test="param.userId != null">
AND a.user_id = #{param.userId}
</if>
<if test="param.deleted != null">
AND a.deleted = #{param.deleted}
</if>
<if test="param.deleted == null">
AND a.deleted = 0
</if>
<if test="param.createTimeStart != null">
AND a.create_time &gt;= #{param.createTimeStart}
</if>
<if test="param.createTimeEnd != null">
AND a.create_time &lt;= #{param.createTimeEnd}
</if>
</where>
</sql>
<!-- 分页查询 -->
<select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerContractSettleRule">
<include refid="selectSql"></include>
</select>
<!-- 查询全部 -->
<select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerContractSettleRule">
<include refid="selectSql"></include>
</select>
</mapper>

83
src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleDetailMapper.xml Normal file
View File

@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gxwebsoft.tower.mapper.TowerSettleDetailMapper">
<!-- 关联查询sql -->
<sql id="selectSql">
SELECT a.*
FROM tower_settle_detail a
<where>
<if test="param.settleDetailId != null">
AND a.settle_detail_id = #{param.settleDetailId}
</if>
<if test="param.settleId != null">
AND a.settle_id = #{param.settleId}
</if>
<if test="param.type != null">
AND a.type = #{param.type}
</if>
<if test="param.settleCostType != null">
AND a.settle_cost_type LIKE CONCAT('%', #{param.settleCostType}, '%')
</if>
<if test="param.equipmentName != null">
AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%')
</if>
<if test="param.equipmentModel != null">
AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%')
</if>
<if test="param.factoryNo != null">
AND a.factory_no LIKE CONCAT('%', #{param.factoryNo}, '%')
</if>
<if test="param.startDate != null">
AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%')
</if>
<if test="param.endDate != null">
AND a.end_date LIKE CONCAT('%', #{param.endDate}, '%')
</if>
<if test="param.monthAmount != null">
AND a.month_amount = #{param.monthAmount}
</if>
<if test="param.taxRate != null">
AND a.tax_rate = #{param.taxRate}
</if>
<if test="param.singleAmount != null">
AND a.single_amount = #{param.singleAmount}
</if>
<if test="param.num != null">
AND a.num = #{param.num}
</if>
<if test="param.unit != null">
AND a.unit LIKE CONCAT('%', #{param.unit}, '%')
</if>
<if test="param.remark != null">
AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
</if>
<if test="param.userId != null">
AND a.user_id = #{param.userId}
</if>
<if test="param.deleted != null">
AND a.deleted = #{param.deleted}
</if>
<if test="param.deleted == null">
AND a.deleted = 0
</if>
<if test="param.createTimeStart != null">
AND a.create_time &gt;= #{param.createTimeStart}
</if>
<if test="param.createTimeEnd != null">
AND a.create_time &lt;= #{param.createTimeEnd}
</if>
</where>
</sql>
<!-- 分页查询 -->
<select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerSettleDetail">
<include refid="selectSql"></include>
</select>
<!-- 查询全部 -->
<select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerSettleDetail">
<include refid="selectSql"></include>
</select>
</mapper>

62
src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleMapper.xml Normal file
View File

@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gxwebsoft.tower.mapper.TowerSettleMapper">
<!-- 关联查询sql -->
<sql id="selectSql">
SELECT a.*
FROM tower_settle a
<where>
<if test="param.settleId != null">
AND a.settle_id = #{param.settleId}
</if>
<if test="param.settleNo != null">
AND a.settle_no LIKE CONCAT('%', #{param.settleNo}, '%')
</if>
<if test="param.contractId != null">
AND a.contract_id = #{param.contractId}
</if>
<if test="param.startDate != null">
AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%')
</if>
<if test="param.endDate != null">
AND a.end_date LIKE CONCAT('%', #{param.endDate}, '%')
</if>
<if test="param.settleMethod != null">
AND a.settle_method = #{param.settleMethod}
</if>
<if test="param.extendMonthDate != null">
AND a.extend_month_date = #{param.extendMonthDate}
</if>
<if test="param.status != null">
AND a.status = #{param.status}
</if>
<if test="param.userId != null">
AND a.user_id = #{param.userId}
</if>
<if test="param.deleted != null">
AND a.deleted = #{param.deleted}
</if>
<if test="param.deleted == null">
AND a.deleted = 0
</if>
<if test="param.createTimeStart != null">
AND a.create_time &gt;= #{param.createTimeStart}
</if>
<if test="param.createTimeEnd != null">
AND a.create_time &lt;= #{param.createTimeEnd}
</if>
</where>
</sql>
<!-- 分页查询 -->
<select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerSettle">
<include refid="selectSql"></include>
</select>
<!-- 查询全部 -->
<select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerSettle">
<include refid="selectSql"></include>
</select>
</mapper>

8
src/main/java/com/gxwebsoft/tower/param/TowerContractParam.java
View File

@@ -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;

75
src/main/java/com/gxwebsoft/tower/param/TowerContractSettleEquipmentParam.java Normal file
View File

@@ -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;
}

46
src/main/java/com/gxwebsoft/tower/param/TowerContractSettleRuleParam.java Normal file
View File

@@ -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;
}

86
src/main/java/com/gxwebsoft/tower/param/TowerSettleDetailParam.java Normal file
View File

@@ -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;
}

61
src/main/java/com/gxwebsoft/tower/param/TowerSettleParam.java Normal file
View File

@@ -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;
}

42
src/main/java/com/gxwebsoft/tower/service/TowerContractSettleEquipmentService.java Normal file
View File

@@ -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<TowerContractSettleEquipment> {
/**
* 分页关联查询
*
* @param param 查询参数
* @return PageResult<TowerContractSettleEquipment>
*/
PageResult<TowerContractSettleEquipment> pageRel(TowerContractSettleEquipmentParam param);
/**
* 关联查询全部
*
* @param param 查询参数
* @return List<TowerContractSettleEquipment>
*/
List<TowerContractSettleEquipment> listRel(TowerContractSettleEquipmentParam param);
/**
* 根据id查询
*
* @param contractSettleId
* @return TowerContractSettleEquipment
*/
TowerContractSettleEquipment getByIdRel(Integer contractSettleId);
}

42
src/main/java/com/gxwebsoft/tower/service/TowerContractSettleRuleService.java Normal file
View File

@@ -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<TowerContractSettleRule> {
/**
* 分页关联查询
*
* @param param 查询参数
* @return PageResult<TowerContractSettleRule>
*/
PageResult<TowerContractSettleRule> pageRel(TowerContractSettleRuleParam param);
/**
* 关联查询全部
*
* @param param 查询参数
* @return List<TowerContractSettleRule>
*/
List<TowerContractSettleRule> listRel(TowerContractSettleRuleParam param);
/**
* 根据id查询
*
* @param contractSettleRuleId
* @return TowerContractSettleRule
*/
TowerContractSettleRule getByIdRel(Integer contractSettleRuleId);
}

42
src/main/java/com/gxwebsoft/tower/service/TowerSettleDetailService.java Normal file
View File

@@ -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<TowerSettleDetail> {
/**
* 分页关联查询
*
* @param param 查询参数
* @return PageResult<TowerSettleDetail>
*/
PageResult<TowerSettleDetail> pageRel(TowerSettleDetailParam param);
/**
* 关联查询全部
*
* @param param 查询参数
* @return List<TowerSettleDetail>
*/
List<TowerSettleDetail> listRel(TowerSettleDetailParam param);
/**
* 根据id查询
*
* @param settleDetailId
* @return TowerSettleDetail
*/
TowerSettleDetail getByIdRel(Integer settleDetailId);
}

42
src/main/java/com/gxwebsoft/tower/service/TowerSettleService.java Normal file
View File

@@ -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<TowerSettle> {
/**
* 分页关联查询
*
* @param param 查询参数
* @return PageResult<TowerSettle>
*/
PageResult<TowerSettle> pageRel(TowerSettleParam param);
/**
* 关联查询全部
*
* @param param 查询参数
* @return List<TowerSettle>
*/
List<TowerSettle> listRel(TowerSettleParam param);
/**
* 根据id查询
*
* @param settleId
* @return TowerSettle
*/
TowerSettle getByIdRel(Integer settleId);
}

47
src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleEquipmentServiceImpl.java Normal file
View File

@@ -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<TowerContractSettleEquipmentMapper, TowerContractSettleEquipment> implements TowerContractSettleEquipmentService {
@Override
public PageResult<TowerContractSettleEquipment> pageRel(TowerContractSettleEquipmentParam param) {
PageParam<TowerContractSettleEquipment, TowerContractSettleEquipmentParam> page = new PageParam<>(param);
//page.setDefaultOrder("create_time desc");
List<TowerContractSettleEquipment> list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@Override
public List<TowerContractSettleEquipment> listRel(TowerContractSettleEquipmentParam param) {
List<TowerContractSettleEquipment> list = baseMapper.selectListRel(param);
// 排序
PageParam<TowerContractSettleEquipment, TowerContractSettleEquipmentParam> 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));
}
}

47
src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleRuleServiceImpl.java Normal file
View File

@@ -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<TowerContractSettleRuleMapper, TowerContractSettleRule> implements TowerContractSettleRuleService {
@Override
public PageResult<TowerContractSettleRule> pageRel(TowerContractSettleRuleParam param) {
PageParam<TowerContractSettleRule, TowerContractSettleRuleParam> page = new PageParam<>(param);
//page.setDefaultOrder("create_time desc");
List<TowerContractSettleRule> list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@Override
public List<TowerContractSettleRule> listRel(TowerContractSettleRuleParam param) {
List<TowerContractSettleRule> list = baseMapper.selectListRel(param);
// 排序
PageParam<TowerContractSettleRule, TowerContractSettleRuleParam> 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));
}
}

47
src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleDetailServiceImpl.java Normal file
View File

@@ -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<TowerSettleDetailMapper, TowerSettleDetail> implements TowerSettleDetailService {
@Override
public PageResult<TowerSettleDetail> pageRel(TowerSettleDetailParam param) {
PageParam<TowerSettleDetail, TowerSettleDetailParam> page = new PageParam<>(param);
//page.setDefaultOrder("create_time desc");
List<TowerSettleDetail> list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@Override
public List<TowerSettleDetail> listRel(TowerSettleDetailParam param) {
List<TowerSettleDetail> list = baseMapper.selectListRel(param);
// 排序
PageParam<TowerSettleDetail, TowerSettleDetailParam> 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));
}
}

47
src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleServiceImpl.java Normal file
View File

@@ -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<TowerSettleMapper, TowerSettle> implements TowerSettleService {
@Override
public PageResult<TowerSettle> pageRel(TowerSettleParam param) {
PageParam<TowerSettle, TowerSettleParam> page = new PageParam<>(param);
//page.setDefaultOrder("create_time desc");
List<TowerSettle> list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@Override
public List<TowerSettle> listRel(TowerSettleParam param) {
List<TowerSettle> list = baseMapper.selectListRel(param);
// 排序
PageParam<TowerSettle, TowerSettleParam> 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));
}
}