elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1118代码回滚end

feature/dangjian
李鹏飞 6 years ago
parent
b60ed53037
commit
cc32edaf48
2 changed files with 152 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java
  2. 222
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiRuleController.java

47
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java
View File

@ -17,7 +17,9 @@
package com.elink.esua.epdc.controller;
import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@ -36,7 +38,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -54,36 +55,36 @@ public class KpiManualScoreController {
@Autowired
private KpiManualScoreService kpiManualScoreService;
private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");//设置日期格式
@GetMapping("page")
public Result<PageData<KpiManualScoreResultDTO>> page(@RequestParam Map<String, Object> params){
// PageData<KpiManualScoreDTO> page = kpiManualScoreService.page(params);
@DataFilter(prefix = "and", tableAlias = "kmc", isPendingCreator = false)
public Result<PageData<KpiManualScoreResultDTO>> page(@RequestParam Map<String, Object> params) {
PageData<KpiManualScoreResultDTO> page = kpiManualScoreService.listKpiManualScoreResultDTO(params);
return new Result<PageData<KpiManualScoreResultDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<KpiManualScoreDTO> get(@PathVariable("id") String id){
public Result<KpiManualScoreDTO> get(@PathVariable("id") String id) {
KpiManualScoreDTO data = kpiManualScoreService.get(id);
return new Result<KpiManualScoreDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody KpiManualScoreDTO dto){
public Result save(@RequestBody KpiManualScoreDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
return kpiManualScoreService.save(dto);
}
@PutMapping
public Result update(@RequestBody KpiManualScoreDTO dto){
public Result update(@RequestBody KpiManualScoreDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
return kpiManualScoreService.update(dto);
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
public Result delete(@RequestBody String[] ids) {
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
kpiManualScoreService.delete(ids);
@ -96,6 +97,19 @@ public class KpiManualScoreController {
ExcelUtils.exportExcelToTarget(response, null, list, KpiManualScoreExcel.class);
}
/**
* 导出打分模版前，校验选项
*
* @param params
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author work@yujt.net.cn
* @date 2019/12/16 14:17
*/
@GetMapping("checkExportTemplate")
public Result checkExportTemplate(@RequestParam Map<String, Object> params) {
return kpiManualScoreService.checkExportTemplate(params);
}
/**
* @param params
* @return void
@ -106,8 +120,8 @@ public class KpiManualScoreController {
@GetMapping("exportTemplate")
public void exportTemplate(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<KpiManualScoreTemplateResultDTO> list = kpiManualScoreService.listKpiManualScoreTemplateResultDTO(params);
ExcelUtils.exportExcelToTarget(response, simpleDateFormat.format(new Date()), list, KpiManualScoreTemplateExcel.class);
ExcelUtils.exportExcelToTarget(response,
DateUtils.format(new Date(), DateUtils.DATE_TIME_NO_SPLIT), list, KpiManualScoreTemplateExcel.class);
}
/**
@ -121,4 +135,17 @@ public class KpiManualScoreController {
public Result importManualScoreExcel(@RequestParam("file") MultipartFile file) {
return kpiManualScoreService.importManualScoreExcel(file);
}
/**
* 将手动打分初始化为元数据项
*
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author work@yujt.net.cn
* @date 2019/12/25 14:10
*/
@GetMapping("initMetaData/{params}")
public Result initManualScoreToMetaData(@PathVariable("params") String params) {
kpiManualScoreService.initManualScoreToMetaData(params);
return new Result();
}
}

222
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiRuleController.java
View File

@ -48,111 +48,119 @@ import java.util.Map;
@RequestMapping("rule")
public class KpiRuleController {
@Autowired
private KpiRuleService kpiRuleService;
@GetMapping("page")
public Result<PageData<KpiRuleDTO>> page(@RequestParam Map<String, Object> params) {
PageData<KpiRuleDTO> page = kpiRuleService.page(params);
return new Result<PageData<KpiRuleDTO>>().ok(page);
}
/*@GetMapping("{id}")
public Result<KpiRuleDTO> get(@PathVariable("id") String id){
KpiRuleDTO data = kpiRuleService.get(id);
return new Result<KpiRuleDTO>().ok(data);
}*/
@PostMapping
public Result save(@RequestBody KpiRuleDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
kpiRuleService.save(dto);
return new Result();
}
@PutMapping
public Result update(@RequestBody KpiRuleDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
kpiRuleService.update(dto);
return new Result();
}
@DeleteMapping
public Result delete(@RequestBody String[] ids) {
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
kpiRuleService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<KpiRuleDTO> list = kpiRuleService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, KpiRuleExcel.class);
}
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.KpiRuleDTO>>
* @Author yinzuomei
* @Description 列表查询
* @Date 2019/11/27 13:22
**/
@GetMapping("query")
public Result<PageData<KpiRuleQueryResultDTO>> query(@RequestParam Map<String, Object> params) {
PageData<KpiRuleQueryResultDTO> page = kpiRuleService.query(params);
return new Result<PageData<KpiRuleQueryResultDTO>>().ok(page);
}
/**
* @param id
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.KpiRuleQueryResultDTO>
* @Author yinzuomei
* @Description 查询详情
* @Date 2019/11/27 15:17
**/
@GetMapping("{id}")
public Result<KpiRuleQueryResultDTO> queryDetailInfo(@PathVariable("id") String id) {
KpiRuleQueryResultDTO data = kpiRuleService.queryDetailInfo(id);
return new Result<KpiRuleQueryResultDTO>().ok(data);
}
/**
* @param dto
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Author yinzuomei
* @Description 新增
* @Date 2019/11/27 16:23
**/
@PostMapping("saveOrUpdate")
public Result add(@RequestBody KpiRuleSaveOrUpdateFormDTO dto) {
ValidatorUtils.validateEntity(dto);
return kpiRuleService.add(dto);
}
/**
* @param dto
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Author yinzuomei
* @Description 修改
* @Date 2019/11/27 16:20
**/
@PutMapping("saveOrUpdate")
public Result edit(@RequestBody KpiRuleSaveOrUpdateFormDTO dto) {
ValidatorUtils.validateEntity(dto);
return kpiRuleService.edit(dto);
}
/**
* @return
* @Author yinzuomei
* @Description 已绑定手动打分的考核规则 手动打分下拉框使用
* @Date 2019/12/4 15:52
**/
@GetMapping("getKpiManualRule")
public Result<List<KpiRuleDTO>> getKpiManualRule() {
return kpiRuleService.listKpiRuleDTO();
}
@Autowired
private KpiRuleService kpiRuleService;
@GetMapping("page")
public Result<PageData<KpiRuleDTO>> page(@RequestParam Map<String, Object> params) {
PageData<KpiRuleDTO> page = kpiRuleService.page(params);
return new Result<PageData<KpiRuleDTO>>().ok(page);
}
@PostMapping
public Result save(@RequestBody KpiRuleDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
kpiRuleService.save(dto);
return new Result();
}
@PutMapping
public Result update(@RequestBody KpiRuleDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
kpiRuleService.update(dto);
return new Result();
}
@DeleteMapping
public Result delete(@RequestBody String[] ids) {
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
kpiRuleService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<KpiRuleDTO> list = kpiRuleService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, KpiRuleExcel.class);
}
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.KpiRuleDTO>>
* @Author yinzuomei
* @Description 列表查询
* @Date 2019/11/27 13:22
**/
@GetMapping("query")
public Result<PageData<KpiRuleQueryResultDTO>> query(@RequestParam Map<String, Object> params) {
PageData<KpiRuleQueryResultDTO> page = kpiRuleService.query(params);
return new Result<PageData<KpiRuleQueryResultDTO>>().ok(page);
}
/**
* @param id
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.KpiRuleQueryResultDTO>
* @Author yinzuomei
* @Description 查询详情
* @Date 2019/11/27 15:17
**/
@GetMapping("{id}")
public Result<KpiRuleQueryResultDTO> queryDetailInfo(@PathVariable("id") String id) {
KpiRuleQueryResultDTO data = kpiRuleService.queryDetailInfo(id);
return new Result<KpiRuleQueryResultDTO>().ok(data);
}
/**
* @param dto
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Author yinzuomei
* @Description 新增
* @Date 2019/11/27 16:23
**/
@PostMapping("saveOrUpdate")
public Result add(@RequestBody KpiRuleSaveOrUpdateFormDTO dto) {
ValidatorUtils.validateEntity(dto);
return kpiRuleService.add(dto);
}
/**
* @param dto
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Author yinzuomei
* @Description 修改
* @Date 2019/11/27 16:20
**/
@PutMapping("saveOrUpdate")
public Result edit(@RequestBody KpiRuleSaveOrUpdateFormDTO dto) {
ValidatorUtils.validateEntity(dto);
return kpiRuleService.edit(dto);
}
/**
* @return
* @Author yinzuomei
* @Description 已绑定手动打分的考核规则 手动打分下拉框使用
* @Date 2019/12/4 15:52
**/
@GetMapping("getKpiManualRule")
public Result<List<KpiRuleDTO>> getKpiManualRule() {
return kpiRuleService.listKpiRuleDTO();
}
/**
* 根据考核规则编码，计算考核规则绑定公式的运算结果
*
* @param ruleCode
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.KpiRuleDTO>>
* @author work@yujt.net.cn
* @date 2019/12/17 17:04
*/
@GetMapping("calcByCode/{ruleCode}")
public Result calcByRuleCode(@PathVariable("ruleCode") String ruleCode) {
kpiRuleService.calcByRuleCode(ruleCode);
return new Result();
}
}

Write Preview
Loading…
Cancel
Save