From 43db8d016dc5079da163c02a6e7d63185c78b3af Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 09:46:05 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 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..a6e1338 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
@@ -212,7 +215,7 @@
visits.setCreateDate(date);
//闅忚浜哄憳鏁伴噺
visits.setMemberNum(Constants.ZERO);
- //璁垮淇℃伅(浣跨敤韬唤璇佸彿鏌ヨ鏄惁宸插瓨鍦ㄦ敼鏅�氳瀹紝娌℃湁鍒欐柊澧烇紝瀛樺湪鍒欐洿鏂皁penid绛変俊鎭�),鍖呮嫭闅忚浜哄憳鏍￠獙鍜屽鐞�
+ //璁垮淇℃伅(浣跨敤韬唤璇佸彿鏌ヨ鏄惁宸插瓨鍦ㄨ鏅�氳瀹紝娌℃湁鍒欐柊澧烇紝瀛樺湪鍒欐洿鏂皁penid绛変俊鎭�),鍖呮嫭闅忚浜哄憳鏍￠獙鍜屽鐞�
Member member = dealMemberAndVisits(visits);
visits.setMemberId(member.getId());
visits.setVisitType(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MDJ_VISIT_REQUIRED).getCode()));
@@ -235,8 +238,9 @@
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(),
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_AUDIT_VISIT).getCode());
}else if(dataSyncConfig.getVisitorDataOrigin().equals(Constants.ZERO)){
- visits.setStatus(Constants.VisitStatus.pass);
+ visits.setStatus(Constants.VisitStatus.waitCheck);
visitsMapper.updateById(visits);
+ approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId());
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鍙戣捣鎷滆瀹℃壒鐢宠澶辫触锛�");
}
@@ -254,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());
@@ -261,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();
}
@@ -490,7 +497,6 @@
.eq(ApproveParam::getMemberType,Constants.ZERO)
.last("limit 1"));
return Objects.isNull(approveParam)?null:approveParam.getId();
-
}
@@ -604,22 +610,29 @@
|| 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)
- && (StringUtils.isBlank( visits.getName())
+ 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.getMemberNum())
+ || 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()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鍏ュ巶鏃堕棿蹇呴』澶т簬褰撳墠鏃堕棿锛�");//
@@ -1074,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);
@@ -1108,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;
}
@@ -1125,7 +1147,7 @@
@Override
public PageData<Visits> findPage(PageWrap<Visits> pageWrap) {
- IPage<Visits> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ IPage<Visits> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Visits.class);
@@ -1136,8 +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.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()))
@@ -1210,7 +1233,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);
@@ -1235,6 +1258,8 @@
visitDetailVO.setName(visits.getName());
visitDetailVO.setCompanyName(visits.getCompanyName());
visitDetailVO.setFaceImg(visits.getFaceImg());
+ visitDetailVO.setType(visits.getType());
+ visitDetailVO.setConstructionReason(visits.getConstructionReason());
visitDetailVO.setImgUrl(visits.getImgurl());
visitDetailVO.setIdCardDecode(visits.getIdcardDecode());
visitDetailVO.setPrefix(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
@@ -1254,6 +1279,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 +1390,6 @@
dto.setId(systemUser.getId());
dto.setOperaUserId(systemUser.getId());
systemUserBiz.resetPwd(dto);
-
-
}
}
--
Gitblit v1.9.3