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-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java
index 0dbd2d0..35aca2f 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java
@@ -13,22 +13,13 @@
import com.java110.dto.floor.FloorDto;
import com.java110.dto.room.RoomDto;
import com.java110.dto.unit.UnitDto;
-import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.owner.OwnerCarDto;
-import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;
-import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.intf.community.IFloorInnerServiceSMO;
-import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.community.IUnitInnerServiceSMO;
-import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.intf.user.IOwnerCarInnerServiceSMO;
-import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
-import com.java110.po.fee.FeeAttrPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.*;
@@ -40,7 +31,6 @@
import org.springframework.http.ResponseEntity;
import java.math.BigDecimal;
-import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -55,16 +45,7 @@
private static Logger logger = LoggerFactory.getLogger(ListFeeCmd.class);
@Autowired
- private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
-
- @Autowired
- private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
-
- @Autowired
private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
-
- @Autowired
- private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
@Autowired
private IComputeFeeSMO computeFeeSMOImpl;
@@ -80,9 +61,6 @@
@Autowired
private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
-
- @Autowired
- private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
@Autowired
private IOwnerGetDataCheck ownerGetDataCheckImpl;
@@ -110,6 +88,19 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ if (reqJson.containsKey("roomNum") && !StringUtil.isEmpty(reqJson.getString("roomNum"))) {
+ String[] roomNums = reqJson.getString("roomNum").split("-");
+ if (roomNums == null || roomNums.length != 3) {
+ throw new IllegalArgumentException("鎴垮眿缂栧彿鏍煎紡涓嶅锛�");
+ }
+ RoomDto roomDto = new RoomDto();
+ roomDto.setCommunityId(reqJson.getString("communityId"));
+ roomDto.setFloorNum(roomNums[0]);
+ roomDto.setUnitNum(roomNums[1]);
+ roomDto.setRoomNum(roomNums[2]);
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+ Assert.listOnlyOne(roomDtos, "鎵句笉鍒版埧灞嬩俊鎭紒");
+ }
// todo 鎴垮眿鍚嶇О 鍒峰叆 鎴垮眿ID
freshPayerObjIdByRoomNum(reqJson);
@@ -168,7 +159,6 @@
if (!reqJson.containsKey("payerObjIds") || StringUtil.isEmpty(reqJson.getString("payerObjIds"))) {
return;
}
-
String payerObjIds = reqJson.getString("payerObjIds");
feeDto.setPayerObjIds(payerObjIds.split(","));
}
@@ -182,12 +172,10 @@
if (!reqJson.containsKey("roomNum") || StringUtil.isEmpty(reqJson.getString("roomNum"))) {
return;
}
-
String[] roomNums = reqJson.getString("roomNum").split("-", 3);
if (roomNums == null || roomNums.length != 3) {
throw new IllegalArgumentException("鎴垮眿缂栧彿鏍煎紡閿欒锛�");
}
-
String floorNum = roomNums[0];
String unitNum = roomNums[1];
String roomNum = roomNums[2];
@@ -303,8 +291,5 @@
}
//鑰冭檻绉熼噾閫掑
computeFeeSMOImpl.dealRentRate(feeDto);
-
}
-
-
}
--
Gitblit v1.8.0