活动管理优化2

王言钊
1 parent befde78d
Showing 3 changed files with 11 additions and 9 deletions
src/main/java/com/cnlive/shenhe/controller/ShyActivityController.java
src/main/java/com/cnlive/shenhe/serviceImpl/ShyActivityImpl.java
src/main/resources/templates/page/activity.html
@@ -63,12 +63,10 @@ public class ShyActivityController {
     }
  
     @GetMapping("/page")
-    public String getShyActivity(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, Model model, String activity, String exempt_from_trial) {
+    public String getShyActivity(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, Model model, String activity, Integer exempt_from_trial) {
         PageInfo<ShyActivity> shyActivityPageInfo = shyActivityImpl.selectByExample(pageNum, pageSize, activity, exempt_from_trial);
         List<ShyActivity> list = shyActivityPageInfo.getList();
-        for (ShyActivity shyActivity : list) {
-            model.addAttribute("shyActivity",shyActivity);
-        }
+        model.addAttribute("exempt_from_trial",exempt_from_trial);
         model.addAttribute("ShyActivitylist", shyActivityPageInfo);
         return "page/activity.html";
     }
@@ -72,7 +72,7 @@ public class ShyActivityImpl {
      * @param pageSize
      * @return
      */
-    public PageInfo<ShyActivity> selectByExample(Integer pageNum, Integer pageSize, String activity, String exempt_from_trial) {
+    public PageInfo<ShyActivity> selectByExample(Integer pageNum, Integer pageSize, String activity, Integer exempt_from_trial) {
         Example example = new Example(ShyActivity.class);
         //如果为空 按照倒序排序  分页查询所有
         //以创建时间为条件进行倒序
@@ -81,7 +81,7 @@ public class ShyActivityImpl {
         Example.Criteria criteria = example.createCriteria();
  
         // 如果查询条件不为空  按照条件走模糊查询
-        if (CommonUtils.isNotEmpty(exempt_from_trial)) {
+        if (exempt_from_trial != null) {
             criteria.andLike("exempt_from_trial", "%" + exempt_from_trial + "%");
         }
         // 如果查询条件不为空  按照条件走模糊查询
@@ -118,9 +118,9 @@
                                     <div class="col-sm-7" style="padding: 0;">
                                         <select class="form-control" id="exempt_from_trial_query"
                                                 name="exempt_from_trial">
-                                            <option value="" th:selected="selected">--全部审免类型--</option>
-                                            <option value="0" name="未审核" th:selected="${shyActivity.exempt_from_trial}==0" >未审免</option>
-                                            <option value="1" name="已经审核" th:selected="${shyActivity.exempt_from_trial}==1" >已经审免</option>
+                                            <option value="">--全部审免类型--</option>
+                                            <option value="0" name="未审核" th:selected="${exempt_from_trial ==0}" >未审免</option>
+                                            <option value="1" name="已经审核" th:selected="${exempt_from_trial ==1}" >已经审免</option>
                                         </select>
                                     </div>
                                 </div>
@@ -364,6 +364,7 @@
     </div>
  
     <script>
+
         // 添加事件
         function submitAdd() {
             var id1 = $("#id1").val();
@@ -480,9 +481,12 @@
         }
  
         //搜索事件
+        //  $("#exempt_from_trial_query").val("").selected = true;
+
         $('#QueryAll').click(function () {
             var activity = $("#activity_query").val();
             var exempt_from_trial = $("#exempt_from_trial_query").val();
+            // exempt_from_trial.selected = true;
             var pageSize = $("#pageSize").val();
             window.location.href = "/activity/page?activity=" + activity + "&exempt_from_trial=" + exempt_from_trial + "&pageSize=" + pageSize;
         });