From be1b426b7d765a546f4a26b60e80aa49a57079b9 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 13 一月 2024 16:25:11 +0800
Subject: [PATCH] 1、优化采购模块数量不能为小数点问题2、新增客服巡查巡楼记录功能模块3、新增页面导出功能4、优化记录查询条件新增时间段查询条件5、其他界面性调整
---
service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
index 0603d02..6e9dfca 100755
--- a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
+++ b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
@@ -286,6 +286,12 @@
RoomRenovationPo roomRenovationPo = BeanConvertUtil.covertBean(reqJson, RoomRenovationPo.class);
roomRenovationPo.setStartTime(roomRenovationPo.getStartTime() + " 00:00:00");
roomRenovationPo.setEndTime(roomRenovationPo.getEndTime() + " 23:59:59");
+ if (!StringUtil.isEmpty(roomRenovationPo.getIsPostpone()) && roomRenovationPo.getIsPostpone().equals("N")) { //鏄惁寤舵湡 Y寤舵湡 N姝ｅ父
+ roomRenovationPo.setPostponeTime(null); //寤舵湡鏃堕棿
+ }
+ if (!StringUtil.isEmpty(roomRenovationPo.getIsViolation()) && roomRenovationPo.getIsViolation().equals("N")) { //鏄惁杩濊 Y杩濊 N姝ｅ父
+ roomRenovationPo.setViolationDesc(null); //杩濊璇存槑
+ }
//濡傛灉鐘舵�佷负瑁呬慨涓�佸緟楠屾敹锛屽垯鎴垮眿鐘舵�佹敼涓鸿淇腑锛涘鏋滅姸鎬佷负楠屾敹鎴愬姛锛屽垯鎴垮眿鐘舵�佹敼涓哄凡瑁呬慨锛涘鏋滀负寰呭鏍搞�佸鏍稿け璐ャ�侀獙鏀跺け璐ワ紝鍒欐埧灞嬬姸鎬佹敼涓哄凡浜ゆ埧
if (roomRenovationPo.getState().equals("3000") || roomRenovationPo.getState().equals("4000")) {
RoomDto roomDto = new RoomDto();
--
Gitblit v1.8.0