张延森 4 years ago
parent
commit
1c45d2b042

+ 7
- 2
src/main/java/com/yunzhi/liyuanhui/controller/TaActivityController.java View File

5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.yunzhi.liyuanhui.common.BaseController;
6
 import com.yunzhi.liyuanhui.common.BaseController;
7
 import com.yunzhi.liyuanhui.common.ResponseBean;
7
 import com.yunzhi.liyuanhui.common.ResponseBean;
8
+import com.yunzhi.liyuanhui.common.StringUtils;
8
 import org.slf4j.Logger;
9
 import org.slf4j.Logger;
9
 import org.slf4j.LoggerFactory;
10
 import org.slf4j.LoggerFactory;
10
 import org.springframework.beans.factory.annotation.Autowired;
11
 import org.springframework.beans.factory.annotation.Autowired;
45
     @RequestMapping(value="/admin/activity",method= RequestMethod.GET)
46
     @RequestMapping(value="/admin/activity",method= RequestMethod.GET)
46
     public ResponseBean taActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
     public ResponseBean taActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
48
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
48
-                                       @RequestParam(value ="typeId", required = false) Integer typeId) throws Exception{
49
+                                       @RequestParam(value ="typeId", required = false) Integer typeId,
50
+                                       @RequestParam(value ="name", required = false) String name,
51
+                                       @RequestParam(value ="status", required = false) Integer status) throws Exception{
49
 
52
 
50
         IPage<TaActivity> pg = new Page<>(pageNum, pageSize);
53
         IPage<TaActivity> pg = new Page<>(pageNum, pageSize);
51
         QueryWrapper<TaActivity> queryWrapper = new QueryWrapper<>();
54
         QueryWrapper<TaActivity> queryWrapper = new QueryWrapper<>();
52
         queryWrapper.eq(null != typeId, "type_id", typeId);
55
         queryWrapper.eq(null != typeId, "type_id", typeId);
56
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
57
+        queryWrapper.eq(null != status, "status", status);
53
         queryWrapper.orderByDesc("weight, create_date");
58
         queryWrapper.orderByDesc("weight, create_date");
54
 
59
 
55
         IPage<TaActivity> result = iTaActivityService.page(pg, queryWrapper);
60
         IPage<TaActivity> result = iTaActivityService.page(pg, queryWrapper);
92
      * @param taActivity 实体对象
97
      * @param taActivity 实体对象
93
      * @return
98
      * @return
94
      */
99
      */
95
-    @RequestMapping(value="/taActivity/{id}",method= RequestMethod.PUT)
100
+    @RequestMapping(value="/admin/activity/{id}",method= RequestMethod.PUT)
96
     public ResponseBean taActivityUpdate(@PathVariable Integer id,
101
     public ResponseBean taActivityUpdate(@PathVariable Integer id,
97
                                         @RequestBody TaActivity taActivity) throws Exception{
102
                                         @RequestBody TaActivity taActivity) throws Exception{
98
 
103
 

+ 4
- 0
src/main/resources/application.yml View File

40
 spring:
40
 spring:
41
   application:
41
   application:
42
     name: liyuanhui
42
     name: liyuanhui
43
+  servlet:
44
+    multipart:
45
+      max-file-size: 10MB
46
+      max-request-size: 10MB
43
   profiles:
47
   profiles:
44
     active: @profileActive@
48
     active: @profileActive@
45
 
49