Merge remote-tracking branch 'origin/main'

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java

@@ -98,14 +98,14 @@ public class AnnualCompGroupController extends JeecgController<AnnualCompGroup,
 		queryWrappercomp.eq("comp_admin",user.getUsername());
 		List<Comp> list = compService.list(queryWrappercomp);
 		if(list.size()==0){
-			return  Result.error("未绑定比赛");
+			return  Result.OK(null);
 		}
 		List<String> ids = list.stream().map(Comp::getId).collect(Collectors.toList());
 		QueryWrapper<AnnualComp> queryWrapperAnnual = new QueryWrapper<>();
 		queryWrapperAnnual.in("compid",ids);
 		List<AnnualComp> listAnnual = annualCompService.list(queryWrapperAnnual);
 		if(listAnnual.size()==0){
-			return  Result.error("未创建年度比赛");
+			return  Result.OK(null);
 		}
 		List<String> annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList());
 		QueryWrapper<AnnualCompGroup> queryWrapper = QueryGenerator.initQueryWrapper(annualCompGroup, req.getParameterMap());
@@ -117,7 +117,7 @@ public class AnnualCompGroupController extends JeecgController<AnnualCompGroup,
 		queryWrapperacp.eq("annual_comp_switch","Y");    // 比赛必须是开启的
 		List<AnnualCompPoint> listacp = annualCompPointService.list(queryWrapperacp);
 		if(listacp.size()==0){
-			return  Result.error("未创建年度比赛项目");
+			return  Result.OK(null);
 		}
 		List<String> acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList());
 		queryWrapper.in(acpIds.size()!=0,"ann_comp_p",acpIds);

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java

@@ -44,6 +44,10 @@ import org.jeecg.modules.demo.topic.entity.Topic;
 import org.jeecg.modules.demo.topic.service.ITopicService;
 import org.jeecg.modules.demo.upfile_persion.entity.UpfilePersion;
 import org.jeecg.modules.demo.upfile_persion.service.IUpfilePersionService;
+import org.jeecg.modules.demo.upfilegroup.entity.UpfileGroup;
+import org.jeecg.modules.demo.upfilegroup.service.IUpfileGroupService;
+import org.jeecg.modules.demo.upfilegroupassociation.entity.UpfileGroupAssociation;
+import org.jeecg.modules.demo.upfilegroupassociation.service.IUpfileGroupAssociationService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -92,6 +96,10 @@ public class ChaoseTopicPersionController extends JeecgController<ChaoseTopicPer
     private IAnnualCompService annualCompService;
     @Autowired
     private ICompService compService;
+    @Autowired
+    private IUpfileGroupService upfileGroupService;
+    @Autowired
+    private IUpfileGroupAssociationService upfileGroupAssociationService;
 
     /**
      * 分页列表查询
@@ -250,6 +258,40 @@ public class ChaoseTopicPersionController extends JeecgController<ChaoseTopicPer
 
     }
 
+    /**
+     * 作品组绑定作品
+     *
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "比赛选题-分页列表查询")
+    @ApiOperation(value = "作品组绑定作品-分页列表查询", notes = "作品组绑定作品-分页列表查询")
+    @GetMapping(value = "/zpzbdzp")
+    public Result<IPage<UpfilePersion>> zpzbdzp(UpfilePersion upfilePersion,
+                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                HttpServletRequest req,@RequestParam(name="zpzid",required=true) String zpzid) {
+        UpfileGroup upfileGroup = upfileGroupService.getById(zpzid);
+        QueryWrapper<UpfileGroupAssociation> queryWrapperuga = new QueryWrapper<>();
+        List<UpfileGroupAssociation> listuga = upfileGroupAssociationService.list(queryWrapperuga);
+        QueryWrapper<UpfilePersion> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("annual_id",upfileGroup.getAnnid());
+        queryWrapper.eq("annual_comp_id",upfileGroup.getAnnalComp());
+        queryWrapper.eq("annual_comp_point_id",upfileGroup.getAnnComP());
+        String str = "";
+        for(int i = 0 ; i<listuga.size();i++){
+            str = str+listuga.get(i).getUpfileId()+",";
+        }
+        if(str!=""){
+            queryWrapper.notIn("id",str.split(","));
+        }
+        Page<UpfilePersion> page = new Page<>(pageNo, pageSize);
+        IPage<UpfilePersion> pageList = upfilePersionService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
     /**
      * 添加
      *
@@ -298,6 +340,27 @@ public class ChaoseTopicPersionController extends JeecgController<ChaoseTopicPer
         return Result.OK("绑定成功！");
     }
 
+    /**
+     * 作品组绑定作品添加
+     *
+     * @param
+     * @return
+     */
+    @AutoLog(value = "作品组绑定作品-添加")
+    @ApiOperation(value = "作品组绑定作品-添加", notes = "作品组绑定作品-添加")
+//	@RequiresPermissions("chooseTopicPersion:chaose_topic_persion:add")
+    @GetMapping(value = "/zpzbdzpadd")
+    public Result<String> zpzbdzpadd(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="zpzid",required=true) String zpzid,HttpServletRequest req) {
+        String strs[] = ids.split(",");
+        for (int i = 0 ; i < strs.length ; i++){
+            UpfileGroupAssociation upfileGroupAssociation = new UpfileGroupAssociation();
+            upfileGroupAssociation.setUpfileGroupId(zpzid);
+            upfileGroupAssociation.setUpfileId(strs[i]);
+            upfileGroupAssociationService.save(upfileGroupAssociation);
+        }
+        return Result.OK("绑定成功！");
+    }
+
     /**
      * 添加
      *

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java

@@ -586,7 +586,7 @@ public class UserHomePageServiceImpl implements UserHomePageService {
             });
             scoreList4Point.stream().sorted(Comparator.comparing(HomePageCompVo::getTotalScore)).collect(Collectors.toList());
             resultMap.put("比赛学生积分况分析", scoreList4Point);
-            redisUtil.set(REPORT4SCHOOL, resultMap.toString());
+            redisUtil.set(REPORT4SCHOOL, resultMap);
             return resultMap;
         } else {
             boolean hasKey = redisUtil.hasKey(REPORT4SCHOOL);

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroup/controller/UpfileGroupController.java

@@ -0,0 +1,219 @@
+package org.jeecg.modules.demo.upfilegroup.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.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.comp.entity.Comp;
+import org.jeecg.modules.demo.comp.service.ICompService;
+import org.jeecg.modules.demo.upfilegroup.entity.UpfileGroup;
+import org.jeecg.modules.demo.upfilegroup.service.IUpfileGroupService;
+
+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:   2024-08-06
+ * @Version: V1.0
+ */
+@Api(tags="作品组")
+@RestController
+@RequestMapping("/upfilegroup/upfileGroup")
+@Slf4j
+public class UpfileGroupController extends JeecgController<UpfileGroup, IUpfileGroupService> {
+	@Autowired
+	private IUpfileGroupService upfileGroupService;
+
+	 @Autowired
+	 private ICompService compService;
+
+	 @Autowired
+	 private IAnnualCompService annualCompService;
+
+	 @Autowired
+	 private IAnnualCompPointService annualCompPointService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param upfileGroup
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "作品组-分页列表查询")
+	@ApiOperation(value="作品组-分页列表查询", notes="作品组-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<UpfileGroup>> queryPageList(UpfileGroup upfileGroup,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<UpfileGroup> queryWrapper = QueryGenerator.initQueryWrapper(upfileGroup, req.getParameterMap());
+		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		Comp comp = new Comp();
+		QueryWrapper<Comp> queryWrappercomp = QueryGenerator.initQueryWrapper(comp, req.getParameterMap());
+		queryWrappercomp.eq("comp_admin",user.getUsername());
+		List<Comp> list = compService.list(queryWrappercomp);
+		if(list.size()==0){
+			return  Result.OK(null);
+		}
+		List<String> ids = list.stream().map(Comp::getId).collect(Collectors.toList());
+		QueryWrapper<AnnualComp> queryWrapperAnnual = new QueryWrapper<>();
+		queryWrapperAnnual.in("compid",ids);
+		List<AnnualComp> listAnnual = annualCompService.list(queryWrapperAnnual);
+		if(listAnnual.size()==0){
+			return  Result.OK(null);
+		}
+		List<String> annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList());
+		queryWrapper.in("annal_comp",annualIds);
+
+		AnnualCompPoint annualCompPoint = new AnnualCompPoint();
+		QueryWrapper<AnnualCompPoint> queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap());
+		queryWrapperacp.in("annual_comp_id",annualIds);
+		queryWrapperacp.eq("annual_comp_switch","Y");    // 比赛必须是开启的
+		List<AnnualCompPoint> listacp = annualCompPointService.list(queryWrapperacp);
+		if(listacp.size()==0){
+			return  Result.OK(null);
+		}
+		List<String> acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList());
+		queryWrapper.in("ann_com_p",acpIds);
+		Page<UpfileGroup> page = new Page<UpfileGroup>(pageNo, pageSize);
+		IPage<UpfileGroup> pageList = upfileGroupService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param upfileGroup
+	 * @return
+	 */
+	@AutoLog(value = "作品组-添加")
+	@ApiOperation(value="作品组-添加", notes="作品组-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody UpfileGroup upfileGroup) {
+		upfileGroupService.save(upfileGroup);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param upfileGroup
+	 * @return
+	 */
+	@AutoLog(value = "作品组-编辑")
+	@ApiOperation(value="作品组-编辑", notes="作品组-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody UpfileGroup upfileGroup) {
+		upfileGroupService.updateById(upfileGroup);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "作品组-通过id删除")
+	@ApiOperation(value="作品组-通过id删除", notes="作品组-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		upfileGroupService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "作品组-批量删除")
+	@ApiOperation(value="作品组-批量删除", notes="作品组-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.upfileGroupService.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<UpfileGroup> queryById(@RequestParam(name="id",required=true) String id) {
+		UpfileGroup upfileGroup = upfileGroupService.getById(id);
+		if(upfileGroup==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(upfileGroup);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param upfileGroup
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, UpfileGroup upfileGroup) {
+        return super.exportXls(request, upfileGroup, UpfileGroup.class, "作品组");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, UpfileGroup.class);
+    }
+
+}

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroup/entity/UpfileGroup.java

@@ -0,0 +1,77 @@
+package org.jeecg.modules.demo.upfilegroup.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:   2024-08-06
+ * @Version: V1.0
+ */
+@Data
+@TableName("upfile_group")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="upfile_group对象", description="作品组")
+public class UpfileGroup 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)
+    @Dict(dictTable = "annual", dicText = "annual_name", dicCode = "id")
+    @ApiModelProperty(value = "年度")
+    private java.lang.String annid;
+	/**年度比赛*/
+	@Excel(name = "年度比赛", width = 15)
+    @Dict(dictTable = "annual_comp", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "年度比赛")
+    private java.lang.String annalComp;
+	/**年度比赛项目*/
+	@Excel(name = "年度比赛项目", width = 15)
+    @Dict(dictTable = "annual_comp_point", dicText = "obj_name", dicCode = "id")
+    @ApiModelProperty(value = "年度比赛项目")
+    private java.lang.String annComP;
+	/**作品组名称*/
+	@Excel(name = "作品组名称", width = 15)
+    @ApiModelProperty(value = "作品组名称")
+    private java.lang.String name;
+}

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroup/mapper/UpfileGroupMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.demo.upfilegroup.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.demo.upfilegroup.entity.UpfileGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 作品组
+ * @Author: jeecg-boot
+ * @Date:   2024-08-06
+ * @Version: V1.0
+ */
+public interface UpfileGroupMapper extends BaseMapper<UpfileGroup> {
+
+}

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroup/mapper/xml/UpfileGroupMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.upfilegroup.mapper.UpfileGroupMapper">
+
+</mapper>

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroup/service/IUpfileGroupService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.demo.upfilegroup.service;
+
+import org.jeecg.modules.demo.upfilegroup.entity.UpfileGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 作品组
+ * @Author: jeecg-boot
+ * @Date:   2024-08-06
+ * @Version: V1.0
+ */
+public interface IUpfileGroupService extends IService<UpfileGroup> {
+
+}

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroup/service/impl/UpfileGroupServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.demo.upfilegroup.service.impl;
+
+import org.jeecg.modules.demo.upfilegroup.entity.UpfileGroup;
+import org.jeecg.modules.demo.upfilegroup.mapper.UpfileGroupMapper;
+import org.jeecg.modules.demo.upfilegroup.service.IUpfileGroupService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 作品组
+ * @Author: jeecg-boot
+ * @Date:   2024-08-06
+ * @Version: V1.0
+ */
+@Service
+public class UpfileGroupServiceImpl extends ServiceImpl<UpfileGroupMapper, UpfileGroup> implements IUpfileGroupService {
+
+}

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroupassociation/controller/UpfileGroupAssociationController.java

@@ -0,0 +1,173 @@
+package org.jeecg.modules.demo.upfilegroupassociation.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.upfilegroupassociation.entity.UpfileGroupAssociation;
+import org.jeecg.modules.demo.upfilegroupassociation.service.IUpfileGroupAssociationService;
+
+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:   2024-08-06
+ * @Version: V1.0
+ */
+@Api(tags="作品组与作品关联表")
+@RestController
+@RequestMapping("/upfilegroupassociation/upfileGroupAssociation")
+@Slf4j
+public class UpfileGroupAssociationController extends JeecgController<UpfileGroupAssociation, IUpfileGroupAssociationService> {
+	@Autowired
+	private IUpfileGroupAssociationService upfileGroupAssociationService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param upfileGroupAssociation
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "作品组与作品关联表-分页列表查询")
+	@ApiOperation(value="作品组与作品关联表-分页列表查询", notes="作品组与作品关联表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<UpfileGroupAssociation>> queryPageList(UpfileGroupAssociation upfileGroupAssociation,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req,@RequestParam(name="zpzid",required=true) String zpzid) {
+		QueryWrapper<UpfileGroupAssociation> queryWrapper = QueryGenerator.initQueryWrapper(upfileGroupAssociation, req.getParameterMap());
+		queryWrapper.eq("upfile_group_id",zpzid);
+		Page<UpfileGroupAssociation> page = new Page<UpfileGroupAssociation>(pageNo, pageSize);
+		IPage<UpfileGroupAssociation> pageList = upfileGroupAssociationService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param upfileGroupAssociation
+	 * @return
+	 */
+	@AutoLog(value = "作品组与作品关联表-添加")
+	@ApiOperation(value="作品组与作品关联表-添加", notes="作品组与作品关联表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody UpfileGroupAssociation upfileGroupAssociation) {
+		upfileGroupAssociationService.save(upfileGroupAssociation);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param upfileGroupAssociation
+	 * @return
+	 */
+	@AutoLog(value = "作品组与作品关联表-编辑")
+	@ApiOperation(value="作品组与作品关联表-编辑", notes="作品组与作品关联表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody UpfileGroupAssociation upfileGroupAssociation) {
+		upfileGroupAssociationService.updateById(upfileGroupAssociation);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "作品组与作品关联表-通过id删除")
+	@ApiOperation(value="作品组与作品关联表-通过id删除", notes="作品组与作品关联表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		upfileGroupAssociationService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "作品组与作品关联表-批量删除")
+	@ApiOperation(value="作品组与作品关联表-批量删除", notes="作品组与作品关联表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.upfileGroupAssociationService.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<UpfileGroupAssociation> queryById(@RequestParam(name="id",required=true) String id) {
+		UpfileGroupAssociation upfileGroupAssociation = upfileGroupAssociationService.getById(id);
+		if(upfileGroupAssociation==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(upfileGroupAssociation);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param upfileGroupAssociation
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, UpfileGroupAssociation upfileGroupAssociation) {
+        return super.exportXls(request, upfileGroupAssociation, UpfileGroupAssociation.class, "作品组与作品关联表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, UpfileGroupAssociation.class);
+    }
+
+}

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroupassociation/entity/UpfileGroupAssociation.java

@@ -0,0 +1,68 @@
+package org.jeecg.modules.demo.upfilegroupassociation.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:   2024-08-06
+ * @Version: V1.0
+ */
+@Data
+@TableName("upfile_group_association")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="upfile_group_association对象", description="作品组与作品关联表")
+public class UpfileGroupAssociation 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)
+    @Dict(dictTable = "upfile_group", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "作品组")
+    private java.lang.String upfileGroupId;
+	/**作品*/
+	@Excel(name = "作品", width = 15)
+    @Dict(dictTable = "upfile_persion", dicText = "topic_name", dicCode = "id")
+    @ApiModelProperty(value = "作品")
+    private java.lang.String upfileId;
+}

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroupassociation/mapper/UpfileGroupAssociationMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.demo.upfilegroupassociation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.demo.upfilegroupassociation.entity.UpfileGroupAssociation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 作品组与作品关联表
+ * @Author: jeecg-boot
+ * @Date:   2024-08-06
+ * @Version: V1.0
+ */
+public interface UpfileGroupAssociationMapper extends BaseMapper<UpfileGroupAssociation> {
+
+}

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroupassociation/mapper/xml/UpfileGroupAssociationMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.upfilegroupassociation.mapper.UpfileGroupAssociationMapper">
+
+</mapper>

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroupassociation/service/IUpfileGroupAssociationService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.demo.upfilegroupassociation.service;
+
+import org.jeecg.modules.demo.upfilegroupassociation.entity.UpfileGroupAssociation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 作品组与作品关联表
+ * @Author: jeecg-boot
+ * @Date:   2024-08-06
+ * @Version: V1.0
+ */
+public interface IUpfileGroupAssociationService extends IService<UpfileGroupAssociation> {
+
+}

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfilegroupassociation/service/impl/UpfileGroupAssociationServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.demo.upfilegroupassociation.service.impl;
+
+import org.jeecg.modules.demo.upfilegroupassociation.entity.UpfileGroupAssociation;
+import org.jeecg.modules.demo.upfilegroupassociation.mapper.UpfileGroupAssociationMapper;
+import org.jeecg.modules.demo.upfilegroupassociation.service.IUpfileGroupAssociationService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 作品组与作品关联表
+ * @Author: jeecg-boot
+ * @Date:   2024-08-06
+ * @Version: V1.0
+ */
+@Service
+public class UpfileGroupAssociationServiceImpl extends ServiceImpl<UpfileGroupAssociationMapper, UpfileGroupAssociation> implements IUpfileGroupAssociationService {
+
+}

jeecgboot-vue3-master/src/views/upfilegroup/UpfileGroup.api.ts

@@ -0,0 +1,75 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/upfilegroup/upfileGroup/list',
+  save='/upfilegroup/upfileGroup/add',
+  edit='/upfilegroup/upfileGroup/edit',
+  deleteOne = '/upfilegroup/upfileGroup/delete',
+  deleteBatch = '/upfilegroup/upfileGroup/deleteBatch',
+  importExcel = '/upfilegroup/upfileGroup/importExcel',
+  exportXls = '/upfilegroup/upfileGroup/exportXls',
+  queryCompId = '/annualcompgroup/annualCompGroup/queryCompId',
+}
+
+/**
+ * 导出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 });
+
+/**
+ * 删除单个
+ * @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 queryCompId = (params) => defHttp.get({ url: Api.queryCompId, params }, { successMessageMode: 'none' });

jeecgboot-vue3-master/src/views/upfilegroup/UpfileGroup.data.ts

@@ -0,0 +1,58 @@
+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: 'annid_dictText'
+  },
+  {
+    title: '年度比赛',
+    align: "center",
+    dataIndex: 'annalComp_dictText'
+  },
+  {
+    title: '年度比赛项目',
+    align: "center",
+    dataIndex: 'annComP_dictText'
+  },
+  {
+    title: '作品组名称',
+    align: "center",
+    dataIndex: 'name'
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "作品组名称",
+    field: 'name',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '作品组名称',
+    field: 'name',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+      return [
+              { required: true, message: '请输入作品组名称!'},
+             ];
+    },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];

jeecgboot-vue3-master/src/views/upfilegroup/UpfileGroupList.vue

@@ -0,0 +1,259 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item label="作品组名称" name="name">
+              <a-input placeholder="请输入作品组名称" v-model:value="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+<!--        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button>批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <UpfileGroupModal ref="registerModal" @success="handleSuccess"></UpfileGroupModal>
+  </div>
+</template>
+
+<script lang="ts" name="upfilegroup-upfileGroup" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './UpfileGroup.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './UpfileGroup.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import UpfileGroupModal from './components/UpfileGroupModal.vue'
+  import { useRouter } from 'vue-router';
+
+  const router = useRouter();
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '作品组',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: "作品组",
+      url: getExportUrl,
+      params: queryParam,
+    },
+	  importConfig: {
+	    url: getImportUrl,
+	    success: handleSuccess
+	  },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+  /**
+   * 绑定作品事件
+   */
+  function zpzbdzp(record) {
+    let id= record.id;
+    router.push({ path: '/upfilegroupassociation/UpfileGroupAssociationList', query: {id} })
+  }
+
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      },{
+        label: '绑定作品',
+        popConfirm: {
+          title: '是否确认绑定作品',
+          confirm: zpzbdzp.bind(null, record),
+        }
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>

jeecgboot-vue3-master/src/views/upfilegroup/UpfileGroup_menu_insert.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/upfilegroup文件夹下
+-- 如果你想更改到其他目录，请修改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 ('2024080609451870470', NULL, '作品组', '/upfilegroup/upfileGroupList', 'upfilegroup/UpfileGroupList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-08-06 09:45:47', 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 ('2024080609451870471', '2024080609451870470', '添加作品组', NULL, NULL, 0, NULL, NULL, 2, 'upfilegroup:upfile_group:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-08-06 09:45:47', 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 ('2024080609451870472', '2024080609451870470', '编辑作品组', NULL, NULL, 0, NULL, NULL, 2, 'upfilegroup:upfile_group:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-08-06 09:45:47', 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 ('2024080609451870473', '2024080609451870470', '删除作品组', NULL, NULL, 0, NULL, NULL, 2, 'upfilegroup:upfile_group:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-08-06 09:45:47', 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 ('2024080609451870474', '2024080609451870470', '批量删除作品组', NULL, NULL, 0, NULL, NULL, 2, 'upfilegroup:upfile_group:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-08-06 09:45:47', 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 ('2024080609451870475', '2024080609451870470', '导出excel_作品组', NULL, NULL, 0, NULL, NULL, 2, 'upfilegroup:upfile_group:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-08-06 09:45:47', 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 ('2024080609451870476', '2024080609451870470', '导入excel_作品组', NULL, NULL, 0, NULL, NULL, 2, 'upfilegroup:upfile_group:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-08-06 09:45:47', NULL, NULL, 0, 0, '1', 0);

jeecgboot-vue3-master/src/views/upfilegroup/components/UpfileGroupForm.vue

@@ -0,0 +1,179 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="年度" v-bind="validateInfos.annid">
+            <j-dict-select-tag v-model:value="formData.annid" dictCode="annual,annual_name,id" placeholder="请选择年度"
+                               :disabled="disabled || isT" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="年度比赛" v-bind="validateInfos.annalComp">
+            <j-search-select v-model:value="formData.annalComp" :dict="strst" :disabled="disabled || isT" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="年度比赛项目" v-bind="validateInfos.annComP">
+            <j-search-select v-model:value="formData.annComP" :dict="ndbsxm" :disabled="disabled || isT" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="作品组名称" v-bind="validateInfos.name">
+            <a-input v-model:value="formData.name" placeholder="请输入作品组名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted,watch } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate,queryCompId } from '../UpfileGroup.api';
+  import { Form } from 'ant-design-vue';
+
+  let strst = ref();
+  let ndbsxm = ref();
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    annid: '',
+    annalComp: '',
+    annComP: '',
+    name: '',
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+    annid: [{ required: true, message: '请输入年度!' },],
+    annalComp: [{ required: true, message: '请输入年度比赛!' },],
+    annComP: [{ required: true, message: '请输入年度比赛项目!' },],
+    name: [{ required: true, message: '请输入作品组名称!'},],
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+  watch(formData, (newVal) => {
+    if (formData.annid == null || formData.annid == "") {
+
+    } else {
+      queryCompId("").then((result) => {
+        //console.log(result);
+        const str = result;
+        if (str != null && str != "") {
+          //const ndbs = "annual_comp,name,id,annualid='1691982939857920001' and (compid='1696134761153875969' or compid='1697137689830363138')";
+          var ndbsstr = "annual_comp,name,id,annualid='" + formData.annid + "' and " + "(" + str + ")";
+          strst.value = ndbsstr;
+        }
+      });
+    }
+    if (formData.annalComp != "") {
+      ndbsxm.value = "annual_comp_point,obj_name,id,annual_comp_id='" + formData.annalComp + "'";
+    }
+  });
+
+  /**
+   * 特定的禁用
+   */
+  let isT = ref(false)
+  function setIsT(bool=false){
+    isT.value=bool
+  }
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+    setIsT
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>

jeecgboot-vue3-master/src/views/upfilegroup/components/UpfileGroupModal.vue

@@ -0,0 +1,79 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <UpfileGroupForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></UpfileGroupForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose,watch } from 'vue';
+  import UpfileGroupForm from './UpfileGroupForm.vue'
+
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+  watch(() => visible.value, newVal => {
+    if (!newVal) registerForm.value.setIsT(false);
+  })
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+      registerForm.value.setIsT(true);
+    });
+  }
+
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>

jeecgboot-vue3-master/src/views/upfilegroupassociation/UpfileGroupAssociation.api.ts

@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/upfilegroupassociation/upfileGroupAssociation/list',
+  save='/upfilegroupassociation/upfileGroupAssociation/add',
+  edit='/upfilegroupassociation/upfileGroupAssociation/edit',
+  deleteOne = '/upfilegroupassociation/upfileGroupAssociation/delete',
+  deleteBatch = '/upfilegroupassociation/upfileGroupAssociation/deleteBatch',
+  importExcel = '/upfilegroupassociation/upfileGroupAssociation/importExcel',
+  exportXls = '/upfilegroupassociation/upfileGroupAssociation/exportXls',
+}
+
+/**
+ * 导出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 });
+
+/**
+ * 删除单个
+ * @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 });
+}

jeecgboot-vue3-master/src/views/upfilegroupassociation/UpfileGroupAssociation.data.ts

@@ -0,0 +1,42 @@
+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: 'upfileGroupId_dictText'
+  },
+  {
+    title: '作品',
+    align: "center",
+    dataIndex: 'upfileId_dictText'
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '作品组',
+    field: 'upfileGroupId',
+    component: 'Input',
+  },
+  {
+    label: '作品',
+    field: 'upfileId',
+    component: 'Input',
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];

jeecgboot-vue3-master/src/views/upfilegroupassociation/UpfileGroupAssociationList.vue

@@ -0,0 +1,219 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button>批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <UpfileGroupAssociationModal ref="registerModal" @success="handleSuccess"></UpfileGroupAssociationModal>
+  </div>
+</template>
+
+<script lang="ts" name="upfilegroupassociation-upfileGroupAssociation" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './UpfileGroupAssociation.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './UpfileGroupAssociation.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import UpfileGroupAssociationModal from './components/UpfileGroupAssociationModal.vue'
+  import { useRoute } from 'vue-router';
+
+  const route = useRoute();
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '作品组与作品关联表',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, {zpzid:route.query.id});
+      },
+    },
+    exportConfig: {
+      name: "作品组与作品关联表",
+      url: getExportUrl,
+      params: queryParam,
+    },
+	  importConfig: {
+	    url: getImportUrl,
+	    success: handleSuccess
+	  },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>

jeecgboot-vue3-master/src/views/upfilegroupassociation/UpfileGroupAssociation_menu_insert.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/upfilegroupassociation文件夹下
+-- 如果你想更改到其他目录，请修改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 ('2024080610428870180', NULL, '作品组与作品关联表', '/upfilegroupassociation/upfileGroupAssociationList', 'upfilegroupassociation/UpfileGroupAssociationList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-08-06 10:42:18', 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 ('2024080610428870181', '2024080610428870180', '添加作品组与作品关联表', NULL, NULL, 0, NULL, NULL, 2, 'upfilegroupassociation:upfile_group_association:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-08-06 10:42:18', 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 ('2024080610428870182', '2024080610428870180', '编辑作品组与作品关联表', NULL, NULL, 0, NULL, NULL, 2, 'upfilegroupassociation:upfile_group_association:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-08-06 10:42:18', 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 ('2024080610428880183', '2024080610428870180', '删除作品组与作品关联表', NULL, NULL, 0, NULL, NULL, 2, 'upfilegroupassociation:upfile_group_association:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-08-06 10:42:18', 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 ('2024080610428880184', '2024080610428870180', '批量删除作品组与作品关联表', NULL, NULL, 0, NULL, NULL, 2, 'upfilegroupassociation:upfile_group_association:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-08-06 10:42:18', 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 ('2024080610428880185', '2024080610428870180', '导出excel_作品组与作品关联表', NULL, NULL, 0, NULL, NULL, 2, 'upfilegroupassociation:upfile_group_association:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-08-06 10:42:18', 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 ('2024080610428880186', '2024080610428870180', '导入excel_作品组与作品关联表', NULL, NULL, 0, NULL, NULL, 2, 'upfilegroupassociation:upfile_group_association:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-08-06 10:42:18', NULL, NULL, 0, 0, '1', 0);

jeecgboot-vue3-master/src/views/upfilegroupassociation/components/ChaoseTopicPersion.api.ts

@@ -0,0 +1,82 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/chooseTopicPersion/chaoseTopicPersion/zpzbdzp',
+  watch = '/chooseTopicPersion/chaoseTopicPersion/watch',
+  list4 = '/topic/topic/list4',
+  save='/chooseTopicPersion/chaoseTopicPersion/zpzbdzpadd',
+  edit='/chooseTopicPersion/chaoseTopicPersion/edit',
+  edit1='/chooseTopicPersion/chaoseTopicPersion/edit1',
+  deleteOne = '/chooseTopicPersion/chaoseTopicPersion/delete',
+  deleteBatch = '/chooseTopicPersion/chaoseTopicPersion/deleteBatch',
+  importExcel = '/chooseTopicPersion/chaoseTopicPersion/importExcel',
+  exportXls = '/chooseTopicPersion/chaoseTopicPersion/exportXls',
+}
+
+/**
+ * 导出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 list4 = (params) => defHttp.get({ url: Api.list4, params });
+export const watch = (params) => defHttp.get({ url: Api.watch, 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();
+      });
+    }
+  });
+}
+export const update = (params) => {
+  return defHttp.post({ url: Api.edit1, params });
+}
+export const update1 = (params) => {
+  return defHttp.post({ url: Api.edit1, params }, { isTransformResponse: false });
+}
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.get({ url: url, params }, { isTransformResponse: false });
+}

jeecgboot-vue3-master/src/views/upfilegroupassociation/components/ChaoseTopicPersion.data.ts

@@ -0,0 +1,55 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '作品名称',
+    align: "center",
+    dataIndex: 'topicName'
+  },
+  {
+    title: '报名编号',
+    align: "center",
+    dataIndex: 'applyCode'
+  }
+/*  {
+    title: '状态',
+    align: "center",
+    dataIndex: "待评分"
+  }*/
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '报名编号',
+    field: 'bmcode',
+    component: 'Input',
+  },
+  {
+    label: '题目',
+    field: 'timul',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "topic,name,id"
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "choose_topic_persion_status"
+    },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];

jeecgboot-vue3-master/src/views/upfilegroupassociation/components/ChaoseTopicPersionList.vue

@@ -0,0 +1,250 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+                <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+                <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+                <a-dropdown v-if="selectedRowKeys.length > 0">
+                  <template #overlay>
+                    <a-menu>
+                      <a-menu-item key="1" @click="batchHandleDelete">
+                        <Icon icon="ant-design:delete-outlined"></Icon>
+                        删除
+                      </a-menu-item>
+                    </a-menu>
+                  </template>
+                  <a-button>批量操作
+                    <Icon icon="mdi:chevron-down"></Icon>
+                  </a-button>
+                </a-dropdown>-->
+      </template>
+      <!--操作栏-->
+      <!--      <template #action="{ record }">
+              <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+            </template>-->
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <!--      <template #pcaSlot="{text}">
+              {{ getAreaTextByCode(text) }}
+            </template>
+            <template #fileSlot="{text}">
+              <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+              <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+            </template>-->
+    </BasicTable>
+    <!-- 表单区域 -->
+  </div>
+</template>
+
+<script lang="ts" name="chooseTopicPersion-chaoseTopicPersion" setup>
+  import { ref, reactive,defineExpose } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import {columns} from './ChaoseTopicPersion.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl,saveOrUpdate } from './ChaoseTopicPersion.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import { useRoute } from 'vue-router';
+  import {getValueType} from "../../../utils";
+  import {useMessage} from "../../../hooks/web/useMessage";
+
+
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const route = useRoute();
+  const emit = defineEmits(['register', 'ok']);
+//注册table数据
+const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
+  tableProps: {
+    title: '比赛选题',
+    api: list,
+    columns,
+    canResize:false,
+    useSearchForm: false,
+    showActionColumn:false,
+    /*      actionColumn: {
+            width: 120,
+            fixed: 'right',
+          },*/
+    beforeFetch: (params) => {
+      return Object.assign(params, {zpzid:route.query.id});
+    },
+  },
+  exportConfig: {
+    name: "比赛选题",
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+});
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+  const { createMessage } = useMessage();
+  const confirmLoading = ref<boolean>(false);
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    let srk = selectedRowKeys.value.toString();
+    if(srk==""||srk==null){
+      createMessage.warning("请选择至少一条进行绑定");
+    }else{
+      await saveOrUpdate({ids:selectedRowKeys.value.toString(),zpzid:route.query.id}, false)
+        .then((res) => {
+          if (res.success) {
+            createMessage.success(res.message);
+            emit('ok');
+          } else {
+            createMessage.warning(res.message);
+          }
+        })
+        .finally(() => {
+          confirmLoading.value = false;
+        });
+    }
+  }
+  defineExpose({
+    submitForm,
+    searchReset,
+  });
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>

jeecgboot-vue3-master/src/views/upfilegroupassociation/components/UpfileGroupAssociationForm.vue

@@ -0,0 +1,133 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="作品组" v-bind="validateInfos.upfileGroupId">
+            <a-input v-model:value="formData.upfileGroupId" placeholder="请输入作品组" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="作品" v-bind="validateInfos.upfileId">
+            <a-input v-model:value="formData.upfileId" placeholder="请输入作品" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../UpfileGroupAssociation.api';
+  import { Form } from 'ant-design-vue';
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    upfileGroupId: '',   
+    upfileId: '',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>

jeecgboot-vue3-master/src/views/upfilegroupassociation/components/UpfileGroupAssociationModal.vue

@@ -0,0 +1,74 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <UpfileGroupAssociationForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></UpfileGroupAssociationForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import UpfileGroupAssociationForm from './ChaoseTopicPersionList.vue'
+
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '绑定作品';
+    visible.value = true;
+
+  }
+
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+    registerForm.value.searchReset();
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>