Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -34,6 +34,14 @@ public class SysNoticeController extends BaseController {
     public TableDataInfo<SysNotice> list(SysNotice notice, PageQuery pageQuery) {
         return noticeService.selectPageNoticeList(notice, pageQuery);
     }
+    /**
+     * 获取通知公告列表App
+     */
+    @SaCheckPermission("system:notice:list")
+    @GetMapping("/listApp")
+    public TableDataInfo<SysNotice> selectPageNoticeListApp(SysNotice notice, PageQuery pageQuery) {
+        return noticeService.selectPageNoticeListApp(notice, pageQuery);
+    }
 
     /**
      * 根据通知公告编号获取详细信息

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java

@@ -15,6 +15,7 @@ public interface ISysNoticeService {
 
 
     TableDataInfo<SysNotice> selectPageNoticeList(SysNotice notice, PageQuery pageQuery);
+    TableDataInfo<SysNotice> selectPageNoticeListApp(SysNotice notice, PageQuery pageQuery);
 
     /**
      * 查询公告信息

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java

@@ -31,6 +31,24 @@ public class SysNoticeServiceImpl implements ISysNoticeService {
             .like(StringUtils.isNotBlank(notice.getNoticeTitle()), SysNotice::getNoticeTitle, notice.getNoticeTitle())
             .eq(StringUtils.isNotBlank(notice.getNoticeType()), SysNotice::getNoticeType, notice.getNoticeType())
             .like(StringUtils.isNotBlank(notice.getCreateBy()), SysNotice::getCreateBy, notice.getCreateBy());
+        lqw.orderByDesc(SysNotice::getCreateTime);
+        Page<SysNotice> page = baseMapper.selectPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(page);
+    }
+
+    @Override
+    public TableDataInfo<SysNotice> selectPageNoticeListApp(SysNotice notice, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysNotice> lqw = new LambdaQueryWrapper<SysNotice>();
+        String str = "3";
+        if (StringUtils.isNotBlank(notice.getNoticeType()) && str.equals(notice.getNoticeType())) {
+            lqw.eq(SysNotice::getNoticeType, str);
+        }
+        String[] arr = {"1", "2"};
+        List<String> list = Arrays.asList(arr);
+        if (StringUtils.isNotBlank(notice.getNoticeType()) && list.contains(notice.getNoticeType())) {
+            lqw.in(SysNotice::getNoticeType, list);
+        }
+        lqw.orderByDesc(SysNotice::getCreateTime);
         Page<SysNotice> page = baseMapper.selectPage(pageQuery.build(), lqw);
         return TableDataInfo.build(page);
     }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringIndustryBo.java

@@ -117,4 +117,14 @@ public class ZEngineeringIndustryBo extends BaseEntity {
     public void setzEngineeringNodeBo(ZEngineeringNodeBo zEngineeringNodeBo) {
         this.zEngineeringNodeBo = zEngineeringNodeBo;
     }
+
+    private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+
+    public List<ZEngineeringNodeBo> getzEngineeringNodeBoList() {
+        return zEngineeringNodeBoList;
+    }
+
+    public void setzEngineeringNodeBoList(List<ZEngineeringNodeBo> zEngineeringNodeBoList) {
+        this.zEngineeringNodeBoList = zEngineeringNodeBoList;
+    }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -250,9 +250,12 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 photoService.insertBatch(list);
             }
         }
-        bo.getzEngineeringNodeBo().setCivliId(bo.getId());
-        bo.getzEngineeringNodeBo().setType(bo.getType());
-        izEngineeringNodeService.update(bo.getzEngineeringNodeBo());
+        bo.getzEngineeringNodeBoList().stream().forEach(item->{
+            item.setCivliId(bo.getId());
+            item.setCreateTime(bo.getCreateTime());
+            item.setType(bo.getType());
+            izEngineeringNodeService.updateMuch(item);
+        });
         return flag;
     }
 
@@ -269,9 +272,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if (isValid) {
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
+
         ids.forEach(item -> {
             // 查询数据库中已存在的文件列表
             ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringNodeServiceImpl.java

@@ -297,7 +297,9 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringNode::getId,bo.getId());
         ZEngineeringNode zEngineeringNode=baseMapper.selectOne(lqw);
         ZEngineeringNodeBo zEngineeringNodeBo = BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
-        izEngineeringInfoService.delete(zEngineeringNodeBo);
+        if (zEngineeringNodeBo != null) {
+            izEngineeringInfoService.delete(zEngineeringNodeBo);
+        }
         return baseMapper.deleteById(bo.getId()) > 0;
     }