投稿要求,对公账户等接口修改

src/main/java/io/renren/modules/admin/controller/LectureController.java

@@ -86,9 +86,7 @@ public class LectureController {
    @PostMapping("/delete")
    @RequiresPermissions("admin:lecture:delete")
    public R delete(@RequestBody Long[] ids) {
        // lectureService.removeByIds(Arrays.asList(ids));
        BaseMapper<LectureEntity> lectureBaseMapper = lectureService.getBaseMapper();
        lectureBaseMapper.deleteBatchIds(Arrays.asList(ids));
        lectureService.removeByIds(Arrays.asList(ids));
        return R.ok();
    }

src/main/java/io/renren/modules/admin/controller/MoneyAccountController.java

@@ -7,6 +7,7 @@ import java.util.Date;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -55,6 +56,36 @@ public class MoneyAccountController {
        return R.ok().put("moneyAccount", moneyAccount);
    }
    /**
     * 根据meetingId信息
     */
    @RequestMapping("/infobymid/{mid}")
    @RequiresPermissions("admin:moneyaccount:info")
    public R infoByMid(@PathVariable("mid") Long mid){
		MoneyAccountEntity moneyAccount = moneyAccountService.getOneByMeetingId(mid);
        
        return R.ok().put("moneyAccount", moneyAccount);
    }
    /**
     * 添加or修改 moneyAccount
     * @param moneyAccount
     * @return
     */
    @PostMapping("addorupdate")
    @RequiresPermissions("admin:moneyaccount:save")
    public R addOrUpdate(@RequestBody MoneyAccountEntity moneyAccount){
        Long meetingId = moneyAccount.getMeetingId();
        String name = moneyAccount.getName();
        String bank = moneyAccount.getBank();
        String accout = moneyAccount.getAccount();
        Date createTime = new Date();
        System.out.println(meetingId);
         Integer rows = moneyAccountService.addOrUpdate(meetingId, name, bank, accout, createTime);
        return R.ok().put("rows", rows);
    }
    /**
     * 保存
     */

src/main/java/io/renren/modules/admin/controller/PaperRequireController.java

@@ -0,0 +1,94 @@
package io.renren.modules.admin.controller;
import java.util.Arrays;
import java.util.Date;
import java.util.Map;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
import io.renren.modules.admin.entity.PaperRequireEntity;
import io.renren.modules.admin.service.PaperRequireService;
/**
 * 投稿要求表
 *
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-03-16 11:02:40
 */
@RestController
@RequestMapping("admin/paperrequire")
public class PaperRequireController {
    @Autowired
    private PaperRequireService paperRequireService;
    /**
     * 列表
     */
    @RequestMapping("/list")
    @RequiresPermissions("admin:paperrequire:list")
    public R list(@RequestParam Map<String, Object> params){
        PageUtils page = paperRequireService.queryPage(params);
        return R.ok().put("page", page);
    }
    /**
     * 信息
     */
    @GetMapping("/info/{id}")
    @RequiresPermissions("admin:paperrequire:info")
    public R info(@PathVariable("id") Long id){
		PaperRequireEntity paperRequire = paperRequireService.getById(id);
        return R.ok().put("paperRequire", paperRequire);
    }
    /**
     * 保存
     */
    @PostMapping("/save")
    @RequiresPermissions("admin:paperrequire:save")
    public R save(@RequestBody PaperRequireEntity paperRequire){
        paperRequire.setCreateTime(new Date());
		paperRequireService.save(paperRequire);
        return R.ok();
    }
    /**
     * 修改
     */
    @PostMapping("/update")
    @RequiresPermissions("admin:paperrequire:update")
    public R update(@RequestBody PaperRequireEntity paperRequire){
		paperRequireService.updateById(paperRequire);
        return R.ok();
    }
    /**
     * 删除
     */
    @PostMapping("/delete")
    @RequiresPermissions("admin:paperrequire:delete")
    public R delete(@RequestBody Long[] ids){
		paperRequireService.removeByIds(Arrays.asList(ids));
        return R.ok();
    }
}

src/main/java/io/renren/modules/admin/controller/TypesOfFeeController.java

@@ -1,5 +1,6 @@
package io.renren.modules.admin.controller;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Map;
import java.util.Date;
@@ -9,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -35,7 +38,7 @@ public class TypesOfFeeController {
    /**
     * 列表
     */
    @RequestMapping("/list")
    @GetMapping("/list")
    @RequiresPermissions("admin:typesoffee:list")
    public R list(@RequestParam Map<String, Object> params){
        PageUtils page = typesOfFeeService.queryPage(params);
@@ -47,7 +50,7 @@ public class TypesOfFeeController {
    /**
     * 信息
     */
    @RequestMapping("/info/{id}")
    @GetMapping("/info/{id}")
    @RequiresPermissions("admin:typesoffee:info")
    public R info(@PathVariable("id") Long id){
		TypesOfFeeEntity typesOfFee = typesOfFeeService.getById(id);
@@ -58,9 +61,14 @@ public class TypesOfFeeController {
    /**
     * 保存
     */
    @RequestMapping("/save")
    @PostMapping("/save")
    @RequiresPermissions("admin:typesoffee:save")
    public R save(@RequestBody TypesOfFeeEntity typesOfFee){
        BigDecimal maxMoney = BigDecimal.valueOf(999999.99);
        if (typesOfFee.getMoney().compareTo(maxMoney) == 1) {
            return R.error("金额超出可使用范围");
        }
        typesOfFee.setCreateTime(new Date());
		typesOfFeeService.save(typesOfFee);
@@ -70,7 +78,7 @@ public class TypesOfFeeController {
    /**
     * 修改
     */
    @RequestMapping("/update")
    @PostMapping("/update")
    @RequiresPermissions("admin:typesoffee:update")
    public R update(@RequestBody TypesOfFeeEntity typesOfFee){
		typesOfFeeService.updateById(typesOfFee);
@@ -81,7 +89,7 @@ public class TypesOfFeeController {
    /**
     * 删除
     */
    @RequestMapping("/delete")
    @PostMapping("/delete")
    @RequiresPermissions("admin:typesoffee:delete")
    public R delete(@RequestBody Long[] ids){
		typesOfFeeService.removeByIds(Arrays.asList(ids));

src/main/java/io/renren/modules/admin/dao/MoneyAccountDao.java

@@ -1,8 +1,12 @@
package io.renren.modules.admin.dao;
import io.renren.modules.admin.entity.MoneyAccountEntity;
import java.util.Date;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Update;
/**
 * 
@@ -13,5 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 */
@Mapper
public interface MoneyAccountDao extends BaseMapper<MoneyAccountEntity> {
	
    @Update("REPLACE INTO money_account(`meeting_id`, `name`, `bank`, `account`, `create_time`) VALUES(#{meeting_id}, #{name}, #{bank}, #{account}, #{create_time});")
    Integer addOrUpdate(Long meeting_id, String name, String bank, String account, Date create_time);
}

src/main/java/io/renren/modules/admin/dao/PaperRequireDao.java

@@ -0,0 +1,17 @@
package io.renren.modules.admin.dao;
import io.renren.modules.admin.entity.PaperRequireEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
 * 投稿要求表
 * 
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-03-16 11:02:40
 */
@Mapper
public interface PaperRequireDao extends BaseMapper<PaperRequireEntity> {
	
}

src/main/java/io/renren/modules/admin/dao/TypesOfAttendersDao.java

@@ -17,7 +17,7 @@ import java.util.List;
@Mapper
public interface TypesOfAttendersDao extends BaseMapper<TypesOfAttendersEntity> {
    @Select("select * from types_of_attenders where type like '%${name}%' ")
    @Select("select * from types_of_attenders where name like '%${name}%' ")
    List<TypesOfAttendersEntity> findAllByType (String name);

src/main/java/io/renren/modules/admin/entity/MeetingEntity.java

@@ -81,18 +81,14 @@ public class MeetingEntity implements Serializable {
	 * 现场报名截止时间
	 */
	private Date onsiteRegDeadline;
	/**
	 * 投稿截止时间
	 */
	private Date subDeadline;
	/**
	 * 投稿范围及要求
	 */
	private String subRequirement;
	/**
	 * 会议介绍
	 */
	private String introduction;
	/**
	 * 举办单位id
	 */
	private Long paperRequireId;
	/**
	 * 创建时间
	 */

src/main/java/io/renren/modules/admin/entity/PaperRequireEntity.java

@@ -0,0 +1,44 @@
package io.renren.modules.admin.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 投稿要求表
 * 
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-03-16 11:02:40
 */
@Data
@TableName("paper_require")
public class PaperRequireEntity implements Serializable {
	private static final long serialVersionUID = 1L;
	/**
	 * 
	 */
	@TableId
	private Long id;
	/**
	 * 截止时间
	 */
	private Date deadline;
	/**
	 * 要求
	 */
	private String content;
	/**
	 * 创建时间
	 */
	private Date createTime;
	/**
	 * 是否被删除 状态  0：正常   1：删除
	 */
	private Integer isDel;
}

src/main/java/io/renren/modules/admin/service/MoneyAccountService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.common.utils.PageUtils;
import io.renren.modules.admin.entity.MoneyAccountEntity;
import java.util.Date;
import java.util.Map;
/**
@@ -16,5 +17,9 @@ import java.util.Map;
public interface MoneyAccountService extends IService<MoneyAccountEntity> {
    PageUtils queryPage(Map<String, Object> params);
    MoneyAccountEntity getOneByMeetingId(Long meetingId);
    Integer addOrUpdate(Long meeting_id, String name, String bank, String account, Date create_time);
}

src/main/java/io/renren/modules/admin/service/PaperRequireService.java

@@ -0,0 +1,20 @@
package io.renren.modules.admin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.common.utils.PageUtils;
import io.renren.modules.admin.entity.PaperRequireEntity;
import java.util.Map;
/**
 * 投稿要求表
 *
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-03-16 11:02:40
 */
public interface PaperRequireService extends IService<PaperRequireEntity> {
    PageUtils queryPage(Map<String, Object> params);
}

src/main/java/io/renren/modules/admin/service/impl/LectureServiceImpl.java

@@ -1,6 +1,5 @@
package io.renren.modules.admin.service.impl;
import java.util.Arrays;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;

src/main/java/io/renren/modules/admin/service/impl/MoneyAccountServiceImpl.java

@@ -1,6 +1,8 @@
package io.renren.modules.admin.service.impl;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,4 +28,14 @@ public class MoneyAccountServiceImpl extends ServiceImpl<MoneyAccountDao, MoneyA
        return new PageUtils(page);
    }
}
    @Override
    public MoneyAccountEntity getOneByMeetingId(Long meetingId) {
        MoneyAccountEntity moneyAccount = this.getOne(new QueryWrapper<MoneyAccountEntity>().eq("meeting_id", meetingId));
        return moneyAccount;
    }
    @Override
    public Integer addOrUpdate(Long meeting_id, String name, String bank, String account, Date create_time){
        return baseMapper.addOrUpdate(meeting_id, name, bank, account, create_time);
    }
}

src/main/java/io/renren/modules/admin/service/impl/PaperRequireServiceImpl.java

@@ -0,0 +1,29 @@
package io.renren.modules.admin.service.impl;
import org.springframework.stereotype.Service;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.Query;
import io.renren.modules.admin.dao.PaperRequireDao;
import io.renren.modules.admin.entity.PaperRequireEntity;
import io.renren.modules.admin.service.PaperRequireService;
@Service("paperRequireService")
public class PaperRequireServiceImpl extends ServiceImpl<PaperRequireDao, PaperRequireEntity> implements PaperRequireService {
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        IPage<PaperRequireEntity> page = this.page(
                new Query<PaperRequireEntity>().getPage(params),
                new QueryWrapper<PaperRequireEntity>()
        );
        return new PageUtils(page);
    }
}

src/main/java/io/renren/modules/admin/service/impl/TypesOfFeeServiceImpl.java

@@ -1,7 +1,8 @@
package io.renren.modules.admin.service.impl;
import org.springframework.stereotype.Service;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,18 +13,18 @@ import io.renren.modules.admin.dao.TypesOfFeeDao;
import io.renren.modules.admin.entity.TypesOfFeeEntity;
import io.renren.modules.admin.service.TypesOfFeeService;
@Service("typesOfFeeService")
public class TypesOfFeeServiceImpl extends ServiceImpl<TypesOfFeeDao, TypesOfFeeEntity> implements TypesOfFeeService {
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        String meetingId = (String)params.get("meetingId");
        IPage<TypesOfFeeEntity> page = this.page(
                new Query<TypesOfFeeEntity>().getPage(params),
                new QueryWrapper<TypesOfFeeEntity>()
                new QueryWrapper<TypesOfFeeEntity>().eq(StringUtils.isNotBlank(meetingId),"meeting_id", meetingId)
        );
        return new PageUtils(page);
    }
}