【网格实体化运作打分】操作记录后台管理-王公峰-2020-12-08

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;
 
-}
+}

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<PageData<SubAuditRecordsLogDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<SubAuditRecordsLogDTO> page = subAuditRecordsLogService.page(params);
+//        PageData<SubAuditRecordsLogDTO> page = subAuditRecordsLogService.page(params);
+        PageData<SubAuditRecordsLogDTO> page = subAuditRecordsLogService.getSubAuditRecordsLogPage(params);
         return new Result<PageData<SubAuditRecordsLogDTO>>().ok(page);
     }
 
@@ -91,4 +92,4 @@ public class SubAuditRecordsLogController {
         ExcelUtils.exportExcelToTarget(response, null, list, SubAuditRecordsLogExcel.class);
     }
 
-}
+}

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<SubAuditRecordsLogEntity> {
-	
+    /**
-}
+     * 条件查询
+     * @param params
+     * @return
+     */
+    List<SubAuditRecordsLogDTO> getSubAuditRecordsLogPage(Map<String, Object> params);
+}

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<SubAuditRecordsLo
      */
     PageData<SubAuditRecordsLogDTO> page(Map<String, Object> params);
 
+    /**
+     * 分页条件查询
+     * @param params
+     * @return
+     */
+    PageData<SubAuditRecordsLogDTO> getSubAuditRecordsLogPage(Map<String, Object> params);
+
     /**
      * 默认查询
      *
@@ -92,4 +99,4 @@ public interface SubAuditRecordsLogService extends BaseService<SubAuditRecordsLo
      * @date 2020-12-07
      */
     void delete(String[] ids);
-}
+}

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubAuditRecordsLogServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 审核记录表 
+ * 审核记录表
  *
  * @author qu qu@elink-cn.com
  * @since v1.0.0 2020-12-07
@@ -58,6 +58,18 @@ public class SubAuditRecordsLogServiceImpl extends BaseServiceImpl<SubAuditRecor
         return getPageData(page, SubAuditRecordsLogDTO.class);
     }
 
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    @Override
+    public PageData<SubAuditRecordsLogDTO> getSubAuditRecordsLogPage(Map<String, Object> params) {
+        IPage<SubAuditRecordsLogDTO> page = getPage(params);
+        List<SubAuditRecordsLogDTO> list = baseDao.getSubAuditRecordsLogPage(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
     @Override
     public List<SubAuditRecordsLogDTO> list(Map<String, Object> params) {
         List<SubAuditRecordsLogEntity> entityList = baseDao.selectList(getWrapper(params));
@@ -101,4 +113,4 @@ public class SubAuditRecordsLogServiceImpl extends BaseServiceImpl<SubAuditRecor
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
+}

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubCheckDictionaryServiceImpl.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -93,6 +94,12 @@ public class SubCheckDictionaryServiceImpl extends BaseServiceImpl<SubCheckDicti
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(SubCheckDictionaryDTO dto) {
+        String checkLabel = dto.getCheckLabel();
+        if (StringUtils.isNotBlank(checkLabel)) {
+            if (getcheckLabelCount(dto) > 0) {
+                throw new RenException("您输入的考核项名称已存在!");
+            }
+        }
         SubCheckDictionaryEntity entity = ConvertUtils.sourceToTarget(dto, SubCheckDictionaryEntity.class);
         insert(entity);
     }
@@ -100,10 +107,30 @@ public class SubCheckDictionaryServiceImpl extends BaseServiceImpl<SubCheckDicti
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(SubCheckDictionaryDTO dto) {
+        String checkLabel = dto.getCheckLabel();
+        if (StringUtils.isNotBlank(checkLabel)) {
+            if (getcheckLabelCount(dto) > 0) {
+                throw new RenException("您输入的考核项名称已存在!");
+            }
+        }
         SubCheckDictionaryEntity entity = ConvertUtils.sourceToTarget(dto, SubCheckDictionaryEntity.class);
         updateById(entity);
     }
 
+    /**
+     * 统计考核项名称数量
+     * @param dto
+     * @return
+     */
+    public Integer getcheckLabelCount(SubCheckDictionaryDTO dto) {
+        QueryWrapper<SubCheckDictionaryEntity> 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) {

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubAuditRecordsLogDao.xml

@@ -20,5 +20,30 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="getSubAuditRecordsLogPage" resultType="com.elink.esua.epdc.dto.SubAuditRecordsLogDTO">
+        select
+            ID,
+            INFO_ID,
+            CHECK_DEPT_ID,
+            CHECK_DEPT_NAME,
+            CHECK_TIME,
+            CHECK_RESULT,
+            CHECK_OPINION,
+            PROCESS_CODE,
+            PROCESS_NAME,
+            DEL_FLAG,
+            REVISION,
+            CREATED_BY,
+            CREATED_TIME,
+            UPDATED_BY,
+            UPDATED_TIME
+        from epdc_act_phrase
+        where DEL_FLAG = '0'
+        <if test="processCode != null and processCode != ''">
+            and PROCESS_CODE = #{processCode}
+        </if>
+        order by CREATED_TIME desc,INFO_ID,CHECK_TIME desc
+    </select>
 
-</mapper>
+
+</mapper>