From dc87cff171b50d728e2c396d72ce70c10acd5715 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Sat, 17 Jun 2023 22:43:55 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8817=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kc/qa/mapper/KcEvaluationMapper.java | 9 +- .../kc/qa/mapper/xml/KcEvaluationMapper.xml | 23 +++ .../kc/qa/service/IKcEvaluationService.java | 3 + .../service/impl/KcEvaluationServiceImpl.java | 6 + .../kc/statistics/KcEvaluationVo2.java | 168 ++++++++++++++++++ .../TingKeStatisticsController.java | 160 ++++++++++++++++- .../sys/jwms/controller/JwmsController.java | 163 +++++++++++++++++ .../jeecg/modules/sys/jwms/entity/Jwms.java | 55 ++++++ .../modules/sys/jwms/mapper/JwmsMapper.java | 14 ++ .../sys/jwms/mapper/xml/JwmsMapper.xml | 5 + .../sys/jwms/service/IJwmsService.java | 14 ++ .../jwms/service/impl/JwmsServiceImpl.java | 19 ++ jeecg-module-system/jeecg-system-biz/pom.xml | 2 +- .../jeecg/modules/jwms/entity/SysJwms.java | 49 +++++ .../modules/jwms/mapper/SysJwmsMapper.java | 14 ++ .../modules/jwms/mapper/xml/SysJwmsMapper.xml | 5 + .../modules/jwms/service/ISysJwmsService.java | 14 ++ .../jwms/service/impl/SysJwmsServiceImpl.java | 19 ++ .../system/controller/LoginController.java | 43 ++++- .../service/impl/SysUserServiceImpl.java | 47 +++-- pom.xml | 7 + 21 files changed, 818 insertions(+), 21 deletions(-) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo2.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/controller/JwmsController.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/entity/Jwms.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/mapper/JwmsMapper.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/mapper/xml/JwmsMapper.xml create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/service/IJwmsService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/service/impl/JwmsServiceImpl.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/jwms/entity/SysJwms.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/jwms/mapper/SysJwmsMapper.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/jwms/mapper/xml/SysJwmsMapper.xml create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/jwms/service/ISysJwmsService.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/jwms/service/impl/SysJwmsServiceImpl.java diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java index f77e027f..ea43e592 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java @@ -1,16 +1,17 @@ package org.jeecg.modules.kc.qa.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.kc.qa.entity.KcEvaluation; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.kc.qa.entity.KcEvaluationPkmx; import org.jeecg.modules.kc.statistics.KcEvaluationVo; +import org.jeecg.modules.kc.statistics.KcEvaluationVo2; + +import java.util.List; /** * @Description: 调查问卷-回答主表 @@ -34,4 +35,6 @@ public interface KcEvaluationMapper extends BaseMapper { List keTangList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); List selectPageAndKcmc(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List selectPageAndKcmc2(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml index 04c6a6ab..26f5fdc9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml @@ -416,4 +416,27 @@ ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java index d77c0027..f90204b6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java @@ -7,6 +7,7 @@ import org.jeecg.modules.kc.qa.entity.KcEvaluation; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.kc.qa.entity.KcEvaluationPkmx; import org.jeecg.modules.kc.statistics.KcEvaluationVo; +import org.jeecg.modules.kc.statistics.KcEvaluationVo2; import java.util.List; @@ -35,4 +36,6 @@ public interface IKcEvaluationService extends IService { IPage keTangList(Page page, QueryWrapper queryWrapper); IPage selectPageAndKcmc(Page page, QueryWrapper queryWrapper); + + IPage selectPageAndKcmc2(Page page, QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java index 75776b34..eea77d7e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java @@ -14,6 +14,7 @@ import org.jeecg.modules.kc.qa.mapper.KcEvaluationMapper; import org.jeecg.modules.kc.qa.service.IKcEvaluationService; import org.jeecg.modules.kc.qa.service.IKcEvaluationsService; import org.jeecg.modules.kc.statistics.KcEvaluationVo; +import org.jeecg.modules.kc.statistics.KcEvaluationVo2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -111,4 +112,9 @@ public class KcEvaluationServiceImpl extends ServiceImpl selectPageAndKcmc2(Page page, QueryWrapper queryWrapper) { + return page.setRecords(baseMapper.selectPageAndKcmc2(page,queryWrapper)); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo2.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo2.java new file mode 100644 index 00000000..29299307 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo2.java @@ -0,0 +1,168 @@ +package org.jeecg.modules.kc.statistics; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 调查问卷-回答主表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +@Data +@TableName("kc_evaluation") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="kc_evaluation对象", description="调查问卷-回答主表") +public class KcEvaluationVo2 implements Serializable{ + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "上传日期") + private Date upDate; + @JsonFormat(timezone = "GMT+8",pattern = "HH:mm") + @DateTimeFormat(pattern="HH:mm") + @ApiModelProperty(value = "上传时间") + private Date upTime; + @ApiModelProperty(value = "答案") + private String answer1; + /**上传人id*/ + @ApiModelProperty(value = "上传人id") + private Integer upuserid; + /**上传人id*/ + @ApiModelProperty(value = "上传人id") + @TableField(exist = false) + private String upuseridLike; + /**上传时间戳*/ + @ApiModelProperty(value = "上传时间戳") + private String upTimestamp; + /**课程最小id*/ + @ApiModelProperty(value = "课程最小id") + private String minkcid; + /**答案2*/ + @ApiModelProperty(value = "答案2") + private String answer2; + /**答案3*/ + @ApiModelProperty(value = "答案3") + private String answer3; + /**答案4*/ + @ApiModelProperty(value = "答案4") + private String answer4; + /**答案5*/ + @ApiModelProperty(value = "答案5") + private String answer5; + /**答案6*/ + @ApiModelProperty(value = "答案6") + private String answer6; + /**答案7*/ + @ApiModelProperty(value = "答案7") + private String answer7; + /**答案8*/ + @ApiModelProperty(value = "答案8") + private String answer8; + /**答案9*/ + @ApiModelProperty(value = "答案9") + private String answer9; + /**答案10*/ + @ApiModelProperty(value = "答案10") + //@MappedJdbcTypes(JdbcType.LONGVARCHAR) + //@TableField(jdbcType = JdbcType.LONGVARCHAR) + private String answer10; + /**答案11*/ + @ApiModelProperty(value = "答案11") + private String answer11; + /**问卷版本*/ + @ApiModelProperty(value = "问卷版本") + private Integer evaluationver; + + /**数据来源（0：门户添加，1：老系统，2：政务大厅，3后台导入）*/ + @ApiModelProperty(value = "数据来源（0：课程中心，1：老系统，2：政务大厅，3：纸质评价）") + private Integer source; + + + + @Excel(name = "学期", width = 15) + @TableField(exist = false) + private String xqxn; + + @Excel(name = "课程名称", width = 15) + @TableField(exist = false) + private String kcmc; + + + @Excel(name = "开课单位", width = 15) + @TableField(exist = false) + private String kkdw; + + @Excel(name = "授课教师", width = 15) + @TableField(exist = false) + private String skjs; + + @Excel(name = "授课教师工号", width = 15) + @TableField(exist = false) + private String skjgh; + + //授课日期（时间/节次） + @Excel(name = "授课日期", width = 15) + @TableField(exist = false) + private String skrq; + + @Excel(name = "授课时间", width = 15) + @TableField(exist = false) + private String sksj; + + @Excel(name = "授课节次", width = 15) + @TableField(exist = false) + private String jieci; + + @Excel(name = "授课地点", width = 15) + @TableField(exist = false) + private String skdd; + + @Excel(name = "听课教师单位", width = 15) + @TableField(exist = false) + private String tkdwmc; + + @Excel(name = "听课教师工号", width = 15) + @TableField(exist = false) + private String tkjgh; + + @Excel(name = "听课教师姓名", width = 15) + @TableField(exist = false) + private String tkjsxm; + + @Excel(name = "听课身份", width = 15) + @TableField(exist = false) + private String tksf; + +// @Excel(name = "听课评价结果（5分制）", width = 15) + @TableField(exist = false) + private String tkpjjg; + + @Excel(name = "评价量表类型", width = 15) + @TableField(exist = false) + private String pjlblx; + + @Excel(name = "数据来源", width = 15) + @TableField(exist = false) + private String sourceName; + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java index 17833d80..c775e9cd 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java @@ -174,7 +174,120 @@ public class TingKeStatisticsController { long betweenStartDay = DateUtil.between(startTime, upDate, DateUnit.DAY,false); long betweenEndDay = DateUtil.between(endTime, upDate, DateUnit.DAY,false); if(betweenStartDay >=0 && betweenEndDay <=0) { - System.out.println("在范围内"); + x.setXqxn(hx.getTitle()); + } + } ); + + }); + + return pageList; + } + + public IPage loadPageData2(KcEvaluationVo2 evaluation,QueryWrapper queryWrapper,Page page){ + queryWrapper.isNotNull("a.upuserid"); + queryWrapper.isNotNull("a.minkcid"); + +// if(StringUtils.isNotBlank(evaluation.getDwmc())){ +// List xxhbuserList = szdwList.stream().filter(x -> StringUtils.equals(x.getDwh(),evaluation.getDwmc())).collect(Collectors.toList()); +// Set ghSet = xxhbuserList.stream().map(x -> x.getGh()).collect(Collectors.toSet()); +// queryWrapper.in("a.upuserid",ghSet); +// } + queryWrapper.like(StringUtils.isNotBlank(evaluation.getKkdw()),"kt.kkdw",evaluation.getKkdw()); + queryWrapper.like(StringUtils.isNotBlank(evaluation.getSkjs()),"kt.skjs",evaluation.getSkjs()); + queryWrapper.like(StringUtils.isNotBlank(evaluation.getSkjgh()),"kt.jgh",evaluation.getSkjgh()); + queryWrapper.like(StringUtils.isNotBlank(evaluation.getUpuseridLike()),"a.upuserid",evaluation.getUpuseridLike()); + + + + List kcXqxnHistoryList = kcXqxnHistoryService.list(); + //查询所在单位 + List szdwList = xxhbuserService.list(); + Map szdwMap = Maps.newHashMap(); + szdwList.forEach(x -> { + szdwMap.put(x.getGh(),x); + }); + + //补充搜索 + if(StringUtils.isNotBlank(evaluation.getXqxn())){ + List xqxnHistoryList = kcXqxnHistoryList.stream().filter(x -> StringUtils.equals(x.getTitle(),evaluation.getXqxn())).collect(Collectors.toList()); + if(xqxnHistoryList != null && !xqxnHistoryList.isEmpty()){ + KcXqxnHistory xqxnHistory = xqxnHistoryList.get(0); + queryWrapper.ge("a.up_date",xqxnHistory.getStartTime()); + queryWrapper.le("a.up_date",xqxnHistory.getEndTime()); + } + } + IPage pageList = service.selectPageAndKcmc2(page, queryWrapper); + //---------------------补数据1------------------------------------------ + Map sourceDictMap = Maps.newHashMap(); + //0：门户添加，1：老系统，2：政务大厅，3后台导入 + sourceDictMap.put(0,"课程中心"); + sourceDictMap.put(1,"老系统"); + sourceDictMap.put(2,"服务大厅"); + sourceDictMap.put(3,"线下纸质"); + //---------------------补数据1------------------------------------------ + + Set tjSet = Sets.newHashSet(); + pageList.getRecords().forEach(x -> { + //补充信息 + x.setSourceName(sourceDictMap.get(x.getSource()));//数据来源 + Integer ixuserId = x.getUpuserid(); + String xuserId = String.valueOf(ixuserId); + tjSet.add(xuserId); + }); + + if(tjSet.isEmpty()){ + return new Page<>(); + } + //---------------------补数据2------------------------------------------ + + //查询听课身份 + QueryWrapper tksfQw = new QueryWrapper<>(); + tksfQw.in("gh",tjSet); + List tksfList = kcTksfrzbService.list(tksfQw); + Map tksfMap = Maps.newHashMap(); + tksfList.forEach(x -> { + if(tksfMap.containsKey(x.getGh())){ + //存在了，拼接职务名称，取最大的听课要求 + KcTksfrzb currentData = tksfMap.get(x.getGh()); + String currentZwmc = currentData.getZwmc(); + String currentTkyq = currentData.getTkyq(); + if(StringUtils.isNotBlank(currentTkyq)){ + int tkyq = Integer.parseInt(currentTkyq); + int xtkyq = Integer.parseInt(x.getTkyq()); + x.setZwmc(currentZwmc + "、" + x.getZwmc()); + if(tkyq > xtkyq){ + x.setTkyq(String.valueOf(tkyq)); + }else{ + x.setTkyq(String.valueOf(xtkyq)); + } + } + tksfMap.put(x.getGh(),x); + }else { + tksfMap.put(x.getGh(),x); + } + }); + //---------------------补数据2------------------------------------------ + pageList.getRecords().forEach(x -> { + Integer ixuserId = x.getUpuserid(); + String xuserId = String.valueOf(ixuserId); +// if(szdwMap.containsKey(xuserId)){ +// Xxhbuser currentData = szdwMap.get(xuserId); +// x.setDwmc(currentData.getDwmc()); +// } + if(tksfMap.containsKey(xuserId)){ + KcTksfrzb currentData = tksfMap.get(xuserId); + //tj.setJsxm(currentData.getXm()); + x.setTksf(currentData.getZwmc()); + //tj.setYskcs(currentData.getTkyq()); + } + + Date upDate = x.getUpDate(); + kcXqxnHistoryList.forEach(hx -> { + Date startTime = hx.getStartTime(); + Date endTime = hx.getEndTime(); + long betweenStartDay = DateUtil.between(startTime, upDate, DateUnit.DAY,false); + long betweenEndDay = DateUtil.between(endTime, upDate, DateUnit.DAY,false); + if(betweenStartDay >=0 && betweenEndDay <=0) { x.setXqxn(hx.getTitle()); } } ); @@ -208,6 +321,17 @@ public class TingKeStatisticsController { return exportXls(request, kcEvaluationVo, KcEvaluationVo.class, "评价量表统计"); } + /** + * 导出excel + * + * @param request + */ + @RequestMapping(value = "/exportEvaluationXls2") + public ModelAndView exportXls2(HttpServletRequest request, KcEvaluationVo2 kcEvaluationVo) { + return exportXls(request, kcEvaluationVo, KcEvaluationVo2.class, "评价量表统计"); + } + + /** * 导出excel @@ -244,6 +368,40 @@ public class TingKeStatisticsController { return mv; } + /** + * 导出excel + * + * @param request + */ + public ModelAndView exportXls(HttpServletRequest request, KcEvaluationVo2 object, Class clazz, String title) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + queryWrapper.in("id",selectionList); + } + // Step.2 获取导出数据 +// List exportList = service.selectPageAndKcmc(queryWrapper); + Page page = new Page<>(1, -1); + IPage pageList = loadPageData2(object,queryWrapper,page); + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, title); + mv.addObject(NormalExcelConstants.CLASS, clazz); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); + exportParams.setImageBasePath(upLoadPath); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList.getRecords()); + return mv; + } public static void main(String[] args) { Date upDate = DateUtil.parseDateTime("2023-03-13 00:00:00"); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/controller/JwmsController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/controller/JwmsController.java new file mode 100644 index 00000000..cc1eb38e --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/controller/JwmsController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.sys.jwms.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.sys.jwms.entity.Jwms; +import org.jeecg.modules.sys.jwms.service.IJwmsService; + +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: 教务秘书 + * @Author: jeecg-boot + * @Date: 2023-06-17 + * @Version: V1.0 + */ +@Api(tags="教务秘书") +@RestController +@RequestMapping("/sys/jwms") +@Slf4j +public class JwmsController extends JeecgController { + @Autowired + private IJwmsService jwmsService; + + /** + * 分页列表查询 + * + * @param jwms + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "教务秘书-分页列表查询") + @ApiOperation(value="教务秘书-分页列表查询", notes="教务秘书-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(Jwms jwms, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(jwms, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = jwmsService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param jwms + * @return + */ + @AutoLog(value = "教务秘书-添加") + @ApiOperation(value="教务秘书-添加", notes="教务秘书-添加") + @RequiresPermissions("sys:jwms:add") + @PostMapping(value = "/add") + public Result add(@RequestBody Jwms jwms) { + jwmsService.save(jwms); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param jwms + * @return + */ + @AutoLog(value = "教务秘书-编辑") + @ApiOperation(value="教务秘书-编辑", notes="教务秘书-编辑") + @RequiresPermissions("sys:jwms:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody Jwms jwms) { + jwmsService.updateById(jwms); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "教务秘书-通过id删除") + @ApiOperation(value="教务秘书-通过id删除", notes="教务秘书-通过id删除") + @RequiresPermissions("sys:jwms:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + jwmsService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "教务秘书-批量删除") + @ApiOperation(value="教务秘书-批量删除", notes="教务秘书-批量删除") + @RequiresPermissions("sys:jwms:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.jwmsService.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) { + Jwms jwms = jwmsService.getById(id); + if(jwms==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(jwms); + } + + /** + * 导出excel + * + * @param request + * @param jwms + */ + @RequiresPermissions("sys:jwms:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Jwms jwms) { + return super.exportXls(request, jwms, Jwms.class, "教务秘书"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("sys:jwms:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, Jwms.class); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/entity/Jwms.java b/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/entity/Jwms.java new file mode 100644 index 00000000..e7924240 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/entity/Jwms.java @@ -0,0 +1,55 @@ +package org.jeecg.modules.sys.jwms.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: 教务秘书 + * @Author: jeecg-boot + * @Date: 2023-06-17 + * @Version: V1.0 + */ +@Data +@TableName("jwms") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="jwms对象", description="教务秘书") +public class Jwms 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 userid; + /**用户名*/ + @Excel(name = "用户名", width = 15) + @ApiModelProperty(value = "用户名") + private java.lang.String username; + /**范围*/ + @Excel(name = "范围", width = 15) + @ApiModelProperty(value = "范围") + private java.lang.String range; + /**院校*/ + @Excel(name = "院校", width = 15) + @ApiModelProperty(value = "院校") + private java.lang.String college; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/mapper/JwmsMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/mapper/JwmsMapper.java new file mode 100644 index 00000000..9872ce59 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/mapper/JwmsMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.sys.jwms.mapper; + +import org.jeecg.modules.sys.jwms.entity.Jwms; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 教务秘书 + * @Author: jeecg-boot + * @Date: 2023-06-17 + * @Version: V1.0 + */ +public interface JwmsMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/mapper/xml/JwmsMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/mapper/xml/JwmsMapper.xml new file mode 100644 index 00000000..991e7612 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/mapper/xml/JwmsMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/service/IJwmsService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/service/IJwmsService.java new file mode 100644 index 00000000..3acddd89 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/service/IJwmsService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.sys.jwms.service; + +import org.jeecg.modules.sys.jwms.entity.Jwms; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 教务秘书 + * @Author: jeecg-boot + * @Date: 2023-06-17 + * @Version: V1.0 + */ +public interface IJwmsService extends IService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/service/impl/JwmsServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/service/impl/JwmsServiceImpl.java new file mode 100644 index 00000000..706c3295 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/sys/jwms/service/impl/JwmsServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.sys.jwms.service.impl; + +import org.jeecg.modules.sys.jwms.entity.Jwms; +import org.jeecg.modules.sys.jwms.mapper.JwmsMapper; +import org.jeecg.modules.sys.jwms.service.IJwmsService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 教务秘书 + * @Author: jeecg-boot + * @Date: 2023-06-17 + * @Version: V1.0 + */ +@Service +public class JwmsServiceImpl extends ServiceImpl implements IJwmsService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-module-system/jeecg-system-biz/pom.xml index dcfd8cb4..fb64752a 100644 --- a/jeecg-module-system/jeecg-system-biz/pom.xml +++ b/jeecg-module-system/jeecg-system-biz/pom.xml @@ -34,7 +34,7 @@ org.jeecgframework.jimureport jimureport-spring-boot-starter - + + org.jeecgframework.boot + jeecg-module-main + ${jeecgboot.version} + + org.jeecgframework.boot