diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java deleted file mode 100644 index f49f625b..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java +++ /dev/null @@ -1,444 +0,0 @@ -package org.jeecg.modules.demo.annualcompgroup.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.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.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.entity.AnnualCompPoint; -import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService; -import org.jeecg.modules.demo.annualcomp.entity.AnnualComp; -import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService; -import org.jeecg.modules.demo.annualcompgroup.entity.AnnualCompGroup; -import org.jeecg.modules.demo.annualcompgroup.service.IAnnualCompGroupService; - -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.modules.demo.awardpersion.entity.AwardPersion; -import org.jeecg.modules.demo.chooseTopicPersion.entity.ChaoseTopicPersion; -import org.jeecg.modules.demo.chooseTopicPersion.service.IChaoseTopicPersionService; -import org.jeecg.modules.demo.comp.entity.Comp; -import org.jeecg.modules.demo.comp.service.ICompService; -import org.jeecg.modules.demo.scoresta.entity.ScoreSta; -import org.jeecg.modules.demo.scoresta.service.IScoreStaService; -import org.jeecg.modules.demo.upfile_persion.entity.UpfilePersion; -import org.jeecg.modules.demo.upfile_persion.service.IUpfilePersionService; -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-13 - * @Version: V1.0 - */ -@Api(tags="年度比赛项目专家小组") -@RestController -@RequestMapping("/annualcompgroup/annualCompGroup") -@Slf4j -public class AnnualCompGroupController extends JeecgController { - @Autowired - private IAnnualCompGroupService annualCompGroupService; - - @Autowired - private ICompService compService; - - @Autowired - private IScoreStaService scoreStaService; - - @Autowired - private IAnnualCompService annualCompService; - - @Autowired - private IAnnualCompPointService annualCompPointService; - - @Autowired - private IAnnComGroTopPService annComGroTopPService; - - @Autowired - private IUpfilePersionService upfilePersionService; - - @Autowired - private IChaoseTopicPersionService chaoseTopicPersionService; - - @Autowired - private IAnnComGroTopService annComGroTopService; - - - /** - * 分页列表查询 - * - * @param annualCompGroup - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "年度比赛项目专家小组-分页列表查询") - @ApiOperation(value="年度比赛项目专家小组-分页列表查询", notes="年度比赛项目专家小组-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(AnnualCompGroup annualCompGroup, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - Comp comp = new Comp(); - QueryWrapper queryWrappercomp = QueryGenerator.initQueryWrapper(comp, req.getParameterMap()); - queryWrappercomp.eq("comp_admin",user.getUsername()); - List list = compService.list(queryWrappercomp); - if(list.size()==0){ - return Result.OK(null); - } - List ids = list.stream().map(Comp::getId).collect(Collectors.toList()); - QueryWrapper queryWrapperAnnual = new QueryWrapper<>(); - queryWrapperAnnual.in("compid",ids); - List listAnnual = annualCompService.list(queryWrapperAnnual); - if(listAnnual.size()==0){ - return Result.OK(null); - } - List annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList()); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompGroup, req.getParameterMap()); - queryWrapper.in(annualIds.size()!=0,"annal_comp",annualIds); - - AnnualCompPoint annualCompPoint = new AnnualCompPoint(); - QueryWrapper queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); - queryWrapperacp.in("annual_comp_id",annualIds); - queryWrapperacp.eq("annual_comp_switch","Y"); // 比赛必须是开启的 - List listacp = annualCompPointService.list(queryWrapperacp); - if(listacp.size()==0){ - return Result.OK(null); - } - List acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList()); - queryWrapper.in(acpIds.size()!=0,"ann_comp_p",acpIds); - - - Page page = new Page(pageNo, pageSize); - IPage pageList = annualCompGroupService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param annualCompGroup - * @return - */ - @AutoLog(value = "年度比赛项目专家小组-添加") - @ApiOperation(value="年度比赛项目专家小组-添加", notes="年度比赛项目专家小组-添加") - //@RequiresPermissions("annualcompgroup:annual_comp_group:add") - @PostMapping(value = "/add") - public Result add(@RequestBody AnnualCompGroup annualCompGroup) { - annualCompGroupService.save(annualCompGroup); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param annualCompGroup - * @return - */ - @AutoLog(value = "年度比赛项目专家小组-编辑") - @ApiOperation(value="年度比赛项目专家小组-编辑", notes="年度比赛项目专家小组-编辑") - //@RequiresPermissions("annualcompgroup:annual_comp_group:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody AnnualCompGroup annualCompGroup) { - annualCompGroupService.updateById(annualCompGroup); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "年度比赛项目专家小组-通过id删除") - @ApiOperation(value="年度比赛项目专家小组-通过id删除", notes="年度比赛项目专家小组-通过id删除") - //@RequiresPermissions("annualcompgroup:annual_comp_group:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - annualCompGroupService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "年度比赛项目专家小组-批量删除") - @ApiOperation(value="年度比赛项目专家小组-批量删除", notes="年度比赛项目专家小组-批量删除") - //@RequiresPermissions("annualcompgroup:annual_comp_group:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.annualCompGroupService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 获取当前登录用户对应的比赛id - * - * @return - */ - @ApiOperation(value="获取当前登录用户对应的比赛id", notes="获取当前登录用户对应的比赛id") - @GetMapping(value = "/queryCompId") - public Result queryCompId(HttpServletRequest req) { - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - Comp comp = new Comp(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(comp, req.getParameterMap()); - queryWrapper.eq("comp_admin",user.getUsername()); - List list = compService.list(queryWrapper); - String str = ""; - for(int i = 0 ; i < list.size() ; i++){ - if(list.size()==1){ - str = "compid='"+list.get(i).getId()+"'"; - }else{ - if(i==list.size()-1){ - str = str + "compid='"+list.get(i).getId()+"'"; - }else { - str = "compid='"+list.get(i).getId()+"' or "+str; - } - - } - - } - return Result.OK(str); - } - - /** - * 获取已有的题目id - * - * @return - */ - @ApiOperation(value="获取已有的题目id", notes="获取已有的题目id") - @GetMapping(value = "/queryTmId") - public Result queryTmId(HttpServletRequest req,@RequestParam(name="ndid",required=true) String ndid,@RequestParam(name="ndbsid",required=true) String ndbsid,@RequestParam(name="ndbsxmid",required=true) String ndbsxmid,@RequestParam(name="staid",required=true) String staid) { - ScoreSta scoreSta = new ScoreSta(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(scoreSta, req.getParameterMap()); - queryWrapper.eq("annual_id",ndid); - queryWrapper.eq("annal_comp",ndbsid); - queryWrapper.eq("annual_compid",ndbsxmid); - List list = scoreStaService.list(queryWrapper); - String str = ""; - if(staid.equals("")){ - for(int i = 0 ; i < list.size() ; i++){ - if(list.size()==1){ - str = "id!='"+list.get(i).getTopicid()+"'"; - }else{ - if(i==list.size()-1){ - str = str + "id!='"+list.get(i).getTopicid()+"'";; - }else { - str = "id!='"+list.get(i).getTopicid()+"' and "+str; - } - } - } - }else { - ScoreSta scoreSta1 = scoreStaService.getById(staid); - for(int i = 0 ; i < list.size() ; i++){ - if(list.size()==1){ - if(!scoreSta1.getTopicid().equals(list.get(i).getTopicid())){ - str = "id!='"+list.get(i).getTopicid()+"'"; - } - }else{ - if(i==list.size()-1){ - if(!scoreSta1.getTopicid().equals(list.get(i).getTopicid())){ - str = str + "id!='"+list.get(i).getTopicid()+"'";; - } - }else { - if(!scoreSta1.getTopicid().equals(list.get(i).getTopicid())){ - str = "id!='"+list.get(i).getTopicid()+"' and "+str; - } - } - } - } - } - - return Result.OK(str); - } - - /** - * 通过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) { - AnnualCompGroup annualCompGroup = annualCompGroupService.getById(id); - if(annualCompGroup==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(annualCompGroup); - } - - /** - * 导出excel - * - * @param request - * @param annualCompGroup - */ - //@RequiresPermissions("annualcompgroup:annual_comp_group:exportXls") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, AnnualCompGroup annualCompGroup) { - return super.exportXls(request, annualCompGroup, AnnualCompGroup.class, "年度比赛项目专家小组"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - //@RequiresPermissions("annualcompgroup:annual_comp_group:importExcel") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, AnnualCompGroup.class); - } - - /** - * 自动分配作品 - * - * @return - */ - @ApiOperation(value="自动分配作品", notes="自动分配作品") - @GetMapping(value = "/zdfpzp") - public Result zdfpzp(AnnualCompGroup annualCompGroup, HttpServletRequest req) { - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - QueryWrapper queryWrappercomp = new QueryWrapper<>(); - queryWrappercomp.eq("comp_admin", user.getUsername()); - List list = compService.list(queryWrappercomp); - if (list.size() == 0) { - return Result.error("分配失败，该用户无负责比赛"); - } - List ids = list.stream().map(Comp::getId).collect(Collectors.toList()); - QueryWrapper queryWrapperAnnual = new QueryWrapper<>(); - queryWrapperAnnual.in("compid", ids); - List listAnnual = annualCompService.list(queryWrapperAnnual); - if (listAnnual.size() == 0) { - return Result.error("分配失败，该用户无负责年度比赛"); - } - List annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList()); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompGroup, req.getParameterMap()); - queryWrapper.in(annualIds.size() != 0, "annal_comp", annualIds); - - - QueryWrapper queryWrapperacp = new QueryWrapper<>(); - queryWrapperacp.in("annual_comp_id", annualIds); - queryWrapperacp.eq("annual_comp_switch", "Y"); // 比赛必须是开启的 - List listacp = annualCompPointService.list(queryWrapperacp); - if (listacp.size() == 0) { - return Result.error("分配失败，该用户无负责年度比赛项目"); - } - List acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList()); - queryWrapper.in(acpIds.size() != 0, "ann_comp_p", acpIds); - - List pageList = annualCompGroupService.list(queryWrapper); - if (pageList.size() == 0) { - return Result.error("分配失败，无可分配的专家组"); - } - List annualids = pageList.stream().map(AnnualCompGroup::getAnnal).collect(Collectors.toList()); - List annualcpids = pageList.stream().map(AnnualCompGroup::getAnnCompP).collect(Collectors.toList()); - QueryWrapper queryWrapperup = new QueryWrapper<>(); - queryWrapperup.in("annual_id", annualids); - queryWrapperup.in("annual_comp_point_id", annualcpids); - queryWrapperup.eq("status", "0"); - - QueryWrapper queryWrapperagt = new QueryWrapper<>(); - //queryWrapperagt.eq("ann_com_gro_topid",xmtmid); - queryWrapperagt.in("annid", annualids); - queryWrapperagt.in("ann_com_p", annualcpids); - annComGroTopPService.remove(queryWrapperagt); -/* String str = ""; - for (int i = 0; i < listact.size(); i++) { - str = str + listact.get(i).getBmcode() + ","; - } - if (str != "") { - queryWrapperup.notIn("apply_code", str.split(",")); - }*/ - List listup = upfilePersionService.list(queryWrapperup); - //作品的年度比赛项目必须和组的年度比赛项目相同才可以分配作品 - for (int o = 0; o < listup.size(); o++) { - QueryWrapper queryWrapperctp1 = new QueryWrapper<>(); - queryWrapperctp1.eq("bmcode", listup.get(o).getApplyCode()); - List listctp1 = chaoseTopicPersionService.list(queryWrapperctp1); - if (listctp1.size() == 0) { - return Result.error(listup.get(o).getTopicName() + "未选题，绑定失败！"); - } - } - //List acgids = pageList.stream().map(AnnualCompGroup::getId).collect(Collectors.toList()); - int upsum = listup.size(); - int acgsum = pageList.size(); - int pjz = upsum / acgsum; - int syz = upsum % acgsum; - - for (int y = 0; y < pageList.size(); y++) { - QueryWrapper queryWrapperatp = new QueryWrapper<>(); - queryWrapperatp.eq("ann_com_p_g", pageList.get(y).getId()); - List listtop = annComGroTopService.list(queryWrapperatp); - int upnum = 0; - for (int i = 0; i < listup.size(); i++) { - if(upnum==pjz&&pjz!=0&&listup.size()>syz){ - break; - } - for (int k = 0; k < listtop.size(); k++) { - QueryWrapper queryWrapperctp = new QueryWrapper<>(); - queryWrapperctp.eq("bmcode", listup.get(i).getApplyCode()); - List listctp = chaoseTopicPersionService.list(queryWrapperctp); - if (listtop.get(k).getTopid().equals(listctp.get(0).getTimul())) { - AnnComGroTopP annComGroTopP = new AnnComGroTopP(); - annComGroTopP.setAnnComGroTopid(listtop.get(k).getId()); - annComGroTopP.setBmcode(listup.get(i).getApplyCode()); - annComGroTopP.setAnnid(listtop.get(k).getAnnid()); - annComGroTopP.setAnnComP(listtop.get(k).getAnnComP()); - annComGroTopP.setAnnComPG(listtop.get(k).getAnnComPG()); - annComGroTopP.setTopicName(listup.get(i).getTopicName()); - annComGroTopP.setTopid(listtop.get(k).getTopid()); - annComGroTopPService.save(annComGroTopP); - listup.remove(i); - upnum++; - i=-1; - break; - } - } - } - } - return Result.OK("自动分配作品成功"); - } - -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/entity/AnnualCompGroup.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/entity/AnnualCompGroup.java deleted file mode 100644 index cda82fda..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/entity/AnnualCompGroup.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.jeecg.modules.demo.annualcompgroup.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-13 - * @Version: V1.0 - */ -@Data -@TableName("annual_comp_group") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="annual_comp_group对象", description="年度比赛项目专家小组") -public class AnnualCompGroup 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 annal; - /**年度比赛项目*/ - @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 annCompP; - /**小组名称*/ - @Excel(name = "小组名称", width = 15) - @ApiModelProperty(value = "小组名称") - private java.lang.String name; - /**年度比赛*/ - @Excel(name = "年度比赛", width = 15, dictTable = "annual_comp", dicText = "name", dicCode = "id") - @Dict(dictTable = "annual_comp", dicText = "name", dicCode = "id") - @ApiModelProperty(value = "年度比赛") - private java.lang.String annalComp; -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/mapper/AnnualCompGroupMapper.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/mapper/AnnualCompGroupMapper.java deleted file mode 100644 index f8d932cf..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/mapper/AnnualCompGroupMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.demo.annualcompgroup.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.annualcompgroup.entity.AnnualCompGroup; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 年度比赛项目专家小组 - * @Author: jeecg-boot - * @Date: 2023-10-13 - * @Version: V1.0 - */ -public interface AnnualCompGroupMapper extends BaseMapper { - -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/mapper/xml/AnnualCompGroupMapper.xml b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/mapper/xml/AnnualCompGroupMapper.xml deleted file mode 100644 index 3bb8808a..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/mapper/xml/AnnualCompGroupMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/service/IAnnualCompGroupService.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/service/IAnnualCompGroupService.java deleted file mode 100644 index 629affa0..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/service/IAnnualCompGroupService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.demo.annualcompgroup.service; - -import org.jeecg.modules.demo.annualcompgroup.entity.AnnualCompGroup; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 年度比赛项目专家小组 - * @Author: jeecg-boot - * @Date: 2023-10-13 - * @Version: V1.0 - */ -public interface IAnnualCompGroupService extends IService { - -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/service/impl/AnnualCompGroupServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/service/impl/AnnualCompGroupServiceImpl.java deleted file mode 100644 index 2169c45f..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/service/impl/AnnualCompGroupServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.demo.annualcompgroup.service.impl; - -import org.jeecg.modules.demo.annualcompgroup.entity.AnnualCompGroup; -import org.jeecg.modules.demo.annualcompgroup.mapper.AnnualCompGroupMapper; -import org.jeecg.modules.demo.annualcompgroup.service.IAnnualCompGroupService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 年度比赛项目专家小组 - * @Author: jeecg-boot - * @Date: 2023-10-13 - * @Version: V1.0 - */ -@Service -public class AnnualCompGroupServiceImpl extends ServiceImpl implements IAnnualCompGroupService { - -} diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.api.ts b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.api.ts deleted file mode 100644 index 0e98f3cb..00000000 --- a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.api.ts +++ /dev/null @@ -1,100 +0,0 @@ -import { defHttp } from '/@/utils/http/axios'; -import { useMessage } from "/@/hooks/web/useMessage"; - -const { createConfirm } = useMessage(); - -enum Api { - list = '/annualcompgroup/annualCompGroup/list', - save='/annualcompgroup/annualCompGroup/add', - edit='/annualcompgroup/annualCompGroup/edit', - deleteOne = '/annualcompgroup/annualCompGroup/delete', - deleteBatch = '/annualcompgroup/annualCompGroup/deleteBatch', - importExcel = '/annualcompgroup/annualCompGroup/importExcel', - exportXls = '/annualcompgroup/annualCompGroup/exportXls', - queryCompId = '/annualcompgroup/annualCompGroup/queryCompId', - saveTop = '/topic/topic/szadd', - zdfpzp = '/annualcompgroup/annualCompGroup/zdfpzp', -} - -export const zdfpzp = () => { - createConfirm({ - iconType: 'warning', - title: '确认自动分配作品', - content: '会清空已分配作品，重新进行分配', - okText: '确认', - cancelText: '取消', - onOk: () => { - return defHttp.get({ url: Api.zdfpzp}, { isTransformResponse: true }); - } - }); -} - -/** - * 导出api - * @param params - */ -export const getExportUrl = Api.exportXls; - -/** - * 导入api - */ -export const getImportUrl = Api.importExcel; - -export const queryCompId = (params) => defHttp.get({ url: Api.queryCompId, params }, { successMessageMode: 'none' }); - -/** - * 列表接口 - * @param params - */ -export const list = (params) => defHttp.get({ url: Api.list, params }); - -/** - * 删除单个 - * @param params - * @param handleSuccess - */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); -} - -/** - * 批量删除 - * @param params - * @param handleSuccess - */ -export const batchDelete = (params, handleSuccess) => { - createConfirm({ - iconType: 'warning', - title: '确认删除', - content: '是否删除选中数据', - okText: '确认', - cancelText: '取消', - onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); - } - }); -} - -/** - * 保存或者更新 - * @param params - * @param isUpdate - */ -export const saveOrUpdate = (params, isUpdate) => { - let url = isUpdate ? Api.edit : Api.save; - return defHttp.post({ url: url, params }, { isTransformResponse: false }); -} - -/** - * 保存或者更新 - * @param params - * @param isUpdate - */ -export const saveOrUpdateTop = (params, isUpdate) => { - let url = isUpdate ? Api.edit : Api.saveTop; - return defHttp.get({ url: url, params }, { isTransformResponse: false }); -} diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.data.ts b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.data.ts deleted file mode 100644 index de2f3f02..00000000 --- a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.data.ts +++ /dev/null @@ -1,107 +0,0 @@ -import {BasicColumn} from '/@/components/Table'; -import {FormSchema} from '/@/components/Table'; -import { rules} from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; -//列表数据 -export const columns: BasicColumn[] = [ - { - title: '年度', - align: "center", - dataIndex: 'annal_dictText' - }, - { - title: '年度比赛', - align: "center", - dataIndex: 'annalComp_dictText' - }, - { - title: '年度比赛项目', - align: "center", - dataIndex: 'annCompP_dictText' - }, - { - title: '小组名称', - align: "center", - dataIndex: 'name' - }, -]; - -//查询数据 -export const searchFormSchema: FormSchema[] = [ - { - label: "年度", - field: 'annal', - component: 'JDictSelectTag', - componentProps:{ - dictCode: "annual,annual_name,id" - }, - colProps: {span: 6}, - }, - { - label: "小组名称", - field: 'name', - component: 'Input', - colProps: {span: 6}, - }, -]; - -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '年度', - field: 'annal', - component: 'JDictSelectTag', - componentProps:{ - dictCode: "annual,annual_name,id" - }, - dynamicRules: ({model,schema}) => { - return [ - { required: true, message: '请输入年度!'}, - ]; - }, - }, - { - label: '年度比赛', - field: 'annalComp', - component: 'JSearchSelect', - componentProps:{ - dict: "annual_comp,name,id" - }, - dynamicRules: ({model,schema}) => { - return [ - { required: true, message: '请输入年度比赛!'}, - ]; - }, - }, - { - label: '年度比赛项目', - field: 'annCompP', - component: 'JSearchSelect', - componentProps:{ - dict: "annual_comp_point,obj_name,id" - }, - dynamicRules: ({model,schema}) => { - return [ - { required: true, message: '请输入年度比赛项目!'}, - ]; - }, - }, - { - label: '小组名称', - field: 'name', - component: 'Input', - dynamicRules: ({model,schema}) => { - return [ - { required: true, message: '请输入小组名称!'}, - ]; - }, - }, - - // TODO 主键隐藏字段，目前写死为ID - { - label: '', - field: 'id', - component: 'Input', - show: false, - }, -]; diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue deleted file mode 100644 index 2109cc25..00000000 --- a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue +++ /dev/null @@ -1,271 +0,0 @@ - - - - - diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList1.vue b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList1.vue deleted file mode 100644 index 63812aa2..00000000 --- a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList1.vue +++ /dev/null @@ -1,296 +0,0 @@ - - - - - diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup_menu_insert.sql b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup_menu_insert.sql deleted file mode 100644 index 97be7162..00000000 --- a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup_menu_insert.sql +++ /dev/null @@ -1,26 +0,0 @@ --- 注意：该页面对应的前台目录为views/annualcompgroup文件夹下 --- 如果你想更改到其他目录，请修改sql中component字段对应的值 - - -INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) -VALUES ('2023101302319980100', NULL, '年度比赛项目专家小组', '/annualcompgroup/annualCompGroupList', 'annualcompgroup/AnnualCompGroupList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-10-13 14:31:10', NULL, NULL, 0); - --- 权限控制sql --- 新增 -INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023101302319990101', '2023101302319980100', '添加年度比赛项目专家小组', NULL, NULL, 0, NULL, NULL, 2, 'annualcompgroup:annual_comp_group:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-13 14:31:10', NULL, NULL, 0, 0, '1', 0); --- 编辑 -INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023101302319990102', '2023101302319980100', '编辑年度比赛项目专家小组', NULL, NULL, 0, NULL, NULL, 2, 'annualcompgroup:annual_comp_group:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-13 14:31:10', NULL, NULL, 0, 0, '1', 0); --- 删除 -INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023101302319990103', '2023101302319980100', '删除年度比赛项目专家小组', NULL, NULL, 0, NULL, NULL, 2, 'annualcompgroup:annual_comp_group:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-13 14:31:10', NULL, NULL, 0, 0, '1', 0); --- 批量删除 -INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023101302319990104', '2023101302319980100', '批量删除年度比赛项目专家小组', NULL, NULL, 0, NULL, NULL, 2, 'annualcompgroup:annual_comp_group:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-13 14:31:10', NULL, NULL, 0, 0, '1', 0); --- 导出excel -INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023101302319990105', '2023101302319980100', '导出excel_年度比赛项目专家小组', NULL, NULL, 0, NULL, NULL, 2, 'annualcompgroup:annual_comp_group:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-13 14:31:10', NULL, NULL, 0, 0, '1', 0); --- 导入excel -INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023101302319990106', '2023101302319980100', '导入excel_年度比赛项目专家小组', NULL, NULL, 0, NULL, NULL, 2, 'annualcompgroup:annual_comp_group:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-13 14:31:10', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/components/AnnualCompGroupForm.vue b/jeecgboot-vue3-master/src/views/annualcompgroup/components/AnnualCompGroupForm.vue deleted file mode 100644 index 0e0f3424..00000000 --- a/jeecgboot-vue3-master/src/views/annualcompgroup/components/AnnualCompGroupForm.vue +++ /dev/null @@ -1,170 +0,0 @@ - - - - - diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/components/AnnualCompGroupModal.vue b/jeecgboot-vue3-master/src/views/annualcompgroup/components/AnnualCompGroupModal.vue deleted file mode 100644 index cb4d0b2d..00000000 --- a/jeecgboot-vue3-master/src/views/annualcompgroup/components/AnnualCompGroupModal.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - - -