修改bug

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/template/EnforceTemplateHandbookServiceImpl.java

@@ -38,14 +38,13 @@ import java.util.stream.Collectors;
 
 /**
  * 执法监督检查项详情Service业务层处理
- * 
+ *
  * @author mxkj
  * @date 2022-12-06
  */
 @Service
 @Slf4j
-public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTemplateHandbookMapper, EnforceTemplateHandbook> implements IEnforceTemplateHandbookService
-{
+public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTemplateHandbookMapper, EnforceTemplateHandbook> implements IEnforceTemplateHandbookService {
 
     @Autowired
     private EnforceTemplateHandbookProblemMapper enforceTemplateHandbookProblemMapper;
@@ -58,6 +57,7 @@ public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTempl
 
     /**
      * 执法监督检查项详情
+     *
      * @param itemId itemId
      * @return List<EnforceTemplateHandbookDTO>
      */
@@ -66,11 +66,11 @@ public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTempl
         List<EnforceTemplateHandbook> enforceTemplateHandbooks = baseMapper.selectList(new QueryWrapper<EnforceTemplateHandbook>().lambda()
                 .in(EnforceTemplateHandbook::getId, itemId).eq(EnforceTemplateHandbook::getIsDeleted, DeleteStatusEnum.NOT_DELETED.getStatus()));
         if (!StringUtils.isNotEmpty(enforceTemplateHandbooks)) {
-            log.info("流程副本:[{}]不存在！",itemId);
+            log.info("流程副本:[{}]不存在！", itemId);
             return null;
         }
         LambdaQueryWrapper<EnforceTemplateHandbookProblem> enforceTemplateHandbookProblemWrapper = new LambdaQueryWrapper<>();
-        enforceTemplateHandbookProblemWrapper.in(EnforceTemplateHandbookProblem::getItemHandbookId,itemId)
+        enforceTemplateHandbookProblemWrapper.in(EnforceTemplateHandbookProblem::getItemHandbookId, itemId)
                 .eq(EnforceTemplateHandbookProblem::getIsDeleted, DeleteStatusEnum.NOT_DELETED.getStatus());
         //所有检查项的常见问题
         List<EnforceTemplateHandbookProblem> enforceTemplateHandbookProblems = enforceTemplateHandbookProblemMapper.selectList(enforceTemplateHandbookProblemWrapper);
@@ -97,7 +97,7 @@ public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTempl
     @Override
     public void add(EnforceTemplateHandbookDTO dto) {
         EnforceTemplateHandbook entity = new EnforceTemplateHandbook();
-        BeanUtils.copyProperties(dto,entity);
+        BeanUtils.copyProperties(dto, entity);
         entity.setId(null);
         entity.setCreateTime(new Date());
         entity.setCreateUserId(null);
@@ -122,7 +122,7 @@ public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTempl
     @Override
     public void updateByDto(EnforceTemplateHandbookDTO dto) {
         EnforceTemplateHandbook entity = new EnforceTemplateHandbook();
-        BeanUtils.copyProperties(dto,entity);
+        BeanUtils.copyProperties(dto, entity);
         baseMapper.updateById(entity);
 
         // 先将旧的问题改成失效
@@ -131,7 +131,7 @@ public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTempl
         //重新插入问题列表
         List<EnforceTemplateHandbookProblemDTO> problems = dto.getProblems();
         if (CollectionUtils.isEmpty(problems)) {
-            return ;
+            return;
         }
         problems.forEach(e -> {
             e.setItemHandbookId(dto.getId());
@@ -145,57 +145,57 @@ public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTempl
     @Override
     public Optional<EnforceTemplateHandbookDTO> find(Long id) {
         EnforceTemplateHandbook enforceTemplateHandbook = baseMapper.selectById(id);
-        if (StringUtils.isNull(enforceTemplateHandbook) || enforceTemplateHandbook.getIsDeleted().equals(DeleteStatusEnum.DELETED.getStatus())){
+        if (StringUtils.isNull(enforceTemplateHandbook) || enforceTemplateHandbook.getIsDeleted().equals(DeleteStatusEnum.DELETED.getStatus())) {
             return Optional.empty();
         }
         EnforceTemplateHandbookDTO dto = new EnforceTemplateHandbookDTO();
-        BeanUtils.copyProperties(enforceTemplateHandbook,dto);
+        BeanUtils.copyProperties(enforceTemplateHandbook, dto);
         return Optional.of(dto);
     }
 
     /**
      * 新建流程模板副本信息
      *
-     * @param templateItemId 流程检查项id (required)
-     * @param enforceTemplateHandbookDTO  (optional)
+     * @param templateItemId             流程检查项id (required)
+     * @param enforceTemplateHandbookDTO (optional)
      * @return Created (status code 201)
      */
     @Override
     @Transactional
-    public int createJobHandbook(Long templateItemId, EnforceTemplateHandbookDTO enforceTemplateHandbookDTO,IEnforceTemplateService enforceTemplateService) {
+    public int createJobHandbook(Long templateItemId, EnforceTemplateHandbookDTO enforceTemplateHandbookDTO, IEnforceTemplateService enforceTemplateService) {
         add(enforceTemplateHandbookDTO);
 
         //更新自定义检查项
         EnforceTemplateNodeItemDTO enforceTemplateNodeItemDTO = new EnforceTemplateNodeItemDTO();
         enforceTemplateNodeItemDTO.setId(templateItemId);
         enforceTemplateNodeItemDTO.setItemId(enforceTemplateHandbookDTO.getId());
-        enforceTemplateService.putEnforceTemplateNodeItem(enforceTemplateNodeItemDTO.getId(),enforceTemplateNodeItemDTO);
+        enforceTemplateService.putEnforceTemplateNodeItem(enforceTemplateNodeItemDTO.getId(), enforceTemplateNodeItemDTO);
         return 1;
     }
 
     /**
      * 查询流程模板副本信息详情
      *
-     * @param id  (required)
+     * @param id (required)
      * @return ok (status code 200)
      */
     @Override
     public EnforceTemplateHandbookDTO getJobHandbook(Long id) {
         Optional<EnforceTemplateHandbookDTO> poOptional = find(id);
         if (!poOptional.isPresent()) {
-            log.info("流程副本:[{}]不存在！",id);
+            log.info("流程副本:[{}]不存在！", id);
             return null;
         }
         EnforceTemplateHandbookDTO dto = poOptional.get();
 
         LambdaQueryWrapper<EnforceTemplateHandbookProblem> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(EnforceTemplateHandbookProblem::getItemHandbookId,dto.getId())
-                .eq(EnforceTemplateHandbookProblem::getIsDeleted,DeleteStatusEnum.NOT_DELETED.getStatus());
+        wrapper.eq(EnforceTemplateHandbookProblem::getItemHandbookId, dto.getId())
+                .eq(EnforceTemplateHandbookProblem::getIsDeleted, DeleteStatusEnum.NOT_DELETED.getStatus());
         List<EnforceTemplateHandbookProblem> problemList = enforceTemplateHandbookProblemMapper.selectList(wrapper);
-        if (StringUtils.isNotEmpty(problemList)){
+        if (StringUtils.isNotEmpty(problemList)) {
             dto.setProblems(problemList.stream().map(o -> {
                 EnforceTemplateHandbookProblemDTO d = new EnforceTemplateHandbookProblemDTO();
-                BeanUtils.copyProperties(o,d);
+                BeanUtils.copyProperties(o, d);
                 return d;
             }).collect(Collectors.toList()));
         }
@@ -214,7 +214,7 @@ public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTempl
     public List<EnforceJobTemplateHandbookDTO> listJobHandbookSearch(Long jobId, JobHandbookListQuery query) {
         EnforceHandbookQuery enforceHandbookQuery = new EnforceHandbookQuery();
         //todo 参数？？？
-        BeanUtils.copyProperties(query,enforceHandbookQuery);
+        BeanUtils.copyProperties(query, enforceHandbookQuery);
         final List<EnforceHandbookDTO> list = enforceHandbookService.getEnforceHandbooks(enforceHandbookQuery);
 
         //搜索当前任务已经创建的检查项
@@ -222,21 +222,21 @@ public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTempl
         enforceJobTemplateHandbookQuery.setJobId(jobId);
         List<EnforceJobTemplateHandbookDTO> enforceJobTemplateHandbookList = enforceJobTemplateHandbookService.pageListEnforceJobTemplateHandbook(enforceJobTemplateHandbookQuery);
 
-        if(CollectionUtils.isEmpty(list) && CollectionUtils.isEmpty(enforceJobTemplateHandbookList)){
+        if (CollectionUtils.isEmpty(list) && CollectionUtils.isEmpty(enforceJobTemplateHandbookList)) {
             return Collections.emptyList();
         }
 
-        if(CollectionUtils.isEmpty(list)){
+        if (CollectionUtils.isEmpty(list)) {
             return enforceJobTemplateHandbookList;
         }
 
         List<EnforceJobTemplateHandbookDTO> enforceJobTemplateHandbookDTOS = enforceJobTemplateHandbookList.stream().map(o -> {
             EnforceJobTemplateHandbookDTO enforceJobTemplateHandbookDTO = new EnforceJobTemplateHandbookDTO();
-            BeanUtils.copyProperties(o,enforceJobTemplateHandbookDTO);
+            BeanUtils.copyProperties(o, enforceJobTemplateHandbookDTO);
             return enforceJobTemplateHandbookDTO;
         }).collect(Collectors.toList());
 
-        if(CollectionUtils.isEmpty(enforceJobTemplateHandbookList)){
+        if (CollectionUtils.isEmpty(enforceJobTemplateHandbookList)) {
             return enforceJobTemplateHandbookDTOS;
         }
         enforceJobTemplateHandbookList.addAll(enforceJobTemplateHandbookDTOS);
@@ -246,7 +246,7 @@ public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTempl
     /**
      * 分页查询流程模板副本信息
      *
-     * @param query  (optional)
+     * @param query (optional)
      * @return ok (status code 200)
      */
     @Override
@@ -302,7 +302,7 @@ public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTempl
 
         List<EnforceJobTemplateHandbookDTO> enforceJobTemplateHandbookDTOS = handbooks.stream().map(o -> {
             EnforceJobTemplateHandbookDTO enforceJobTemplateHandbookDTO = new EnforceJobTemplateHandbookDTO();
-            BeanUtils.copyProperties(o,enforceJobTemplateHandbookDTO);
+            BeanUtils.copyProperties(o, enforceJobTemplateHandbookDTO);
             enforceJobTemplateHandbookDTO.setHandbookId(o.getId());
             enforceJobTemplateHandbookDTO.setNodeType(o.getNodeType());
             enforceJobTemplateHandbookDTO.setSort(Long.valueOf(o.getSort()));
@@ -391,15 +391,15 @@ public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTempl
     /**
      * 更新流程模板副本信息详情
      *
-     * @param id  (required)
-     * @param enforceTemplateHandbookDTO  (optional)
+     * @param id                         (required)
+     * @param enforceTemplateHandbookDTO (optional)
      * @return Success (status code 200)
      */
     @Override
     @Transactional
     public int updateJobHandbook(Long id, EnforceTemplateHandbookDTO enforceTemplateHandbookDTO) {
         Optional<EnforceTemplateHandbookDTO> optional = find(id);
-        if (!optional.isPresent()){
+        if (!optional.isPresent()) {
             throw new ServiceException("数据不存在！");
         }
         updateByDto(enforceTemplateHandbookDTO);
@@ -408,9 +408,12 @@ public class EnforceTemplateHandbookServiceImpl extends ServiceImpl<EnforceTempl
 
     private void saveProblems(EnforceTemplateHandbookProblemDTO dto) {
         EnforceTemplateHandbookProblem entity = new EnforceTemplateHandbookProblem();
-        BeanUtils.copyProperties(dto,entity);
-
-        enforceTemplateHandbookProblemMapper.insert(entity);
+        BeanUtils.copyProperties(dto, entity);
+        if (Objects.isNull(entity.getId())){
+            enforceTemplateHandbookProblemMapper.insert(entity);
+        }else {
+            enforceTemplateHandbookProblemMapper.updateById(entity);
+        }
     }
 
     private String checkOptions(String result, String option) {