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-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java
index 126fae3..028c122 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java
@@ -11,7 +11,6 @@
import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.dto.resource.ResourceStoreDto;
import com.java110.dto.resource.ResourceStoreTimesDto;
-import com.java110.dto.store.StorehouseDto;
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.store.IResourceStoreInnerServiceSMO;
import com.java110.utils.exception.CmdException;
@@ -46,8 +45,8 @@
)
@Java110ParamsDoc(params = {
- @Java110ParamDoc(name = "page", length = 11,type = "int",remark = "椤垫暟"),
- @Java110ParamDoc(name = "row", length = 11,type = "int", remark = "琛屼笟鏁�"),
+ @Java110ParamDoc(name = "page", length = 11, type = "int", remark = "椤垫暟"),
+ @Java110ParamDoc(name = "row", length = 11, type = "int", remark = "琛屼笟鏁�"),
})
@Java110ResponseDoc(
@@ -55,14 +54,14 @@
@Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
@Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
@Java110ParamDoc(name = "data", type = "Object", remark = "鏈夋晥鏁版嵁"),
- @Java110ParamDoc(parentNodeName = "data",name = "resCode", type = "String", remark = "鐗╁搧缂栧彿"),
- @Java110ParamDoc(parentNodeName = "data",name = "resName", type = "String", remark = "鐗╁搧鍚嶇О"),
+ @Java110ParamDoc(parentNodeName = "data", name = "resCode", type = "String", remark = "鐗╁搧缂栧彿"),
+ @Java110ParamDoc(parentNodeName = "data", name = "resName", type = "String", remark = "鐗╁搧鍚嶇О"),
}
)
@Java110ExampleDoc(
- reqBody="http://localhost:3000/app/resourceStore.listResourceStores?resId=&resName=&resCode=&shId=&parentRstId=&rstId=&rssId=&isFixed=&page=1&row=10",
- resBody="{\n" +
+ reqBody = "http://localhost:3000/app/resourceStore.listResourceStores?resId=&resName=&resCode=&shId=&parentRstId=&rstId=&rssId=&isFixed=&page=1&row=10",
+ resBody = "{\n" +
" \"page\": 0,\n" +
" \"records\": 1,\n" +
" \"resourceStores\": [\n" +
@@ -157,9 +156,8 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
super.validatePageInfo(reqJson);
-
Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈鍟嗘埛ID");
- if(!reqJson.containsKey("shId") || StringUtil.isEmpty(reqJson.getString("shId"))) {
+ if (!reqJson.containsKey("shId") || StringUtil.isEmpty(reqJson.getString("shId"))) {
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯ID");
}
}
@@ -172,7 +170,6 @@
//閲囪喘2806闆嗗洟浠撳簱 鐗╁搧棰嗙敤2807灏忓尯浠撳簱 榛樿鏌ヨ褰撳墠灏忓尯鎵�鏈夊晢鍝�
//鏄惁鍏锋湁鏌ョ湅闆嗗洟浠撳簱鐗╁搧鏉冮檺
String userId = reqJson.getString("userId");
-
BasePrivilegeDto basePrivilegeDto1 = new BasePrivilegeDto();
basePrivilegeDto1.setResource("/viewHiddenWarehouse");
basePrivilegeDto1.setUserId(userId);
@@ -213,12 +210,9 @@
* @param resourceStores
*/
private void queryResourceStoreAndResourceTotalPrice(List<ApiResourceStoreDataVo> resourceStores) {
-
if (resourceStores == null || resourceStores.size() < 1) {
return;
}
-
-
BigDecimal stock = null;
BigDecimal totalPrice = null;
for (ApiResourceStoreDataVo resourceStore : resourceStores) {
@@ -228,15 +222,12 @@
if (resourceStoreTimesDtos == null || resourceStoreTimesDtos.size() < 1) {
continue;
}
-
for (ResourceStoreTimesDto resourceStoreTimesDto : resourceStoreTimesDtos) {
- stock = stock.add(new BigDecimal(resourceStoreTimesDto.getStock()));
- totalPrice = totalPrice.add(new BigDecimal(resourceStoreTimesDto.getTotalPrice()));
+ stock = stock.add(new BigDecimal(resourceStoreTimesDto.getStock())).setScale(2,BigDecimal.ROUND_HALF_EVEN);
+ totalPrice = totalPrice.add(new BigDecimal(resourceStoreTimesDto.getTotalPrice())).setScale(2,BigDecimal.ROUND_HALF_EVEN);
}
-
resourceStore.setStock(stock.doubleValue() + "");
resourceStore.setTotalPrice(totalPrice.doubleValue() + "");
}
-
}
}
--
Gitblit v1.8.0