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/ListResourceStoreUseRecordCmd.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoreUseRecordCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoreUseRecordCmd.java
index 00a2136..8617cb4 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoreUseRecordCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoreUseRecordCmd.java
@@ -20,8 +20,9 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.privilege.BasePrivilegeDto;
+import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.store.IResourceStoreUseRecordInnerServiceSMO;
-import com.java110.intf.store.IResourceStoreUseRecordV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
@@ -30,6 +31,7 @@
import java.util.List;
import java.util.ArrayList;
+import java.util.Map;
import org.springframework.http.ResponseEntity;
import org.springframework.http.HttpStatus;
@@ -52,10 +54,10 @@
private static Logger logger = LoggerFactory.getLogger(ListResourceStoreUseRecordCmd.class);
@Autowired
- private IResourceStoreUseRecordV1InnerServiceSMO resourceStoreUseRecordV1InnerServiceSMOImpl;
+ private IResourceStoreUseRecordInnerServiceSMO resourceStoreUseRecordInnerServiceSMOImpl;
@Autowired
- private IResourceStoreUseRecordInnerServiceSMO resourceStoreUseRecordInnerServiceSMOImpl;
+ private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -67,6 +69,19 @@
ResourceStoreUseRecordDto resourceStoreUseRecordDto = BeanConvertUtil.covertBean(reqJson, ResourceStoreUseRecordDto.class);
+ //鏌ヨ鐗╁搧鎵�鏈変娇鐢ㄨ褰曟潈闄�
+ BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
+ basePrivilegeDto.setResource("/allResourceStoreUseRecord");
+ basePrivilegeDto.setUserId(reqJson.getString("userId"));
+ List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
+ if (privileges.size() == 0) {
+ resourceStoreUseRecordDto.setUserId(reqJson.getString("userId"));
+ resourceStoreUseRecordDto.setUserName(reqJson.getString("userName"));
+ } else {
+ resourceStoreUseRecordDto.setUserId("");
+ resourceStoreUseRecordDto.setUserName("");
+ }
+
int count = resourceStoreUseRecordInnerServiceSMOImpl.queryResourceStoreUseRecordsCount(resourceStoreUseRecordDto);
List<ResourceStoreUseRecordDto> resourceStoreUseRecordDtos = null;
--
Gitblit v1.8.0