From 4253f8db8f79616a4d714af3adafc62890f5fac9 Mon Sep 17 00:00:00 2001
From: sangzhigang <sangzhigang@hongruiinfo.com>
Date: 星期一, 20 十二月 2021 10:23:03 +0800
Subject: [PATCH] 1、优化采购管理2、优化小区审核工作流问题3、优化用户信息
---
service-store/src/main/java/com/java110/store/api/ContractApi.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/api/ContractApi.java b/service-store/src/main/java/com/java110/store/api/ContractApi.java
index 8c65863..ae84700 100755
--- a/service-store/src/main/java/com/java110/store/api/ContractApi.java
+++ b/service-store/src/main/java/com/java110/store/api/ContractApi.java
@@ -379,6 +379,7 @@
@RequestParam(value = "expiration", required = false) String expiration,
@RequestParam(value = "objId", required = false) String objId,
@RequestParam(value = "contractId", required = false) String contractId,
+ @RequestParam(value = "contractNameLike", required = false) String contractNameLike,
@RequestParam(value = "contractCode", required = false) String contractCode,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
@@ -390,6 +391,7 @@
contractDto.setObjId(objId);
contractDto.setContractId(contractId);
contractDto.setContractCode(contractCode);
+ contractDto.setContractNameLike(contractNameLike);
//濡傛灉鏄埌鏈熷悎鍚�
if ("1".equals(expiration)) {
contractDto.setNoStates(new String[]{ContractDto.STATE_COMPLAINT, ContractDto.STATE_FAIL});
@@ -850,11 +852,19 @@
contractChangePlanPo.setRemark(reqJson.getString("changeRemark"));
List<ContractChangePlanRoomPo> contractChangePlanRoomPos = new ArrayList<>();
+ ContractChangePlanRoomPo contractChangePlanRoomPo = null;
+ JSONObject roomInfo = null;
if (reqJson.containsKey("rooms")) {
JSONArray rooms = reqJson.getJSONArray("rooms");
if (rooms != null && rooms.size() > 0) {
for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
- contractChangePlanRoomPos.add(BeanConvertUtil.covertBean(rooms.getJSONObject(roomIndex), ContractChangePlanRoomPo.class));
+// contractChangePlanRoomPos.add(BeanConvertUtil.covertBean(rooms.getJSONObject(roomIndex), ContractChangePlanRoomPo.class));
+ roomInfo = rooms.getJSONObject(roomIndex);
+ contractChangePlanRoomPo = BeanConvertUtil.covertBean(roomInfo, ContractChangePlanRoomPo.class);
+ contractChangePlanRoomPo.setRoomName(roomInfo.getString("floorNum")
+ +"-"+roomInfo.getString("unitNum")
+ +"-"+roomInfo.getString("roomNum"));
+ contractChangePlanRoomPos.add(contractChangePlanRoomPo);
}
}
}
--
Gitblit v1.8.0