通知轮播

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementInspectionProgramController.java

@@ -74,6 +74,18 @@ public class AppEnforcementInspectionProgramController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询执法检查计划通知和日常通知（APP首页）
+     */
+    @GetMapping("/queryNoticeList")
+    @ResponseBody
+    public TableDataInfo queryNoticeList(EnforcementInspectionProgram enforcementInspectionProgram)
+    {
+        List<EnforcementInspectionProgram> list =
+                enforcementInspectionProgramService.queryNoticeList(enforcementInspectionProgram);
+        return getDataTable(list);
+    }
+
     /**
      * 查询执法检查计划列表不分页
      */

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/NoticeMapper.xml

@@ -42,10 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND bureau_dept_names like concat('%', #{bureauDeptNames}, '%')
 			</if>
             <if test="beginTime != null and beginTime != ''">
-                AND DATE_FORMAT(create_time,'%Y-%m-%d')>=#{beginTime}
+                AND DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND #{endTime}>=DATE_FORMAT(create_time,'%Y-%m-%d')
+                AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime}
             </if>
 		</where>
     </select>

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java

@@ -99,6 +99,19 @@ public class EnforcementInspectionProgram extends BaseDomain
      */
     private String quarter;
 
+    /**
+     * 类型 0:计划通知 1：日常通知
+     */
+    private Integer type;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     /**
      * 文件对象
      */

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementInspectionProgramService.java

@@ -31,6 +31,7 @@ public interface IEnforcementInspectionProgramService
     List<EnforcementInspectionProgram> selectEnforcementInspectionProgramList(EnforcementInspectionProgram enforcementInspectionProgram);
     List<EnforcementInspectionProgram> selectEnforcementInspectionProgramListNoPermission(EnforcementInspectionProgram enforcementInspectionProgram);
 
+    List<EnforcementInspectionProgram> queryNoticeList(EnforcementInspectionProgram enforcementInspectionProgram);
     /**
      * 新增执法检查计划
      * 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java

@@ -1,16 +1,21 @@
 package com.zdxt.code.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
 import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.UserApi;
 import com.zdxt.auth.feign.ZdxtFileCommonApi;
+import com.zdxt.auth.project.system.notice.domain.Notice;
+import com.zdxt.auth.project.system.notice.mapper.NoticeMapper;
 import com.zdxt.code.domain.dto.EnforcementInspectionProgramDto;
 import com.zdxt.common.annotation.DataScope;
 import com.zdxt.common.util.DateUtils;
 import com.zdxt.common.zdxtFile.ZdxtFileCommon;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zdxt.code.mapper.EnforcementInspectionProgramMapper;
@@ -29,6 +34,9 @@ public class EnforcementInspectionProgramServiceImpl implements IEnforcementInsp
     @Autowired
     private EnforcementInspectionProgramMapper enforcementInspectionProgramMapper;
 
+    @Autowired
+    private NoticeMapper noticeMapper;
+
     @Autowired
     private ZdxtFileCommonApi zdxtFileCommonApi;
 
@@ -96,6 +104,37 @@ public class EnforcementInspectionProgramServiceImpl implements IEnforcementInsp
         return enforcementInspectionPrograms;
     }
 
+    @Override
+    public List<EnforcementInspectionProgram> queryNoticeList(EnforcementInspectionProgram enforcementInspectionProgram) {
+        List<EnforcementInspectionProgram> list = new ArrayList<>();
+        //计划通知
+        List<EnforcementInspectionProgram> enforcementInspectionPrograms =
+                enforcementInspectionProgramMapper.selectEnforcementInspectionProgramList(enforcementInspectionProgram);
+        if (CollectionUtils.isNotEmpty(enforcementInspectionPrograms)) {
+            list = enforcementInspectionPrograms.stream()
+                    .peek(i -> i.setType(0)).collect(Collectors.toList());
+        }
+        //日常通知
+        Notice notice = new Notice();
+        notice.setBeginTime(DateUtils.getPastTimes(7));
+        notice.setEndTime(DateUtils.dateTimeNow("yyyy-MM-dd"));
+
+        List<Notice> noticeList = noticeMapper.selectNoticeList(notice);
+        if (CollectionUtils.isNotEmpty(noticeList)) {
+            List<EnforcementInspectionProgram> collect = noticeList.stream().map(item -> {
+                EnforcementInspectionProgram program = new EnforcementInspectionProgram();
+                program.setId(item.getNoticeId());
+                program.setType(1);
+                program.setPlanName(item.getNoticeTitle());
+                program.setBureauDeptName(item.getBureauDeptNames());
+                return program;
+            }).collect(Collectors.toList());
+
+            list.addAll(collect);
+        }
+        return list;
+    }
+
     /**
      * 新增执法检查计划
      *