Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemFireHazardsNoticeController.java

@@ -39,10 +39,10 @@ public class DemFireHazardsNoticeController {
      * @return
      */
     @GetMapping("hazardsNoticeList")
-    public ApiResult<CommonPage<DemFireHazardsNotice>> hazardsNoticeList(@RequestParam(value = "pageNum", required = false,
-            defaultValue = "1") Integer pageNum,
+    public ApiResult<CommonPage<DemFireHazardsNotice>> hazardsNoticeList(@RequestParam(value = "listingLevel",required = false) Integer listingLevel,
+                                                                         @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                                          @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(demFireHazardsNoticeService.hazardsNoticeList(pageNum, pageSize));
+        return ApiResult.success(demFireHazardsNoticeService.hazardsNoticeList(listingLevel,pageNum, pageSize));
     }
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemFireHazardsNotice.java

@@ -387,6 +387,11 @@ public class DemFireHazardsNotice implements Serializable {
      */
     private String spbid;
 
+    /**
+     * 挂牌级别（1、市级 2、区级）
+     */
+    private Integer listingLevel;
+
     /**
      * unionKey
      */

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemFireHazardsNoticeService.java

@@ -22,7 +22,7 @@ public interface DemFireHazardsNoticeService extends CrudService<DemFireHazardsN
      * @param pageNum      当前页
      * @param pageSize     每页条数
      */
-    CommonPage<DemFireHazardsNotice> hazardsNoticeList(Integer pageNum, Integer pageSize);
+    CommonPage<DemFireHazardsNotice> hazardsNoticeList(Integer listingLevel, Integer pageNum, Integer pageSize);
 
     List<Map<String, Object>> hazardsNoticeStatistic();
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFireHazardsNoticeServiceImpl.java

@@ -36,12 +36,13 @@ public class DemFireHazardsNoticeServiceImpl extends AbstractCrudService<DemFire
     private DemFireHazardsCancellationService demFireHazardsCancellationService;
 
     @Override
-    public CommonPage<DemFireHazardsNotice> hazardsNoticeList(Integer pageNum, Integer pageSize) {
+    public CommonPage<DemFireHazardsNotice> hazardsNoticeList(Integer listingLevel, Integer pageNum, Integer pageSize) {
         IPage<DemFireHazardsNotice> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DemFireHazardsNotice> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DemFireHazardsNotice::getUserDesignId,DemFireHazardsNotice::getCompanyName,
                 DemFireHazardsNotice::getCheckTime,DemFireHazardsNotice::getOrderCorrectTime,
                 DemFireHazardsNotice::getContent,DemFireHazardsNotice::getBookNum)
+                .eq(listingLevel != null, DemFireHazardsNotice::getListingLevel,listingLevel)
                 .eq(DemFireHazardsNotice::getDeleteFlag,0);
         page = this.page(page, queryWrapper);
         if (page.getTotal() > 0) {

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemFireHazardsNoticeMapper.xml

@@ -77,6 +77,7 @@
         <result column="jgjc" property="jgjc" />
         <result column="spbid" property="spbid" />
         <result column="union_key" property="unionKey" />
+        <result column="listing_level" property="listingLevel" />
     </resultMap>
 
 </mapper>