From 61e204aeb3c212504c7b0ff18f9d07c66e1558ad Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 25 Oct 2023 14:18:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E5=88=86=E7=BB=84=E9=A2=98?= =?UTF-8?q?=E7=9B=AE=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AnnComGroTopController.java | 179 ++++++++++++++++++ .../anncomgrotop/entity/AnnComGroTop.java | 78 ++++++++ .../mapper/AnnComGroTopMapper.java | 17 ++ .../mapper/xml/AnnComGroTopMapper.xml | 5 + .../service/IAnnComGroTopService.java | 14 ++ .../service/impl/AnnComGroTopServiceImpl.java | 19 ++ .../controller/AnnComGroTopPController.java | 179 ++++++++++++++++++ .../anncomgrotopp/entity/AnnComGroTopP.java | 71 +++++++ .../mapper/AnnComGroTopPMapper.java | 17 ++ .../mapper/xml/AnnComGroTopPMapper.xml | 5 + .../service/IAnnComGroTopPService.java | 14 ++ .../impl/AnnComGroTopPServiceImpl.java | 19 ++ .../ChaoseTopicPersionController.java | 68 +++++++ .../topic/controller/TopicController.java | 61 ++++++ 14 files changed, 746 insertions(+) create mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/controller/AnnComGroTopController.java create mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/entity/AnnComGroTop.java create mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/mapper/AnnComGroTopMapper.java create mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/mapper/xml/AnnComGroTopMapper.xml create mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/service/IAnnComGroTopService.java create mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/service/impl/AnnComGroTopServiceImpl.java create mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/controller/AnnComGroTopPController.java create mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/entity/AnnComGroTopP.java create mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/mapper/AnnComGroTopPMapper.java create mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/mapper/xml/AnnComGroTopPMapper.xml create mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/service/IAnnComGroTopPService.java create mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/service/impl/AnnComGroTopPServiceImpl.java diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/controller/AnnComGroTopController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/controller/AnnComGroTopController.java new file mode 100644 index 00000000..2ee423cb --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/controller/AnnComGroTopController.java @@ -0,0 +1,179 @@ +package org.jeecg.modules.demo.anncomgrotop.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +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.util.oConvertUtils; +import org.jeecg.modules.demo.anncomgrotop.entity.AnnComGroTop; +import org.jeecg.modules.demo.anncomgrotop.service.IAnnComGroTopService; + +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.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.jeecg.common.system.base.controller.JeecgController; +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; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 专家组年度比赛项目题目 + * @Author: jeecg-boot + * @Date: 2023-10-23 + * @Version: V1.0 + */ +@Api(tags="专家组年度比赛项目题目") +@RestController +@RequestMapping("/anncomgrotop/annComGroTop") +@Slf4j +public class AnnComGroTopController extends JeecgController { + @Autowired + private IAnnComGroTopService annComGroTopService; + + /** + * 分页列表查询 + * + * @param annComGroTop + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "专家组年度比赛项目题目-分页列表查询") + @ApiOperation(value="专家组年度比赛项目题目-分页列表查询", notes="专家组年度比赛项目题目-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(AnnComGroTop annComGroTop, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req,@RequestParam(name="ndbsxzid",required=true) String ndbsxzid) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annComGroTop, req.getParameterMap()); + queryWrapper.eq("ann_com_p_g",ndbsxzid); + Page page = new Page(pageNo, pageSize); + IPage pageList = annComGroTopService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param annComGroTop + * @return + */ + @AutoLog(value = "专家组年度比赛项目题目-添加") + @ApiOperation(value="专家组年度比赛项目题目-添加", notes="专家组年度比赛项目题目-添加") + //@RequiresPermissions("anncomgrotop:ann_com_gro_top:add") + @PostMapping(value = "/add") + public Result add(@RequestBody AnnComGroTop annComGroTop) { + annComGroTopService.save(annComGroTop); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param annComGroTop + * @return + */ + @AutoLog(value = "专家组年度比赛项目题目-编辑") + @ApiOperation(value="专家组年度比赛项目题目-编辑", notes="专家组年度比赛项目题目-编辑") + //@RequiresPermissions("anncomgrotop:ann_com_gro_top:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody AnnComGroTop annComGroTop) { + annComGroTopService.updateById(annComGroTop); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "专家组年度比赛项目题目-通过id删除") + @ApiOperation(value="专家组年度比赛项目题目-通过id删除", notes="专家组年度比赛项目题目-通过id删除") + //@RequiresPermissions("anncomgrotop:ann_com_gro_top:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + annComGroTopService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "专家组年度比赛项目题目-批量删除") + @ApiOperation(value="专家组年度比赛项目题目-批量删除", notes="专家组年度比赛项目题目-批量删除") + //@RequiresPermissions("anncomgrotop:ann_com_gro_top:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.annComGroTopService.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) { + AnnComGroTop annComGroTop = annComGroTopService.getById(id); + if(annComGroTop==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(annComGroTop); + } + + /** + * 导出excel + * + * @param request + * @param annComGroTop + */ + //@RequiresPermissions("anncomgrotop:ann_com_gro_top:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, AnnComGroTop annComGroTop) { + return super.exportXls(request, annComGroTop, AnnComGroTop.class, "专家组年度比赛项目题目"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("anncomgrotop:ann_com_gro_top:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, AnnComGroTop.class); + } + +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/entity/AnnComGroTop.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/entity/AnnComGroTop.java new file mode 100644 index 00000000..d030f4a8 --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/entity/AnnComGroTop.java @@ -0,0 +1,78 @@ +package org.jeecg.modules.demo.anncomgrotop.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-10-23 + * @Version: V1.0 + */ +@Data +@TableName("ann_com_gro_top") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ann_com_gro_top对象", description="专家组年度比赛项目题目") +public class AnnComGroTop implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**年度*/ + @Excel(name = "年度", width = 15, dictTable = "annual", dicText = "annual_name", dicCode = "id") + @Dict(dictTable = "annual", dicText = "annual_name", dicCode = "id") + @ApiModelProperty(value = "年度") + private java.lang.String annid; + /**年度比赛项目*/ + @Excel(name = "年度比赛项目", width = 15, dictTable = "annual_comp_point", dicText = "obj_name", dicCode = "id") + @Dict(dictTable = "annual_comp_point", dicText = "obj_name", dicCode = "id") + @ApiModelProperty(value = "年度比赛项目") + private java.lang.String annComP; + /**专家组*/ + @Excel(name = "专家组", width = 15, dictTable = "annual_comp_group", dicText = "name", dicCode = "id") + @Dict(dictTable = "annual_comp_group", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "专家组") + private java.lang.String annComPG; + /**题目*/ + @Excel(name = "题目", width = 15, dictTable = "topic", dicText = "name", dicCode = "id") + @Dict(dictTable = "topic", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "题目") + private java.lang.String topid; +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/mapper/AnnComGroTopMapper.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/mapper/AnnComGroTopMapper.java new file mode 100644 index 00000000..dffbaff1 --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/mapper/AnnComGroTopMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.anncomgrotop.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.anncomgrotop.entity.AnnComGroTop; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 专家组年度比赛项目题目 + * @Author: jeecg-boot + * @Date: 2023-10-23 + * @Version: V1.0 + */ +public interface AnnComGroTopMapper extends BaseMapper { + +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/mapper/xml/AnnComGroTopMapper.xml b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/mapper/xml/AnnComGroTopMapper.xml new file mode 100644 index 00000000..14922069 --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/mapper/xml/AnnComGroTopMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/service/IAnnComGroTopService.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/service/IAnnComGroTopService.java new file mode 100644 index 00000000..32afb1d5 --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/service/IAnnComGroTopService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.anncomgrotop.service; + +import org.jeecg.modules.demo.anncomgrotop.entity.AnnComGroTop; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 专家组年度比赛项目题目 + * @Author: jeecg-boot + * @Date: 2023-10-23 + * @Version: V1.0 + */ +public interface IAnnComGroTopService extends IService { + +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/service/impl/AnnComGroTopServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/service/impl/AnnComGroTopServiceImpl.java new file mode 100644 index 00000000..ef2e7b6f --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotop/service/impl/AnnComGroTopServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.anncomgrotop.service.impl; + +import org.jeecg.modules.demo.anncomgrotop.entity.AnnComGroTop; +import org.jeecg.modules.demo.anncomgrotop.mapper.AnnComGroTopMapper; +import org.jeecg.modules.demo.anncomgrotop.service.IAnnComGroTopService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 专家组年度比赛项目题目 + * @Author: jeecg-boot + * @Date: 2023-10-23 + * @Version: V1.0 + */ +@Service +public class AnnComGroTopServiceImpl extends ServiceImpl implements IAnnComGroTopService { + +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/controller/AnnComGroTopPController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/controller/AnnComGroTopPController.java new file mode 100644 index 00000000..a4fb4e30 --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/controller/AnnComGroTopPController.java @@ -0,0 +1,179 @@ +package org.jeecg.modules.demo.anncomgrotopp.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +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.util.oConvertUtils; +import org.jeecg.modules.demo.anncomgrotopp.entity.AnnComGroTopP; +import org.jeecg.modules.demo.anncomgrotopp.service.IAnnComGroTopPService; + +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.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.jeecg.common.system.base.controller.JeecgController; +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; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 专家组年度比赛项目题目报名编号 + * @Author: jeecg-boot + * @Date: 2023-10-24 + * @Version: V1.0 + */ +@Api(tags="专家组年度比赛项目题目报名编号") +@RestController +@RequestMapping("/anncomgrotopp/annComGroTopP") +@Slf4j +public class AnnComGroTopPController extends JeecgController { + @Autowired + private IAnnComGroTopPService annComGroTopPService; + + /** + * 分页列表查询 + * + * @param annComGroTopP + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "专家组年度比赛项目题目报名编号-分页列表查询") + @ApiOperation(value="专家组年度比赛项目题目报名编号-分页列表查询", notes="专家组年度比赛项目题目报名编号-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(AnnComGroTopP annComGroTopP, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req,@RequestParam(name="xmtmid",required=true) String xmtmid) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annComGroTopP, req.getParameterMap()); + queryWrapper.eq("ann_com_gro_topid",xmtmid); + Page page = new Page(pageNo, pageSize); + IPage pageList = annComGroTopPService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param annComGroTopP + * @return + */ + @AutoLog(value = "专家组年度比赛项目题目报名编号-添加") + @ApiOperation(value="专家组年度比赛项目题目报名编号-添加", notes="专家组年度比赛项目题目报名编号-添加") + //@RequiresPermissions("anncomgrotopp:ann_com_gro_top_p:add") + @PostMapping(value = "/add") + public Result add(@RequestBody AnnComGroTopP annComGroTopP) { + annComGroTopPService.save(annComGroTopP); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param annComGroTopP + * @return + */ + @AutoLog(value = "专家组年度比赛项目题目报名编号-编辑") + @ApiOperation(value="专家组年度比赛项目题目报名编号-编辑", notes="专家组年度比赛项目题目报名编号-编辑") + //@RequiresPermissions("anncomgrotopp:ann_com_gro_top_p:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody AnnComGroTopP annComGroTopP) { + annComGroTopPService.updateById(annComGroTopP); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "专家组年度比赛项目题目报名编号-通过id删除") + @ApiOperation(value="专家组年度比赛项目题目报名编号-通过id删除", notes="专家组年度比赛项目题目报名编号-通过id删除") + //@RequiresPermissions("anncomgrotopp:ann_com_gro_top_p:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + annComGroTopPService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "专家组年度比赛项目题目报名编号-批量删除") + @ApiOperation(value="专家组年度比赛项目题目报名编号-批量删除", notes="专家组年度比赛项目题目报名编号-批量删除") + //@RequiresPermissions("anncomgrotopp:ann_com_gro_top_p:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.annComGroTopPService.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) { + AnnComGroTopP annComGroTopP = annComGroTopPService.getById(id); + if(annComGroTopP==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(annComGroTopP); + } + + /** + * 导出excel + * + * @param request + * @param annComGroTopP + */ + //@RequiresPermissions("anncomgrotopp:ann_com_gro_top_p:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, AnnComGroTopP annComGroTopP) { + return super.exportXls(request, annComGroTopP, AnnComGroTopP.class, "专家组年度比赛项目题目报名编号"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("anncomgrotopp:ann_com_gro_top_p:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, AnnComGroTopP.class); + } + +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/entity/AnnComGroTopP.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/entity/AnnComGroTopP.java new file mode 100644 index 00000000..e4da6b2f --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/entity/AnnComGroTopP.java @@ -0,0 +1,71 @@ +package org.jeecg.modules.demo.anncomgrotopp.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-10-24 + * @Version: V1.0 + */ +@Data +@TableName("ann_com_gro_top_p") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ann_com_gro_top_p对象", description="专家组年度比赛项目题目报名编号") +public class AnnComGroTopP implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**专家组年度比赛项目题目*/ + @Excel(name = "专家组年度比赛项目题目", width = 15) + @ApiModelProperty(value = "专家组年度比赛项目题目") + private java.lang.String annComGroTopid; + /**题目*/ + @Excel(name = "题目", width = 15, dictTable = "topic", dicText = "name", dicCode = "id") + @Dict(dictTable = "topic", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "题目") + private java.lang.String topid; + /**报名编号*/ + @Excel(name = "报名编号", width = 15) + @ApiModelProperty(value = "报名编号") + private java.lang.String bmcode; +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/mapper/AnnComGroTopPMapper.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/mapper/AnnComGroTopPMapper.java new file mode 100644 index 00000000..44e88560 --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/mapper/AnnComGroTopPMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.anncomgrotopp.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.anncomgrotopp.entity.AnnComGroTopP; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 专家组年度比赛项目题目报名编号 + * @Author: jeecg-boot + * @Date: 2023-10-24 + * @Version: V1.0 + */ +public interface AnnComGroTopPMapper extends BaseMapper { + +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/mapper/xml/AnnComGroTopPMapper.xml b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/mapper/xml/AnnComGroTopPMapper.xml new file mode 100644 index 00000000..8414224b --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/mapper/xml/AnnComGroTopPMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/service/IAnnComGroTopPService.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/service/IAnnComGroTopPService.java new file mode 100644 index 00000000..78a7ea48 --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/service/IAnnComGroTopPService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.anncomgrotopp.service; + +import org.jeecg.modules.demo.anncomgrotopp.entity.AnnComGroTopP; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 专家组年度比赛项目题目报名编号 + * @Author: jeecg-boot + * @Date: 2023-10-24 + * @Version: V1.0 + */ +public interface IAnnComGroTopPService extends IService { + +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/service/impl/AnnComGroTopPServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/service/impl/AnnComGroTopPServiceImpl.java new file mode 100644 index 00000000..b4b1f8e7 --- /dev/null +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/anncomgrotopp/service/impl/AnnComGroTopPServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.anncomgrotopp.service.impl; + +import org.jeecg.modules.demo.anncomgrotopp.entity.AnnComGroTopP; +import org.jeecg.modules.demo.anncomgrotopp.mapper.AnnComGroTopPMapper; +import org.jeecg.modules.demo.anncomgrotopp.service.IAnnComGroTopPService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 专家组年度比赛项目题目报名编号 + * @Author: jeecg-boot + * @Date: 2023-10-24 + * @Version: V1.0 + */ +@Service +public class AnnComGroTopPServiceImpl extends ServiceImpl implements IAnnComGroTopPService { + +} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java index e02a3b00..3e1802be 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java @@ -16,6 +16,10 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.demo.anncomgrotop.entity.AnnComGroTop; +import org.jeecg.modules.demo.anncomgrotop.service.IAnnComGroTopService; +import org.jeecg.modules.demo.anncomgrotopp.entity.AnnComGroTopP; +import org.jeecg.modules.demo.anncomgrotopp.service.IAnnComGroTopPService; import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService; import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.AnnualCompetitionProjectRegistration; import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.IAnnualCompetitionProjectRegistrationService; @@ -68,6 +72,10 @@ public class ChaoseTopicPersionController extends JeecgController> bmbhlist(ChaoseTopicPersion chaoseTopicPersion, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req,@RequestParam(name="xmtmid",required=true) String xmtmid) { + AnnComGroTop annComGroTop = annComGroTopService.getById(xmtmid); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(chaoseTopicPersion, req.getParameterMap()); + queryWrapper.eq("timul",annComGroTop.getTopid()); + queryWrapper.eq("status","2"); + AnnComGroTopP annComGroTopP = new AnnComGroTopP(); + QueryWrapper queryWrapperagt = QueryGenerator.initQueryWrapper(annComGroTopP, req.getParameterMap()); + //queryWrapperagt.eq("ann_com_gro_topid",xmtmid); + queryWrapperagt.eq("topid",annComGroTop.getTopid()); + List listact = annComGroTopPService.list(queryWrapperagt); + String str = ""; + for(int i = 0 ; i page = new Page<>(pageNo, pageSize); + IPage pageList = chaoseTopicPersionService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param + * @return + */ + @AutoLog(value = "报名编号-添加") + @ApiOperation(value = "报名编号-添加", notes = "报名编号-添加") +// @RequiresPermissions("chooseTopicPersion:chaose_topic_persion:add") + @GetMapping(value = "/bmbhadd") + public Result bmbhadd(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="xmtmid",required=true) String xmtmid) { + String strs[] = ids.split(","); + for (int i = 0 ; i < strs.length ; i++){ + ChaoseTopicPersion chaoseTopicPersion = chaoseTopicPersionService.getById(strs[i]); + AnnComGroTopP annComGroTopP = new AnnComGroTopP(); + annComGroTopP.setAnnComGroTopid(xmtmid); + annComGroTopP.setTopid(chaoseTopicPersion.getTimul()); + annComGroTopP.setBmcode(chaoseTopicPersion.getBmcode()); + annComGroTopPService.save(annComGroTopP); + } + return Result.OK("绑定成功！"); + } + /** * 添加 * diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java index 97c634c0..86e9c8c3 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java @@ -11,10 +11,14 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.modules.demo.anncomgrotop.entity.AnnComGroTop; +import org.jeecg.modules.demo.anncomgrotop.service.IAnnComGroTopService; import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService; import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.AnnualCompetitionProjectRegistration; import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.IAnnualCompetitionProjectRegistrationService; +import org.jeecg.modules.demo.annualcompgroup.entity.AnnualCompGroup; +import org.jeecg.modules.demo.annualcompgroup.service.IAnnualCompGroupService; import org.jeecg.modules.demo.topic.entity.Topic; import org.jeecg.modules.demo.topic.service.ITopicService; @@ -53,6 +57,10 @@ public class TopicController extends JeecgController { private IAnnualCompPointService annualCompPointService; @Autowired private IAnnualCompetitionProjectRegistrationService annualCompetitionProjectRegistrationService; + @Autowired + private IAnnualCompGroupService annualCompGroupService; + @Autowired + private IAnnComGroTopService annComGroTopService; /** * 分页列表查询 @@ -79,6 +87,59 @@ public class TopicController extends JeecgController { return Result.OK(pageList); } + //@AutoLog(value = "题目管理-分页列表查询") + @ApiOperation(value = "设置题目", notes = "设置题目") + @GetMapping(value = "/szlist") + public Result> szlist(Topic topic, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req,@RequestParam(name="ndbsxzid",required=true) String ndbsxzid) { + AnnualCompGroup annualCompGroup = annualCompGroupService.getById(ndbsxzid); + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String orgCode = user.getOrgCode(); + topic.setSysOrgCode(orgCode); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(topic, req.getParameterMap()); + queryWrapper.eq("annual_compid",annualCompGroup.getAnnCompP()); + queryWrapper.eq("status",2); + queryWrapper.eq("isopen","Y"); + AnnComGroTop annComGroTop = new AnnComGroTop(); + QueryWrapper queryWrapper1 = QueryGenerator.initQueryWrapper(annComGroTop, req.getParameterMap()); + queryWrapper1.eq("ann_com_p_g",ndbsxzid); + List listagt = annComGroTopService.list(queryWrapper1); + String str = ""; + for(int i = 0 ; i page = new Page(pageNo, pageSize); + IPage pageList = topicService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param ids + * @return + */ + @AutoLog(value = "设置题目添加") + @ApiOperation(value="设置题目添加", notes="设置题目添加") + //@RequiresPermissions("expert:expert:add") + @GetMapping(value = "/szadd") + public Result szadd(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="ndbsxzid",required=true) String ndbsxzid) { + AnnualCompGroup annualCompGroup = annualCompGroupService.getById(ndbsxzid); + String str[] =ids.split(","); + for (int i = 0 ; i < str.length;i++){ + AnnComGroTop annComGroTop = new AnnComGroTop(); + annComGroTop.setAnnid(annualCompGroup.getAnnal()); + annComGroTop.setAnnComP(annualCompGroup.getAnnCompP()); + annComGroTop.setAnnComPG(ndbsxzid); + annComGroTop.setTopid(str[i]); + annComGroTopService.save(annComGroTop); + } + return Result.OK("设置成功！"); + } + // @ApiOperation(value = "题目管理-教务处待审核", notes = "题目管理-分页列表查询") // @GetMapping(value = "/list1") // public Result> queryPageList1(Topic topic,