From 813056fb7ea48cdbc2be2c2627f9ab44ebb9831a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 8 Dec 2020 15:00:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=8C=96=E8=BF=90=E4=BD=9C=E6=89=93=E5=88=86=E3=80=91=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=AE=B0=E5=BD=95=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-12-08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/SubAuditRecordsLogDTO.java | 4 +-- .../SubAuditRecordsLogController.java | 9 ++++--- .../esua/epdc/dao/SubAuditRecordsLogDao.java | 15 ++++++++--- .../service/SubAuditRecordsLogService.java | 11 ++++++-- .../impl/SubAuditRecordsLogServiceImpl.java | 16 +++++++++-- .../impl/SubCheckDictionaryServiceImpl.java | 27 +++++++++++++++++++ .../mapper/SubAuditRecordsLogDao.xml | 27 ++++++++++++++++++- 7 files changed, 95 insertions(+), 14 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubAuditRecordsLogDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubAuditRecordsLogDTO.java index cb3187c55..f72a04612 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubAuditRecordsLogDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubAuditRecordsLogDTO.java @@ -23,7 +23,7 @@ import lombok.Data; /** - * 审核记录表 + * 审核记录表 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-07 @@ -103,4 +103,4 @@ public class SubAuditRecordsLogDTO implements Serializable { */ private Date updatedTime; -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubAuditRecordsLogController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubAuditRecordsLogController.java index 6983611f8..395ff03da 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubAuditRecordsLogController.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubAuditRecordsLogController.java @@ -37,7 +37,7 @@ import java.util.Map; /** - * 审核记录表 + * 审核记录表 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-07 @@ -45,13 +45,14 @@ import java.util.Map; @RestController @RequestMapping("subauditrecordslog") public class SubAuditRecordsLogController { - + @Autowired private SubAuditRecordsLogService subAuditRecordsLogService; @GetMapping("page") public Result> page(@RequestParam Map params){ - PageData page = subAuditRecordsLogService.page(params); +// PageData page = subAuditRecordsLogService.page(params); + PageData page = subAuditRecordsLogService.getSubAuditRecordsLogPage(params); return new Result>().ok(page); } @@ -91,4 +92,4 @@ public class SubAuditRecordsLogController { ExcelUtils.exportExcelToTarget(response, null, list, SubAuditRecordsLogExcel.class); } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubAuditRecordsLogDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubAuditRecordsLogDao.java index 1e281ccaa..3258d3747 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubAuditRecordsLogDao.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubAuditRecordsLogDao.java @@ -18,16 +18,25 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.SubAuditRecordsLogDTO; import com.elink.esua.epdc.entity.SubAuditRecordsLogEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** - * 审核记录表 + * 审核记录表 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-07 */ @Mapper public interface SubAuditRecordsLogDao extends BaseDao { - -} \ No newline at end of file + /** + * 条件查询 + * @param params + * @return + */ + List getSubAuditRecordsLogPage(Map params); +} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubAuditRecordsLogService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubAuditRecordsLogService.java index 4093b7061..1b36351f7 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubAuditRecordsLogService.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubAuditRecordsLogService.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; /** - * 审核记录表 + * 审核记录表 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-07 @@ -43,6 +43,13 @@ public interface SubAuditRecordsLogService extends BaseService page(Map params); + /** + * 分页条件查询 + * @param params + * @return + */ + PageData getSubAuditRecordsLogPage(Map params); + /** * 默认查询 * @@ -92,4 +99,4 @@ public interface SubAuditRecordsLogService extends BaseService getSubAuditRecordsLogPage(Map params) { + IPage page = getPage(params); + List list = baseDao.getSubAuditRecordsLogPage(params); + return new PageData<>(list, page.getTotal()); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); @@ -101,4 +113,4 @@ public class SubAuditRecordsLogServiceImpl extends BaseServiceImpl 0) { + throw new RenException("您输入的考核项名称已存在!"); + } + } SubCheckDictionaryEntity entity = ConvertUtils.sourceToTarget(dto, SubCheckDictionaryEntity.class); insert(entity); } @@ -100,10 +107,30 @@ public class SubCheckDictionaryServiceImpl extends BaseServiceImpl 0) { + throw new RenException("您输入的考核项名称已存在!"); + } + } SubCheckDictionaryEntity entity = ConvertUtils.sourceToTarget(dto, SubCheckDictionaryEntity.class); updateById(entity); } + /** + * 统计考核项名称数量 + * @param dto + * @return + */ + public Integer getcheckLabelCount(SubCheckDictionaryDTO dto) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("checkLabel", dto.getCheckLabel()); + String id = dto.getId(); + wrapper.ne(id != null, "id", dto.getId()); + wrapper.eq("del_flag", "0"); + return baseDao.selectCount(wrapper); + } + @Override @Transactional(rollbackFor = Exception.class) public void delete(String[] ids) { diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubAuditRecordsLogDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubAuditRecordsLogDao.xml index f35a8c78c..1a00c20d8 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubAuditRecordsLogDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubAuditRecordsLogDao.xml @@ -20,5 +20,30 @@ + - \ No newline at end of file + +