From 53d014edd19f57125c355abe71ec5b478500e610 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 八月 2025 09:57:40 +0800
Subject: [PATCH] 保洁巡检所有代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectorController.java | 366 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 273 insertions(+), 93 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectorController.java
index 7b7444e..d344b02 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectorController.java
@@ -5,6 +5,7 @@
import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
@@ -17,8 +18,10 @@
import com.ruoyi.system.query.InsepectorListQuery;
import com.ruoyi.system.query.TaskListQuery;
import com.ruoyi.system.service.*;
-import com.ruoyi.system.vo.system.InspectorListVO;
-import com.ruoyi.system.vo.system.TaskListVO;
+import com.ruoyi.system.utils.TemplateMessageSendUtil;
+import com.ruoyi.system.vo.system.*;
+import com.ruoyi.web.controller.tool.EmailUtils;
+import com.ruoyi.web.controller.tool.MsgUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
@@ -51,6 +54,8 @@
@Resource
private TLocationService locationService;
@Resource
+ private TLocationTypeService locationTypeService;
+ @Resource
private TProjectDeptService projectDeptService;
@Resource
@@ -65,70 +70,86 @@
@Resource
private TInspectorService inspectorService;
@Resource
+ private TInspectorDetailService inspectorDetailService;
+ @Resource
private TTaskCleanService taskCleanerService;
+
@ApiOperation(value = "督察记录分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<InspectorListVO>> pageList(@RequestBody InsepectorListQuery query) {
List<SysUser> sysUsers = sysUserService.selectAllList();
List<TLocation> locationList = locationService.list();
- if (StringUtils.hasLength(query.getDeptName())){
- List<String> projectIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
+ if (StringUtils.hasLength(query.getDeptName())) {
+ List<TProjectDept> list = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list();
+ List<String> listIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
.stream().map(TProjectDept::getId).collect(Collectors.toList());
+ for (TProjectDept tProjectDept : list) {
+ if (tProjectDept.getParentId().equals("0")) {
+ List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()
+ .stream().map(TProjectDept::getId).collect(Collectors.toList());
+ listIds.addAll(collect);
+ listIds.add(tProjectDept.getId());
+ }
+ }
List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
.stream().map(TDept::getId).collect(Collectors.toList());
- projectIds.addAll(deptIds);
- if (projectIds.isEmpty()){
+ listIds.addAll(deptIds);
+ if (listIds.isEmpty()) {
return R.ok(new PageInfo<>());
}
- if (StringUtils.hasLength(query.getPhonenumber())){
+ List<Long> collect = sysUsers.stream().filter(e -> listIds.contains(e.getDeptId()))
+ .map(SysUser::getUserId).collect(Collectors.toList());
+ query.setPatrolInspectorIds(collect);
+ if (StringUtils.hasLength(query.getPhonenumber())) {
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
- sysUser.getPhonenumber().equals(query.getPhonenumber())
- && projectIds.contains(sysUser.getDeptId())
+ sysUser.getPhonenumber().contains(query.getPhonenumber())
+ && listIds.contains(sysUser.getDeptId())
).map(SysUser::getUserId).collect(Collectors.toList());
- if (patrolInspectorIds.isEmpty()){
+ if (patrolInspectorIds.isEmpty()) {
return R.ok(new PageInfo<>());
}
query.setPatrolInspectorIds(patrolInspectorIds);
}
}
- if (StringUtils.hasLength(query.getPhonenumber())){
+ if (StringUtils.hasLength(query.getPhonenumber())) {
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
- sysUser.getPhonenumber().equals(query.getPhonenumber())
+ sysUser.getPhonenumber().contains(query.getPhonenumber())
).map(SysUser::getUserId).collect(Collectors.toList());
- if (!query.getPatrolInspectorIds().isEmpty()){
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ if (!query.getPatrolInspectorIds().isEmpty()) {
// 取交集
patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
}
query.setPatrolInspectorIds(patrolInspectorIds);
- if (patrolInspectorIds.isEmpty()){
+ if (patrolInspectorIds.isEmpty()) {
return R.ok(new PageInfo<>());
}
}
- if (query.getClearStatus()!=null){
- List<String> collect = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getClearStatus, query.getClearStatus())
- .list().stream().distinct().map(TTaskDetail::getTaskId).collect(Collectors.toList());
+ if (query.getClearStatus() != null) {
+ List<String> collect = inspectorDetailService.lambdaQuery().eq(TInspectorDetail::getClearStatus, query.getClearStatus())
+ .list().stream().distinct().map(TInspectorDetail::getInspectorId).collect(Collectors.toList());
query.setTaskIds(collect);
- if (collect.isEmpty()){
+ if (collect.isEmpty()) {
return R.ok(new PageInfo<>());
}
}
- if (query.getLocationType()!=null){
+ if (StringUtils.hasLength(query.getLocationType())) {
List<String> collect = locationList.stream().filter(e -> e.getLocationType().equals(query.getLocationType())).map(TLocation::getId)
.collect(Collectors.toList());
- if (collect.isEmpty()){
+ if (collect.isEmpty()) {
return R.ok(new PageInfo<>());
}
query.setLocationIds(collect);
}
- if (StringUtils.hasLength(query.getLocationName())){
+ if (StringUtils.hasLength(query.getLocationName())) {
List<String> collect = locationList.stream().filter(e -> e.getLocationName().contains(query.getLocationName())).map(TLocation::getId)
.collect(Collectors.toList());
- if (collect.isEmpty()){
- query.setLocationIds(collect);
+ query.setLocationIds(collect);
+ if (collect.isEmpty()) {
return R.ok(new PageInfo<>());
- }else{
+ } else {
collect = collect.stream().filter(query.getLocationIds()::contains).collect(Collectors.toList());
- if (collect.isEmpty()){
+ if (collect.isEmpty()) {
return R.ok(new PageInfo<>());
}
query.setLocationIds(collect);
@@ -137,74 +158,74 @@
return R.ok(inspectorService.pageList(query));
}
- @Log(title = "督察记录导出", businessType = BusinessType.EXPORT)
+ @Log(title = "督察记录导出", businessType = BusinessType.OTHER)
@ApiOperation(value = "督察记录导出")
@PostMapping(value = "/exportExcel")
public void exportExcel(@RequestBody InsepectorListQuery query) {
List<SysUser> sysUsers = sysUserService.selectAllList();
List<TLocation> locationList = locationService.list();
- if (StringUtils.hasLength(query.getDeptName())){
+ if (StringUtils.hasLength(query.getDeptName())) {
List<String> projectIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
.stream().map(TProjectDept::getId).collect(Collectors.toList());
List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
.stream().map(TDept::getId).collect(Collectors.toList());
projectIds.addAll(deptIds);
- if (projectIds.isEmpty()){
- projectIds.add("0") ;
+ if (projectIds.isEmpty()) {
+ projectIds.add("0");
}
- if (StringUtils.hasLength(query.getPhonenumber())){
+ if (StringUtils.hasLength(query.getPhonenumber())) {
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
sysUser.getPhonenumber().equals(query.getPhonenumber())
&& projectIds.contains(sysUser.getDeptId())
).map(SysUser::getUserId).collect(Collectors.toList());
- if (patrolInspectorIds.isEmpty()){
- patrolInspectorIds.add(0L) ;
+ if (patrolInspectorIds.isEmpty()) {
+ patrolInspectorIds.add(0L);
}
query.setPatrolInspectorIds(patrolInspectorIds);
}
}
- if (StringUtils.hasLength(query.getPhonenumber())){
+ if (StringUtils.hasLength(query.getPhonenumber())) {
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
sysUser.getPhonenumber().equals(query.getPhonenumber())
).map(SysUser::getUserId).collect(Collectors.toList());
- if (!query.getPatrolInspectorIds().isEmpty()){
+ if (!query.getPatrolInspectorIds().isEmpty()) {
// 取交集
patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
}
- if (patrolInspectorIds.isEmpty()){
+ if (patrolInspectorIds.isEmpty()) {
patrolInspectorIds.add(0L);
}
query.setPatrolInspectorIds(patrolInspectorIds);
}
- if (query.getClearStatus()!=null){
- List<String> collect = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getClearStatus, query.getClearStatus())
- .list().stream().distinct().map(TTaskDetail::getTaskId).collect(Collectors.toList());
- if (collect.isEmpty()){
+ if (query.getClearStatus() != null) {
+ List<String> collect = inspectorDetailService.lambdaQuery().eq(TInspectorDetail::getClearStatus, query.getClearStatus())
+ .list().stream().distinct().map(TInspectorDetail::getInspectorId).collect(Collectors.toList());
+ if (collect.isEmpty()) {
collect.add("-1");
}
query.setTaskIds(collect);
}
- if (query.getLocationType()!=null){
+ if (query.getLocationType() != null) {
List<String> collect = locationList.stream().filter(e -> e.getLocationType().equals(query.getLocationType())).map(TLocation::getId)
.collect(Collectors.toList());
- if (collect.isEmpty()){
+ if (collect.isEmpty()) {
collect.add("-1");
}
query.setLocationIds(collect);
}
- if (StringUtils.hasLength(query.getLocationName())){
+ if (StringUtils.hasLength(query.getLocationName())) {
List<String> collect = locationList.stream().filter(e -> e.getLocationName().contains(query.getLocationName())).map(TLocation::getId)
.collect(Collectors.toList());
- if (collect.isEmpty()){
+ if (collect.isEmpty()) {
collect.add("-1");
query.setLocationIds(collect);
- }else{
+ } else {
collect = collect.stream().filter(query.getLocationIds()::contains).collect(Collectors.toList());
- if (collect.isEmpty()){
+ if (collect.isEmpty()) {
collect.add("-1");
}
query.setLocationIds(collect);
@@ -233,6 +254,64 @@
}
}
+
+ @ApiOperation(value = "督察详情任务")
+ @GetMapping(value = "/detail")
+ public R<InspectorDetailVO> detail(@RequestParam String id) {
+ TInspector inspector = inspectorService.getById(id);
+ List<TInspectorDetail> list = inspectorDetailService.lambdaQuery().eq(TInspectorDetail::getInspectorId, id)
+ .orderByDesc(BaseModel::getCreateTime).list();
+ InspectorDetailVO taskDetailVO = new InspectorDetailVO();
+ BeanUtils.copyProperties(inspector, taskDetailVO);
+ TLocation byId1 = locationService.getById(inspector.getLocationId());
+ TLocationType byId2 = locationTypeService.getById(byId1.getLocationType());
+ taskDetailVO.setLocationAddress(byId1.getLocationAddress());
+ taskDetailVO.setLocationIcon(byId2.getLocationIcon());
+ taskDetailVO.setLocationName(byId1.getLocationName());
+ taskDetailVO.setLocationTypeName(byId2.getLocationName());
+ TInspectorDetail tTaskDetail = list.stream().filter(e -> e.getHandleType() == 1).findFirst().orElse(null);
+ if (tTaskDetail != null && tTaskDetail.getUnqualified() != null) {
+ TDictData byId3 = dictDataService.getById(tTaskDetail.getUnqualified());
+ if (byId3 != null) {
+ tTaskDetail.setUnqualifiedName(byId3.getDataContent());
+ }
+ }
+ if (tTaskDetail != null) {
+ tTaskDetail.setFinishTime(tTaskDetail.getCreateTime());
+ }
+ taskDetailVO.setTaskDetail(tTaskDetail);
+ taskDetailVO.setRecords(list);
+ return R.ok(taskDetailVO);
+ }
+
+ @ApiOperation(value = "详情任务-操作记录-详情")
+ @GetMapping(value = "/detailRecord")
+ public R<InspectorRecordDetailVO> detailRecord(@RequestParam String id) {
+ InspectorRecordDetailVO taskDetailVO = new InspectorRecordDetailVO();
+ TInspectorDetail byId4 = inspectorDetailService.getById(id);
+ TInspector byId = inspectorService.getById(byId4.getInspectorId());
+ BeanUtils.copyProperties(byId, taskDetailVO);
+ TLocation byId1 = locationService.getById(byId.getLocationId());
+ TLocationType byId2 = locationTypeService.getById(byId1.getLocationType());
+ taskDetailVO.setLocationAddress(byId1.getLocationAddress());
+ taskDetailVO.setLocationIcon(byId2.getLocationIcon());
+ taskDetailVO.setLocationName(byId2.getLocationName());
+ if (byId4.getUnqualified() != null) {
+ TDictData byId3 = dictDataService.getById(byId4.getUnqualified());
+ if (byId3 != null) {
+ byId4.setUnqualifiedName(byId3.getDataContent());
+ }
+ }
+ if (byId4.getAuditPerson() != null) {
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId4.getAuditPerson()));
+ if (sysUser != null) {
+ byId4.setAuditPersonName(sysUser.getUserName());
+ }
+ }
+ taskDetailVO.setTaskDetail(byId4);
+ return R.ok(taskDetailVO);
+ }
+
@Log(title = "批量删除督察任务", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除督察任务")
@DeleteMapping(value = "/deleteByIds")
@@ -241,6 +320,7 @@
inspectorService.removeBatchByIds(Arrays.asList(split));
return R.ok();
}
+
@Log(title = "删除督察任务", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除督察任务")
@DeleteMapping(value = "/deleteById")
@@ -248,78 +328,178 @@
inspectorService.removeById(id);
return R.ok();
}
+
@Resource
private TNoticeService noticeService;
@Resource
private TNoticeSetService noticeSetService;
+ @Resource
+ private TDictDataService dictDataService;
+ @Resource
+ private MsgUtils msgUtils;
+ @Resource
+ private TemplateMessageSendUtil templateMessageSendUtil;
+
@Log(title = "审核任务", businessType = BusinessType.UPDATE)
@ApiOperation(value = "审核任务")
@PostMapping(value = "/audit")
- public R<Boolean> audit(@RequestBody TInspectorAuditDTO dto) {
+ public R<Boolean> audit(@RequestBody TInspectorAuditDTO dto) throws Exception {
+// TTaskAuditDTO tTaskAuditDTO = new TTaskAuditDTO();
+// BeanUtils.copyProperties(dto, tTaskAuditDTO);
+// TTask task = taskCleanerService.getById(dto.getTaskId());
+// TLocation location = locationService.getById(task.getLocationId());
+// TNotice tNotice = new TNotice();
+// TNoticeSet noticeSet = noticeSetService.lambdaQuery().eq(TNoticeSet::getType, 2).last("limit 1")
+// .one();
+// tNotice.setUserId(task.getPatrolInspector());
+// tNotice.setStatus(1);
+// tNotice.setDataId(task.getId());
+// tNotice.setNoticeSetType(noticeSet.getNoticeType());
+// TInspector byId = inspectorService.getById(dto.getId());
+// SysUser sysUser = sysUserService.selectUserById(Long.valueOf(task.getPatrolInspector()));
+// // 邮箱
+// TDictData email = dictDataService.lambdaQuery().eq(TDictData::getDataType,4).one();
+// // 授权码
+// TDictData code = dictDataService.lambdaQuery().eq(TDictData::getDataType,5).one();
+// if (dto.getAuditStatus()==1){
+// if (byId.getClearStatus()==2){
+// tTaskAuditDTO.setHandleType(3);
+// dto.setStatus(2);
+// // 增加消息
+// tNotice.setNoticeType(8);
+// tNotice.setNoticeContent("【"+location.getLocationName()+"】督察任务不合格,请重新上传!");
+// noticeService.save(tNotice);
+// switch (noticeSet.getNoticeType()) {
+// case 1:
+// msgUtils.sendMsg5(sysUser.getPhonenumber(), location.getLocationName());
+// break;
+// case 2:
+// if (StringUtils.hasLength(email.getDataContent()) && StringUtils.hasLength(code.getDataContent())) {
+// EmailUtils.sendEmail(sysUser.getEmail(), email.getDataContent(), code.getDataContent(), "【"+location.getLocationName()+"】任务督察不合格,请及时整改!");
+// }
+// break;
+// case 3:
+// if (StringUtils.hasLength(sysUser.getOpenId())){
+// templateMessageSendUtil.wxTemplateProblemRectificationRequest(sysUser.getOpenId(),
+// location.getLocationName(),dto.getAuditRemark());
+// }
+// break;
+// }
+// }else{
+// if (dto.getAuditTime()!=null){
+// dto.setStatus(3);
+// }else{
+// dto.setStatus(4);
+// }
+// }
+// }
+// dto.setAuditTime(LocalDateTime.now());
+//
+// dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
+// inspectorService.updateById(dto);
+// return R.ok();
+
+
+ SysUser auditPerson = sysUserService.selectUserById(tokenService.getLoginUser().getUserId());
+
+ TInspector byId = inspectorService.getById(dto.getId());
+
TTaskAuditDTO tTaskAuditDTO = new TTaskAuditDTO();
BeanUtils.copyProperties(dto, tTaskAuditDTO);
- dto.setAuditTime(LocalDateTime.now());
- TTask task = taskCleanerService.getById(dto.getTaskId());
- TLocation location = locationService.getById(task.getLocationId());
+ TLocation location = locationService.getById(byId.getLocationId());
TNotice tNotice = new TNotice();
TNoticeSet noticeSet = noticeSetService.lambdaQuery().eq(TNoticeSet::getType, 2).last("limit 1")
.one();
- tNotice.setUserId(task.getPatrolInspector());
+ tNotice.setUserId(location.getLocationLeader());
tNotice.setStatus(1);
- tNotice.setDataId(task.getId());
+ tNotice.setDataId(byId.getId());
tNotice.setNoticeSetType(noticeSet.getNoticeType());
- if (dto.getAuditStatus()==2){
- tTaskAuditDTO.setHandleType(3);
- // 将任务修改为待整改
- task.setStatus(4);
- taskCleanerService.updateById(task);
- // 增加消息
- tNotice.setNoticeType(1);
- tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(location.getLocationLeader()));
+ // 邮箱
+ TDictData email = dictDataService.lambdaQuery().eq(TDictData::getDataType, 4).one();
+ // 授权码
+ TDictData code = dictDataService.lambdaQuery().eq(TDictData::getDataType, 5).one();
+ TInspectorDetail one = inspectorDetailService.lambdaQuery().eq(TInspectorDetail::getInspectorId, byId.getId())
+ .eq(TInspectorDetail::getHandleType, 1).orderByDesc(TInspectorDetail::getCreateTime)
+ .last("limit 1").one();
+ if (dto.getAuditStatus() == 1) {
+ TInspectorDetail tInspectorDetail = new TInspectorDetail();
+ tInspectorDetail.setInspectorId(byId.getId());
+ tInspectorDetail.setClearStatus(byId.getClearStatus());
+ tInspectorDetail.setUnqualified(byId.getUnqualified());
+ tInspectorDetail.setRemark(byId.getRemark());
+ tInspectorDetail.setPicture(byId.getPicture());
+ tInspectorDetail.setAudioUrl(byId.getAudioUrl());
+ tInspectorDetail.setHandleType(2);
+ tInspectorDetail.setAuditPerson(tokenService.getLoginUser().getUserId() + "");
+ tInspectorDetail.setAuditTime(LocalDateTime.now());
+ tInspectorDetail.setAuditRemark(dto.getAuditRemark());
+ tInspectorDetail.setAuditStatus(dto.getAuditStatus());
+ inspectorDetailService.save(tInspectorDetail);
- }else{
- tTaskAuditDTO.setHandleType(2);
- // 如果是初次审核就通过 将状态设置为已完成
- List<TTaskDetail> list = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
- if (list.isEmpty()){
- if (dto.getClearStatus()==1){
- task.setStatus(6);
- dto.setStatus(4);
- taskCleanerService.updateById(task);
- }else{
- dto.setStatus(2);
- task.setStatus(4);
- taskCleanerService.updateById(task);
-// 增加消息
- tNotice.setNoticeType(1);
- tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
- }
+ Long count = inspectorDetailService.lambdaQuery().eq(TInspectorDetail::getInspectorId, byId.getId())
+ .eq(TInspectorDetail::getHandleType, 1).count();
+
+ if (count>2){
+ dto.setStatus(3);
}else{
- if (dto.getClearStatus()==1){
- dto.setStatus(3);
- task.setStatus(5);
- taskCleanerService.updateById(task);
- // 增加消息
- tNotice.setNoticeType(2);
- tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
+ if (byId.getClearStatus() == 1) {
+ dto.setStatus(4);
}else{
- dto.setStatus(2);
- task.setStatus(4);
- taskCleanerService.updateById(task);
- // 增加消息
- tNotice.setNoticeType(1);
- tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
+ dto.setStatus(3);
}
-
+ }
+ } else {
+ TInspectorDetail tInspectorDetail = new TInspectorDetail();
+ tInspectorDetail.setInspectorId(byId.getId());
+ tInspectorDetail.setClearStatus(dto.getClearStatus());
+ tInspectorDetail.setUnqualified(byId.getUnqualified());
+ tInspectorDetail.setRemark(dto.getAuditRemark());
+ tInspectorDetail.setPicture(byId.getPicture());
+ tInspectorDetail.setAudioUrl(byId.getAudioUrl());
+ tInspectorDetail.setHandleType(3);
+ tInspectorDetail.setAuditPerson(tokenService.getLoginUser().getUserId() + "");
+ tInspectorDetail.setAuditTime(LocalDateTime.now());
+ tInspectorDetail.setAuditRemark(dto.getAuditRemark());
+ tInspectorDetail.setAuditStatus(dto.getAuditStatus());
+ inspectorDetailService.save(tInspectorDetail);
+ tTaskAuditDTO.setHandleType(3);
+ dto.setStatus(2);
+ // 增加消息
+ tNotice.setNoticeType(8);
+ tNotice.setNoticeContent("【" + location.getLocationName() + "】督察任务不合格,请重新上传!");
+ noticeService.save(tNotice);
+ switch (noticeSet.getNoticeType()) {
+ case 1:
+ msgUtils.sendMsg5(sysUser.getPhonenumber(), location.getLocationName());
+ break;
+ case 2:
+ if (StringUtils.hasLength(email.getDataContent()) && StringUtils.hasLength(code.getDataContent())
+ &&StringUtils.hasLength(sysUser.getEmail())) {
+ EmailUtils.sendEmail(sysUser.getEmail(), email.getDataContent(), code.getDataContent(), "【" + location.getLocationName() + "】任务督察不合格,请及时整改!");
+ }
+ break;
+ case 3:
+ if (StringUtils.hasLength(sysUser.getOpenId())) {
+ templateMessageSendUtil.wxTemplateTaskResultRequest(sysUser.getOpenId(),
+ location.getLocationName(), "驳回", auditPerson.getNickName());
+ }
+ break;
}
}
- noticeService.save(tNotice);
- dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
+ dto.setAuditTime(LocalDateTime.now());
+ dto.setAuditPerson(tokenService.getLoginUser().getUserId() + "");
inspectorService.updateById(dto);
- tTaskDetailService.save(tTaskAuditDTO);
+ one.setAuditPerson(tokenService.getLoginUser().getUserId() + "");
+ one.setAuditTime(LocalDateTime.now());
+ one.setAuditRemark(dto.getAuditRemark());
+ one.setAuditStatus(dto.getAuditStatus());
+ inspectorDetailService.updateById(one);
return R.ok();
}
+
+
}
--
Gitblit v1.7.1