feat(base): 添加质检项信息维护列表查询接口

- 在BaseQualityInspectionItemController中新增selectBaseQualityInspectionItemList方法
- 添加权限验证注解@PreAuthorize控制访问权限
- 更新巡检执行情况统计数据源,从DMS_PLAN_INSPECT表改为DMS_BILLS_INSPECT_INSTANCE表
- 简化selectInspectStatistics查询逻辑,移除复杂的子查询结构
- 调整应检设备计算方式,直接统计DMS_BILLS_INSPECT_INSTANCE表中的记录数
master
zangch@mesnac.com 1 week ago
parent a97c17c566
commit 34f7f2bb59

@ -129,4 +129,15 @@ public class BaseQualityInspectionItemController extends BaseController {
public AjaxResult getQualityDefects(@PathVariable("stationCode" ) String stationCode) {
return success(baseQualityInspectionItemService.getQualityDefects(stationCode));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('base:qualityInspectionItem:list')" )
@GetMapping("/selectBaseQualityInspectionItemList" )
public AjaxResult selectBaseQualityInspectionItemList(BaseQualityInspectionItem baseQualityInspectionItem) {
List<BaseQualityInspectionItem> list = baseQualityInspectionItemService.selectBaseQualityInspectionItemList(baseQualityInspectionItem);
return success(list);
}
}

@ -1,13 +1,5 @@
package com.aucma.dms.service.impl;
//import com.hw.common.core.exception.ServiceException;
//import com.hw.common.core.utils.DateUtils;
//import com.hw.common.security.utils.SecurityUtils;
//import com.aucma.dms.domain.DmsBaseInspectProject;
//import com.aucma.dms.mapper.DmsBaseInspectProjectMapper;
//import com.aucma.dms.service.IDmsBaseInspectProjectService;
//import com.hw.system.api.model.LoginUser;
import com.aucma.common.core.domain.model.LoginUser;
import com.aucma.common.exception.ServiceException;
import com.aucma.common.utils.DateUtils;
@ -69,7 +61,7 @@ public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectS
InspectProject.setInspectProjectCode(dmsBaseInspectProject.getInspectProjectCode());
List<DmsBaseInspectProject> DmsBaseInspectProjectList = dmsBaseInspectProjectMapper
.selectDmsBaseInspectProjectList(InspectProject);
if (DmsBaseInspectProjectList.size()>0){
if (!DmsBaseInspectProjectList.isEmpty()){
throw new ServiceException("巡检项目编号已存在");
}
if (dmsBaseInspectProject.getInspectType()==null){
@ -95,7 +87,7 @@ public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectS
InspectProject.setInspectProjectCode(dmsBaseInspectProject.getInspectProjectCode());
List<DmsBaseInspectProject> DmsBaseInspectProjectList = dmsBaseInspectProjectMapper
.selectDmsBaseInspectProjectList(InspectProject);
if (DmsBaseInspectProjectList.size()>0 && !DmsBaseInspectProjectList.get(0).getInspectProjectId()
if (!DmsBaseInspectProjectList.isEmpty() && !DmsBaseInspectProjectList.get(0).getInspectProjectId()
.equals(dmsBaseInspectProject.getInspectProjectId())){
throw new ServiceException("巡检项目编号已存在");
}

@ -55,18 +55,11 @@
</select>
<!-- 查询巡检执行情况统计(全量历史) -->
<!-- 应检设备 = 关联 DMS_PLAN_INSPECT 表,汇总 DEVICE_AMOUNT设备总数 -->
<!-- 应检设备 = DMS_BILLS_INSPECT_INSTANCE 全量(历史累计 -->
<!-- 已检设备 = DMS_BILLS_INSPECT_INSTANCE 中 INSPECT_STATUS='3'(已完成) 的工单数量 -->
<!-- 数据来源DMS_BILLS_INSPECT_INSTANCE + DMS_PLAN_INSPECT -->
<!-- 数据来源DMS_BILLS_INSPECT_INSTANCE -->
<select id="selectInspectStatistics" resultType="java.util.HashMap">
SELECT (SELECT NVL(SUM(p.DEVICE_AMOUNT), 0)
FROM DMS_PLAN_INSPECT p
WHERE p.PLAN_INSPECT_ID IN (
SELECT DISTINCT PLAN_INSPECT_ID
FROM DMS_BILLS_INSPECT_INSTANCE
WHERE IS_FLAG = '1'
)
) AS DEVICE_COUNT,
SELECT (SELECT COUNT(*) FROM DMS_BILLS_INSPECT_INSTANCE WHERE IS_FLAG = '1') AS DEVICE_COUNT,
(SELECT COUNT(*) FROM DMS_BILLS_INSPECT_INSTANCE WHERE IS_FLAG = '1' AND INSPECT_STATUS = '3') AS COMPLETE_COUNT
FROM DUAL
</select>

Loading…
Cancel
Save