diff --git a/xinnengyuan/.gitignore b/xinnengyuan/.gitignore index 2adafeb0..e1e3d8ac 100644 --- a/xinnengyuan/.gitignore +++ b/xinnengyuan/.gitignore @@ -54,3 +54,4 @@ docs /file .idea/ chat-memory/ +queries/ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/controller/MsgConfigController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/controller/MsgConfigController.java index 373d5204..c4b08f44 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/controller/MsgConfigController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/controller/MsgConfigController.java @@ -1,37 +1,28 @@ package org.dromara.message.controller; -import java.util.List; -import java.util.Objects; - -import cn.hutool.core.bean.BeanUtil; -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.message.domain.bo.MsgConfigAddReq; -import org.dromara.message.domain.bo.MsgConfigEditReq; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysDeptService; -import org.dromara.system.service.ISysUserService; -import org.springframework.boot.actuate.beans.BeansEndpoint; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import cn.hutool.core.bean.BeanUtil; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.message.domain.vo.MsgConfigVo; -import org.dromara.message.domain.bo.MsgConfigBo; -import org.dromara.message.service.IMsgConfigService; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.message.domain.bo.MsgConfigAddReq; +import org.dromara.message.domain.bo.MsgConfigBo; +import org.dromara.message.domain.bo.MsgConfigEditReq; +import org.dromara.message.domain.vo.MsgConfigVo; +import org.dromara.message.service.IMsgConfigService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 消息配置 @@ -46,21 +37,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class MsgConfigController extends BaseController { private final IMsgConfigService msgConfigService; - private final ISysUserService userService; - private final ISysDeptService deptService; - - /** - * 获取当前用户所在上级部门ID - */ - @SaCheckPermission("message:config:allUsersOfTheDepartment") - @GetMapping("/allUsersOfTheDepartment") - public R allUsersOfTheDepartment() { - //获取当前用户的上级部门 - Long deptId = Objects.requireNonNull(LoginHelper.getLoginUser()).getDeptId(); - SysDeptBo bm = deptService.selectDeptByIdBo(deptId); - //从顶级往下推两个部门 - return R.ok(bm); - } /** * 查询消息配置列表 @@ -79,7 +55,7 @@ public class MsgConfigController extends BaseController { @SaCheckPermission("message:config:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable Long id) { return R.ok(msgConfigService.queryById(id)); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java index 200a04f9..6f84f6fb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java @@ -1,36 +1,35 @@ package org.dromara.project.controller; -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.contractor.domain.dto.contractor.SubContractorQueryReq; -import org.dromara.contractor.domain.vo.contractor.SubContractorVo; -import org.dromara.contractor.service.ISubContractorService; -import org.dromara.project.domain.dto.attendance.*; -import org.dromara.project.domain.dto.projectteam.BusProjectTeamQueryReq; -import org.dromara.project.domain.vo.attendance.*; -import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo; -import org.dromara.project.service.IBusProjectTeamService; -import org.dromara.system.domain.dto.FbUserListDto; -import org.dromara.system.domain.vo.SysUserVo; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.project.domain.vo.BusAttendanceVo; -import org.dromara.project.domain.bo.BusAttendanceBo; -import org.dromara.project.service.IBusAttendanceService; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.contractor.domain.dto.contractor.SubContractorQueryReq; +import org.dromara.contractor.domain.vo.contractor.SubContractorVo; +import org.dromara.contractor.service.ISubContractorService; +import org.dromara.project.domain.bo.BusAttendanceBo; +import org.dromara.project.domain.dto.attendance.*; +import org.dromara.project.domain.dto.projectteam.BusProjectTeamQueryReq; +import org.dromara.project.domain.vo.BusAttendanceVo; +import org.dromara.project.domain.vo.attendance.*; +import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo; +import org.dromara.project.service.IBusAttendanceService; +import org.dromara.project.service.IBusProjectTeamService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 考勤 @@ -92,7 +91,7 @@ public class BusAttendanceController extends BaseController { @SaCheckPermission("project:attendance:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable Long id) { return R.ok(busAttendanceService.queryById(id)); } @@ -138,6 +137,7 @@ public class BusAttendanceController extends BaseController { public R> getClockDateForTwoWeekList(TwoWeekDto dto) { return R.ok(busAttendanceService.getClockDateForTwoWeekList(dto)); } + /** * 查询项目施工人员当天考勤状况 */ @@ -150,8 +150,8 @@ public class BusAttendanceController extends BaseController { * 查询当天出勤人员 */ @GetMapping("/list/attendanceUser") - public TableDataInfo getTodayAttendanceUser(TodayUserDto dto, PageQuery pageQuery) { - return busAttendanceService.getTodayAttendanceUser(dto,pageQuery); + public TableDataInfo getTodayAttendanceUser(TodayUserDto dto, PageQuery pageQuery) { + return busAttendanceService.getTodayAttendanceUser(dto, pageQuery); } /** @@ -209,8 +209,8 @@ public class BusAttendanceController extends BaseController { * 查询分包当天出勤人员 */ @GetMapping("/sub/list/attendanceUser") - public TableDataInfo getSubTodayAttendanceUser(SubTodayUserDto dto, PageQuery pageQuery) { - return busAttendanceService.getSubTodayAttendanceUser(dto,pageQuery); + public TableDataInfo getSubTodayAttendanceUser(SubTodayUserDto dto, PageQuery pageQuery) { + return busAttendanceService.getSubTodayAttendanceUser(dto, pageQuery); } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java index 52bde677..d7db496a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java @@ -168,4 +168,9 @@ public class BusProject extends BaseEntity { */ private String position; + /** + * xzd项目id + */ + private Long xzdProjectId; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectCreateReq.java index 8d83f563..fa973bb3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectCreateReq.java @@ -140,4 +140,9 @@ public class BusProjectCreateReq implements Serializable { * 所属部门列表 */ private List deptIds; + + /** + * xzd项目id + */ + private Long xzdProjectId; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java index 8334204f..8c53f358 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java @@ -223,4 +223,9 @@ public class BusProjectVo implements Serializable { */ private List roleVos; + /** + * xzd项目id + */ + private Long xzdProjectId; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/rabbitmq/service/impl/MqDelayTaskServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/rabbitmq/service/impl/MqDelayTaskServiceImpl.java index 54bdfe83..46d9f292 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/rabbitmq/service/impl/MqDelayTaskServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/rabbitmq/service/impl/MqDelayTaskServiceImpl.java @@ -99,6 +99,7 @@ public class MqDelayTaskServiceImpl extends ServiceImpl userIds = hazardRuleNotifyObjectService.queryNotifyObjectIds(hiddenDanger.getDangerLevelId(), projectId); - SseMessageDto sseDto = new SseMessageDto(); - String title = "安全隐患工单[" + dangerCode + "]未进行整改,请及时关注!"; - for (Long userId : userIds) { + // 隐患等级 + HazardRule rule = hazardRuleService.getById(hiddenDanger.getDangerLevelId()); + String notifyMethod = rule.getNotifyMethod(); + if (notifyMethod.equals("1")) { + // 通知领导 + } else { + // 发送消息 + String dangerCode = hiddenDanger.getDangerCode(); + Long rectifyUserId = hiddenDanger.getRectifyUserId(); + Long projectId = hiddenDanger.getProjectId(); + String titleRectify = "您的安全隐患工单[" + dangerCode + "]已超时,请及时处理!"; try { - chatServerHandler.sendSystemMessageToUser(userId, title, "2"); + chatServerHandler.sendSystemMessageToUser(rectifyUserId, titleRectify, "2"); + SseMessageUtils.sendMessage(rectifyUserId, titleRectify); } catch (Exception e) { - log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", userId, title, e); + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", rectifyUserId, titleRectify, e); + } + // 发送给需要通知的对象 + Set userIds = hazardRuleNotifyObjectService.queryNotifyObjectIds(hiddenDanger.getDangerLevelId(), projectId); + SseMessageDto sseDto = new SseMessageDto(); + String title = "安全隐患工单[" + dangerCode + "]未进行整改,请及时关注!"; + for (Long userId : userIds) { + try { + chatServerHandler.sendSystemMessageToUser(userId, title, "2"); + } catch (Exception e) { + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", userId, title, e); + } + } + sseDto.setUserIds(userIds.stream().toList()); + sseDto.setMessage(title); + sseDto.setRoute(""); + sseDto.setProjectId(projectId); + sseDto.setIsRecord(true); + SseMessageUtils.publishMessage(sseDto); + // 重复整改 + if (notifyMethod.equals("2")) { + // 获取通知时间 + LocalDateTime executeTime = LocalDateTime.now(); + String responseUnit = rule.getResponseUnit(); + switch (responseUnit) { + case "3" -> executeTime = executeTime.plusDays(rule.getResponseTime()); + case "2" -> executeTime = executeTime.plusHours(rule.getResponseTime()); + case "1" -> executeTime = executeTime.plusMinutes(rule.getResponseTime()); + } + // 发送整改期限数据到消息队列 + MqDelayTask task = new MqDelayTask(); + task.setBizType(MqDelayTaskTypeEnum.HIDDEN_DANGER.getType()); + task.setBizId(bizId); + task.setExecuteTime(executeTime); + try { + mqDelayTaskService.addDelayTask(task); + } catch (Exception e) { + log.error("添加延迟任务失败,延迟任务: {}", task, e); + throw new ServiceException("添加延迟任务失败"); + } } } - sseDto.setUserIds(userIds.stream().toList()); - sseDto.setMessage(title); - sseDto.setRoute(""); - sseDto.setProjectId(projectId); - sseDto.setIsRecord(true); - SseMessageUtils.publishMessage(sseDto); } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java index 82e1b0ee..2d4eaac2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java @@ -1,7 +1,6 @@ package org.dromara.system.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.system.domain.SysDept; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.vo.SysDeptVo; @@ -60,13 +59,6 @@ public interface ISysDeptService { */ SysDeptVo selectDeptById(Long deptId); - /** - * 根据部门ID获取到顶级部门 - * - * @return 部门信息 - */ - SysDeptBo selectDeptByIdBo(Long deptId); - /** * 根据部门ID查询所属项目ID列表 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index 2153b337..0b0ebd47 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -35,7 +35,6 @@ import org.dromara.system.mapper.SysPostMapper; import org.dromara.system.mapper.SysRoleMapper; import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.service.ISysDeptService; -import org.dromara.system.service.ISysRoleService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Caching; @@ -60,8 +59,6 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { private final SysUserMapper userMapper; private final SysPostMapper postMapper; - private final ISysRoleService roleService; - /** * 查询部门管理数据 * @@ -220,16 +217,6 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { return dept; } - /** - * 根据部门ID获取到顶级部门 - * - * @return 部门信息 - */ - @Override - public SysDeptBo selectDeptByIdBo(Long deptId) { - return null; - } - /** * 根据部门ID查询所属项目ID列表 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java index 50b9f74d..fe0ddb5a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java @@ -1,7 +1,10 @@ package org.dromara.xzd.biddingManagement.biaoqianlixiang.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; @@ -9,19 +12,20 @@ import org.dromara.common.core.domain.event.ProcessTaskEvent; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBqlxProjectInfo; -import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdProjectRiskAssessment; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.bo.XzdBidPreProjectBo; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.bo.XzdBqlxProjectInfoBo; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.dto.BiddingManagementDto; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.dto.QuerBiddingManagementDto; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QuerListXzdBidPreVo; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QueryListXzdVo; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBqlxProjectInfoVo; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.mapper.XzdBidPreProjectMapper; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProjectService; import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBqlxProjectInfoService; import org.dromara.xzd.biddingManagement.biddingDocument.domain.XzdBiddingFileEstimate; import org.dromara.xzd.biddingManagement.biddingDocument.service.IXzdBiddingFileEstimateService; @@ -41,15 +45,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; -import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.bo.XzdBidPreProjectBo; -import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo; -import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject; -import org.dromara.xzd.biddingManagement.biaoqianlixiang.mapper.XzdBidPreProjectMapper; -import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProjectService; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -69,7 +66,6 @@ public class XzdBidPreProjectServiceImpl extends ServiceImpl(XzdBqlxProjectInfo.class).eq(XzdBqlxProjectInfo::getBidPreProjectId, id)); XzdBqlxProjectInfoVo res = new XzdBqlxProjectInfoVo(); - if (xzdBqlxProjectInfo != null){ + if (xzdBqlxProjectInfo != null) { BeanUtils.copyProperties(xzdBqlxProjectInfo, res); } querListXzdBidPreVo.setXzdBqlxProjectInfoVo(res); @@ -141,12 +135,12 @@ public class XzdBidPreProjectServiceImpl extends ServiceImpl list = baseMapper.queryPageListBy(bo,pageQuery.getPageSize()); - Integer res = baseMapper.queryPageListByNum(bo,pageQuery.getPageSize()); + List list = baseMapper.queryPageListBy(bo, pageQuery.getPageSize()); + Integer res = baseMapper.queryPageListByNum(bo, pageQuery.getPageSize()); queryListXzdVo.setList(list); @@ -203,19 +197,19 @@ public class XzdBidPreProjectServiceImpl extends ServiceImpl ids, Boolean isValid) { - if(isValid){ + if (isValid) { } for (Long id : ids) { @@ -285,7 +278,7 @@ public class XzdBidPreProjectServiceImpl extends ServiceImpl 0) throw new ServiceException("招标文件审估已引用,不允许删除"); //投标文件 - l = xzdBiddingDocumentService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdBiddingDocument::getProjectName, id)); + l = xzdBiddingDocumentService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdBiddingDocument::getProjectName, id)); if (l > 0) throw new ServiceException("投标文件已引用,不允许删除"); //投标保证金缴纳 @@ -305,23 +298,22 @@ public class XzdBidPreProjectServiceImpl extends ServiceImpl 0) throw new ServiceException("招标代理服务费支付申请已引用,不允许删除"); // 删除附件 - if (!StringUtils.isEmpty(xzdBidPreProjectVo.getFileId())){ - List collect = Arrays.stream(xzdBidPreProjectVo.getFileId().split(",")).map(item -> { - return Long.parseLong(item); - }).collect(Collectors.toList()); + if (!StringUtils.isEmpty(xzdBidPreProjectVo.getFileId())) { + List collect = Arrays.stream(xzdBidPreProjectVo.getFileId().split(",")).map(Long::parseLong).collect(Collectors.toList()); sysOssService.deleteWithValidByIds(collect, false); } // 删除项目信息 HashMap objectObjectHashMap = new HashMap<>(); - objectObjectHashMap.put("bid_pre_project_id",id); + objectObjectHashMap.put("bid_pre_project_id", id); iXzdBqlxProjectInfoService.removeByMap(objectObjectHashMap); } return baseMapper.deleteByIds(ids) > 0; } + /** * 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等) * 正常使用只需#processEvent.flowCode=='leave1' @@ -329,7 +321,7 @@ public class XzdBidPreProjectServiceImpl extends ServiceImpl queryPageList(XzdProjectBo bo, PageQuery pageQuery) { - if(pageQuery.getPageNum() != null && pageQuery.getPageSize() != null) { + if (pageQuery.getPageNum() != null && pageQuery.getPageSize() != null) { bo.setPageNum(pageQuery.getPageNum()); bo.setPageSize(pageQuery.getPageSize()); - }else { + } else { bo.setPageNum(1); bo.setPageSize(10); } @@ -112,12 +119,12 @@ public class XzdProjectServiceImpl extends ServiceImpl ids = StringUtils.splitTo(ancestors, Convert::toLong); if (ids.size() == 2) { bo.setSsgs(deptVo.getDeptId()); - }else { + } else { bo.setSsgs(iSysDeptService.selectDeptById(ids.get(2)).getDeptId()); } } @@ -202,30 +209,30 @@ public class XzdProjectServiceImpl extends ServiceImpl ids = StringUtils.splitTo(ancestors, Convert::toLong); if (ids.size() == 2) { add.setSsgs(deptVo.getDeptId()); - }else { + } else { add.setSsgs(iSysDeptService.selectDeptById(ids.get(2)).getDeptId()); } } boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); - }else { + } else { return false; } //项目概况处理 - if (bo.getXmgk() != null){ + if (bo.getXmgk() != null) { bo.getXmgk().setXzdProjectId(add.getId()); xzdProjectProfileService.insertByBo(bo.getXmgk()); } //项目人员处理 - if (bo.getXmry() != null && !bo.getXmry().isEmpty()){ + if (bo.getXmry() != null && !bo.getXmry().isEmpty()) { for (XzdProjectPersonnelBo personnelBo : bo.getXmry()) { personnelBo.setXzdProjectId(add.getId()); xzdProjectPersonnelService.insertByBo(personnelBo); @@ -233,19 +240,19 @@ public class XzdProjectServiceImpl extends ServiceImpl 0; - if (!b){ + if (!b) { return false; } //项目概况处理 - if (bo.getXmgk() != null){ + if (bo.getXmgk() != null) { xzdProjectProfileService.updateByBo(bo.getXmgk()); } //项目人员处理 - if (bo.getXmry() != null && !bo.getXmry().isEmpty()){ + if (bo.getXmry() != null && !bo.getXmry().isEmpty()) { // 获取原有记录的ID列表 if (oldValue.getXmry() != null && !oldValue.getXmry().isEmpty()) { @@ -323,9 +330,9 @@ public class XzdProjectServiceImpl extends ServiceImpl now = new ArrayList<>(); for (XzdProjectWarehousesBo boValue : bo.getXmck()) { - if (boValue.getId() == null){ + if (boValue.getId() == null) { boValue.setXzdProjectId(update.getId()); } XzdProjectWarehouses temp = new XzdProjectWarehouses(); @@ -373,9 +380,9 @@ public class XzdProjectServiceImpl extends ServiceImpl now = new ArrayList<>(); for (XzdProjectInternalAccountsBo boValue : bo.getNbzj()) { - if (boValue.getId() == null){ + if (boValue.getId() == null) { boValue.setXzdProjectId(update.getId()); } XzdProjectInternalAccounts temp = new XzdProjectInternalAccounts(); @@ -412,9 +419,9 @@ public class XzdProjectServiceImpl extends ServiceImpl now = new ArrayList<>(); for (XzdProjectParticipatingUnitsBo boValue : bo.getCjdw()) { - if (boValue.getId() == null){ + if (boValue.getId() == null) { boValue.setXzdProjectId(update.getId()); } XzdProjectParticipatingUnits temp = new XzdProjectParticipatingUnits(); @@ -451,9 +458,9 @@ public class XzdProjectServiceImpl extends ServiceImpl ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } @@ -549,7 +556,7 @@ public class XzdProjectServiceImpl extends ServiceImpl profileLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -627,7 +634,7 @@ public class XzdProjectServiceImpl extends ServiceImpl