huwhois 5 gadi atpakaļ
vecāks
revīzija
a361b49b30

+ 3 - 8
src/main/java/io/renren/modules/admin/controller/MeetingController.java

@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
19 19
import org.springframework.web.bind.annotation.RequestParam;
20 20
import org.springframework.web.bind.annotation.RestController;
21 21

22
import java.util.Arrays;
22 23
import java.util.Date;
23 24
import java.util.List;
24 25
import java.util.Map;
@ -266,17 +267,11 @@ public class MeetingController {
266 267
    /**
267 268
     * 删除
268 269
     */
269
    // @RequestMapping("/delete")
270
    // @RequiresPermissions("admin:meeting:delete")
271
    // public R delete(@RequestBody Long[] ids){
272
	// 	meetingService.removeByIds(Arrays.asList(ids));
273

274
    //     return R.ok();
275
    // }
276 270
    @PostMapping("/delete")
277 271
    @RequiresPermissions("admin:meeting:delete")
278 272
    public R delete(@RequestBody Long[] ids){
279
        meetingService.delete(ids);
273
		meetingService.removeByIds(Arrays.asList(ids));
274

280 275
        return R.ok();
281 276
    }
282 277


+ 4 - 4
src/main/java/io/renren/modules/admin/entity/MeetingEntity.java

@ -73,6 +73,10 @@ public class MeetingEntity implements Serializable {
73 73
	 * 会议负责人
74 74
	 */
75 75
	private String serviceEmp;
76
	/**
77
	 * 会议负责人ids
78
	 */
79
	private Long serviceIds;
76 80
	/**
77 81
	 * 线上报名截止时间
78 82
	 */
@ -85,10 +89,6 @@ public class MeetingEntity implements Serializable {
85 89
	 * 会议介绍
86 90
	 */
87 91
	private String introduction;
88
	/**
89
	 * 举办单位id
90
	 */
91
	private Long paperRequireId;
92 92
	/**
93 93
	 * 创建时间
94 94
	 */

+ 1 - 6
src/main/java/io/renren/modules/admin/service/MeetingService.java

@ -17,16 +17,11 @@ public interface MeetingService extends IService<MeetingEntity> {
17 17

18 18
	PageUtils queryPage(Map<String, Object> params);
19 19
	
20
		/**
20
	/**
21 21
	 * 	带单位分页
22 22
	 */
23 23
	PageUtils queryList(int page, int limit, String key);
24 24

25
    /**
26
	 * 删除用户(逻辑删除)
27
	 */
28
	void delete(Long[] ids);
29

30 25
	/**
31 26
	 * 更新审核状态
32 27
	 * @param id

+ 1 - 12
src/main/java/io/renren/modules/admin/service/impl/MeetingServiceImpl.java

@ -30,25 +30,14 @@ public class MeetingServiceImpl extends ServiceImpl<MeetingDao, MeetingEntity> i
30 30

31 31
    @Override
32 32
    public PageUtils queryList(int page, int limit, String key) {
33
        // System.out.println(page);
34
        // System.out.println(limit);
35
        // System.out.println(key);
36 33
        List<Map<String, Object>> mList=baseMapper.queryCN(page, limit, key, key);
37 34
        Integer mc = baseMapper.queryCNCOUNTS(key, key);
38 35

39 36
        return new PageUtils(mList, mc, limit, page);
40 37
    }
41 38

42
    // 删除用户(逻辑删除)
43
    @Override
44
    public void delete(Long[] ids) {
45
        baseMapper.deleteBatchIds(Arrays.asList(ids));
46
    }
47

48 39
    @Override
49 40
    public int updateStatus(Long id, Integer isCheck) {
50
        int itemp = baseMapper.updateStatus(id, isCheck);
51
        return itemp;
52
        // @Update("update member set is_check=#{is_check}  where id = #{id}")
41
        return  baseMapper.updateStatus(id, isCheck);
53 42
    }
54 43
}