将新都增加到到年度比赛

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

@@ -18,6 +18,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 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.annualcomp.entity.AnnualComp;
 import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService;
 import org.jeecg.modules.demo.annualcomp.vo.AnnualCompVo;
@@ -590,6 +591,8 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
     @GetMapping(value = "/findndbswxq")
     public Result<?> findndbswxq(@RequestParam(name = "id", required = true) String id) {
         AnnualComp annualComp =annualCompService.getById(id);
+        Annual annual = annualService.getById(annualComp.getAnnualid());
+        annualComp.setAnnualid(annual.getAnnualName());
         return Result.OK(annualComp);
     }