From c18b8f0f12f9c3965fee72ea2ae668c2fc89d908 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 十二月 2023 17:24:58 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
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 245bb9e..8dd1de3 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
@@ -682,21 +682,29 @@
Company company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getId()).last("limit 1"));
if(Objects.isNull(company)){
company = new Company();
- BeanUtils.copyProperties(param,company);
+// BeanUtils.copyProperties(param,company);
company.setId(null);
company.setCreateDate(new Date());
company.setHkStatus(Constants.ZERO);
company.setErpStatus(Constants.ONE);
company.setErpDate(new Date());
company.setErpId(param.getId());
+ company.setErpParentId(param.getParentId());
company.setFsStatus(Constants.ZERO);
company.setType(Constants.ONE);
+ company.setLinkName(param.getLinkName());
+ company.setLinkPhone(param.getLinkPhone());
companyMapper.insert(company);
//TODO 娴峰悍鏁版嵁鍒涘缓
}else{
- BeanUtils.copyProperties(param,company);
+// BeanUtils.copyProperties(param,company);
company.setEditDate(new Date());
+ company.setErpId(param.getId());
+ company.setHkStatus(Constants.ZERO);
company.setErpDate(new Date());
+ company.setErpParentId(param.getParentId());
+ company.setLinkName(param.getLinkName());
+ company.setLinkPhone(param.getLinkPhone());
companyMapper.updateById(company);
//TODO 娴峰悍鏁版嵁鏇存柊
}
@@ -742,7 +750,6 @@
member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
member.setCompanyId(param.getOrgId());
memberMapper.insert(member);
-
//TODO 娴峰悍鏁版嵁鍒涘缓
}else{
BeanUtils.copyProperties(param,member);
@@ -821,6 +828,7 @@
visitsList.forEach(i->{
i.setStatus(param.getStatus().equals(Constants.ZERO)?Constants.VisitStatus.pass:Constants.VisitStatus.noPass);
i.setEndCheckDate(DateUtil.StringToDate(param.getApproveDate(),"yyyy-MM-dd HH:mm:ss"));
+ i.setHkStatus(Constants.ZERO);
visitsMapper.updateById(i);
});
}
--
Gitblit v1.9.3