diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java index 0459a5f..51797f8 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java @@ -1,13 +1,13 @@ package com.ruoyi.kaohe.controller; +import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.kaohe.domain.KhItems; -import com.ruoyi.kaohe.domain.KhTemItem; -import com.ruoyi.kaohe.domain.KhVote; +import com.ruoyi.kaohe.domain.*; import com.ruoyi.kaohe.service.IKhTemItemService; import com.ruoyi.kaohe.service.IKhVoteService; import org.springframework.security.access.prepost.PreAuthorize; @@ -18,7 +18,6 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.kaohe.domain.KhTemplate; import com.ruoyi.kaohe.service.IKhTemplateService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; @@ -76,8 +75,7 @@ public class KhTemplateController extends BaseController } /** - * 根据模板查询出考核项及考核项对应的投票 - * @param id + * 考核任务生成评分账号时,根据模板查询出考核项及考核项对应的投票 * @return */ @GetMapping(value = "/getItemVote") @@ -96,6 +94,35 @@ public class KhTemplateController extends BaseController } return success(khTemplate); } + /** + * 生成领导评分账号时,根据模板查询出考核项及考核项对应的投票 + * 参数具体(id,templateId,pcTitle) + * @return + */ + @PostMapping(value = "/pcItemVotes") + public AjaxResult getInfo(@RequestBody List pingces) + { + List pcItems = new ArrayList<>(); + for (KhPingce pingce : pingces) { + KhTemplate khTemplate = khTemplateService.selectKhTemplateById(pingce.getTemplateId()); + List items = khTemplate.getItems(); + for(KhItems item:items){ + KhVote query = new KhVote(); + query.setPingceId(pingce.getId()); + query.setKhitemId(item.getId()); + List khVotes = voteService.selectKhVoteList(query); + if(khVotes!=null&&khVotes.size()>0){ + item.setVote(khVotes.get(0)); + } + } + PcItems pcitem = new PcItems(); + pcitem.setPcName(pingce.getPcTitle()); + pcitem.setItems(khTemplate.getItems()); + pcItems.add(pcitem); + } + + return success(pcItems); + } /** * 新增考核模板 diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/PcItems.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/PcItems.java new file mode 100644 index 0000000..d009c5d --- /dev/null +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/PcItems.java @@ -0,0 +1,24 @@ +package com.ruoyi.kaohe.domain; + +import java.util.List; + +public class PcItems { + private String pcName; + private List items; + + public String getPcName() { + return pcName; + } + + public void setPcName(String pcName) { + this.pcName = pcName; + } + + public List getItems() { + return items; + } + + public void setItems(List items) { + this.items = items; + } +}