From de00fe811ce5f1c1e8592869d218e7c201e1748f Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期四, 23 五月 2024 17:42:22 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 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 55ca0be..922d615 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 @@ -39,6 +39,7 @@ import com.doumee.dao.web.reqeust.VisitRecordDTO; 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.SmsEmailService; import com.doumee.service.business.VisitsService; @@ -104,6 +105,8 @@ private SmsEmailService smsEmailService; @Autowired private SystemUserMapper systemUserMapper; + @Autowired + private ApproveService approveService; @Override @@ -237,6 +240,7 @@ }else if(dataSyncConfig.getVisitorDataOrigin().equals(Constants.ZERO)){ visits.setStatus(Constants.VisitStatus.pass); visitsMapper.updateById(visits); + approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId()); }else{ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鍙戣捣鎷滆瀹℃壒鐢宠澶辫触锛�"); } @@ -490,7 +494,6 @@ .eq(ApproveParam::getMemberType,Constants.ZERO) .last("limit 1")); return Objects.isNull(approveParam)?null:approveParam.getId(); - } @@ -1210,7 +1213,7 @@ @Override - public VisitDetailVO getVisitDetail(Integer id){ + public VisitDetailVO getVisitDetail(Integer id,Integer memberId){ Visits visits = visitsMapper.selectById(id); if(Objects.isNull(visits)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); @@ -1254,6 +1257,15 @@ visitsMapper.selectList(new QueryWrapper<Visits>().lambda() .select(Visits::getName,Visits::getPhone,Visits::getQrcode,Visits::getFaceImg,Visits::getImgurl,Visits::getIdcardDecode,Visits::getStatus) .eq(Visits::getParentId,id))); + + + if(Objects.nonNull(memberId)){ + visitDetailVO.setApproveDateVO( + approveService.arrangeApprovedData(id, + visits.getType(), + memberId) + ); + } return visitDetailVO; } @@ -1356,8 +1368,6 @@ dto.setId(systemUser.getId()); dto.setOperaUserId(systemUser.getId()); systemUserBiz.resetPwd(dto); - - } } -- Gitblit v1.9.3