硕儒修改

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

@@ -1,11 +1,9 @@
package io.renren.modules.admin.controller;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.Map;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
import io.renren.modules.admin.entity.CompanyEntity;
import io.renren.modules.admin.service.CompanyService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
@@ -14,10 +12,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import io.renren.modules.admin.entity.CompanyEntity;
import io.renren.modules.admin.service.CompanyService;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.Map;
@@ -103,15 +102,29 @@ public class CompanyController {
        return R.ok();
    }
    ///**
    // * 删除
    // */
    //@RequestMapping("/delete/{id}")
    //@RequiresPermissions("admin:company:delete")
    //public R delete(@PathVariable("id") Long id){
	//	//companyService.removeByIds(Arrays.asList(ids));
    //    boolean flag = companyService.delete(id);
    //
    //    if(flag){
    //        R.ok("逻辑删除成功");
    //    }
    //    return R.ok();
    //}
    /**
     * 删除
     * 逻辑删除
     */
    @RequestMapping("/delete/{id}")
    @RequestMapping("/delete")
    @RequiresPermissions("admin:company:delete")
    public R delete(@PathVariable("id") Long id){
		//companyService.removeByIds(Arrays.asList(ids));
        boolean flag = companyService.delete(id);
    public R delete(@RequestBody Long[] ids){
        boolean flag = companyService.removeByIds(Arrays.asList(ids));
        if(flag){
            R.ok("逻辑删除成功");
        }

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

@@ -1,12 +1,9 @@
package io.renren.modules.admin.controller;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
import io.renren.modules.admin.entity.IndustryEntity;
import io.renren.modules.admin.service.IndustryService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
@@ -15,10 +12,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import io.renren.modules.admin.entity.IndustryEntity;
import io.renren.modules.admin.service.IndustryService;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -74,9 +72,14 @@ public class IndustryController {
            e.printStackTrace();
        }
        industry.setCreateTime(time);
		industryService.save(industry);
        int i = industryService.selectIsName(industry.getName());
        if(i==0) {
            industryService.save(industry);
            return R.ok();
        }else{
            return  R.error("该行业名称已经存在");
        }
        return R.ok();
    }
    /**

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

@@ -24,7 +24,7 @@ public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
//    boolean delete(Long id);
    //多表联查 + 分页
    @Select("select e.id,e.truename,e.username,e.password,e.phone,e.email,e.create_time,e.modify_time,e.is_del,c.companyname " +
    @Select("select e.id,e.truename,e.username,e.password,e.phone,e.email,e.create_time,e.modify_time,e.is_del,c.companyname,c.id as cid " +
            " from employee e left JOIN company c on e.company_id = c.id" +
            " where e.is_del = 0 AND (e.truename like '%${key}%' or e.username like '%${key2}%') limit #{page},#{limit}")
    List<Map<String,Object>> queryListBykey( String key,String key2 ,int page, int limit);

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

@@ -1,5 +1,6 @@
package io.renren.modules.admin.service.impl;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,9 +19,11 @@ public class AttendersServiceImpl extends ServiceImpl<AttendersDao, AttendersEnt
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        String name = (String) params.get("name");
        IPage<AttendersEntity> page = this.page(
                new Query<AttendersEntity>().getPage(params),
                new QueryWrapper<AttendersEntity>()
                .like(StringUtils.isNotBlank(name),"name",name)
        );
        return new PageUtils(page);

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

@@ -1,5 +1,6 @@
package io.renren.modules.admin.service.impl;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,9 +19,11 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyDao, CompanyEntity> i
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        String companyname = (String) params.get("companyname");
        IPage<CompanyEntity> page = this.page(
                new Query<CompanyEntity>().getPage(params),
                new QueryWrapper<CompanyEntity>()
                .like(StringUtils.isNotBlank(companyname),"companyname",companyname)
        );
        return new PageUtils(page);

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

@@ -1,7 +1,7 @@
package io.renren.modules.admin.service.impl;
import org.springframework.stereotype.Service;
import org.apache.commons.lang.StringUtils;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -21,9 +21,10 @@ public class IndustryServiceImpl extends ServiceImpl<IndustryDao, IndustryEntity
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        String name = (String) params.get("name");
        IPage<IndustryEntity> page = this.page(
                new Query<IndustryEntity>().getPage(params),
                new QueryWrapper<IndustryEntity>()
                new QueryWrapper<IndustryEntity>().like(StringUtils.isNotBlank(name),"name",name)
        );
        return new PageUtils(page);

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

@@ -21,9 +21,11 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        String meetingId = (String) params.get("meetingId");
        String title = (String)params.get("title");
        IPage<PaperEntity> page = this.page(
                new Query<PaperEntity>().getPage(params),
                new QueryWrapper<PaperEntity>().eq(StringUtils.isNotBlank(meetingId),"meeting_id", meetingId)
                .like(StringUtils.isNotBlank(title),"title",title)
        );
        return new PageUtils(page);

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

@@ -1,5 +1,6 @@
package io.renren.modules.admin.service.impl;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,9 +19,10 @@ public class SignServiceImpl extends ServiceImpl<SignDao, SignEntity> implements
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        String meetingId = (String) params.get("meetingId");
        IPage<SignEntity> page = this.page(
                new Query<SignEntity>().getPage(params),
                new QueryWrapper<SignEntity>()
                new QueryWrapper<SignEntity>().eq(StringUtils.isNotBlank(meetingId),"meeting_id", meetingId)
        );
        return new PageUtils(page);