From 50cafce55546fac0928614e56d43845e2b6e0ca0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 11 六月 2024 15:46:08 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 7c124a7..7d8d473 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -258,6 +258,7 @@
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer visitReporting(Visits visits) {
+ visits.setSourceType(Constants.ZERO);
isValidBaseParam(visits);
//妫�楠岃鎷滆浜烘槸鍚﹀悎娉�
Member visitMember = isValideVisitedUser(visits.getMemberId());
@@ -265,14 +266,16 @@
//鍒涘缓鏃堕棿
visits.setCreateDate(date);
//璁垮鎶ュ
+ visits.setIsdeleted(Constants.ZERO);
visits.setType(Constants.TWO);
visits.setReceptMemberId(visitMember.getId());
visits.setStatus(Constants.VisitStatus.waitCheck);
visits.setVisitType(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MDJ_VISIT_REQUIRED).getCode()));
visits.setIdcardNo(DESUtil.decrypt(Constants.EDS_PWD, visitMember.getIdcardNo()));
//鍒濆鍖栬瀹俊鎭�
- initVisitInfo(visits,date);
+// initVisitInfo(visits,date);
visitsMapper.insert(visits);
+ approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId());
return visits.getId();
}
@@ -607,23 +610,28 @@
|| StringUtils.isBlank( visits.getName())
|| StringUtils.isBlank( visits.getPhone())
|| StringUtils.isBlank( visits.getCompanyName())
- || visits.getIdcardType() == null
|| Objects.isNull(visits.getType())
// || StringUtils.isBlank( visits.getFaceImg() )
- || StringUtils.isBlank( visits.getIdcardNo() )
|| visits.getReceptMemberId() == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝淇℃伅濉啓涓嶆纭紒");
}
+ if(Constants.equalsInteger(visits.getType(),Constants.ZERO)
+ || Constants.equalsInteger(visits.getType(),Constants.ONE)){
+ if( visits.getIdcardType() == null
+ || StringUtils.isBlank( visits.getIdcardNo() ) ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝淇℃伅濉啓涓嶆纭紒");
+ }
+ }
//璁垮鎶ュ
- if(visits.getType().equals(Constants.TWO)
+ if(Constants.equalsInteger(visits.getType(),Constants.TWO)
&& (StringUtils.isBlank( visits.getName())
|| StringUtils.isBlank( visits.getPhone())
- || StringUtils.isBlank( visits.getCompanyName()))
+ || StringUtils.isBlank( visits.getCompanyName())
|| StringUtils.isBlank( visits.getCarNos())
+ || Objects.isNull(visits.getReceptMemberId()))
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝淇℃伅濉啓涓嶆纭紒");
}else if(visits.getType().equals(Constants.ONE) && StringUtils.isBlank(visits.getConstructionReason())){
-
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈～鍐欐柦宸ヤ簨鐢憋紒");
}
if(visits.getEndtime().getTime() < System.currentTimeMillis()){
@@ -1079,14 +1087,16 @@
}
@Override
- public Visits findById(Integer id) {
+ public Visits findById(Integer id,Integer memberId) {
MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Visits.class);
queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
+ queryWrapper.select("t3.name",Visits::getCreateMemberName);
queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
queryWrapper.leftJoin(Company.class,Company::getErpId,Member::getErpOrgId);
+ queryWrapper.leftJoin("Member t3 on t.CREATE_MEMBER_ID=t3.id");
queryWrapper.eq(Visits::getId,id);
Visits result = visitsJoinMapper.selectJoinOne(Visits.class,queryWrapper);
@@ -1113,6 +1123,13 @@
result.setWithUserList(visitsList);
result.setPrefixUrl(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode());
+
+ result.setApproveDateVO(
+ approveService.arrangeApprovedData(id,
+ result.getType(),
+ memberId)
+ );
+
return result;
}
@@ -1141,10 +1158,9 @@
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
- queryWrapper.eq(pageWrap.getModel().getType()!=null,Visits::getType,pageWrap.getModel().getType());
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Visits::getType,pageWrap.getModel().getType());
queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getOpenid()),Visits::getOpenid,pageWrap.getModel().getOpenid());
- queryWrapper.eq(StringUtils.isBlank(pageWrap.getModel().getOpenid()),"1","2");
+// queryWrapper.eq(StringUtils.isBlank(pageWrap.getModel().getOpenid()),"1","2");
queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getName()),ms->ms.like(Visits::getName,pageWrap.getModel().getName())
.or().like(Visits::getPhone,pageWrap.getModel().getName()))
.eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Visits::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, pageWrap.getModel().getIdcardNo()))
--
Gitblit v1.9.3