Browse Source

评价修改

feature/dangjian
李鹏飞 6 years ago
parent
commit
41f05b494d
  1. 5
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptions.java
  2. 107
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java
  3. 3
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java
  4. 9
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateInfoController.java
  5. 3
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOfficerController.java
  6. 9
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java
  7. 11
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java
  8. 2
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java
  9. 6
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOptionDao.java
  10. 77
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java
  11. 77
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java
  12. 5
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateInfoService.java
  13. 2
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOfficerService.java
  14. 3
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOptionService.java
  15. 21
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java
  16. 14
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java
  17. 6
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOptionServiceImpl.java
  18. 55
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
  19. 14
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml
  20. 19
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml

5
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<T> {
private List<T> optionList;
public class EvaluateOptions {
private List<EvaluateOptionAppResultDTO> optionList;
}

107
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
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;
/**
* 删除标识 01
*/
private String delFlag;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
private Integer optionCount;
/**
* 评价选项
*/
private List<EvaluateSelectOption> optionsList;
}

3
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<String, Object> params, HttpServletResponse response) throws Exception {
List<EvaluateDeptCountResultDTO> list = evaluateDeptService.countExport(params);
ExcelUtils.exportExcelToTarget(response, null, list, EvaluateDeptExcel.class);
ExcelUtils.exportExcelToTarget(response, null, list, EvaluateDeptCountExcel.class);
}
@GetMapping("export")

9
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<PageData<EvaluateInfoDTO>> page(@RequestParam Map<String, Object> params){
PageData<EvaluateInfoDTO> page = evaluateInfoService.page(params);
return new Result<PageData<EvaluateInfoDTO>>().ok(page);
public Result<PageData<EvaluateInfoResultDTO>> page(@RequestParam Map<String, Object> params){
PageData<EvaluateInfoResultDTO> page = evaluateInfoService.infoPage(params);
return new Result<PageData<EvaluateInfoResultDTO>>().ok(page);
}
@GetMapping("{id}")
@ -95,7 +96,7 @@ public class EvaluateInfoController {
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<EvaluateInfoDTO> list = evaluateInfoService.list(params);
List<EvaluateInfoResultDTO> list = evaluateInfoService.listExport(params);
ExcelUtils.exportExcelToTarget(response, null, list, EvaluateInfoExcel.class);
}

3
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<String, Object> params, HttpServletResponse response) throws Exception {
List<EvaluateOfficerCountResultDTO> list = evaluateOfficerService.countExport(params);
ExcelUtils.exportExcelToTarget(response, null, list, EvaluateOfficerExcel.class);
ExcelUtils.exportExcelToTarget(response, null, list, EvaluateOfficerCountExcel.class);
}
@GetMapping("getDeptOfficer")
public Result<List<EvaluateOfficerAppResultDTO>> getDeptOfficer(@RequestBody EvaluateOfficerAppFormDTO formDto){

9
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<EvaluateOptionAppResultDTO> list = evaluateOptionService.getOptionList(formDto);
return new Result<List<EvaluateOptionAppResultDTO>>().ok(list);
}
@GetMapping("optionShowList")
public Result<EvaluateOptions> optionShowList(){
List<EvaluateOptionAppResultDTO> optionList = evaluateOptionService.optionShowList();
EvaluateOptions evalOption = new EvaluateOptions();
evalOption.setOptionList(optionList);
return new Result<EvaluateOptions>().ok(evalOption);
}
/**
* 更新可用标记

11
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;
/**
* 评价信息表 评价信息表
*
@ -30,4 +34,11 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface EvaluateInfoDao extends BaseDao<EvaluateInfoEntity> {
/**
* 条件查询
* @param params
* @return
*/
List<EvaluateInfoResultDTO> getInfoPage(Map<String, Object> params);
}

2
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<EvaluateOfficerEntity> {
*/
List<EvaluateOfficerDTO> getOfficerPage(Map<String, Object> params);
void updateCount(@Param("id")String id,@Param("type")String type);
/**
* 数据批量插入
* @param evaluateOfficerEntities

6
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<EvaluateOptionEntity> {
* @return
*/
List<EvaluateOptionAppResultDTO> getOptionList(EvaluateOptionAppFormDTO formDto);
/**
* 选项显示列表后台
* @return
*/
List<EvaluateOptionAppResultDTO> optionShowList();
}

77
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
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;
}

77
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
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;
}

5
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<EvaluateInfoEntity> {
*/
PageData<EvaluateInfoDTO> page(Map<String, Object> params);
PageData<EvaluateInfoResultDTO> infoPage(Map<String, Object> params);
/**
* 默认查询
*
@ -55,6 +58,8 @@ public interface EvaluateInfoService extends BaseService<EvaluateInfoEntity> {
*/
List<EvaluateInfoDTO> list(Map<String, Object> params);
List<EvaluateInfoResultDTO> listExport(Map<String, Object> params);
/**
* 单条查询
*

2
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<EvaluateOfficerEntit
*/
void update(EvaluateOfficerDTO dto);
void updateCount(String id, String type);
/**
* 批量删除
*

3
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOptionService.java

@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.evaluate.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.dto.evaluate.EvaluateShowOption;
import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO;
import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
@ -110,4 +111,6 @@ public interface EvaluateOptionService extends BaseService<EvaluateOptionEntity>
* @date 2020-02-05
*/
void delete(String[] ids);
List<EvaluateOptionAppResultDTO> optionShowList();
}

21
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<EvaluateInfoDao, Ev
@Autowired
private EvaluateDetailService evaluateDetailService;
@Autowired
private EvaluateOfficerService evaluateOfficerService;
@Override
public PageData<EvaluateInfoDTO> page(Map<String, Object> params) {
IPage<EvaluateInfoEntity> page = baseDao.selectPage(
@ -66,6 +73,12 @@ public class EvaluateInfoServiceImpl extends BaseServiceImpl<EvaluateInfoDao, Ev
);
return getPageData(page, EvaluateInfoDTO.class);
}
@Override
public PageData<EvaluateInfoResultDTO> infoPage(Map<String, Object> params) {
IPage<EvaluateInfoResultDTO> page = getPage(params);
List<EvaluateInfoResultDTO> list = baseDao.getInfoPage(params);
return new PageData<>(list, page.getTotal());
}
@Override
public List<EvaluateInfoDTO> list(Map<String, Object> params) {
@ -74,6 +87,12 @@ public class EvaluateInfoServiceImpl extends BaseServiceImpl<EvaluateInfoDao, Ev
return ConvertUtils.sourceToTarget(entityList, EvaluateInfoDTO.class);
}
@Override
public List<EvaluateInfoResultDTO> listExport(Map<String, Object> params) {
List<EvaluateInfoResultDTO> list = baseDao.getInfoPage(params);
return list;
}
private QueryWrapper<EvaluateInfoEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
@ -129,6 +148,8 @@ public class EvaluateInfoServiceImpl extends BaseServiceImpl<EvaluateInfoDao, Ev
detailDto.setRoleCode(formDto.getRoleCode());
evaluateDetailService.save(detailDto);
}
evaluateOfficerService.updateCount(formDto.getOfficerId(),formDto.getRoleCode().toString());
}catch (Exception e){
e.printStackTrace();
}

14
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java

@ -29,6 +29,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.CompleteDeptDTO;
import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO;
import com.elink.esua.epdc.dto.evaluate.EvaluateRoleDTO;
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;
@ -36,6 +37,7 @@ import com.elink.esua.epdc.modules.evaluate.dao.EvaluateOfficerDao;
import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOfficerEntity;
import com.elink.esua.epdc.modules.evaluate.redis.EvaluateOfficerRedis;
import com.elink.esua.epdc.modules.evaluate.service.EvaluateOfficerService;
import com.elink.esua.epdc.modules.evaluate.service.EvaluateRoleService;
import com.elink.esua.epdc.modules.feign.SysFeignClient;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFCell;
@ -78,6 +80,9 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
@Autowired
private SysFeignClient sysFeignClient;
@Autowired
private EvaluateRoleService evaluateRoleService;
@Override
public PageData<EvaluateOfficerDTO> page(Map<String, Object> params) {
IPage<EvaluateOfficerEntity> page = baseDao.selectPage(
@ -103,6 +108,10 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
if (!completeDept.success()) {
throw new RenException("获取街道失败");
}
EvaluateRoleDTO data = evaluateRoleService.getAvailable();
if (!"1".equals(data.getAvailable())) {
throw new RenException("评价功能停用");
}
CompleteDeptDTO completeDeptDTO = completeDept.getData();
Map<String, Object> params = new HashMap<String, Object>();
params.put("deptId",completeDeptDTO.getStreetId());
@ -166,6 +175,11 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
EvaluateOfficerEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateOfficerEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateCount(String id, String type) {
baseDao.updateCount(id,type);
}
@Override
@Transactional(rollbackFor = Exception.class)

6
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOptionServiceImpl.java

@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
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.dao.EvaluateOptionDao;
@ -64,6 +65,11 @@ public class EvaluateOptionServiceImpl extends BaseServiceImpl<EvaluateOptionDao
List<EvaluateOptionAppResultDTO> list = baseDao.getOptionList(formDto);
return list;
}
@Override
public List<EvaluateOptionAppResultDTO> optionShowList() {
List<EvaluateOptionAppResultDTO> list = baseDao.optionShowList();
return list;
}
/**
* 条件查询

55
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml

@ -18,6 +18,61 @@
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="optionCount" column="OPTION_COUNT"/>
</resultMap>
<resultMap type="com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO" id="evaluateInfoResultMap">
<result property="id" column="ID"/>
<result property="fullName" column="FULL_NAME"/>
<result property="mobile" column="MOBILE"/>
<result property="officerId" column="OFFICER_ID"/>
<result property="roleCode" column="ROLE_CODE"/>
<result property="content" column="CONTENT"/>
<result property="revision" column="REVISION"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="optionCount" column="OPTION_COUNT"/>
<collection property="optionsList" ofType="com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption">
<result property="optionId" column="OPTION_ID"/>
<result property="selectFlag" column="SELECT_FLAG"/>
</collection>
</resultMap>
<select id="getInfoPage" resultMap="evaluateInfoResultMap">
SELECT
info.ID,
info.FULL_NAME,
info.MOBILE,
info.OFFICER_ID,
info.ROLE_CODE,
info.CONTENT,
info.OPTION_COUNT,
info.CREATED_TIME,
detail.OPTION_ID,
detail.SELECT_FLAG
FROM
epdc_evaluate_info info
LEFT JOIN epdc_evaluate_detail detail ON info.ID = detail.INFO_ID
AND detail.DEL_FLAG = '0'
WHERE
info.DEL_FLAG = '0'
<if test="id != null and id != ''">
and info.OFFICER_ID = #{id}
</if>
<if test="roleCode != null and roleCode != ''">
and info.ROLE_CODE = #{roleCode}
</if>
<if test="fullName != null and fullName != ''">
and info.FULL_NAME like '%' #{fullName} '%'
</if>
<if test="mobile != null and mobile != ''">
and info.MOBILE like '%' #{mobile} '%'
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( info.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
ORDER BY
info.CREATED_TIME DESC
</select>
</mapper>

14
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}
</delete>
<update id="updateCount">
UPDATE epdc_evaluate_officer SET
<if test='type != null and type != "" and type == "1"'>
LIKES_COUNT = LIKES_COUNT + 1
</if>
<if test='type != null and type != "" and type == "2"'>
OPPOSE_COUNT = OPPOSE_COUNT + 1
</if>
where ID = #{id} and DEL_FLAG = '0'
</update>
<resultMap type="com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO" id="evaluateOfficerCountMap">
@ -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

19
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
</select>
<resultMap type="com.elink.esua.epdc.dto.evaluate.EvaluateShowOption" id="evaluateShowOptionMap">
<result property="index" column="Num"/>
<result property="optionContent" column="OPTION_CONTENT"/>
</resultMap>
<select id="optionShowList" resultMap="evaluateOptionAppResultMap">
SELECT
ID,
ROLE_CODE,
OPTION_CONTENT
FROM
epdc_evaluate_option
WHERE
DEL_FLAG = '0'
ORDER BY
ROLE_CODE,
SORT ASC
</select>
</mapper>
Loading…
Cancel
Save