XA/xa-master-prod
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

兴安取消企微注释

Browse Source
This commit is contained in:
zc
2025-07-11 09:39:49 +08:00
parent 63c67c07e6
commit 7fe428453d
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java
View File

@@ -202,7 +202,7 @@ public class VisCarryStuffController extends BaseController {
//发送企微信息 //发送企微信息
try { try {
// visitorController.sendWeCom(people.getPhone(), url + " --访客姓名：" + vo.getName()); visitorController.sendWeCom(people.getPhone(), url + " --访客姓名：" + vo.getName());
} catch (Exception e) { } catch (Exception e) {
log.error("出门证申请add-sendWeCom异常：", e); log.error("出门证申请add-sendWeCom异常：", e);
throw new ServiceException("系统异常，请重新提交或联系管理员！"); throw new ServiceException("系统异常，请重新提交或联系管理员！");
@@ -308,7 +308,7 @@ public class VisCarryStuffController extends BaseController {
//发送企微信息 //发送企微信息
try { try {
// visitorController.sendWeCom(people.getPhone(), url + " --访客姓名：" + vo.getName()); visitorController.sendWeCom(people.getPhone(), url + " --访客姓名：" + vo.getName());
} catch (Exception e) { } catch (Exception e) {
log.error("出门证申请add-sendWeCom异常：", e); log.error("出门证申请add-sendWeCom异常：", e);
throw new ServiceException("系统异常，请重新提交或联系管理员！"); throw new ServiceException("系统异常，请重新提交或联系管理员！");
@@ -320,13 +320,13 @@ public class VisCarryStuffController extends BaseController {
visVisitorExamineService.insertVisVisitorExamine(examine); visVisitorExamineService.insertVisVisitorExamine(examine);
try { try {
// visitorController.sendWeCom(telephone, vo.getName() + "的访客审核已驳回"); visitorController.sendWeCom(telephone, vo.getName() + "的访客审核已驳回");
} catch (Exception e) { } catch (Exception e) {
log.error("访客approve-sendWeCom驳回异常", e); log.error("访客approve-sendWeCom驳回异常", e);
} }
// 申请人发送短信（审核不通过） // 申请人发送短信（审核不通过）
SysPeople sysPeople1 = sysPeopleService.selectSysPeopleById(stuffVo.getUserId()); SysPeople sysPeople1 = sysPeopleService.selectSysPeopleById(stuffVo.getUserId());
// visitorController.sendMessage(sysPeople1.getPhone(), "1", smsProperties.getTemplate3()); visitorController.sendMessage(sysPeople1.getPhone(), "1", smsProperties.getTemplate3());
} }
visCarryStuffService.updateStaff(vo); visCarryStuffService.updateStaff(vo);

17
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java
View File

@@ -443,9 +443,6 @@ public class VisitorController extends BaseController {
throw new ServiceException("您已预约"); throw new ServiceException("您已预约");
} }
// 校验图片
// checkPhoto(visitor.getAvatar(), visitor.getName());
log.info("新增访客信息：{}", visitor); log.info("新增访客信息：{}", visitor);
int i = visitorService.insertVisitor(visitor); int i = visitorService.insertVisitor(visitor);
List<Visitor> itemList = visitor.getItemList(); List<Visitor> itemList = visitor.getItemList();
@@ -455,8 +452,6 @@ public class VisitorController extends BaseController {
if (!validatePhoneNumber(item.getPhone())) { if (!validatePhoneNumber(item.getPhone())) {
throw new ServiceException("您输入的随访人员手机号格式不正确"); throw new ServiceException("您输入的随访人员手机号格式不正确");
} }
// 校验图片
// checkPhoto(item.getAvatar(), item.getName());
item.setParentId(visitor.getId()); item.setParentId(visitor.getId());
item.setSource(Constants.ONE); item.setSource(Constants.ONE);
item.setUserId(visitor.getUserId()); item.setUserId(visitor.getUserId());
@@ -556,7 +551,7 @@ public class VisitorController extends BaseController {
//发送企微信息 //发送企微信息
try { try {
// sendWeCom(sysPeople.getPhone(), url + " --访客姓名：" + visitor.getName()); sendWeCom(sysPeople.getPhone(), url + " --访客姓名：" + visitor.getName());
} catch (Exception e) { } catch (Exception e) {
log.error("访客add-sendWeCom异常：", e); log.error("访客add-sendWeCom异常：", e);
} }
@@ -1071,7 +1066,7 @@ public class VisitorController extends BaseController {
log.info("approve发送审核链接：{}", url); log.info("approve发送审核链接：{}", url);
try { try {
// sendWeCom(nextPeople.getPhone(), url + " --访客姓名：" + visitor.getName()); sendWeCom(nextPeople.getPhone(), url + " --访客姓名：" + visitor.getName());
} catch (Exception e) { } catch (Exception e) {
log.error("访客approve-sendWeCom异常：", e); log.error("访客approve-sendWeCom异常：", e);
} }
@@ -1097,7 +1092,7 @@ public class VisitorController extends BaseController {
phoneList.addAll(itemList.stream().map(Visitor::getPhone).collect(Collectors.toList())); phoneList.addAll(itemList.stream().map(Visitor::getPhone).collect(Collectors.toList()));
phoneList = phoneList.stream().distinct().collect(Collectors.toList()); phoneList = phoneList.stream().distinct().collect(Collectors.toList());
} }
log.info("临时日志，发同意短信{}", JSON.toJSONString(phoneList)); log.info("approve-发同意短信:{}", JSON.toJSONString(phoneList));
for (String phone : phoneList) { for (String phone : phoneList) {
sendMessage(phone, "1", smsProperties.getTemplate2()); sendMessage(phone, "1", smsProperties.getTemplate2());
} }
@@ -1114,14 +1109,14 @@ public class VisitorController extends BaseController {
visitorService.updateVisitorReviewProcess(visitor); visitorService.updateVisitorReviewProcess(visitor);
try { try {
// sendWeCom(telephone, visitor.getName() + "的访客审核已驳回"); sendWeCom(telephone, visitor.getName() + "的访客审核已驳回");
} catch (Exception e) { } catch (Exception e) {
log.error("访客approve-sendWeCom驳回异常：", e); log.error("访客approve-sendWeCom驳回异常：", e);
} }
// 申请人发送短信（审核不通过） // 申请人发送短信（审核不通过）
log.info("临时日志，发拒绝短信{}", visitor.getPhone()); log.info("approve-发拒绝短信:{}", visitor.getPhone());
// sendMessage(visitor.getPhone(), "1", smsProperties.getTemplate3()); sendMessage(visitor.getPhone(), "1", smsProperties.getTemplate3());
} }
visitorService.approve(visitor); visitorService.approve(visitor);