2023年5月22日 修改问题

This commit is contained in:
bai 2023-05-22 20:37:34 +08:00
parent 88d400c5d0
commit 71ec8fee00
12 changed files with 677 additions and 0 deletions

View File

@ -0,0 +1,203 @@
package org.jeecg.modules.kc.kcAssessuser.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.kc.kcAssessuser.entity.KcAssessuser;
import org.jeecg.modules.kc.kcAssessuser.service.IKcAssessuserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/**
* @Description: kc_assessuser
* @Author: jeecg-boot
* @Date: 2023-05-22
* @Version: V1.0
*/
@Api(tags="kc_assessuser")
@RestController
@RequestMapping("/kcAssessuser/kcAssessuser")
@Slf4j
public class KcAssessuserController extends JeecgController<KcAssessuser, IKcAssessuserService> {
@Autowired
private IKcAssessuserService kcAssessuserService;
/**
* 分页列表查询
*
* @param kcAssessuser
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "kc_assessuser-分页列表查询")
@ApiOperation(value="kc_assessuser-分页列表查询", notes="kc_assessuser-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<KcAssessuser>> queryPageList(KcAssessuser kcAssessuser,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcAssessuser> queryWrapper = QueryGenerator.initQueryWrapper(kcAssessuser, req.getParameterMap());
Page<KcAssessuser> page = new Page<KcAssessuser>(pageNo, pageSize);
IPage<KcAssessuser> pageList = kcAssessuserService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param kcAssessuser
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "kc_assessuser-分页列表查询")
@ApiOperation(value="kc_assessuser-分页列表查询", notes="kc_assessuser-分页列表查询")
@GetMapping(value = "/allList")
public Result<List<KcAssessuser>> allList(KcAssessuser kcAssessuser,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcAssessuser> queryWrapper = QueryGenerator.initQueryWrapper(kcAssessuser, req.getParameterMap());
queryWrapper.setEntity(kcAssessuser);
List<KcAssessuser> pageList = kcAssessuserService.allList(queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param kcAssessuser
* @return
*/
@AutoLog(value = "kc_assessuser-添加")
@ApiOperation(value="kc_assessuser-添加", notes="kc_assessuser-添加")
@RequiresPermissions("kcAssessuser:kc_assessuser:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody KcAssessuser kcAssessuser) {
kcAssessuserService.save(kcAssessuser);
return Result.OK("添加成功!");
}
/**
* 添加
*
* @param kcAssessuser
* @return
*/
@AutoLog(value = "kc_assessuser-添加")
@ApiOperation(value="kc_assessuser-添加", notes="kc_assessuser-添加")
// @RequiresPermissions("kcAssessuser:kc_assessuser:add")
@PostMapping(value = "/addAll")
public Result<String> addAll(@RequestBody KcAssessuser kcAssessuser) {
kcAssessuserService.saveAll(kcAssessuser);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param kcAssessuser
* @return
*/
@AutoLog(value = "kc_assessuser-编辑")
@ApiOperation(value="kc_assessuser-编辑", notes="kc_assessuser-编辑")
@RequiresPermissions("kcAssessuser:kc_assessuser:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody KcAssessuser kcAssessuser) {
kcAssessuserService.updateById(kcAssessuser);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "kc_assessuser-通过id删除")
@ApiOperation(value="kc_assessuser-通过id删除", notes="kc_assessuser-通过id删除")
// @RequiresPermissions("kcAssessuser:kc_assessuser:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
kcAssessuserService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "kc_assessuser-批量删除")
@ApiOperation(value="kc_assessuser-批量删除", notes="kc_assessuser-批量删除")
// @RequiresPermissions("kcAssessuser:kc_assessuser:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.kcAssessuserService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "kc_assessuser-通过id查询")
@ApiOperation(value="kc_assessuser-通过id查询", notes="kc_assessuser-通过id查询")
@GetMapping(value = "/queryById")
public Result<KcAssessuser> queryById(@RequestParam(name="id",required=true) String id) {
KcAssessuser kcAssessuser = kcAssessuserService.getById(id);
if(kcAssessuser==null) {
return Result.error("未找到对应数据");
}
return Result.OK(kcAssessuser);
}
/**
* 导出excel
*
* @param request
* @param kcAssessuser
*/
@RequiresPermissions("kcAssessuser:kc_assessuser:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, KcAssessuser kcAssessuser) {
return super.exportXls(request, kcAssessuser, KcAssessuser.class, "kc_assessuser");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("kcAssessuser:kc_assessuser:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, KcAssessuser.class);
}
}

View File

@ -0,0 +1,77 @@
package org.jeecg.modules.kc.kcAssessuser.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: kc_assessuser
* @Author: jeecg-boot
* @Date: 2023-05-22
* @Version: V1.0
*/
@Data
@TableName("kc_assessuser")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="kc_assessuser对象", description="kc_assessuser")
public class KcAssessuser implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Integer id;
/**用户代码*/
@Excel(name = "用户代码", width = 15)
@ApiModelProperty(value = "用户代码")
private java.lang.Integer usercode;
/**用户名*/
@Excel(name = "用户名", width = 15)
@ApiModelProperty(value = "用户名")
private java.lang.String username;
/**身份编码*/
@Excel(name = "身份编码", width = 15)
@ApiModelProperty(value = "身份编码")
private java.lang.String assesscode;
/**听课身份一级*/
@Excel(name = "听课身份一级", width = 15)
@ApiModelProperty(value = "听课身份一级")
private java.lang.String assess1;
/**听课身份二级*/
@Excel(name = "听课身份二级", width = 15)
@ApiModelProperty(value = "听课身份二级")
private java.lang.String assess2;
/**单位名称*/
@Excel(name = "单位名称", width = 15)
@ApiModelProperty(value = "单位名称")
private java.lang.String dwmc;
/**听课要求(次数)*/
@Excel(name = "听课要求(次数)", width = 15)
@ApiModelProperty(value = "听课要求(次数)")
private java.lang.String tkyq;
@TableField(exist = false)
private String cn;
@TableField(exist = false)
private String user;
@TableField(exist = false)
private String college;
@TableField(exist = false)
private String zwmc;
private List<KcAssessuser> lists;
}

View File

@ -0,0 +1,20 @@
package org.jeecg.modules.kc.kcAssessuser.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.kc.kcAssessuser.entity.KcAssessuser;
import java.util.List;
/**
* @Description: kc_assessuser
* @Author: jeecg-boot
* @Date: 2023-05-22
* @Version: V1.0
*/
public interface KcAssessuserMapper extends BaseMapper<KcAssessuser> {
List<KcAssessuser> allList(@Param(Constants.WRAPPER) QueryWrapper<KcAssessuser> queryWrapper);
}

View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.kc.kcAssessuser.mapper.KcAssessuserMapper">
<select id="allList" resultType="org.jeecg.modules.kc.kcAssessuser.entity.KcAssessuser">
SELECT
cu.cn,
cu.user,
cu.college,
cu.zwmc,
au.assesscode,
au.assess1,
au.assess2
FROM
( SELECT * FROM kc_casusers
<where>
<if test="ew != null and ew.entity != null and ew.entity.cn != null and ew.entity.cn != ''">
and cn LIKE CONCAT('%',#{ew.entity.cn},'%')
</if>
</where>
) cu
LEFT JOIN kc_assessuser au ON cu.USER = au.usercode
ORDER BY
cu.collegecode,
IF
( cu.zwdm = '' OR cu.zwdm IS NULL, 99, cu.zwdm ),
cu.zwdm,
cu.USER
</select>
</mapper>

View File

@ -0,0 +1,20 @@
package org.jeecg.modules.kc.kcAssessuser.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.kc.kcAssessuser.entity.KcAssessuser;
import java.util.List;
/**
* @Description: kc_assessuser
* @Author: jeecg-boot
* @Date: 2023-05-22
* @Version: V1.0
*/
public interface IKcAssessuserService extends IService<KcAssessuser> {
List<KcAssessuser> allList(QueryWrapper<KcAssessuser> queryWrapper);
void saveAll(KcAssessuser kcAssessuser);
}

View File

@ -0,0 +1,32 @@
package org.jeecg.modules.kc.kcAssessuser.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.kc.kcAssessuser.entity.KcAssessuser;
import org.jeecg.modules.kc.kcAssessuser.mapper.KcAssessuserMapper;
import org.jeecg.modules.kc.kcAssessuser.service.IKcAssessuserService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description: kc_assessuser
* @Author: jeecg-boot
* @Date: 2023-05-22
* @Version: V1.0
*/
@Service
public class KcAssessuserServiceImpl extends ServiceImpl<KcAssessuserMapper, KcAssessuser> implements IKcAssessuserService {
@Override
public List<KcAssessuser> allList(QueryWrapper<KcAssessuser> queryWrapper) {
return baseMapper.allList(queryWrapper);
}
@Override
public void saveAll(KcAssessuser kcAssessuser) {
if(kcAssessuser != null && kcAssessuser.getLists() != null && !kcAssessuser.getLists().isEmpty()){
saveBatch(kcAssessuser.getLists());
}
}
}

View File

@ -0,0 +1,163 @@
package org.jeecg.modules.kc.kcCasusers.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.kc.kcCasusers.entity.KcCasusers;
import org.jeecg.modules.kc.kcCasusers.service.IKcCasusersService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
* @Description: kc_casusers
* @Author: jeecg-boot
* @Date: 2023-05-22
* @Version: V1.0
*/
@Api(tags="kc_casusers")
@RestController
@RequestMapping("/kcCasusers/kcCasusers")
@Slf4j
public class KcCasusersController extends JeecgController<KcCasusers, IKcCasusersService> {
@Autowired
private IKcCasusersService kcCasusersService;
/**
* 分页列表查询
*
* @param kcCasusers
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "kc_casusers-分页列表查询")
@ApiOperation(value="kc_casusers-分页列表查询", notes="kc_casusers-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<KcCasusers>> queryPageList(KcCasusers kcCasusers,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcCasusers> queryWrapper = QueryGenerator.initQueryWrapper(kcCasusers, req.getParameterMap());
Page<KcCasusers> page = new Page<KcCasusers>(pageNo, pageSize);
IPage<KcCasusers> pageList = kcCasusersService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param kcCasusers
* @return
*/
@AutoLog(value = "kc_casusers-添加")
@ApiOperation(value="kc_casusers-添加", notes="kc_casusers-添加")
@RequiresPermissions("kcCasusers:kc_casusers:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody KcCasusers kcCasusers) {
kcCasusersService.save(kcCasusers);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param kcCasusers
* @return
*/
@AutoLog(value = "kc_casusers-编辑")
@ApiOperation(value="kc_casusers-编辑", notes="kc_casusers-编辑")
@RequiresPermissions("kcCasusers:kc_casusers:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody KcCasusers kcCasusers) {
kcCasusersService.updateById(kcCasusers);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "kc_casusers-通过id删除")
@ApiOperation(value="kc_casusers-通过id删除", notes="kc_casusers-通过id删除")
@RequiresPermissions("kcCasusers:kc_casusers:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
kcCasusersService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "kc_casusers-批量删除")
@ApiOperation(value="kc_casusers-批量删除", notes="kc_casusers-批量删除")
@RequiresPermissions("kcCasusers:kc_casusers:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.kcCasusersService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "kc_casusers-通过id查询")
@ApiOperation(value="kc_casusers-通过id查询", notes="kc_casusers-通过id查询")
@GetMapping(value = "/queryById")
public Result<KcCasusers> queryById(@RequestParam(name="id",required=true) String id) {
KcCasusers kcCasusers = kcCasusersService.getById(id);
if(kcCasusers==null) {
return Result.error("未找到对应数据");
}
return Result.OK(kcCasusers);
}
/**
* 导出excel
*
* @param request
* @param kcCasusers
*/
@RequiresPermissions("kcCasusers:kc_casusers:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, KcCasusers kcCasusers) {
return super.exportXls(request, kcCasusers, KcCasusers.class, "kc_casusers");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("kcCasusers:kc_casusers:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, KcCasusers.class);
}
}

View File

@ -0,0 +1,79 @@
package org.jeecg.modules.kc.kcCasusers.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: kc_casusers
* @Author: jeecg-boot
* @Date: 2023-05-22
* @Version: V1.0
*/
@Data
@TableName("kc_casusers")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="kc_casusers对象", description="kc_casusers")
public class KcCasusers implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Integer id;
/**学院编码*/
@Excel(name = "学院编码", width = 15)
@ApiModelProperty(value = "学院编码")
private java.lang.String collegecode;
/**学院*/
@Excel(name = "学院", width = 15)
@ApiModelProperty(value = "学院")
private java.lang.String college;
/**工号*/
@Excel(name = "工号", width = 15)
@ApiModelProperty(value = "工号")
private java.lang.String user;
/**姓名*/
@Excel(name = "姓名", width = 15)
@ApiModelProperty(value = "姓名")
private java.lang.String cn;
/**职务*/
@Excel(name = "职务", width = 15)
@ApiModelProperty(value = "职务")
private java.lang.String duties;
/**身份*/
@Excel(name = "身份", width = 15)
@ApiModelProperty(value = "身份")
private java.lang.String identity;
/**状态*/
@Excel(name = "状态", width = 15)
@ApiModelProperty(value = "状态")
private java.lang.String status;
/**职称*/
@Excel(name = "职称", width = 15)
@ApiModelProperty(value = "职称")
private java.lang.String zdxms;
/**职务名称*/
@Excel(name = "职务名称", width = 15)
@ApiModelProperty(value = "职务名称")
private java.lang.String zwmc;
/**职务代码*/
@Excel(name = "职务代码", width = 15)
@ApiModelProperty(value = "职务代码")
private java.lang.String zwdm;
}

View File

@ -0,0 +1,14 @@
package org.jeecg.modules.kc.kcCasusers.mapper;
import org.jeecg.modules.kc.kcCasusers.entity.KcCasusers;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: kc_casusers
* @Author: jeecg-boot
* @Date: 2023-05-22
* @Version: V1.0
*/
public interface KcCasusersMapper extends BaseMapper<KcCasusers> {
}

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.kc.kcCasusers.mapper.KcCasusersMapper">
</mapper>

View File

@ -0,0 +1,14 @@
package org.jeecg.modules.kc.kcCasusers.service;
import org.jeecg.modules.kc.kcCasusers.entity.KcCasusers;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: kc_casusers
* @Author: jeecg-boot
* @Date: 2023-05-22
* @Version: V1.0
*/
public interface IKcCasusersService extends IService<KcCasusers> {
}

View File

@ -0,0 +1,19 @@
package org.jeecg.modules.kc.kcCasusers.service.impl;
import org.jeecg.modules.kc.kcCasusers.entity.KcCasusers;
import org.jeecg.modules.kc.kcCasusers.mapper.KcCasusersMapper;
import org.jeecg.modules.kc.kcCasusers.service.IKcCasusersService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: kc_casusers
* @Author: jeecg-boot
* @Date: 2023-05-22
* @Version: V1.0
*/
@Service
public class KcCasusersServiceImpl extends ServiceImpl<KcCasusersMapper, KcCasusers> implements IKcCasusersService {
}