From cdd2dca6f715918369554f3e6db5a0dabfc68578 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 19 二月 2024 18:33:37 +0800
Subject: [PATCH] 大屏
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
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 a951072..e42296e 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
@@ -38,6 +38,7 @@
import com.doumee.dao.web.response.VisitDetailVO;
import com.doumee.dao.web.response.VisitRecordVO;
import com.doumee.service.business.ApproveService;
+import com.doumee.service.business.InterfaceLogService;
import com.doumee.service.business.VisitsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -84,6 +85,8 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private DeviceJoinMapper deviceJoinMapper;
+ @Autowired
+ private ErpTool erpTool;
@Autowired
private WxPlatNotice wxPlatNotice;
@@ -131,6 +134,7 @@
String erpId = startSendErpCheck(visits,visitMember);
if(StringUtils.isNotBlank(erpId)){
visits.setErpId(erpId);
+ visits.setStatus(Constants.VisitStatus.submitCheck);
visitsMapper.updateById(visits);
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鍙戣捣鎷滆瀹℃壒鐢宠澶辫触锛�");
@@ -481,9 +485,9 @@
|| visits.getReceptMemberId() == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝淇℃伅濉啓涓嶆纭紒");
}
- if(visits.getStarttime().getTime() < System.currentTimeMillis()){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝棰勭害寮�濮嬫椂闂村繀椤诲ぇ浜庡綋鍓嶆椂闂达紒");//
- }
+// if(visits.getStarttime().getTime() < System.currentTimeMillis()){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝棰勭害寮�濮嬫椂闂村繀椤诲ぇ浜庡綋鍓嶆椂闂达紒");//
+// }
if(visits.getEndtime().getTime() <= visits.getStarttime().getTime()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝棰勭害缁撴潫鏃堕棿蹇呴』澶т簬寮�濮嬫椂闂达紒");//
}
@@ -529,6 +533,7 @@
private void initWithVisitInfo(Visits visits) {
if(CollectionUtils.isNotEmpty(visits.getWithUserList())){
for(Visits v :visits.getWithUserList()){
+ v.setBirthday(Constants.getBirthdyByCardNo(v.getIdcardNo()));
v.setParentId(visits.getId());
v.setStarttime(visits.getStarttime());
v.setEndtime(visits.getEndtime());
@@ -539,7 +544,7 @@
v.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, v.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
v.setErpId(visits.getErpId());
v.setHkStatus(Constants.ZERO);
- v.setStatus(Constants.ZERO);
+ v.setStatus(Constants.VisitStatus.submitCheck);
}
//鎵归噺鎻掑叆鏁版嵁
visitsMapper.insertBatchSomeColumn(visits.getWithUserList());
@@ -584,7 +589,6 @@
}
param.setWithUserList(withUserList);
-
param.setId(visits.getId());
param.setBeVisitedUserId(visitMember.getErpId());
param.setVisitorWorkUint(visits.getCompanyName());
@@ -602,12 +606,15 @@
param.setRoleNames(deviceRoleList.stream().map(m->m.getName()).collect(Collectors.toList()));
}
}
- ApproveInfoResponse response = ErpTool.submitApprove(ErpConstants.approveUrl,param);
+ ApproveInfoResponse response = erpTool.submitApprove(ErpConstants.approveUrl,param);
if(!Objects.isNull(response)){
return visits.getId().toString();
}
+
return null;
}
+
+
private String visitAppiontment(Visits visits) {
VisitAppointmentRequest param = new VisitAppointmentRequest();
@@ -647,6 +654,7 @@
//闅忚浜哄憳淇℃伅澶勭悊
if(visits.getWithUserList()!= null && visits.getWithUserList().size()>0){
for(Visits model:visits.getWithUserList()){
+ model.setBirthday(Constants.getBirthdyByCardNo(model.getIdcardNo()));
model.setStarttime(visits.getStarttime());
model.setEndtime(visits.getEndtime());
//鏍￠獙闅忚浜哄憳濉姤鏁版嵁鍚堟硶鎬�
@@ -673,6 +681,11 @@
if(StringUtils.isNotBlank(visits.getCarNos())&&!Constants.checkCarNo(visits.getCarNos())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝杞︾墝鍙枫��"+visits.getCarNos()+"銆戜笉鍚堟硶锛岃鏍稿疄鍚庨噸璇晘");
}
+ if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18
+ //&&!IdcardUtil.isValidCard(cardno)
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝韬唤璇佸彿鐮佹湁璇紝璇锋牳瀹炲悗閲嶈瘯锛�");
+ }
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
.eq(Member::getType,Constants.memberType.visitor)
.eq(Member::getIdcardType,visits.getIdcardType())
@@ -684,6 +697,7 @@
member.setCreateDate(visits.getCreateDate());
member.setIsdeleted(Constants.ZERO);
member.setIdcardNo(visits.getIdcardNo());
+ member.setBirthday(Constants.getBirthdyByCardNo(cardno));
member.setIdcardDecode(visits.getIdcardDecode());
member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//韬唤璇佸彿鍔犲瘑
member.setIdcardDecode(Constants.getTuominStr(cardno));//鑴辨晱鎵嬫満鍙�
@@ -699,6 +713,7 @@
member.setSex(Constants.getSexByCardNo(cardno));
member.setHkStatus(Constants.ZERO);
member.setErpStatus(Constants.ZERO);
+ member.setVisitCompanyName(visits.getCompanyName());
// 鏂板璁垮璁板綍
addList.add(member);
}else{
@@ -721,6 +736,7 @@
member.setSex(Constants.getSexByCardNo(cardno));
member.setHkStatus(Constants.ZERO);
member.setErpStatus(Constants.ZERO);
+ member.setVisitCompanyName(visits.getCompanyName());
// 鏇存柊璁垮淇℃伅,
editList.add(member);
}
@@ -904,7 +920,7 @@
queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
- queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.leftJoin(Company.class,Company::getErpId,Member::getErpOrgId);
queryWrapper.eq(Visits::getId,id);
Visits result = visitsJoinMapper.selectJoinOne(Visits.class,queryWrapper);
@@ -912,10 +928,10 @@
if(result!=null){
if(StringUtils.isNotBlank(result.getDoors())){
String[] doorList=result.getDoors().split(",");
- MPJLambdaWrapper<Device> deviceQuery = new MPJLambdaWrapper<>();
- deviceQuery.in(Device::getId,doorList);
- List<Device> deviceList= deviceJoinMapper.selectList(deviceQuery);
- result.setDeviceList(deviceList);
+ MPJLambdaWrapper<DeviceRole> deviceQuery = new MPJLambdaWrapper<>();
+ deviceQuery.in(DeviceRole::getId,doorList);
+ List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(deviceQuery);
+ result.setDeviceRoleList(deviceRoleList);
}
}
@@ -1062,7 +1078,7 @@
}
visitDetailVO.setWithVisitsList(
visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
- .select(Visits::getName,Visits::getPhone,Visits::getFaceImg,Visits::getImgurl,Visits::getIdcardDecode)
+ .select(Visits::getName,Visits::getPhone,Visits::getFaceImg,Visits::getImgurl,Visits::getIdcardDecode,Visits::getStatus)
.eq(Visits::getParentId,id)));
return visitDetailVO;
}
--
Gitblit v1.9.3