From 41f05b494d32fb23f49b56394b2a7625d88e41eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Sat, 8 Feb 2020 00:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/evaluate/EvaluateOptions.java | 5 +- .../result/EvaluateInfoResultDTO.java | 107 ++++++++++++++++++ .../controller/EvaluateDeptController.java | 3 +- .../controller/EvaluateInfoController.java | 9 +- .../controller/EvaluateOfficerController.java | 3 +- .../controller/EvaluateOptionController.java | 9 ++ .../modules/evaluate/dao/EvaluateInfoDao.java | 11 ++ .../evaluate/dao/EvaluateOfficerDao.java | 2 + .../evaluate/dao/EvaluateOptionDao.java | 6 + .../excel/EvaluateDeptCountExcel.java | 77 +++++++++++++ .../excel/EvaluateOfficerCountExcel.java | 77 +++++++++++++ .../evaluate/service/EvaluateInfoService.java | 5 + .../service/EvaluateOfficerService.java | 2 + .../service/EvaluateOptionService.java | 3 + .../service/impl/EvaluateInfoServiceImpl.java | 21 ++++ .../impl/EvaluateOfficerServiceImpl.java | 14 +++ .../impl/EvaluateOptionServiceImpl.java | 6 + .../mapper/evaluate/EvaluateInfoDao.xml | 55 +++++++++ .../mapper/evaluate/EvaluateOfficerDao.xml | 14 ++- .../mapper/evaluate/EvaluateOptionDao.xml | 19 ++++ 20 files changed, 438 insertions(+), 10 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptions.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptions.java index b46cb68b5..12b28c441 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptions.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptions.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.dto.evaluate; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; import lombok.Data; import java.util.List; @@ -11,8 +12,8 @@ import java.util.List; * @date 2019/11/27 10:03 */ @Data -public class EvaluateOptions { - private List optionList; +public class EvaluateOptions { + private List optionList; } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java new file mode 100644 index 000000000..b40fea6e6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java @@ -0,0 +1,107 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.evaluate.result; + +import com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 评价信息表 评价信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-02-06 + */ +@Data +public class EvaluateInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 提交人姓名 + */ + private String fullName; + + /** + * 联系电话 + */ + private String mobile; + + /** + * 干部ID 干部信息表主键 + */ + private String officerId; + + /** + * 评价类别（1.点赞，2.吐槽） + */ + private Integer roleCode; + + /** + * 评价内容 + */ + private String content; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 删除标识 0：否，1：是 + */ + private String delFlag; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + private Integer optionCount; + + /** + * 评价选项 + */ + private List optionsList; + + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java index 1733b7f07..eca3acced 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.evaluate.result.EvaluateDeptCountResultDTO; import com.elink.esua.epdc.dto.evaluate.EvaluateDeptDTO; +import com.elink.esua.epdc.modules.evaluate.excel.EvaluateDeptCountExcel; import com.elink.esua.epdc.modules.evaluate.excel.EvaluateDeptExcel; import com.elink.esua.epdc.modules.evaluate.service.EvaluateDeptService; import org.springframework.beans.factory.annotation.Autowired; @@ -96,7 +97,7 @@ public class EvaluateDeptController { public void countExport(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = evaluateDeptService.countExport(params); - ExcelUtils.exportExcelToTarget(response, null, list, EvaluateDeptExcel.class); + ExcelUtils.exportExcelToTarget(response, null, list, EvaluateDeptCountExcel.class); } @GetMapping("export") diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateInfoController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateInfoController.java index 86ee95c78..5e7893ab7 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateInfoController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateInfoController.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.evaluate.EvaluateInfoDTO; import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO; import com.elink.esua.epdc.modules.evaluate.excel.EvaluateInfoExcel; import com.elink.esua.epdc.modules.evaluate.service.EvaluateDetailService; import com.elink.esua.epdc.modules.evaluate.service.EvaluateInfoService; @@ -53,9 +54,9 @@ public class EvaluateInfoController { @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = evaluateInfoService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = evaluateInfoService.infoPage(params); + return new Result>().ok(page); } @GetMapping("{id}") @@ -95,7 +96,7 @@ public class EvaluateInfoController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = evaluateInfoService.list(params); + List list = evaluateInfoService.listExport(params); ExcelUtils.exportExcelToTarget(response, null, list, EvaluateInfoExcel.class); } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOfficerController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOfficerController.java index 5afb4d319..06f540797 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOfficerController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOfficerController.java @@ -29,6 +29,7 @@ import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO; import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO; +import com.elink.esua.epdc.modules.evaluate.excel.EvaluateOfficerCountExcel; import com.elink.esua.epdc.modules.evaluate.excel.EvaluateOfficerExcel; import com.elink.esua.epdc.modules.evaluate.service.EvaluateOfficerService; import org.springframework.beans.factory.annotation.Autowired; @@ -68,7 +69,7 @@ public class EvaluateOfficerController { @GetMapping("countExport") public void countExport(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = evaluateOfficerService.countExport(params); - ExcelUtils.exportExcelToTarget(response, null, list, EvaluateOfficerExcel.class); + ExcelUtils.exportExcelToTarget(response, null, list, EvaluateOfficerCountExcel.class); } @GetMapping("getDeptOfficer") public Result> getDeptOfficer(@RequestBody EvaluateOfficerAppFormDTO formDto){ diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java index 3c48c2a85..ac6fdb5d7 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java @@ -27,6 +27,8 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.evaluate.EvaluateOptionDTO; +import com.elink.esua.epdc.dto.evaluate.EvaluateOptions; +import com.elink.esua.epdc.dto.evaluate.EvaluateShowOption; import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionFormDTO; import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; @@ -101,6 +103,13 @@ public class EvaluateOptionController { List list = evaluateOptionService.getOptionList(formDto); return new Result>().ok(list); } + @GetMapping("optionShowList") + public Result optionShowList(){ + List optionList = evaluateOptionService.optionShowList(); + EvaluateOptions evalOption = new EvaluateOptions(); + evalOption.setOptionList(optionList); + return new Result().ok(evalOption); + } /** * 更新可用标记 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java index 32c693736..dfb2d805a 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java @@ -18,9 +18,13 @@ package com.elink.esua.epdc.modules.evaluate.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO; import com.elink.esua.epdc.modules.evaluate.entity.EvaluateInfoEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 评价信息表 评价信息表 * @@ -29,5 +33,12 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface EvaluateInfoDao extends BaseDao { + + /** + * 条件查询 + * @param params + * @return + */ + List getInfoPage(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java index 8bf2d48cc..fed3f2b48 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java @@ -43,6 +43,8 @@ public interface EvaluateOfficerDao extends BaseDao { */ List getOfficerPage(Map params); + void updateCount(@Param("id")String id,@Param("type")String type); + /** * 数据批量插入 * @param evaluateOfficerEntities diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOptionDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOptionDao.java index 538c82433..443ea560d 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOptionDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOptionDao.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.evaluate.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.evaluate.EvaluateShowOption; import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOptionEntity; @@ -48,4 +49,9 @@ public interface EvaluateOptionDao extends BaseDao { * @return */ List getOptionList(EvaluateOptionAppFormDTO formDto); + /** + * 选项显示列表（后台） + * @return + */ + List optionShowList(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java new file mode 100644 index 000000000..eb5c6c191 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java @@ -0,0 +1,77 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.evaluate.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 评价部门表 评价部门表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-02-05 + */ +@Data +public class EvaluateDeptCountExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "部门ID") + private String deptId; + + @Excel(name = "部门名称") + private String deptName; + + @Excel(name = "干部人数") + private Integer officerCount; + + /** + * 被评价干部人数 + */ + @Excel(name = "被评价干部人数") + private Integer beEvaluatedCount; + + /** + * 评价总人数 + */ + @Excel(name = "评价总人数") + private Integer evaluatePeopleCount; + + /** + * 评价总次数 + */ + @Excel(name = "评价总次数") + private Integer evaluateCount; + + /** + * 被点赞总次数 + */ + @Excel(name = "被点赞总次数") + private Integer likeCount; + + /** + * 被吐槽总次数 + */ + @Excel(name = "被吐槽总次数") + private Integer opposeCount; + + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java new file mode 100644 index 000000000..a1368ded5 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java @@ -0,0 +1,77 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.evaluate.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * 干部信息表 干部信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-02-05 + */ +@Data +public class EvaluateOfficerCountExcel { + + /*@Excel(name = "主键") + private String id; + + @Excel(name = "部门ID 部门表主键ID") + private String deptId;*/ + + @Excel(name = "干部姓名") + private String fullName; + + @Excel(name = "性别", replace = {"女_0", "男_1"}) + private String sex; + + @Excel(name = "单位职务") + private String position; + + @Excel(name = "点赞次数") + private Integer likesCount; + + @Excel(name = "被踩次数") + private Integer opposeCount; + + /** + * 评价总人数 + */ + @Excel(name = "评价总人数") + private Integer evaluatePeopleCount; + + /** + * 评价总次数 + */ + @Excel(name = "评价总次数") + private Integer evaluateCount; + + /** + * 点赞选项次数 + */ + @Excel(name = "点赞选项次数") + private Integer likesOptionCount; + + /** + * 吐槽选项次数 + */ + @Excel(name = "吐槽选项次数") + private Integer opposeOptionCount; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateInfoService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateInfoService.java index 30ed9b623..8ec99b331 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateInfoService.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateInfoService.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.evaluate.EvaluateInfoDTO; import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO; import com.elink.esua.epdc.modules.evaluate.entity.EvaluateInfoEntity; import java.util.List; @@ -45,6 +46,8 @@ public interface EvaluateInfoService extends BaseService { */ PageData page(Map params); + PageData infoPage(Map params); + /** * 默认查询 * @@ -55,6 +58,8 @@ public interface EvaluateInfoService extends BaseService { */ List list(Map params); + List listExport(Map params); + /** * 单条查询 * diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOfficerService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOfficerService.java index 3465e5d8f..1b8e4d9f8 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOfficerService.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOfficerService.java @@ -105,6 +105,8 @@ public interface EvaluateOfficerService extends BaseService * @date 2020-02-05 */ void delete(String[] ids); + + List optionShowList(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java index c5426a858..4ab649770 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java @@ -27,13 +27,17 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.evaluate.EvaluateDetailDTO; import com.elink.esua.epdc.dto.evaluate.EvaluateInfoDTO; +import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO; import com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption; import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateDeptCountResultDTO; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO; import com.elink.esua.epdc.modules.evaluate.dao.EvaluateInfoDao; import com.elink.esua.epdc.modules.evaluate.entity.EvaluateInfoEntity; import com.elink.esua.epdc.modules.evaluate.redis.EvaluateInfoRedis; import com.elink.esua.epdc.modules.evaluate.service.EvaluateDetailService; import com.elink.esua.epdc.modules.evaluate.service.EvaluateInfoService; +import com.elink.esua.epdc.modules.evaluate.service.EvaluateOfficerService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -58,6 +62,9 @@ public class EvaluateInfoServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -66,6 +73,12 @@ public class EvaluateInfoServiceImpl extends BaseServiceImpl infoPage(Map params) { + IPage page = getPage(params); + List list = baseDao.getInfoPage(params); + return new PageData<>(list, page.getTotal()); + } @Override public List list(Map params) { @@ -74,6 +87,12 @@ public class EvaluateInfoServiceImpl extends BaseServiceImpl listExport(Map params) { + List list = baseDao.getInfoPage(params); + return list; + } + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); @@ -129,6 +148,8 @@ public class EvaluateInfoServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -103,6 +108,10 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl params = new HashMap(); params.put("deptId",completeDeptDTO.getStreetId()); @@ -166,6 +175,11 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl list = baseDao.getOptionList(formDto); return list; } + @Override + public List optionShowList() { + List list = baseDao.optionShowList(); + return list; + } /** * 条件查询 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml index e6428cd8b..5ec4fef8b 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml @@ -18,6 +18,61 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml index 9d09a527e..19c13929e 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml @@ -91,6 +91,16 @@ delete from epdc_evaluate_officer where DEPT_ID = #{deptId} + + UPDATE epdc_evaluate_officer SET + + LIKES_COUNT = LIKES_COUNT + 1 + + + OPPOSE_COUNT = OPPOSE_COUNT + 1 + + where ID = #{id} and DEL_FLAG = '0' + @@ -128,7 +138,7 @@ LEFT JOIN ( SELECT OFFICER_ID, - SUM( IF ( OPTION_COUNT = 0, 1, ( IF ( CONTENT IS NOT NULL, OPTION_COUNT + 1, OPTION_COUNT ) ) ) ) likesOptionCount + SUM( IF ( OPTION_COUNT = 0, 1, ( IF ( CONTENT IS NULL OR CONTENT = '', OPTION_COUNT, OPTION_COUNT + 1 ) ) ) ) likesOptionCount FROM epdc_evaluate_info info WHERE @@ -143,7 +153,7 @@ LEFT JOIN ( SELECT OFFICER_ID, - SUM( IF ( OPTION_COUNT = 0, 1, ( IF ( CONTENT IS NOT NULL, OPTION_COUNT + 1, OPTION_COUNT ) ) ) ) opposeOptionCount + SUM( IF ( OPTION_COUNT = 0, 1, ( IF ( CONTENT IS NULL OR CONTENT = '', OPTION_COUNT, OPTION_COUNT + 1 ) ) ) ) opposeOptionCount FROM epdc_evaluate_info info WHERE diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml index 28b355bac..31b2b8d29 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml @@ -64,5 +64,24 @@ order by sort, CREATED_TIME desc + + + + + + + \ No newline at end of file