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-02 10:53:56 +08:00
parent f439594100
commit cf336c67e4
10 changed files with 131 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dcsoft-modules/dcsoft-file/src/main/resources/bootstrap.yml
View File

@@ -19,9 +19,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
# namespace: xa
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
# namespace: xa
# 配置文件格式
file-extension: yml
# 共享配置

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

@@ -418,6 +418,72 @@ public class VisitorController extends BaseController {
throw new ServiceException("您输入的开始时间不能大于结束时间");
}
if (visitorService.queryVisitorByIdCountOld(visitor.getPhone()) > 0) {
throw new ServiceException("该手机号已存在访客预约信息");
}
if (visitorService.queryVisitor(visitor) > 0) {
throw new ServiceException("您已预约");
}
// 校验图片
// checkPhoto(visitor.getAvatar(), visitor.getName());
log.info("新增访客信息：{}", visitor);
int i = visitorService.insertVisitor(visitor);
List<Visitor> itemList = visitor.getItemList();
// 随访人员
if (!CollectionUtils.isEmpty(itemList)) {
for (Visitor item : itemList) {
if (!validatePhoneNumber(item.getPhone())) {
throw new ServiceException("您输入的随访人员手机号格式不正确");
}
// 校验图片
// checkPhoto(item.getAvatar(), item.getName());
item.setParentId(visitor.getId());
item.setSource(Constants.ONE);
item.setUserId(visitor.getUserId());
item.setDeptId(visitor.getDeptId());
item.setCreateTime(visitor.getCreateTime());
item.setStartTime(visitor.getStartTime());
item.setEndTime(visitor.getEndTime());
visitorService.insertVisitor(item);
}
}
// 保存附件
if(!CollectionUtils.isEmpty(visitor.getFileList())) {
saveSysFile(visitor.getFileList(), String.valueOf(visitor.getId()));
}
// 审核通知企微发送消息（小程序来源）
String appletLink = getAppletLink(String.valueOf(visitor.getId()), "pages/visitor/visitor/examineIndex");
SysPeople sysPeople = sysPeopleService.selectSysPeopleByUserId(visitor.getUserId());
log.info("审核通知链接:{}", appletLink);
sendWeCom(sysPeople.getPhone(), appletLink + " --访客姓名：" + visitor.getName());
// 访客审核
SysBranch sysBranch = sysBranchService.selectSysBranchById(visitor.getDeptId());
if(sysBranch != null && Constants.ZERO.equals(sysBranch.getIsExamine())) {
VisVisitorExamine examine = new VisVisitorExamine();
examine.setExamine(Constants.ZERO);
visitor.setExamine(examine);
updateVisitorExamine(visitor);
}
return toAjax(i);
}
/**
* 新增访客信息
*/
@Log(title = "访客信息", businessType = BusinessType.INSERT)
@PostMapping("/app/add")
@Transactional
public AjaxResult appAdd(@RequestBody Visitor visitor) throws Exception {
if (visitor.getStartTime().getTime() > visitor.getEndTime().getTime()) {
throw new ServiceException("您输入的开始时间不能大于结束时间");
}
//判断访客和随访人是否存在预约过的信息
List<String> phones = new ArrayList<>();
List<String> idcards = new ArrayList<>();
@@ -1072,14 +1138,18 @@ public class VisitorController extends BaseController {
// 1保存审核环节
if(Constants.ZERO.equals(examine.getExamine())) {
// 1.1保存安环部审核人
visitor.setType("7529");
visitor.setReviewer(visitor.getReviewer3());
visitorService.saveVisitorReviewProcess(visitor);
Visitor visitor1 = new Visitor();
visitor1.setId(visitor.getId());
visitor1.setType("7529");
visitor1.setReviewer(visitor.getReviewer3());
visitorService.saveVisitorReviewProcess(visitor1);
// 1.2保存设备部审核人
visitor.setType("8121");
visitor.setReviewer(visitor.getReviewer2());
visitorService.saveVisitorReviewProcess(visitor);
Visitor visitor2 = new Visitor();
visitor2.setId(visitor.getId());
visitor2.setType("8121");
visitor2.setReviewer(visitor.getReviewer2());
visitorService.saveVisitorReviewProcess(visitor2);
visitor.setType(null);
visitorService.updateVisitor(visitor);
SysPeople people = sysPeopleService.selectSysPeopleById(Long.valueOf(visitor.getReviewer2()));

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

@@ -245,4 +245,8 @@ public interface VisitorMapper
String selectRecordsByPhone(Long id, String telephone);
void saveVisitorReviewProcessList(@Param("list") List<Visitor> list);
int queryVisitor(Visitor visitor);
int queryVisitorByIdCountOld(String phone);
}

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

@@ -257,4 +257,8 @@ public interface IVisitorService
String selectRecordsByPhone(Long id, String telephone);
void saveVisitorReviewProcessList(List<Visitor> list);
int queryVisitor(Visitor visitor);
int queryVisitorByIdCountOld(String phone);
}

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

@@ -778,4 +778,17 @@ public class VisitorServiceImpl implements IVisitorService {
public void saveVisitorReviewProcessList(List<Visitor> list) {
visitorMapper.saveVisitorReviewProcessList(list);
}
/**
* 查询访客预约数
*/
@Override
public int queryVisitor(Visitor visitor) {
return visitorMapper.queryVisitor(visitor);
}
@Override
public int queryVisitorByIdCountOld(String phone) {
return visitorMapper.queryVisitorByIdCountOld(phone);
}
}

2
dcsoft-modules/dcsoft-system/src/main/resources/bootstrap.yml
View File

@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
# namespace: xa
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
# namespace: xa
# 配置文件格式
file-extension: yml
# 共享配置

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

@@ -1002,4 +1002,16 @@
AND p.phone = #{telephone}
ORDER BY r.created_time desc LIMIT 1
</select>
<select id="queryVisitor" resultType="java.lang.Integer">
select count(1)
from vis_visitor
where idcard = #{idcard}
and out_time is null
</select>
<select id="queryVisitorByIdCountOld" resultType="java.lang.Integer">
select count(1)
from vis_visitor
where phone = #{phone}
and out_time is null
</select>
</mapper>