gongdecai 3 vuotta sitten
vanhempi
commit
c45fbf39d2

+ 3 - 1
winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -14,7 +14,7 @@ spring:
     serialization:
       write_dates_as_timestamps: false
   profiles:
-    active: prod
+    active: local
   resources:
     static-locations: file:///winsea/static/
   thymeleaf:
@@ -142,6 +142,8 @@ auth:
     - /biInfoController/*
     - /login/**/*
     - /login/*
+    - /hyPublicConsultation/**/*
+    - /hyPublicConsultation/*
   expire-in: 2592000
   login-url: /login.html
   logout-url: /auth/api/logout

+ 12 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/HyPublicConsultationController.java

@@ -10,6 +10,9 @@ import com.yh.saas.plugin.yiliangyiyun.service.INewsInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 公告公示咨询 前端控制器
@@ -36,6 +39,15 @@ public class HyPublicConsultationController {
     public Page<HyPublicConsultation> selectHyPublicConsultation(HyPublicConsultation publicConsultation) {
         return publicConsultationService.selectHyPublicConsultation(publicConsultation);
     }
+    /**
+     * 首页
+     *
+     * @return
+     */
+    @GetMapping("/selectHyPublicConsultationList")
+    public HyPublicConsultation selectHyPublicConsultationList() {
+        return publicConsultationService.selectHyPublicConsultationList();
+    }
 
     /**
      * 添加

+ 16 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyPublicConsultation.java

@@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -93,6 +94,21 @@ public class HyPublicConsultation extends BaseModel<HyPublicConsultation> {
      */
     @TableField(exist = false)
     private String searchType;
+    /**
+     * 集合
+     */
+    @TableField(exist = false)
+    private List<HyPublicConsultation> publicConsultations;
+    /**
+     * 集合
+     */
+    @TableField(exist = false)
+    private List<HyPublicConsultation> publicConsultations1;
+    /**
+     * 集合
+     */
+    @TableField(exist = false)
+    private List<HyPublicConsultation> publicConsultations2;
 
     @Override
     protected Serializable pkVal() {

+ 5 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IHyPublicConsultationService.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.HyPublicConsultation;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 公告公示咨询 服务类
@@ -24,4 +27,6 @@ public interface IHyPublicConsultationService extends IService<HyPublicConsultat
     Page<HyPublicConsultation> selectHyPublicConsultation(HyPublicConsultation publicConsultation);
 
     void delete(String id);
+
+    HyPublicConsultation selectHyPublicConsultationList();
 }

+ 23 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyPublicConsultationServiceImpl.java

@@ -150,6 +150,29 @@ public class HyPublicConsultationServiceImpl extends ServiceImpl<HyPublicConsult
     }
 
 
+    /**
+     * 列表
+     * @return
+     */
+    @Override
+    public HyPublicConsultation selectHyPublicConsultationList() {
+        Map<String, Object> pageView = new HashMap<>(7);
+        pageView.put("pageSize", 5);
+        pageView.put("currentPage", 1);
+        pageView.put("searchType", "公告");
+        List<HyPublicConsultation> dataList = baseMapper.getListByCondition(pageView);
+        pageView.put("searchType", "资讯");
+        List<HyPublicConsultation> dataList1 = baseMapper.getListByCondition(pageView);
+        pageView.put("searchType", "公示");
+        List<HyPublicConsultation> dataList2 = baseMapper.getListByCondition(pageView);
+        HyPublicConsultation publicConsultation = new HyPublicConsultation();
+        publicConsultation.setPublicConsultations(dataList);
+        publicConsultation.setPublicConsultations1(dataList1);
+        publicConsultation.setPublicConsultations2(dataList2);
+        return publicConsultation;
+    }
+
+
     /**
      * 删除
      *