diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/controller/AnnconalCompZWHController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/controller/AnnconalCompZWHController.java deleted file mode 100644 index d2baf378..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/controller/AnnconalCompZWHController.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.jeecg.modules.demo.annualCompIntface.controller; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.demo.annualCompIntface.service.AnnconalCompZWHService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; - - -@Api(tags = "组委会首页") -@RestController -@RequestMapping("/zwh/inde") -@Slf4j -public class AnnconalCompZWHController { - - @Autowired - private AnnconalCompZWHService annconalCompZWHService; - - @ApiOperation(value = "组委会首页", notes = "组委会首页") - @GetMapping(value = "/zwhindex") - public Result zwhindex(String ids) { - Map result = annconalCompZWHService.getzwhindex(ids); - return Result.ok(result); - } -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompZWHService.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompZWHService.java deleted file mode 100644 index 5da887ec..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompZWHService.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.jeecg.modules.demo.annualCompIntface.service; - -import java.util.Map; - -public interface AnnconalCompZWHService { - Map getzwhindex(String ids); -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompZWHServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompZWHServiceImpl.java deleted file mode 100644 index 57662e4d..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompZWHServiceImpl.java +++ /dev/null @@ -1,160 +0,0 @@ -package org.jeecg.modules.demo.annualCompIntface.service; - -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.annualcompetitionprojectregistration.entity.AnnualCompetitionProjectRegistration; -import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.IAnnualCompetitionProjectRegistrationService; -import org.jeecg.modules.demo.comp.entity.Comp; -import org.jeecg.modules.demo.comp.service.ICompService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.time.Year; -import java.util.*; - -@Service -public class AnnconalCompZWHServiceImpl implements AnnconalCompZWHService{ - - @Autowired - private IAnnualCompetitionProjectRegistrationService annualCompetitionProjectRegistrationService; - - @Autowired - private ICompService compService; - @Autowired - private IAnnualCompService annualCompService; - @Autowired - private IAnnualCompPointService annualCompPointService; - @Autowired - private IAnnualService annualService; - - - - - - @Override - public Map getzwhindex(String ids) { - Map resultMap = new LinkedHashMap<>(); - /*============================计算已经完成的项目开始============================================*/ - List complist =compService.findcompid(ids); - List annualcomp = new ArrayList<>(); - List annualCompPointList = new ArrayList<>(); - if (complist.size()>0) { - for (int i = 0; i < complist.size();i++) { - List temp = new ArrayList<>(); - temp =annualCompService.getannualcompid(complist.get(i)); - annualcomp.addAll(temp); - } - if (annualcomp.size()>0){ - List temp1 = new ArrayList<>(); - for(int j=0;j annualCompPointList1 = new ArrayList<>(); - if(annualCompPointList.size()>0){ - for (AnnualCompPoint point : annualCompPointList) { - // 获取endTime的年份 - Calendar calendar = Calendar.getInstance(); - calendar.setTime(point.getEndtime()); - int year123 = calendar.get(Calendar.YEAR); - String yearAsString = Integer.toString(year123); - // 使用 Year 类获取年份 - Year year1 = Year.now(); - // 将 Year 对象转换为字符串 - String yearAsString1 = year1.toString(); - if (yearAsString.equals(yearAsString1)) { - annualCompPointList1.add(point); - } - } - resultMap.put("num05",annualCompPointList1.size()); - - }else { - resultMap.put("num05", "暂无"); - } - /*====================================结束======本年度的项目=========*/ - /*====================================开始======专家=========*/ - if (complist.size()>0) { - List compExps = new ArrayList<>(); - for (int i=0;i temp= compExpService.gettempbycom(complist.get(i)); - compExps.addAll(temp); - } - - resultMap.put("num04", compExps.size()); - }else { - resultMap.put("num04", "暂无"); - } - /*====================================结束======专家=========*/ - - /*====================================开始======本年度报名=========*/ - if (annualCompPointList1.size()>0){ - List annualCompetitionProjectRegistrationlist = new ArrayList<>(); - for(int i=0;i temp =annualCompetitionProjectRegistrationService.getbyconoppid(acpid); - annualCompetitionProjectRegistrationlist.addAll(temp); - - } - resultMap.put("num02", annualCompetitionProjectRegistrationlist.size()); - - }else { - resultMap.put("num02","暂无"); - } - /*====================================结束======本年度报名=========*/ - /*====================================开始======比赛=========*/ - if (complist.size()>0) { - List listcomp = new ArrayList<>(); - for (int i=0;i listcompannual = new ArrayList<>(); - if (complist.size()>0) { - for (int i=0;i temo= annualCompService.getannualcompidlist(complist.get(i)); - listcompannual.addAll(temo); - } - resultMap.put("data02",listcompannual); - } - /*====================================结束======年度比赛=========*/ - - - /*====================================开始======年度比赛=========*/ - if (listcompannual.size()>0) { - List listcompannualPO = new ArrayList<>(); - for (int i=0;i temp= annualCompPointService.getannualCompPointList(listcompannual.get(i).getId()); - listcompannualPO.addAll(temp); - } - - resultMap.put("data03",listcompannualPO); - } - /*====================================结束======年度比赛=========*/ - - return resultMap; - } -} diff --git a/jeecgboot-vue3-master/src/views/dashboard/Analysis/indexZWH.vue b/jeecgboot-vue3-master/src/views/dashboard/Analysis/indexZWH.vue deleted file mode 100644 index 40a655ce..00000000 --- a/jeecgboot-vue3-master/src/views/dashboard/Analysis/indexZWH.vue +++ /dev/null @@ -1,417 +0,0 @@ - - - -