diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/controller/AwardManagementController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/controller/AwardManagementController.java deleted file mode 100644 index 7dfd0df3..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/controller/AwardManagementController.java +++ /dev/null @@ -1,234 +0,0 @@ -package org.jeecg.modules.demo.award_management.controller; - -import java.util.*; -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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.apache.commons.lang.StringUtils; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.subject.Subject; -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.annual.entity.Annual; -import org.jeecg.modules.demo.annual.service.IAnnualService; -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.annualcompaward.entity.AnnualCompAward; -import org.jeecg.modules.demo.annualcompaward.service.IAnnualCompAwardService; -import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.TeamManagement; -import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.ITeamManagementService; -import org.jeecg.modules.demo.award_management.entity.AwardManagement; -import org.jeecg.modules.demo.award_management.service.IAwardManagementService; - -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.jetbrains.annotations.Nullable; -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-08-18 - * @Version: V1.0 - */ -@Api(tags = "获奖管理表") -@RestController -@RequestMapping("/award_management/awardManagement") -@Slf4j -public class AwardManagementController extends JeecgController { - @Autowired - private IAwardManagementService awardManagementService; - @Autowired - private IAnnualCompPointService annualCompPointService; - @Autowired - private IAnnualCompAwardService annualCompAwardService; - @Autowired - private IAnnualService annualService; - @Autowired - private IAnnualCompService annualCompService; - @Autowired - private ITeamManagementService teamManagementService; - - - /** - * 添加 - * - * @param awardManagement - * @return - */ - @AutoLog(value = "获奖管理表-添加") - @ApiOperation(value = "获奖管理表-添加", notes = "获奖管理表-添加") -// @RequiresPermissions("award_management:award_management:add") - @PostMapping(value = "/add") - public Result add(@RequestBody AwardManagement awardManagement) { - awardManagementService.save(awardManagement); - return Result.OK("添加成功!"); - } - - /** - * 编辑 - * - * @param awardManagement - * @return - */ - @AutoLog(value = "获奖管理表-编辑") - @ApiOperation(value = "获奖管理表-编辑", notes = "获奖管理表-编辑") -// @RequiresPermissions("award_management:award_management:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) - public Result edit(@RequestBody AwardManagement awardManagement) { - //获取评分结束时间 - AnnualCompPoint annualCompPoint = annualCompPointService.getById(awardManagement.getAnnualCompid()); - Date endTime = annualCompPoint.getEndtime(); - Date currentTime = new Date(); - if (currentTime.after(endTime)) return Result.error("该项目已结束,无法修改!"); - awardManagementService.updateById(awardManagement); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "获奖管理表-通过id删除") - @ApiOperation(value = "获奖管理表-通过id删除", notes = "获奖管理表-通过id删除") -// @RequiresPermissions("award_management:award_management:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name = "id", required = true) String id) { - AwardManagement awardManagement = awardManagementService.getById(id); - //获取评分结束时间 - AnnualCompPoint annualCompPoint = annualCompPointService.getById(awardManagement.getAnnualCompid()); - Date endTime = annualCompPoint.getEndtime(); - Date currentTime = new Date(); - if (currentTime.after(endTime)) return Result.error("该项目已结束,无法删除!"); - awardManagementService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "获奖管理表-批量删除") - @ApiOperation(value = "获奖管理表-批量删除", notes = "获奖管理表-批量删除") -// @RequiresPermissions("award_management:award_management:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - List listId = Arrays.asList(ids.split(",")); - for (String id : listId){ - AwardManagement awardManagement = awardManagementService.getById(id); - AnnualCompPoint annualCompPoint = annualCompPointService.getById(awardManagement.getAnnualCompid()); - Date currentTime = new Date(); - if (currentTime.after(annualCompPoint.getEndtime())){ - return Result.error("批量删除失败,"+annualCompPoint.getObjName()+"已结束"); - } - } - this.scoreManagementService.removeByIds(listId); - 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) { - AwardManagement awardManagement = awardManagementService.getById(id); - if (awardManagement == null) { - return Result.error("未找到对应数据"); - } - return Result.OK(awardManagement); - } - - /** - * 导出excel - * - * @param request - * @param awardManagement - */ -// @RequiresPermissions("award_management:award_management:exportXls") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, AwardManagement awardManagement) { - return super.exportXls(request, awardManagement, AwardManagement.class, "获奖管理表"); - } - - - - private void updateStatus(@RequestParam String annualCompid) { - //评分已完成,修改年度比赛项目的状态 - AnnualCompPoint pointServiceById = annualCompPointService.getById(annualCompid); - pointServiceById.setAnnualCompState("9"); - annualCompPointService.updateById(pointServiceById); - } - - - - /** - * 获取年度比赛项目中的奖项 - * - * @param annualCompid - * @return - */ - @GetMapping("annualCompAwards") - public Result> annualCompAwards(@RequestParam String annualCompid) { - - List annualCompAwards = new ArrayList(); - //根据年度比赛项目id查询年度比赛获奖 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.eq(AnnualCompAward::getAnnucompid, annualCompid); - AnnualCompAward annualCompAward = annualCompAwardService.getOne(queryWrapper); - //将奖项添加到集合中 - if (annualCompAward.getFirstPrize() != null) { - annualCompAwards.add(annualCompAward.getFirstPrize()); - } - if (annualCompAward.getSecondPrize() != null) { - annualCompAwards.add(annualCompAward.getSecondPrize()); - } - if (annualCompAward.getThirdPrize() != null) { - annualCompAwards.add(annualCompAward.getThirdPrize()); - } - if (annualCompAward.getFourthPrize() != null) { - annualCompAwards.add(annualCompAward.getFourthPrize()); - } - if (annualCompAward.getFifthPrize() != null) { - annualCompAwards.add(annualCompAward.getFifthPrize()); - } - return Result.OK(annualCompAwards); - } - -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/entity/AwardManagement.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/entity/AwardManagement.java deleted file mode 100644 index 9dca7ea2..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/entity/AwardManagement.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.jeecg.modules.demo.award_management.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 获奖管理表 - * @Author: jeecg-boot - * @Date: 2023-08-18 - * @Version: V1.0 - */ -@Data -@TableName("award_management") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="award_management对象", description="获奖管理表") -public class AwardManagement 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; - /**年度*/ - @Dict(dictTable = "annual",dicCode = "id",dicText = "annual_name") - @Excel(name = "年度", width = 15) - @ApiModelProperty(value = "年度") - private java.lang.String annualId; - /**年度比赛*/ - @Dict(dictTable = "annual_comp",dicCode = "id",dicText = "name") - @Excel(name = "年度比赛", width = 15) - @ApiModelProperty(value = "年度比赛") - private java.lang.String annualComp; - /**年度比赛项目id*/ - @Dict(dictTable = "annual_comp_point",dicCode = "id",dicText = "obj_name") - @Excel(name = "年度比赛项目id", width = 15) - @ApiModelProperty(value = "年度比赛项目id") - private java.lang.String annualCompid; - /**报名编号*/ - @Excel(name = "报名编号", width = 15) - @ApiModelProperty(value = "报名编号") - private java.lang.String enrollCode; - /**奖项*/ - @Excel(name = "奖项", width = 15) - @ApiModelProperty(value = "奖项") - private java.lang.String awards; - /**奖项排序值*/ - @Excel(name = "奖项排序值", width = 15) - @ApiModelProperty(value = "奖项排序值") - private java.lang.Integer sort; -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/mapper/AwardManagementMapper.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/mapper/AwardManagementMapper.java deleted file mode 100644 index 18f9a19e..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/mapper/AwardManagementMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.demo.award_management.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.award_management.entity.AwardManagement; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 获奖管理表 - * @Author: jeecg-boot - * @Date: 2023-08-18 - * @Version: V1.0 - */ -public interface AwardManagementMapper extends BaseMapper { - -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/mapper/xml/AwardManagementMapper.xml b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/mapper/xml/AwardManagementMapper.xml deleted file mode 100644 index 0c79104b..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/mapper/xml/AwardManagementMapper.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/award_management/service/IAwardManagementService.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/service/IAwardManagementService.java deleted file mode 100644 index d40a622f..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/service/IAwardManagementService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.demo.award_management.service; - -import org.jeecg.modules.demo.award_management.entity.AwardManagement; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 获奖管理表 - * @Author: jeecg-boot - * @Date: 2023-08-18 - * @Version: V1.0 - */ -public interface IAwardManagementService extends IService { - -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/service/impl/AwardManagementServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/service/impl/AwardManagementServiceImpl.java deleted file mode 100644 index fefaf5b9..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/award_management/service/impl/AwardManagementServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.demo.award_management.service.impl; - -import org.jeecg.modules.demo.award_management.entity.AwardManagement; -import org.jeecg.modules.demo.award_management.mapper.AwardManagementMapper; -import org.jeecg.modules.demo.award_management.service.IAwardManagementService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 获奖管理表 - * @Author: jeecg-boot - * @Date: 2023-08-18 - * @Version: V1.0 - */ -@Service -public class AwardManagementServiceImpl extends ServiceImpl implements IAwardManagementService { - -} diff --git a/jeecgboot-vue3-master/src/views/award/AwardManagement.api.ts b/jeecgboot-vue3-master/src/views/award/AwardManagement.api.ts deleted file mode 100644 index 84ff2167..00000000 --- a/jeecgboot-vue3-master/src/views/award/AwardManagement.api.ts +++ /dev/null @@ -1,85 +0,0 @@ -import {defHttp} from '/@/utils/http/axios'; -import {useMessage} from "/@/hooks/web/useMessage"; - -const {createConfirm} = useMessage(); - -enum Api { - list = '/award_management/awardManagement/list', - award = '/award_management/awardManagement/award', - save = '/award_management/awardManagement/add', - edit = '/award_management/awardManagement/edit', - deleteOne = '/award_management/awardManagement/delete', - deleteBatch = '/award_management/awardManagement/deleteBatch', - importExcel = '/award_management/awardManagement/importExcel', - exportXls = '/award_management/awardManagement/exportXls', - annualCompAwards = '/award_management/awardManagement/annualCompAwards' -} - -/** - * 导出api - * @param params - */ -export const getExportUrl = Api.exportXls; - -/** - * 导入api - */ -export const getImportUrl = Api.importExcel; - -/** - * 列表接口 - * @param params - */ -export const list = (params) => defHttp.get({url: Api.list, params}); -export const award = (params) => defHttp.get({url: Api.award, 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}); -} - -export const getAnnualCompAwards = (params) => { - return defHttp.get({ - url: Api.annualCompAwards, - params - }) -} diff --git a/jeecgboot-vue3-master/src/views/award/AwardManagement.data.ts b/jeecgboot-vue3-master/src/views/award/AwardManagement.data.ts deleted file mode 100644 index 6c3f47e5..00000000 --- a/jeecgboot-vue3-master/src/views/award/AwardManagement.data.ts +++ /dev/null @@ -1,115 +0,0 @@ -import { BasicColumn } from '/@/components/Table'; -import { FormSchema } from '/@/components/Table'; -import { rules } from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; -import { compare } from 'pinyin'; -import { SortOrder } from 'ant-design-vue/lib/table/interface'; -//列表数据 -export const columns: BasicColumn[] = [ - { - title: '年度比赛项目', - align: 'center', - dataIndex: 'annualCompid_dictText', - }, - { - title: '报名编号', - align: 'center', - dataIndex: 'enrollCode', - }, - { - title: '奖项', - align: 'center', - dataIndex: 'awards', - }, -]; - -//查询数据 -export const searchFormSchema: FormSchema[] = [ - { - label: '年度', - field: 'annualId_dictText', - component: 'Input', - colProps: { span: 6 }, - }, - { - label: '年度', - field: 'annualId', - component: 'Input', - colProps: { span: 6 }, - show: false, - }, - { - label: '年度比赛', - field: 'annualComp_dictText', - component: 'Input', - colProps: { span: 6 }, - }, - { - label: '年度比赛', - field: 'annualComp', - component: 'Input', - colProps: { span: 6 }, - show: false, - }, - { - label: '年度比赛项目', - field: 'annualCompid_dictText', - component: 'Input', - colProps: { span: 6 }, - }, - { - label: '年度比赛项目', - field: 'annualCompid', - component: 'Input', - colProps: { span: 6 }, - show: false, - }, - { - label: '报名编号', - field: 'enrollCode', - component: 'Input', - colProps: { span: 6 }, - }, - { - label: '奖项', - field: 'awards', - component: 'Input', - colProps: { span: 6 }, - }, -]; - -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '年度', - field: 'annualId', - component: 'Input', - }, - { - label: '年度比赛', - field: 'annualComp', - component: 'Input', - }, - { - label: '年度比赛项目', - field: 'annualCompid', - component: 'Input', - }, - { - label: '报名编号', - field: 'enrollCode', - component: 'Input', - }, - { - label: '奖项', - field: 'awards', - component: 'Input', - }, - // TODO 主键隐藏字段,目前写死为ID - { - label: '', - field: 'id', - component: 'Input', - show: false, - }, -]; diff --git a/jeecgboot-vue3-master/src/views/award/AwardManagementList.vue b/jeecgboot-vue3-master/src/views/award/AwardManagementList.vue deleted file mode 100644 index e41075b3..00000000 --- a/jeecgboot-vue3-master/src/views/award/AwardManagementList.vue +++ /dev/null @@ -1,271 +0,0 @@ - - - - - diff --git a/jeecgboot-vue3-master/src/views/award/AwardManagementStudentList.vue b/jeecgboot-vue3-master/src/views/award/AwardManagementStudentList.vue deleted file mode 100644 index 697c4344..00000000 --- a/jeecgboot-vue3-master/src/views/award/AwardManagementStudentList.vue +++ /dev/null @@ -1,272 +0,0 @@ - - - - - diff --git a/jeecgboot-vue3-master/src/views/award/components/AwardManagementForm.vue b/jeecgboot-vue3-master/src/views/award/components/AwardManagementForm.vue deleted file mode 100644 index 9d933a91..00000000 --- a/jeecgboot-vue3-master/src/views/award/components/AwardManagementForm.vue +++ /dev/null @@ -1,157 +0,0 @@ - - - - - diff --git a/jeecgboot-vue3-master/src/views/award/components/AwardManagementModal.vue b/jeecgboot-vue3-master/src/views/award/components/AwardManagementModal.vue deleted file mode 100644 index a167968f..00000000 --- a/jeecgboot-vue3-master/src/views/award/components/AwardManagementModal.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - - -