GST002精简

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java

@@ -19,9 +19,13 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.annual.entity.Annual;
 import org.jeecg.modules.demo.annual.service.IAnnualService;
 import org.jeecg.modules.demo.annual.service.impl.AnnualServiceImpl;
+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.annualcomp.vo.AnnualCompVo;
+import org.jeecg.modules.demo.annualcompaward.entity.AnnualCompAward;
+import org.jeecg.modules.demo.annualcompaward.service.IAnnualCompAwardService;
 import org.jeecg.modules.demo.comp.entity.Comp;
 import org.jeecg.modules.demo.comp.service.ICompService;
 import org.jeecg.modules.system.entity.SysRole;
@@ -57,9 +61,12 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
     private IAnnualService annualService;
     @Autowired
     private ICompService compService;
-
+    @Autowired
+    private IAnnualCompPointService annualCompPointService;
     @Autowired
     private ISysUserRoleService iSysUserRoleService;
+    @Autowired
+    private IAnnualCompAwardService annualCompAwardService;
 
 
 
@@ -315,6 +322,24 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
         //String annualId = annual.getId();
         annualCompVo.setAnnualid(annualCompVo.getAnnualid());
         annualCompService.save(annualCompVo);
+        AnnualCompPoint annualCompPoint = new AnnualCompPoint();
+        annualCompPoint.setAnnualCompId(annualCompVo.getId());
+        annualCompPoint.setObjName("默认年度比赛项目");
+        annualCompPoint.setEntryForm("N");
+        annualCompPoint.setAnnualCompState("2");
+        annualCompPoint.setTeamNumber(0);
+        annualCompPoint.setRequireLeader("N");
+        annualCompPoint.setRequireTeamName("N");
+        annualCompPoint.setRequireApply("N");
+        annualCompPoint.setRequireTopic("N");
+        annualCompPoint.setRequireUploadWorks("N");
+        annualCompPoint.setRequireScore("N");
+        annualCompPoint.setAnnualCompSwitch("Y");
+        annualCompPointService.save(annualCompPoint);
+        //比赛奖项设置
+        AnnualCompAward annualCompAward=new AnnualCompAward();
+        annualCompAward.setAnnucompid(annualCompPoint.getId());
+        annualCompAwardService.save(annualCompAward);
         return Result.OK("添加成功！");
     }
 

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java

@@ -76,7 +76,7 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
     public Result<IPage<AnnualCompAward>> queryPageList(AnnualCompAward annualCompAward,
                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                        HttpServletRequest req) {
+                                                        HttpServletRequest req,@RequestParam(name = "acpid", required = true) String acpid) {
 
         Subject subject = SecurityUtils.getSubject();
         // 获取当前登录用户
@@ -104,7 +104,8 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
             if (ObjectUtils.isEmpty(compList)) {
                 return Result.OK(page);
             }
-            //获取比赛ID
+            queryWrapper.eq(AnnualCompAward::getAnnucompid,acpid);
+ /*           //获取比赛ID
             Set<String> compIds = compList.stream().map(c -> c.getId()).collect(Collectors.toSet());
             //根据比赛ID查询年度必死啊
             List<AnnualComp> annualCompList = annualCompService.list(new LambdaQueryWrapper<AnnualComp>().in(AnnualComp::getCompid, compIds));
@@ -118,9 +119,8 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
                     Set<String> annualCompPointIds = annualCompPointList.stream().map(e -> e.getId()).collect(Collectors.toSet());
                     queryWrapper.in(AnnualCompAward::getAnnucompid, annualCompPointIds);
                 }
+            }*/
         }
-        }
-
         annualCompAwardService.page(page, queryWrapper);
 
 //        Page<AnnualCompAwardvo> page1 = new Page<>();