2024年1月9日 修改问题，增加容量显示
This commit is contained in:
parent
18db0b5056
commit
d8c056f7ab
|
|
@ -0,0 +1,167 @@
|
|||
package org.jeecg.modules.kc.jiaoshi.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLDecoder;
|
||||
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.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoshirongliang;
|
||||
import org.jeecg.modules.kc.jiaoshi.service.IKcJiaoshirongliangService;
|
||||
import java.util.Date;
|
||||
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.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
/**
|
||||
* @Description: 教室容量
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-01-09
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Slf4j
|
||||
@Api(tags="教室容量")
|
||||
@RestController
|
||||
@RequestMapping("/jiaoshi/kcJiaoshirongliang")
|
||||
public class KcJiaoshirongliangController extends JeecgController<KcJiaoshirongliang, IKcJiaoshirongliangService> {
|
||||
@Autowired
|
||||
private IKcJiaoshirongliangService kcJiaoshirongliangService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param kcJiaoshirongliang
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "教室容量-分页列表查询")
|
||||
@ApiOperation(value="教室容量-分页列表查询", notes="教室容量-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<?> queryPageList(KcJiaoshirongliang kcJiaoshirongliang,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<KcJiaoshirongliang> queryWrapper = QueryGenerator.initQueryWrapper(kcJiaoshirongliang, req.getParameterMap());
|
||||
Page<KcJiaoshirongliang> page = new Page<KcJiaoshirongliang>(pageNo, pageSize);
|
||||
IPage<KcJiaoshirongliang> pageList = kcJiaoshirongliangService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param kcJiaoshirongliang
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "教室容量-添加")
|
||||
@ApiOperation(value="教室容量-添加", notes="教室容量-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody KcJiaoshirongliang kcJiaoshirongliang) {
|
||||
kcJiaoshirongliangService.save(kcJiaoshirongliang);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param kcJiaoshirongliang
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "教室容量-编辑")
|
||||
@ApiOperation(value="教室容量-编辑", notes="教室容量-编辑")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||
public Result<?> edit(@RequestBody KcJiaoshirongliang kcJiaoshirongliang) {
|
||||
kcJiaoshirongliangService.updateById(kcJiaoshirongliang);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "教室容量-通过id删除")
|
||||
@ApiOperation(value="教室容量-通过id删除", notes="教室容量-通过id删除")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||
kcJiaoshirongliangService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "教室容量-批量删除")
|
||||
@ApiOperation(value="教室容量-批量删除", notes="教室容量-批量删除")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.kcJiaoshirongliangService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "教室容量-通过id查询")
|
||||
@ApiOperation(value="教室容量-通过id查询", notes="教室容量-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
KcJiaoshirongliang kcJiaoshirongliang = kcJiaoshirongliangService.getById(id);
|
||||
return Result.OK(kcJiaoshirongliang);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param kcJiaoshirongliang
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, KcJiaoshirongliang kcJiaoshirongliang) {
|
||||
return super.exportXls(request, kcJiaoshirongliang, KcJiaoshirongliang.class, "教室容量");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, KcJiaoshirongliang.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
package org.jeecg.modules.kc.jiaoshi.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
||||
/**
|
||||
* @Description: 教室容量
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-01-09
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("kc_jiaoshirongliang")
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
@ApiModel(value="kc_jiaoshirongliang对象", description="教室容量")
|
||||
public class KcJiaoshirongliang {
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private Integer id;
|
||||
/**创建人登录名称*/
|
||||
@Excel(name = "创建人登录名称", width = 15)
|
||||
@ApiModelProperty(value = "创建人登录名称")
|
||||
private String createBy;
|
||||
/**创建日期*/
|
||||
@Excel(name = "创建日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private Date createTime;
|
||||
/**更新人登录名称*/
|
||||
@Excel(name = "更新人登录名称", width = 15)
|
||||
@ApiModelProperty(value = "更新人登录名称")
|
||||
private String updateBy;
|
||||
/**更新日期*/
|
||||
@Excel(name = "更新日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private Date updateTime;
|
||||
/**教室编号*/
|
||||
@Excel(name = "教室编号", width = 15)
|
||||
@ApiModelProperty(value = "教室编号")
|
||||
private String jsbh;
|
||||
/**教室名称*/
|
||||
@Excel(name = "教室名称", width = 15)
|
||||
@ApiModelProperty(value = "教室名称")
|
||||
private String jsmc;
|
||||
/**所属单位*/
|
||||
@Excel(name = "所属单位", width = 15)
|
||||
@ApiModelProperty(value = "所属单位")
|
||||
private String ssdw;
|
||||
/**教室类型*/
|
||||
@Excel(name = "教室类型", width = 15)
|
||||
@ApiModelProperty(value = "教室类型")
|
||||
private String jslx;
|
||||
/**楼层*/
|
||||
@Excel(name = "楼层", width = 15)
|
||||
@ApiModelProperty(value = "楼层")
|
||||
private String lc;
|
||||
/**教室容量*/
|
||||
@Excel(name = "教室容量", width = 15)
|
||||
@ApiModelProperty(value = "教室容量")
|
||||
private String jsrl;
|
||||
/**教室图片*/
|
||||
@Excel(name = "教室图片", width = 15)
|
||||
@ApiModelProperty(value = "教室图片")
|
||||
private String jstp;
|
||||
/**建筑物名称*/
|
||||
@Excel(name = "建筑物名称", width = 15)
|
||||
@ApiModelProperty(value = "建筑物名称")
|
||||
private String jzwmc;
|
||||
/**校区名称*/
|
||||
@Excel(name = "校区名称", width = 15)
|
||||
@ApiModelProperty(value = "校区名称")
|
||||
private String xqmc;
|
||||
/**是否笔试考试*/
|
||||
@Excel(name = "是否笔试考试", width = 15)
|
||||
@ApiModelProperty(value = "是否笔试考试")
|
||||
private String sfbsks;
|
||||
/**门牌号*/
|
||||
@Excel(name = "门牌号", width = 15)
|
||||
@ApiModelProperty(value = "门牌号")
|
||||
private String mph;
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
package org.jeecg.modules.kc.jiaoshi.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoshirongliang;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 教室容量
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-01-09
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface KcJiaoshirongliangMapper extends BaseMapper<KcJiaoshirongliang> {
|
||||
|
||||
}
|
||||
|
|
@ -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.jiaoshi.mapper.KcJiaoshirongliangMapper">
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
package org.jeecg.modules.kc.jiaoshi.service;
|
||||
|
||||
import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoshirongliang;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @Description: 教室容量
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-01-09
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IKcJiaoshirongliangService extends IService<KcJiaoshirongliang> {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package org.jeecg.modules.kc.jiaoshi.service.impl;
|
||||
|
||||
import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoshirongliang;
|
||||
import org.jeecg.modules.kc.jiaoshi.mapper.KcJiaoshirongliangMapper;
|
||||
import org.jeecg.modules.kc.jiaoshi.service.IKcJiaoshirongliangService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
* @Description: 教室容量
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-01-09
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class KcJiaoshirongliangServiceImpl extends ServiceImpl<KcJiaoshirongliangMapper, KcJiaoshirongliang> implements IKcJiaoshirongliangService {
|
||||
|
||||
}
|
||||
|
|
@ -21,6 +21,8 @@ import org.jeecg.common.api.CommonAPI;
|
|||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
|
||||
import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoshirongliang;
|
||||
import org.jeecg.modules.kc.jiaoshi.service.IKcJiaoshirongliangService;
|
||||
import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
|
||||
import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService;
|
||||
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
|
||||
|
|
@ -65,6 +67,9 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
|||
@Autowired
|
||||
private IKcSysConfigService kcSysConfigService;
|
||||
|
||||
@Autowired
|
||||
private IKcJiaoshirongliangService kcJiaoshirongliangService;
|
||||
|
||||
@Lazy
|
||||
@Autowired
|
||||
private CommonAPI commonApi;
|
||||
|
|
@ -289,6 +294,12 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
|||
if(kcKetangbiao==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
//查询对应教室数据
|
||||
QueryWrapper<KcJiaoshirongliang> jiaoshirongliangQw = new QueryWrapper<>();
|
||||
jiaoshirongliangQw.eq("jsbh",kcKetangbiao.getJsbh());
|
||||
jiaoshirongliangQw.last("limit 1");
|
||||
KcJiaoshirongliang jiaoshirongliang = kcJiaoshirongliangService.getOne(jiaoshirongliangQw);
|
||||
kcKetangbiao.setJiaoshirongliang(jiaoshirongliang);
|
||||
return Result.OK(kcKetangbiao);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import java.math.BigDecimal;
|
|||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoshirongliang;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
|
|
@ -310,7 +311,10 @@ public class KcKetangbiao implements Serializable {
|
|||
@TableField(exist = false)
|
||||
private String sftkb;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String tksy;
|
||||
@TableField(exist = false)
|
||||
private String tksy;
|
||||
|
||||
@TableField(exist = false)
|
||||
private KcJiaoshirongliang jiaoshirongliang;
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue