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-04 14:23:55 +08:00
parent cf336c67e4
commit 393c180817
5 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,7 +367,6 @@ public class VisitorController extends BaseController {
Map<String, String> map = dictDataService.queryDictData("sys_company_type");
visitor.setMatterName(MatterEnum.getByCode(visitor.getMatter()));
visitor.setDeptName(map.get(visitor.getDeptId()));
log.info("临时日志：{}",JSON.toJSONString(visitor));
return success(visitor);
}
@@ -532,14 +531,10 @@ public class VisitorController extends BaseController {
saveSysFile(visitor.getFileList(), String.valueOf(visitor.getId()));
}
String content = getContent(visitor, itemList);
// 审核通知企微发送消息（小程序来源）
SysPeople sysPeople = sysPeopleService.selectSysPeopleByUserId(visitor.getUserId());
String url = getExamineUrl(String.valueOf(visitor.getId()), sysPeople.getPhone());
log.info("add发送审核链接：{}", url);
//发送钉钉信息
// asyncsendV2(sysPeople.getPhone(), "text", content + url);
//发送企微信息
try {
@@ -1013,6 +1008,8 @@ public class VisitorController extends BaseController {
examine.setVisitorId(visitor.getId());
visitor.setState(examine.getExamine());
Map<String, String> map = dictDataService.queryDictData("sys_park_group");
//审核通过
if(Constants.ZERO.equals(examine.getExamine())) {
//被访人审核
@@ -1054,11 +1051,6 @@ public class VisitorController extends BaseController {
visitor2.setParentId(visitor.getId());
String url = getExamineUrl(String.valueOf(visitor.getId()), nextPeople.getPhone());
log.info("approve发送审核链接：{}", url);
// List<Visitor> itemList = visitorService.selectVisitorItemList(visitor2);
// String content = getContent(visitor1, itemList);
// String str = content + url;
// asyncsendV2(nextPeople.getPhone(), "text", str);
// log.info("发送钉钉结束:{}", nextPeople.getPhone());
try {
sendWeCom(nextPeople.getPhone(), url + " --访客姓名：" + visitor.getName());
@@ -1078,12 +1070,18 @@ public class VisitorController extends BaseController {
visitorService.updateVisitorReviewProcess(visitor);
// 同意后，给被访人和访客们发送审核结束短信
List<String> phoneList = new ArrayList<>();
phoneList.add(visitor.getPhone());
Visitor visitor2 = new Visitor();
visitor2.setParentId(visitor.getId());
List<Visitor> itemList = visitorService.selectVisitorItemList(visitor2);
if (CollUtil.isNotEmpty(itemList)) {
// phoneList.addAll(itemList.stream().map(Visitor::getPhone).collect(Collectors.toList()));
// phoneList = phoneList.stream().distinct().collect(Collectors.toList());
phoneList.addAll(itemList.stream().map(Visitor::getPhone).collect(Collectors.toList()));
phoneList = phoneList.stream().distinct().collect(Collectors.toList());
}
log.info("临时日志，发同意短信{}", JSON.toJSONString(phoneList));
for (String phone : phoneList) {
sendMessage(phone, "1", smsProperties.getTemplate2());
}
}
}
@@ -1094,12 +1092,17 @@ public class VisitorController extends BaseController {
examine.setRejectReason(visitor.getRejectReason());
visVisitorExamineService.insertVisVisitorExamine(examine);
//修改环节状态
visitorService.updateVisitorReviewProcess(visitor);
try {
sendWeCom(telephone, visitor.getName() + "的访客审核已驳回");
} catch (Exception e) {
log.error("访客approve-sendWeCom驳回异常：", e);
}
// 申请人发送短信（审核不通过）
log.info("临时日志，发拒绝短信{}", visitor.getPhone());
sendMessage(visitor.getPhone(), "1", smsProperties.getTemplate3());
}
@@ -1182,6 +1185,7 @@ public class VisitorController extends BaseController {
@Log(title = "访客审核", businessType = BusinessType.UPDATE)
@PostMapping("/updateVisitorExamine")
public AjaxResult updateVisitorExamine(@RequestBody Visitor visitor) {
log.info("updateVisitorExamine-入参：{}",JSON.toJSONString(visitor));
List<SysManageRecord> record = visitorService.querySysManageRecord(visitor.getUserId());
if (CollectionUtils.isEmpty(record)) {
throw new RuntimeException("被访人未授权通行");
@@ -1199,10 +1203,11 @@ public class VisitorController extends BaseController {
if("7529".equals(people.getPosition())) {
visitor.setPosition("8121");
}
Visitor visitor5 = visitorService.queryReviewProcess(visitor);
String string = visitorService.queryReviewProcessOld(visitor);
log.info("queryReviewProcessOld-Position：{},result：{}", visitor.getPosition(), string);
visitor.setNextStepReviewer(StringUtils.isNotEmpty(visitor.getReviewer2()) ? visitor.getReviewer2() : visitor.getReviewer3());
if(StringUtils.isNotEmpty(visitor5.getReviewer())) {
visitor.setNextStepReviewer(visitor5.getReviewer());
if(StringUtils.isNotEmpty(string)) {
visitor.setNextStepReviewer(string);
}
if(StringUtils.isEmpty(visitor.getNextStepReviewer())) {
visitor.setNextStepReviewer(String.valueOf(visitor.getUserId()));
@@ -1267,7 +1272,7 @@ public class VisitorController extends BaseController {
visitor.setState(examine.getExamine());
visitorService.updateVisitorReviewProcess(visitor);
OfficialAccountVo officialAccountVo = sysPeopleService.queryPeopleById(visitor5.getReviewer());
OfficialAccountVo officialAccountVo = sysPeopleService.queryPeopleById(string);
// 审核通知企微发送消息（小程序来源）
String appletLink = getAppletLink(String.valueOf(visitor.getId()), "pages/visitor/visitor/examineIndex");
sendWeCom(officialAccountVo.getPhone(), appletLink + " --访客姓名：" + visitor.getName());

2
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/mapper/VisitorMapper.java
View File

@@ -249,4 +249,6 @@ public interface VisitorMapper
int queryVisitor(Visitor visitor);
int queryVisitorByIdCountOld(String phone);
String queryReviewProcessOld(Visitor visitor);
}

2
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/IVisitorService.java
View File

@@ -261,4 +261,6 @@ public interface IVisitorService
int queryVisitor(Visitor visitor);
int queryVisitorByIdCountOld(String phone);
String queryReviewProcessOld(Visitor visitor);
}

5
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/impl/VisitorServiceImpl.java
View File

@@ -791,4 +791,9 @@ public class VisitorServiceImpl implements IVisitorService {
public int queryVisitorByIdCountOld(String phone) {
return visitorMapper.queryVisitorByIdCountOld(phone);
}
@Override
public String queryReviewProcessOld(Visitor visitor) {
return visitorMapper.queryReviewProcessOld(visitor);
}
}

8
dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisitorMapper.xml
View File

@@ -420,8 +420,8 @@
<if test="visitingUnit != null">visiting_unit = #{visitingUnit},</if>
<if test="userName != null">user_name = #{userName},</if>
<if test="visitorPosition != null">position = #{visitorPosition},</if>
<if test="reviewer2 != null">reviewer2 = #{reviewer2},</if>
<if test="reviewer3 != null">reviewer3 = #{reviewer3},</if>
<if test="reviewer2 != null and reviewer2 != ''">reviewer2 = #{reviewer2},</if>
<if test="reviewer3 != null and reviewer3 != ''">reviewer3 = #{reviewer3},</if>
<if test="examineState != null">examine_state = #{examineState},</if>
<if test="currentNode != null">current_node = #{currentNode},</if>
</trim>
@@ -1014,4 +1014,8 @@
where phone = #{phone}
and out_time is null
</select>
<select id="queryReviewProcessOld" resultType="java.lang.String">
select reviewer from vis_visitor_review_process where visitor_id = #{id} and type = #{position}
</select>
</mapper>