From cbaf83881759106a3e4ff1fa784b5ad99137463c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 08 一月 2024 09:36:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/dmvisit_service/src/main/java/com/doumee/dao/web/response/ApproveVO.java | 12 ++++++++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 3 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 6 +++---
server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 24 ++++++++++++++++--------
5 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
index 1e15e58..a3eba1b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
@@ -46,7 +46,7 @@
ERPApiResponse<PageData<ErpOrgListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
if(response!=null && response.getData()!=null&& response.getData().getRecords()!=null){
list.addAll(response.getData().getRecords());
- if(100*pageSize < response.getData().getTotal() ){
+ if(page*pageSize < response.getData().getTotal() ){
hasLast =true;//杩樻湁涓嬩竴椤�
}
page++;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/web/response/ApproveVO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/web/response/ApproveVO.java
new file mode 100644
index 0000000..b3ba322
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/web/response/ApproveVO.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.web.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ApproveVO {
+
+ @ApiModelProperty(value = "涓婚敭")
+ private Integer id;
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 12700f4..e4859e6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -192,4 +192,7 @@
+
+
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index a5f05fa..58d585c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -137,7 +137,7 @@
initWithVisitInfo(visits);
updateProblemLog(visits,problemLog,member);
//鍒涘缓瀹℃壒璁板綍
- createApprove(visits,visitMember);
+// createApprove(visits,visitMember);
//鍙戦�佸井淇″叕浼楀彿閫氱煡
wxPlatNotice.sendVisitAuditTemplateNotice(visits,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(),
@@ -380,9 +380,9 @@
ApproveParam approveParam = new ApproveParam();
//鍙戦�佸鎵�/鎶勯�佽褰曠殑鐢ㄦ埛涓婚敭闆嗗悎
ids.clear();
- if(Objects.isNull(allParam)){
+ if(!CollectionUtils.isNotEmpty(allParam)){
if(Objects.isNull(level)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈厤缃瀹㈣褰曞鎵规祦锛岃鑱旂郴绠＄悊鍛�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈厤缃瀹㈠鎵规祦锛岃鑱旂郴绠＄悊鍛�");
}
}else{
approveParam = allParam.get(0);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index b783c96..197b01a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -209,7 +209,9 @@
company.setEditDate(date);
company.setStatus(respone.getStatus());
company.setCode(respone.getCode());
- company.setErpParentId(respone.getParentOrgId());
+ if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){
+ company.setErpParentId(respone.getParentOrgId());
+ }
company.setErpDate(date);
company.setHkStatus(Constants.ZERO);
return company;
@@ -282,10 +284,10 @@
.eq(Member::getType, Constants.memberType.internal));
dealUserChangeList(list,addList,updateList,delList,allList);
if(addList.size()>0){
+ memberMapper.insertBatchSomeColumn(addList);
for (Member member:addList) {
dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
}
- memberMapper.insertBatchSomeColumn(addList);
}
if(updateList.size()>0){
for(Member c : updateList){
@@ -325,7 +327,7 @@
company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,response.getOrgId()).last("limit 1"));
if(Objects.isNull(company)){
continue;
- }
+ }
}
//鏍规嵁 erpId 鏌ヨ鐢ㄦ埛淇℃伅锛屽垽鏂槸鏂板杩樻槸鏇存柊
Member member = findUserByERPId(allList,response.getId());
@@ -369,6 +371,7 @@
member.setErpStatus(Constants.ONE);
member.setErpDate(new Date());
member.setErpId(param.getId());
+ member.setIdcardType(param.getIdType());
member.setFsStatus(Constants.ZERO);
member.setStatus(param.getStatus());
member.setType(Constants.memberType.internal);
@@ -881,10 +884,13 @@
*/
private void dealMemberRoleEmpower(Member member, List<Integer> doorIds,Date startTime,Date endTime ) {
//鍒犻櫎鎵�鏈夎�佺殑鎺堟潈淇℃伅
- empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
- .eq(Empower::getMemberId,member.getId())
- .set(Empower::getIsdeleted,Constants.ONE)
- .set(Empower::getSendStatus,Constants.ZERO));
+ if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .set(Empower::getSendStatus,Constants.ZERO));
+ }
+
// empowerMapper.delete(new UpdateWrapper<Empower>().lambda()
// .eq(Empower::getMemberId,member.getId())
// );
@@ -919,7 +925,9 @@
private List<Integer> getRoleIdByParam(Integer[] param, Member member) {
//娣诲姞浜哄憳瑙掕壊鍏宠仈鏁版嵁
- memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
+ if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
+ memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
+ }
if(!Objects.isNull(param)&¶m.length>Constants.ZERO){
//鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺
List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
--
Gitblit v1.9.3