admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

新增巡检的通知人修改

Browse Source
This commit is contained in:
GUO 2024-05-24 23:02:46 +08:00
parent 3ec27449ec
commit 304159b895
4 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java
View File

@ -30,7 +30,6 @@ import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskMapper;
import com.zhgd.xmgl.modules.x.service.impl.XzCheckingRouteTaskServiceImpl;
import com.zhgd.xmgl.security.entity.UserInfo;
import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.MapBuilder;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -103,6 +102,7 @@ public class CheckingPointInfoServiceImpl extends ServiceImpl<CheckingPointInfoM
}
CheckingPoint checkingPoint = checkingPointMapper.selectById(checkingPointInfo.getCheckingPointId());
String noticeUserIds;
if (checkingPointInfo.getXzCheckingRouteTaskId() != null) {
checkDuplicateAndPointExist(checkingPointInfo);
checkingPointInfoMapper.insert(checkingPointInfo);
@ -119,12 +119,16 @@ public class CheckingPointInfoServiceImpl extends ServiceImpl<CheckingPointInfoM
.set(XzCheckingRouteTask::getAbnormalCheckingPointNum, checkingPoints.stream().filter(checkingPoint1 -> checkingPoint1.getInspectStatus() == 2).collect(Collectors.toList()).size())
.eq(XzCheckingRouteTask::getId, xzCheckingRouteTaskId)
);
XzCheckingRouteTask task = xzCheckingRouteTaskService.queryById(xzCheckingRouteTaskId);
noticeUserIds = task.getXzCheckingRoute().getNoticeUserIds();
} else {
checkingPointInfoMapper.insert(checkingPointInfo);
noticeUserIds = checkingPoint.getInspectUserIds();
}
//通知
List<String> userIds = StrUtil.split(checkingPoint.getInspectUserIds(), ",");
List<String> userIds = StrUtil.split(noticeUserIds, ",");
for (String userId : userIds) {
SystemUser systemUser = systemUserMapper.selectById(userId);
noticeService.addUserNotice(Long.valueOf(userId),

12
src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskMapper.java
View File

@ -1,16 +1,16 @@
package com.zhgd.xmgl.modules.x.mapper;
import java.util.HashMap;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.HashMap;
import java.util.List;
/**
* @Description: 星纵-巡检路线的任务
@ -24,4 +24,6 @@ public interface XzCheckingRouteTaskMapper extends BaseMapper<XzCheckingRouteTas
List<XzCheckingRouteTask> queryList(@Param(Constants.WRAPPER) QueryWrapper<XzCheckingRouteTask> queryWrapper, @Param("param") HashMap<String, Object> paramMap);
IPage<XzCheckingRouteTask> queryList(Page<XzCheckingRouteTask> page, @Param(Constants.WRAPPER) QueryWrapper<XzCheckingRouteTask> queryWrapper, @Param("param") HashMap<String, Object> paramMap);
XzCheckingRouteTask getById(String id);
}

13
src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskMapper.xml
View File

@ -9,7 +9,7 @@
</association>
</resultMap>
<select id="queryList" resultMap="queryListMap">
<sql id="selectTable">
select t.*,
CASE WHEN t.is_inspect = 1 THEN 3 WHEN t.start_time > current_date THEN 1 WHEN t.end_time &lt; current_date THEN
4 ELSE 2 END as inspectStatus,
@ -34,6 +34,17 @@
from xz_checking_route_task as t
join (<include refid="com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteMapper.selectTable">
</include>) as xcr on t.xz_checking_route_id = xcr.id
</sql>
<select id="queryList" resultMap="queryListMap">
<include refid="selectTable">
</include>
${ew.customSqlSegment}
</select>
<select id="getById" resultMap="queryListMap">
<include refid="selectTable">
</include>
where t.id = #{id}
</select>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java
View File

@ -93,7 +93,7 @@ public class XzCheckingRouteTaskServiceImpl extends ServiceImpl<XzCheckingRouteT
@Override
public XzCheckingRouteTask queryById(String id) {
XzCheckingRouteTask entity = getById(id);
XzCheckingRouteTask entity = baseMapper.getById(id);
if (entity == null) {
throw new OpenAlertException("未找到对应实体");
}