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/EditOwnerCmd.java | 52 +++++++++++++++++++---------------------------------
1 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
index c669ee5..eabd9ae 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
@@ -41,8 +41,7 @@
resource = "userDoc",
author = "鍚村鏂�",
serviceCode = "owner.editOwner",
- seq = 10
-)
+ seq = 10)
@Java110ParamsDoc(params = {
@Java110ParamDoc(name = "communityId", length = 30, remark = "灏忓尯ID"),
@@ -61,8 +60,7 @@
params = {
@Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
@Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
- }
-)
+ })
@Java110ExampleDoc(
reqBody = "{\n" +
@@ -121,7 +119,6 @@
Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
// Assert.jsonObjectHaveKey(paramIn, "idCard", "璇锋眰鎶ユ枃涓湭鍖呭惈韬唤璇佸彿");
Assert.judgeAttrValue(reqJson);
-
//鑾峰彇鎵嬫満鍙�(鍒ゆ柇鎵嬫満鍙锋槸鍚﹂噸澶�)
String link = reqJson.getString("link");
if (!StringUtil.isEmpty(link) && link.contains("*")) {
@@ -136,7 +133,6 @@
}
//鑾峰彇韬唤璇佸彿(鍒ゆ柇韬唤璇佸彿鏄惁閲嶅)
String idCard = reqJson.getString("idCard");
-
if (!StringUtil.isEmpty(idCard) && idCard.contains("*")) {
OwnerDto owner = new OwnerDto();
owner.setOwnerId(reqJson.getString("ownerId"));
@@ -147,13 +143,10 @@
idCard = owners.get(0).getIdCard();
reqJson.put("idCard", idCard);
}
-
String userValidate = MappingCache.getValue("USER_VALIDATE");
-
if (!"ON".equals(userValidate)) {
return;
}
-
OwnerDto ownerDto = new OwnerDto();
ownerDto.setLink(link);
ownerDto.setCommunityId(reqJson.getString("communityId"));
@@ -190,7 +183,6 @@
if (!reqJson.containsKey("ownerId") || OwnerDto.OWNER_TYPE_CD_OWNER.equals(reqJson.getString("ownerTypeCd"))) {
reqJson.put("ownerId", reqJson.getString("memberId"));
}
-
//杩欓噷娉ㄩ噴 鍥犱负 鏈夊浗澶栫殑鎵嬫満鍙� 涓嶆槸11浣�
// if (link.length() != 11) {
// throw new IllegalArgumentException("鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘锛�");
@@ -200,7 +192,6 @@
}
//todo 淇敼 涓氫富淇℃伅
editOwner(reqJson);
-
JSONArray attrs = reqJson.getJSONArray("attrs");
if (attrs == null || attrs.size() < 1) {
return;
@@ -226,26 +217,18 @@
throw new CmdException("淇敼涓氫富灞炴�уけ璐�");
}
}
-
//todo 濡傛灉 涓氫富鍋氫簡缁戝畾鍒欎慨鏀圭粦瀹氱殑鎵嬫満鍙�
updateOwnerAppUser(reqJson);
-
-
}
-
public void editOwner(JSONObject paramInJson) {
-
OwnerDto ownerDto = new OwnerDto();
ownerDto.setMemberId(paramInJson.getString("memberId"));
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
-
Assert.listOnlyOne(ownerDtos, "鏈煡璇㈠埌涓氫富淇℃伅鎴栨煡璇㈠埌澶氭潯");
-
JSONObject businessOwner = new JSONObject();
businessOwner.putAll(BeanConvertUtil.beanCovertMap(ownerDtos.get(0)));
businessOwner.putAll(paramInJson);
-
if (paramInJson.containsKey("wxPhoto")) {
businessOwner.put("link", paramInJson.getString("wxPhoto"));
}
@@ -258,17 +241,28 @@
if (flag < 1) {
throw new CmdException("淇敼涓氫富澶辫触");
}
-
//todo 鍒ゆ柇涓氫富鎵嬫満鍙峰拰璐︽埛鎵嬫満鍙锋槸鍚︾浉鍚岋紝涓嶇浉鍚屼慨鏀硅处鎴锋墜鏈哄彿
AccountDto accountDto = new AccountDto();
accountDto.setObjId(ownerDtos.get(0).getMemberId());
accountDto.setPartId(ownerDtos.get(0).getCommunityId());
List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
- if(accountDtos == null || accountDtos.size()< 1){
- return ;
- }
- if(accountDtos.get(0).getLink().equals(ownerDtos.get(0).getLink())){
+ if (accountDtos == null || accountDtos.size() < 1) {
return;
+ }
+ //鏌ヨ鏇存柊鍚庣殑涓氫富淇℃伅
+ OwnerDto owner = new OwnerDto();
+ owner.setMemberId(paramInJson.getString("memberId"));
+ List<OwnerDto> owners = ownerInnerServiceSMOImpl.queryOwnerMembers(owner);
+ Assert.listOnlyOne(owners, "鏈煡璇㈠埌涓氫富淇℃伅鎴栨煡璇㈠埌澶氭潯");
+ /*if (accountDtos.get(0).getLink().equals(ownerDtos.get(0).getLink())) {
+ return;
+ }*/
+ if (!accountDtos.get(0).getLink().equals(owners.get(0).getLink()) || !accountDtos.get(0).getAcctName().equals(owners.get(0).getName())) {
+ AccountPo accountPo = new AccountPo();
+ accountPo.setAcctName(owners.get(0).getName());
+ accountPo.setLink(owners.get(0).getLink());
+ accountPo.setAcctId(accountDtos.get(0).getAcctId());
+ accountInnerServiceSMOImpl.updateAccount(accountPo);
}
AccountPo accountPo = new AccountPo();
@@ -278,7 +272,6 @@
}
public void editOwnerPhoto(JSONObject paramInJson) {
-
String _photo = paramInJson.getString("ownerPhoto");
if (_photo.length() > 512) {
FileDto fileDto = new FileDto();
@@ -289,7 +282,6 @@
fileDto.setCommunityId(paramInJson.getString("communityId"));
_photo = fileInnerServiceSMOImpl.saveFile(fileDto);
}
-
FileRelDto fileRelDto = new FileRelDto();
fileRelDto.setRelTypeCd("10000");
fileRelDto.setObjId(paramInJson.getString("memberId"));
@@ -310,7 +302,6 @@
}
return;
}
-
JSONObject businessUnit = new JSONObject();
businessUnit.putAll(BeanConvertUtil.beanCovertMap(fileRelDtos.get(0)));
businessUnit.put("fileRealName", _photo);
@@ -322,16 +313,14 @@
}
}
-
/**
* 濡傛灉 涓氫富鍋氫簡缁戝畾鍒欎慨鏀圭粦瀹氱殑鎵嬫満鍙�
+ *
* @param reqJson
*/
private void updateOwnerAppUser(JSONObject reqJson) {
-
OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
ownerAppUserDto.setMemberId(reqJson.getString("memberId"));
-
//todo 鏌ヨapp鐢ㄦ埛琛�
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
@@ -341,7 +330,6 @@
OwnerAppUserPo ownerAppUserPo = BeanConvertUtil.covertBean(ownerAppUser, OwnerAppUserPo.class);
ownerAppUserPo.setLink(reqJson.getString("link"));
ownerAppUserV1InnerServiceSMOImpl.updateOwnerAppUser(ownerAppUserPo);
-
if (StringUtil.isEmpty(ownerAppUser.getUserId())) {
continue;
}
@@ -354,7 +342,5 @@
userPo.setTel(reqJson.getString("link"));
userV1InnerServiceSMOImpl.updateUser(userPo);
}
-
-
}
}
--
Gitblit v1.8.0