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-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerMembersCmd.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerMembersCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerMembersCmd.java
index 3d4c59c..469474b 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerMembersCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerMembersCmd.java
@@ -5,8 +5,10 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.privilege.BasePrivilegeDto;
+import com.java110.dto.file.FileRelDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.utils.exception.CmdException;
@@ -19,6 +21,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -31,11 +34,19 @@
@Autowired
private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰涓湭鍖呭惈communityId淇℃伅");
- Assert.jsonObjectHaveKey(reqJson, "ownerId", "璇锋眰涓湭鍖呭惈ownerId淇℃伅");
// Assert.jsonObjectHaveKey(reqJson, "ownerTypeCd", "璇锋眰涓湭鍖呭惈ownerTypeCd淇℃伅");
+ if (!reqJson.containsKey("page")) {
+ reqJson.put("page", 1);
+ }
+ if (!reqJson.containsKey("row")) {
+ reqJson.put("row", 10);
+ }
}
@Override
@@ -43,7 +54,17 @@
String userId = context.getReqHeaders().get("user-id");
OwnerDto ownerDto = BeanConvertUtil.covertBean(reqJson, OwnerDto.class);
ownerDto.setOwnerTypeCds(new String[]{"1002", "1003", "1004", "1005"});
- List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+
+ int row = reqJson.getInteger("row");
+ //鏌ヨ鎬昏褰曟暟
+ int total = ownerInnerServiceSMOImpl.queryOwnersMemberCount(ownerDto);
+
+ List<OwnerDto> ownerDtoList = null;
+ if (total > 0) {
+ ownerDtoList = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+ } else {
+ ownerDtoList = new ArrayList<>();
+ }
//鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
List<Map> privileges = null;
BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
@@ -64,10 +85,18 @@
}
}
}
+ for (OwnerDto ownerdto : ownerDtoList) {
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjId(ownerdto.getMemberId());
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+ if (fileRelDtos != null && fileRelDtos.size() > 0) {
+ ownerdto.setUrl(fileRelDtos.get(0).getFileSaveName());
+ }
+ }
ApiOwnerVo apiOwnerVo = new ApiOwnerVo();
apiOwnerVo.setOwners(BeanConvertUtil.covertBeanList(ownerDtoList, ApiOwnerDataVo.class));
- apiOwnerVo.setTotal(ownerDtoList.size());
- apiOwnerVo.setRecords(1);
+ apiOwnerVo.setTotal(total);
+ apiOwnerVo.setRecords((int) Math.ceil((double) total / (double) row));
ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiOwnerVo), HttpStatus.OK);
context.setResponseEntity(responseEntity);
--
Gitblit v1.8.0