huwhois 4 years ago
parent
commit
b61536a289

+ 79 - 0
src/main/java/io/renren/modules/admin/controller/OrganizationController.java

@ -0,0 +1,79 @@
1
package io.renren.modules.admin.controller;
2
3
import java.util.Arrays;
4
import java.util.List;
5
import java.util.Map;
6
7
import org.apache.shiro.authz.annotation.RequiresPermissions;
8
import org.springframework.beans.factory.annotation.Autowired;
9
import org.springframework.web.bind.annotation.GetMapping;
10
import org.springframework.web.bind.annotation.PathVariable;
11
import org.springframework.web.bind.annotation.RequestBody;
12
import org.springframework.web.bind.annotation.RequestMapping;
13
import org.springframework.web.bind.annotation.RequestParam;
14
import org.springframework.web.bind.annotation.RestController;
15
16
import io.renren.modules.admin.entity.OrganizationEntity;
17
import io.renren.modules.admin.service.AttendersService;
18
import io.renren.modules.admin.service.OrganizationService;
19
import io.renren.common.utils.PageUtils;
20
import io.renren.common.utils.R;
21
22
23
24
/**
25
 * VIEW
26
 *
27
 * @author huwhois
28
 * @email huwhois@gmail.com
29
 * @date 2020-07-08 09:32:07
30
 */
31
@RestController
32
@RequestMapping("admin/organization")
33
public class OrganizationController {
34
    @Autowired
35
    private OrganizationService organizationService;
36
37
    /**
38
     * 列表
39
     */
40
    @GetMapping("/list")
41
    @RequiresPermissions("admin:organization:list")
42
    public R list(@RequestParam Map<String, Object> params){
43
        PageUtils page = organizationService.queryPage(params);
44
45
        return R.ok().put("page", page);
46
    }
47
48
    /**
49
     * 单位历届参会统计
50
     */
51
    @GetMapping("/prelist")
52
    @RequiresPermissions("admin:organization:list")
53
    public R previousList(@RequestParam Map<String, Object> params){
54
        if (!params.containsKey("organization")) {
55
            return R.error("单位名称不可为空");
56
        }
57
58
        String organization = (String) params.get("organization");
59
60
        List<OrganizationEntity>  list= organizationService.previousList(organization);
61
62
        return R.ok().put("list", list);
63
    }
64
65
    /**
66
     * 单位历届参会统计
67
     */
68
    @GetMapping("/attendlist")
69
    @RequiresPermissions("admin:organization:list")
70
    public R attendlist(@RequestParam Map<String, Object> params){
71
        if (!params.containsKey("organization")) {
72
            return R.error("单位名称不可为空");
73
        }
74
75
        PageUtils page= organizationService.attendList(params);
76
77
        return R.ok().put("page", page);
78
    }
79
}

+ 0 - 2
src/main/java/io/renren/modules/admin/controller/PaperController.java

@ -2,7 +2,6 @@ package io.renren.modules.admin.controller;
2 2
3 3
import java.util.Arrays;
4 4
import java.util.Date;
5
import java.util.List;
6 5
import java.util.Map;
7 6
8 7
import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -111,7 +110,6 @@ public class PaperController {
111 110
        paper.setTitle(paperForm.getTitle());
112 111
        paper.setUrl(paperForm.getUrl());
113 112
        paper.setType(paperForm.getType());
114
        System.out.println(paperForm.getStatus());
115 113
        paper.setStatus(0);
116 114
        paper.setMoney(paperForm.getMoney());
117 115
        paper.setTax(paperForm.getTax());

+ 0 - 2
src/main/java/io/renren/modules/admin/controller/ReportController.java

@ -25,7 +25,6 @@ import io.renren.common.utils.PageUtils;
25 25
import io.renren.common.utils.R;
26 26
27 27
28
29 28
/**
30 29
 * 报告管理
31 30
 *
@ -58,7 +57,6 @@ public class ReportController {
58 57
        return R.ok().put("page", page);
59 58
    }
60 59
61
62 60
    /**
63 61
     * 信息
64 62
     */

+ 32 - 0
src/main/java/io/renren/modules/admin/dao/OrganizationDao.java

@ -0,0 +1,32 @@
1
package io.renren.modules.admin.dao;
2
3
import io.renren.modules.admin.entity.OrganizationEntity;
4
import java.util.Map;
5
import java.util.List;
6
7
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
8
import org.apache.ibatis.annotations.Mapper;
9
import org.apache.ibatis.annotations.Select;
10
11
/**
12
 * VIEW
13
 * 
14
 * @author huwhois
15
 * @email huwhois@gmail.com
16
 * @date 2020-07-08 09:32:07
17
 */
18
@Mapper
19
public interface OrganizationDao extends BaseMapper<OrganizationEntity> {
20
21
    @Select("select `organization`,sum(`num`) as `total` from `organization` where `organization` like '%${key}%' group by `organization` limit #{offset}, #{limit};")
22
    List<Map<String, Object>> getPageList(String key, int offset, int limit);
23
    
24
    @Select("select count(*) from (select count(*) from `organization` where `organization` like '%${key}%' group by `organization`) as o;")
25
    int getCounts(String key);
26
27
    @Select("select `truename`,`phone`,`sex`,`position`,`email`,group_concat(`meeting`.`name`) as `previous` from `attendersview` join `meeting` on `attendersview`.`meeting_id`=`meeting`.`id`  where `organization`=#{organization} group by `truename` limit  #{offset}, #{limit};")
28
    List<Map<String, Object>> getPageAttendList(String organization, int offset, int limit);
29
30
    @Select("select count(*) from (select count(*) from `attendersview` join `meeting` on `attendersview`.`meeting_id`=`meeting`.`id`  where `organization`=#{organization} group by `truename`) as a;")
31
	int getAttendCounts(String organization);
32
}

+ 43 - 0
src/main/java/io/renren/modules/admin/entity/OrganizationEntity.java

@ -0,0 +1,43 @@
1
package io.renren.modules.admin.entity;
2
3
import com.baomidou.mybatisplus.annotation.TableId;
4
import com.baomidou.mybatisplus.annotation.TableName;
5
6
import java.io.Serializable;
7
import lombok.Data;
8
9
/**
10
 * VIEW
11
 * 
12
 * @author huwhois
13
 * @email huwhois@gmail.com
14
 * @date 2020-07-08 09:32:07
15
 */
16
@Data
17
@TableName("organization")
18
public class OrganizationEntity implements Serializable {
19
	private static final long serialVersionUID = 1L;
20
21
	/**
22
	 * 单位名称
23
	 */
24
	@TableId
25
	private String organization;
26
	/**
27
	 * 会议id
28
	 */
29
	private Long meetingId;
30
	/**
31
	 * 
32
	 */
33
	private Long num;
34
	/**
35
	 * 会议名称(中文)
36
	 */
37
	private String name;
38
	/**
39
	 * 
40
	 */
41
	private String mid;
42
43
}

+ 25 - 0
src/main/java/io/renren/modules/admin/service/OrganizationService.java

@ -0,0 +1,25 @@
1
package io.renren.modules.admin.service;
2
3
import com.baomidou.mybatisplus.extension.service.IService;
4
import io.renren.common.utils.PageUtils;
5
import io.renren.modules.admin.entity.OrganizationEntity;
6
7
import java.util.List;
8
import java.util.Map;
9
10
/**
11
 * VIEW
12
 *
13
 * @author huwhois
14
 * @email huwhois@gmail.com
15
 * @date 2020-07-08 09:32:07
16
 */
17
public interface OrganizationService extends IService<OrganizationEntity> {
18
19
    PageUtils queryPage(Map<String, Object> params);
20
21
    List<OrganizationEntity> previousList(String organization);
22
    
23
    PageUtils attendList(Map<String, Object> params);
24
}
25

+ 60 - 0
src/main/java/io/renren/modules/admin/service/impl/OrganizationServiceImpl.java

@ -0,0 +1,60 @@
1
package io.renren.modules.admin.service.impl;
2
3
import org.springframework.stereotype.Service;
4
5
import java.util.List;
6
import java.util.Map;
7
8
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
9
import com.baomidou.mybatisplus.core.metadata.IPage;
10
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
11
import io.renren.common.utils.PageUtils;
12
import io.renren.common.utils.Query;
13
14
import io.renren.modules.admin.dao.OrganizationDao;
15
import io.renren.modules.admin.entity.OrganizationEntity;
16
import io.renren.modules.admin.service.OrganizationService;
17
18
19
@Service("organizationService")
20
public class OrganizationServiceImpl extends ServiceImpl<OrganizationDao, OrganizationEntity> implements OrganizationService {
21
22
    @Override
23
    public PageUtils queryPage(Map<String, Object> params) {
24
        String key = (String)params.get("key");
25
        int page = params.containsKey("page") ? Integer.valueOf((String) params.get("page")) -1: 0;
26
        int limit =  params.containsKey("limit") ? Integer.valueOf((String) params.get("limit")) : 10;
27
        if (page < 0) {
28
            page = 0;
29
        }
30
        int offset = page * limit;
31
32
        List<Map<String, Object>> list = baseMapper.getPageList(key, offset, limit);
33
        int counts = baseMapper.getCounts(key);
34
35
        return new PageUtils(list, counts, limit, page+1);
36
    }
37
38
    @Override
39
    public List<OrganizationEntity> previousList(String organization) {
40
        List<OrganizationEntity> list = this.list(new QueryWrapper<OrganizationEntity>().eq("organization", organization));
41
        return list;
42
    }
43
44
    
45
    @Override
46
    public PageUtils attendList(Map<String, Object> params) {
47
        String organization = (String) params.get("organization");
48
        int page = params.containsKey("page") ? Integer.valueOf((String) params.get("page")) -1: 0;
49
        int limit =  params.containsKey("limit") ? Integer.valueOf((String) params.get("limit")) : 10;
50
        if (page < 0) {
51
            page = 0;
52
        }
53
        int offset = page * limit;
54
55
        List<Map<String, Object>> list = baseMapper.getPageAttendList(organization, offset, limit);
56
        int counts = baseMapper.getAttendCounts(organization);
57
58
        return new PageUtils(list, counts, limit, page+1);
59
    }
60
}

+ 2 - 1
src/main/java/io/renren/modules/admin/service/impl/ReportServiceImpl.java

@ -21,8 +21,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity> impl
21 21
    public PageUtils queryPage(Map<String, Object> params) {
22 22
        Long meetingId = Long.valueOf((String) params.get("meetingId"));
23 23
        String key = params.containsKey("key") ? (String) params.get("key") : null;
24
        Long bid = params.containsKey("bid") ? Long.valueOf((String) params.get("bid")) : 0;
24 25
        IPage<ReportEntity> page = this.page(new Query<ReportEntity>().getPage(params),
25
                new QueryWrapper<ReportEntity>().eq("meeting_id", meetingId)
26
                new QueryWrapper<ReportEntity>().eq("meeting_id", meetingId).eq(bid!=0L, "branch_id", bid)
26 27
                        .like(StringUtils.isNotBlank(key), "title", key).or()
27 28
                        .like(StringUtils.isNotBlank(key), "truename", key).or()
28 29
                        .like(StringUtils.isNotBlank(key), "organization", key));

+ 88 - 0
src/main/java/io/renren/modules/app/controller/AppPaperController.java

@ -0,0 +1,88 @@
1
package io.renren.modules.app.controller;
2
3
import java.util.Arrays;
4
import java.util.Date;
5
import java.util.Map;
6
7
import org.springframework.beans.factory.annotation.Autowired;
8
import org.springframework.web.bind.annotation.PostMapping;
9
import org.springframework.web.bind.annotation.RequestBody;
10
import org.springframework.web.bind.annotation.RequestMapping;
11
import org.springframework.web.bind.annotation.RestController;
12
13
import io.renren.common.utils.MyUtils;
14
import io.renren.common.utils.R;
15
import io.renren.modules.admin.entity.PaperEntity;
16
import io.renren.modules.admin.entity.PaperviewEntity;
17
import io.renren.modules.admin.entity.AttendersEntity;
18
import io.renren.modules.admin.entity.AttendersviewEntity;
19
import io.renren.modules.admin.entity.MemberEntity;
20
import io.renren.modules.admin.service.AttendersService;
21
import io.renren.modules.admin.service.AttendersviewService;
22
import io.renren.modules.admin.service.MemberService;
23
import io.renren.modules.admin.service.PaperService;
24
25
26
/**
27
 * 
28
 * @author chenshun
29
 * @email sunlightcs@gmail.com
30
 * @date 2020-02-12 10:52:23
31
 */
32
@RestController
33
@RequestMapping("app/paper")
34
public class AppPaperController {
35
    @Autowired
36
    private PaperService paperService;
37
    @Autowired
38
    private AttendersService attendersService;
39
    @Autowired
40
    private AttendersviewService attendersviewService;
41
    @Autowired
42
    private MemberService memberService;
43
44
45
    /**
46
     * 保存
47
     */
48
    @PostMapping("/save")
49
    public R save(@RequestBody PaperviewEntity paperForm){
50
        Long meetingId = paperForm.getMeetingId();
51
        if (meetingId == null || meetingId == 0L) {
52
            return R.error("会议id不可为空");
53
        }
54
55
        if (paperForm.getAttendersId()==null || paperForm.getAttendersId()==0L) {
56
            String symbol = MyUtils.md5(paperForm.getTruename() + paperForm.getPhone());
57
58
            AttendersviewEntity attendersview = attendersviewService.getBySymbolAndMid(symbol, meetingId);
59
            
60
            if (attendersview==null) {
61
                MemberEntity member = memberService.saveMember(paperForm.getTruename(), paperForm.getPhone(), paperForm.getOrganization(), null);
62
63
                Long memberId = member.getId();
64
                // 存参会信息 
65
                AttendersEntity attenders = new AttendersEntity();
66
                attenders.setMemberId(memberId);
67
                attenders.setMeetingId(meetingId);
68
                attendersService.save(attenders);
69
                paperForm.setAttendersId(attenders.getId());
70
            } else {
71
                paperForm.setAttendersId(attendersview.getId());
72
            }
73
        }
74
75
        PaperEntity paper = new PaperEntity();
76
        paper.setAttendersId(paperForm.getAttendersId());
77
        paper.setTitle(paperForm.getTitle());
78
        paper.setUrl(paperForm.getUrl());
79
        paper.setType(paperForm.getType());
80
        paper.setStatus(0);
81
        paper.setRemark(paperForm.getRemark());
82
        paper.setCreateTime(new Date());
83
84
        paperService.save(paper);
85
        
86
        return R.ok();
87
    }
88
}