From f9c24ba3d5eba45afef222dcd72b6383893efc76 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 07 一月 2025 17:23:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 63 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 15 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 9a097fd..b2dd665 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
@@ -13,23 +13,21 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
-import com.doumee.core.haikang.model.param.respose.FacePictureCheckResponse;
import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.*;
-import com.doumee.core.wx.WXConstant;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.admin.response.InterestedListVO;
import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.dto.ResetPasswordDTO;
@@ -37,6 +35,7 @@
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.ResetSystemUserPwdDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
@@ -229,6 +228,7 @@
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer createFk(Visits visits,Boolean isERP,Integer source) {
+ visits.setId(null);
isValidBaseParam(visits);
//妫�鏌ユ槸鍚﹀繀椤荤瓟棰橈紝骞朵笖绗﹀悎绛旈瑕佹眰
ProblemLog problemLog = isValidProblemLog(visits,source);
@@ -331,6 +331,19 @@
//鍒濆鍖栬瀹俊鎭�
// initVisitInfo(visits,date);
visitsMapper.insert(visits);
+ if(Objects.nonNull(visits.getLoginUserInfo())){
+ SystemUser systemUser = systemUserMapper.selectById(visits.getLoginUserInfo().getId());
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,visits,
+ Constants.equalsInteger(visits.getType(),Constants.TWO)?WxPlatConstants.visitReportContent.visitReportUpload:WxPlatConstants.visitContent.visitUpload,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(systemUser.getOpenid().split(","))
+ );
+ }
+ }
+
approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId());
return visits.getId();
}
@@ -1207,6 +1220,22 @@
result.setBusinessStatus(result.getStatus());
}
+
+ Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getObjId,id)
+ .eq(Notices::getType,Constants.equalsInteger(result.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
+ .eq(Notices::getUserId,memberId)
+ .eq(Notices::getSendacopy,Constants.ZERO)
+ .orderByDesc(Notices::getId).last(" limit 1 "));
+ if(Objects.nonNull(notices)){
+ if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){
+ result.setInfo("寰呮垜澶勭悊");
+ }else{
+ result.setInfo(notices.getInfo());
+ }
+ }
+
+
return result;
}
@@ -1410,17 +1439,20 @@
);
// }
- Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda().eq(Notices::getObjId,visits.getId())
+ Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getObjId,id)
.eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
- .eq(Notices::getUserId,memberId)
- .eq(Notices::getSendacopy,Constants.ZERO)
- .last(" limit 1 ")
- );
+ .eq(Notices::getUserId,memberId)
+ .eq(Notices::getSendacopy,Constants.ZERO)
+ .orderByDesc(Notices::getId).last(" limit 1 "));
if(Objects.nonNull(notices)){
- notices.setInfo(notices.getInfo());
- }else{
- notices.setInfo("鏆傛棤");
+ if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){
+ visitDetailVO.setInfo("寰呮垜澶勭悊");
+ }else{
+ visitDetailVO.setInfo(notices.getInfo());
+ }
}
+
return visitDetailVO;
}
@@ -1551,6 +1583,7 @@
dto.setPassword(resetPasswordDTO.getPassword());
dto.setId(systemUser.getId());
dto.setOperaUserId(systemUser.getId());
+ dto.setNeedChangePwd(Constants.ONE);
systemUserBiz.resetPwd(dto);
}
@@ -1797,7 +1830,7 @@
SmsEmailServiceImpl.sendVisitTimeOutSms(systemDictDataBiz,
emayService,smsEmailMapper,smsConfigMapper,
SmsConstants.visitContent.visitTimeOutSignOutNum,
- visitReportTimeCount.toString(),Arrays.asList(mobile.split(","))
+ visitTimeCount.toString(),Arrays.asList(mobile.split(","))
);
}
}
--
Gitblit v1.9.3