完善合同管理;
新增结算管理
This commit is contained in:
@@ -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("添加成功");
|
||||
|
||||
Reference in New Issue
Block a user