新增收款;

新增项目结算书
This commit is contained in:
2023-06-18 11:02:37 +08:00
parent d61e7b163d
commit 71e28fd448
53 changed files with 2985 additions and 9 deletions

View File

@@ -1,9 +1,11 @@
package com.gxwebsoft.tower.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.gxwebsoft.common.core.web.BaseController;
import com.gxwebsoft.common.system.entity.User;
import com.gxwebsoft.tower.entity.TowerContractFile;
import com.gxwebsoft.tower.entity.TowerEquipment;
import com.gxwebsoft.tower.service.TowerContractEquipmentService;
import com.gxwebsoft.tower.entity.TowerContractEquipment;
import com.gxwebsoft.tower.param.TowerContractEquipmentParam;
@@ -48,12 +50,20 @@ public class TowerContractEquipmentController extends BaseController {
@ApiOperation("查询全部合同设备清单")
@GetMapping()
public ApiResult<List<TowerContractEquipment>> list(@RequestParam Map<String, String> params) {
MPJLambdaWrapper<TowerContractEquipment> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(TowerContractEquipment.class)
.selectAs(TowerEquipment::getName, TowerEquipment::getEquipmentName)
.select(TowerEquipment::getFactoryNo)
.select(TowerEquipment::getEquipmentNo)
.select(TowerEquipment::getFilingNo)
.leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerContractEquipment::getEquipmentId);
TowerContractEquipmentParam towerContractEquipmentParam = new TowerContractEquipmentParam();
int contractId = Integer.parseInt(params.get("contractId"));
towerContractEquipmentParam.setContractId(contractId);
PageParam<TowerContractEquipment, TowerContractEquipmentParam> page = new PageParam<>(towerContractEquipmentParam);
page.setDefaultOrder("create_time desc");
return success(towerContractEquipmentService.list(page.getOrderWrapper()));
return success(towerContractEquipmentService.list(wrapper));
// 使用关联查询
//return success(towerContractEquipmentService.listRel(param));
}