Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
0599f442 由 康伟
选项

kangwei: 巡检分析功能每个统计的数据都需要增加详情，查看各水厂数据清单 16h

1 个父辈 18632013
内嵌 并排
正在显示 8 个修改的文件 包含 518 行增加 和 7 行删除
sk-module-inspection/src/main/java/com/skua/modules/inspection/controller/web/InspectionAnalysisController.java
......@@ -160,7 +160,18 @@ public class InspectionAnalysisController {
result.setResult(inspectionTaskIndicatorsVO);
return result;
}
@ApiOperation(value = "巡检分析-巡检任务指标-详情", notes = "巡检分析-巡检任务指标-详情")
@GetMapping("/getInspectionTaskIndicatorsDetail")
public Result<List<InspectionEquipIndicatorsDetailVO>> getInspectionTaskIndicatorsDetail(String departId,String startDate,String endDate){
Result<List<InspectionEquipIndicatorsDetailVO>> result = new Result<>();
if(StringUtils.isEmpty(departId)){
departId = BaseContextHandler.getDeparts();
}
List<InspectionEquipIndicatorsDetailVO> dataList = inspectionAnalysisService.getInspectionTaskIndicatorsDetail( JSUtils.quoteEach(departId,",") ,startDate,endDate);
result.setSuccess(true);
result.setResult(dataList);
return result;
}
/**
* <pre>
* 巡检分析-巡检任务概况
......@@ -180,6 +191,20 @@ public class InspectionAnalysisController {
return result;
}
@ApiOperation(value = "巡检分析-巡检任务概况-详情", notes = "巡检分析-巡检任务概况-详情")
@GetMapping("/getInspectionTaskOverviewDetail")
public Result<List<InspectionTaskOverviewDetailVO>> getInspectionTaskOverviewDetail(String departId, String startDate, String endDate){
Result<List<InspectionTaskOverviewDetailVO>> result = new Result<>();
if(StringUtils.isEmpty(departId)){
departId = BaseContextHandler.getDeparts();
}
List<InspectionTaskOverviewDetailVO> dataList = inspectionAnalysisService.getInspectionTaskOverviewDetail(JSUtils.quoteEach(departId,","),startDate,endDate);
result.setSuccess(true);
result.setResult(dataList);
return result;
}
/**
* <pre>
* 巡检分析-巡检设备指标
......@@ -198,7 +223,18 @@ public class InspectionAnalysisController {
result.setResult(inspectionEquipIndicatorsVO);
return result;
}
@ApiOperation(value = "巡检分析-巡检设备指标-详情", notes = "巡检分析-巡检设备指标-详情")
@GetMapping("/getInspectionEquipIndicatorsDetail")
public Result<List<InspectionEquipIndicatorsDetailVO>> getInspectionEquipIndicators(String departId,String startDate, String endDate){
Result<List<InspectionEquipIndicatorsDetailVO>> result = new Result<>();
if(StringUtils.isEmpty(departId)){
departId = BaseContextHandler.getDeparts();
}
List<InspectionEquipIndicatorsDetailVO> dataList = inspectionAnalysisService.getInspectionEquipIndicatorsDetail(JSUtils.quoteEach(departId,","),startDate,endDate);
result.setSuccess(true);
result.setResult(dataList);
return result;
}
/**
* <pre>
* 巡检分析-巡检设备概况
......@@ -217,4 +253,17 @@ public class InspectionAnalysisController {
result.setResult(inspectionEquipOverviewVO);
return result;
}
@ApiOperation(value = "巡检分析-巡检设备概况-详情", notes = "巡检分析-巡检设备概况-详情")
@GetMapping("/getInspectionEquipOverviewDetail")
public Result<List<InspectionEquipIndicatorsDetailVO>> getInspectionEquipOverviewDetail(String departId,String startDate, String endDate){
Result<List<InspectionEquipIndicatorsDetailVO>> result = new Result<>();
if(StringUtils.isEmpty(departId)){
departId = BaseContextHandler.getDeparts();
}
List<InspectionEquipIndicatorsDetailVO> dataList = inspectionAnalysisService.getInspectionEquipOverviewDetail(JSUtils.quoteEach(departId,","),startDate,endDate);
result.setSuccess(true);
result.setResult(dataList);
return result;
}
}
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/mapper/InspectionAnalysisMapper.java
......@@ -3,6 +3,9 @@ package com.skua.modules.inspection.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.skua.modules.inspection.entity.InspectionFillChoice;
import com.skua.modules.inspection.vo.InspectionAbnormalItemsTrendVO;
import com.skua.modules.inspection.vo.InspectionEquipIndicatorsDetailVO;
import com.skua.modules.inspection.vo.InspectionEquipIndicatorsVO;
import com.skua.modules.inspection.vo.InspectionTaskOverviewDetailVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -21,5 +24,21 @@ public interface InspectionAnalysisMapper {
* @return
*/
public List<InspectionAbnormalItemsTrendVO> getInspectionAbnormalItemsTrendDetail(@Param("departIds") String departIds,@Param("startDate") String startDate, @Param("endDate") String endDate);
/***
* 巡检分析-巡检设备指标--详情
* @param startDate
* @param endDate
* @return
*/
public List<InspectionEquipIndicatorsDetailVO> getInspectionEquipIndicatorsDetail(@Param("departIds") String departIds,@Param("startDate") String startDate, @Param("endDate") String endDate);
/***
* 巡检分析-巡检任务概况
* @param departIds
* @param startDate
* @param endDate
* @return
*/
List<InspectionTaskOverviewDetailVO> getInspectionTaskOverviewDetail(@Param("departIds") String departIds,@Param("startDate") String startDate, @Param("endDate") String endDate);
}
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/mapper/xml/InspectionAnalysisMapper.xml
......@@ -37,4 +37,180 @@
order by ddd.total_count desc
</select>
<!-- 巡检分析-巡检设备指标(详情) -->
<select id="getInspectionEquipIndicatorsDetail" resultType="com.skua.modules.inspection.vo.InspectionEquipIndicatorsDetailVO">
SELECT
d.depart_name , ifnull(aaa.count,0) 'totalInspectionEquipCount', ifnull(bbb.count,0) 'checkedInspectionEquipCount',ifnull(ccc.count ,0)'abnormalInspectionEquipCount' , ifnull(eee.count,0) 'abnormalItemsCount', ifnull(ddd.state,0) 'processedAbnormalItemsCount'
FROM sys_depart d
left join (
select aa.depart_id ,count(1) 'count' from (
select t.depart_id ,itpfg.equip_info_id from inspection_task_point_fill_group itpfg , inspection_task t
where itpfg.inspection_task_id = t.id and itpfg.equip_info_id IS NOT NULL AND itpfg.equip_info_id &lt;&gt; ''
AND t.task_state IN ('2','3')
<if test="startDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &gt;= #{startDate}
</if>
<if test="endDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &lt;= #{endDate}
</if>
group by t.depart_id , itpfg.equip_info_id
)aa group by aa.depart_id
)aaa on aaa.depart_id = d.id
left join (
select bb.depart_id ,count(1) 'count' from (
select t.depart_id ,itpfg.equip_info_id
from inspection_task_fill_content isfc ,inspection_task_point_fill_group itpfg,inspection_task t
where
isfc.inspection_task_id = itpfg.inspection_task_id and isfc.inspection_point_fill_group_id = itpfg.inspection_point_fill_group_id
and itpfg.inspection_task_id = t.id and isfc.inspection_task_id = t.id
AND t.task_state IN ('2','3')
<if test="startDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &gt;= #{startDate}
</if>
<if test="endDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &lt;= #{endDate}
</if>
and itpfg.equip_info_id IS NOT NULL AND itpfg.equip_info_id &lt;&gt; '' AND isfc.fill_content IS NOT NULL AND isfc.fill_content &lt;&gt; ''
GROUP BY t.depart_id ,itpfg.equip_info_id
)bb group by bb.depart_id
)bbb on bbb.depart_id = d.id
left join (
select cc.depart_id ,count(1) 'count' from (
select t.depart_id ,itpfg.equip_info_id
from inspection_task_fill_content isfc ,inspection_task_point_fill_group itpfg,inspection_task t
where
isfc.inspection_task_id = itpfg.inspection_task_id and isfc.inspection_point_fill_group_id = itpfg.inspection_point_fill_group_id
and itpfg.inspection_task_id = t.id and isfc.inspection_task_id = t.id
AND t.task_state IN ('2','3')
<if test="startDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &gt;= #{startDate}
</if>
<if test="endDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &lt;= #{endDate}
</if>
and itpfg.equip_info_id IS NOT NULL AND itpfg.equip_info_id &lt;&gt; '' AND isfc.fill_content IS NOT NULL AND isfc.fill_content &lt;&gt; '' and isfc.choice_state =0
GROUP BY t.depart_id ,itpfg.equip_info_id
)cc group by cc.depart_id
)ccc on ccc.depart_id = d.id
left join(
select t.depart_id ,
sum( IF( (SELECT ACT_ID_ AS EndActivityId FROM ACT_HI_ACTINST WHERE PROC_INST_ID_ = prp.process_instance_id AND END_TIME_ IS NOT NULL ORDER BY END_TIME_ DESC LIMIT 1) IS NULL, 0, 1) ) AS state
from problem_report_plan prp , inspection_task_problem_report itpr , inspection_task t
where prp.id = itpr.problem_report_plan_id and itpr.inspection_task_id = t.id
AND t.task_state IN ('2','3')
<if test="startDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &gt;= #{startDate}
</if>
<if test="endDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &lt;= #{endDate}
</if>
group by t.depart_id
)ddd on ddd.depart_id = d.id
left join (
select t.depart_id ,ifnull(count(1),0) 'count' from problem_report_plan prp , inspection_task_problem_report itpr , inspection_task t
where prp.id = itpr.problem_report_plan_id and itpr.inspection_task_id = t.id
AND t.task_state IN ('2','3')
<if test="startDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &gt;= #{startDate}
</if>
<if test="endDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &lt;= #{endDate}
</if>
group by t.depart_id
)eee on eee.depart_id = d.id
WHERE
d.depart_type = 1
<if test="departIds != null ">
and d.id in(${departIds})
</if>
order by aaa.count desc
</select>
<!-- 巡检分析-巡检任务概况-->
<select id="getInspectionTaskOverviewDetail" resultType="com.skua.modules.inspection.vo.InspectionTaskOverviewDetailVO">
SELECT
d.depart_name , d.id 'depart_id' ,ifnull(aaa.totalCount,0) 'totalInspectionTaskCount' , ifnull(aaa.count1,0) 'inProgressInspectionTaskCount', ifnull(aaa.count2,0) 'checkedInspectionTaskCount', ifnull(aaa.count3,0) 'notCheckedInspectionTaskCount',
ifnull(ccc.count , 0) 'abnormalInspectionTaskCount', ifnull(eee.count,0) 'abnormalItemsCount', ifnull(ddd.state,0) 'processedAbnormalItemsCount'
FROM sys_depart d
left join (
select t.depart_id ,count(1) 'totalCount' ,
sum(CASE WHEN t.task_state = '1' THEN 1 ELSE 0 END) AS 'count1' ,
sum(CASE WHEN t.task_state = '2' THEN 1 ELSE 0 END) AS 'count2',
sum(CASE WHEN t.task_state = '3' THEN 1 ELSE 0 END) AS 'count3'
from inspection_task t
where 1=1
<if test="startDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &gt;= #{startDate}
</if>
<if test="endDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &lt;= #{endDate}
</if>
group by t.depart_id
)aaa on aaa.depart_id = d.id
left join (
select cc.depart_id ,count(cc.inspection_task_id) 'count' from (
SELECT t.depart_id, itfc.inspection_task_id FROM inspection_task_fill_content itfc ,inspection_task t
WHERE inspection_task_id =t.id
and t.task_state IN ('2')
<if test="startDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &gt;= #{startDate}
</if>
<if test="endDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &lt;= #{endDate}
</if>
AND choice_state = '0'
GROUP BY itfc.inspection_task_id ,t.depart_id) cc group by cc.depart_id
)ccc on ccc.depart_id = d.id
left join(
select t.depart_id ,
sum( IF( (SELECT ACT_ID_ AS EndActivityId FROM ACT_HI_ACTINST WHERE PROC_INST_ID_ = prp.process_instance_id AND END_TIME_ IS NOT NULL ORDER BY END_TIME_ DESC LIMIT 1) IS NULL, 0, 1) ) AS state
from problem_report_plan prp , inspection_task_problem_report itpr , inspection_task t
where prp.id = itpr.problem_report_plan_id and itpr.inspection_task_id = t.id
and t.task_state IN ('2')
<if test="startDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &gt;= #{startDate}
</if>
<if test="endDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &lt;= #{endDate}
</if>
group by t.depart_id
)ddd on ddd.depart_id = d.id
left join (
select t.depart_id ,ifnull(count(1),0) 'count' from problem_report_plan prp , inspection_task_problem_report itpr , inspection_task t
where prp.id = itpr.problem_report_plan_id and itpr.inspection_task_id = t.id
and t.task_state IN ('2')
<if test="startDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &gt;= #{startDate}
</if>
<if test="endDate != null ">
AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &lt;= #{endDate}
</if>
group by t.depart_id
)eee on eee.depart_id = d.id
WHERE
d.depart_type = 1
<if test="departIds != null ">
and d.id in(${departIds})
</if>
order by aaa.totalCount desc
</select>
</mapper>
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/IInspectionAnalysisService.java
......@@ -13,9 +13,23 @@ public interface IInspectionAnalysisService {
List<Map<String, Object>> getDepartInspectionHistoryAnalysis(String moduleType, String startTime, String endTime,String departId)throws Exception;
/***
* 巡检分析-巡检任务指标
* @param startDate
* @param endDate
* @return
*/
InspectionTaskIndicatorsVO getInspectionTaskIndicators(String startDate, String endDate);
/***
* 巡检分析-巡检任务指标-详情
* @param departIds
* @param startDate
* @param endDate
* @return
*/
List<InspectionEquipIndicatorsDetailVO> getInspectionTaskIndicatorsDetail(String departIds, String startDate, String endDate);
/***
* 巡检分析-巡检设备指标
* @param startDate
* @param endDate
......@@ -23,9 +37,31 @@ public interface IInspectionAnalysisService {
*/
InspectionEquipIndicatorsVO getInspectionEquipIndicators(String startDate, String endDate);
/***
* 巡检分析-巡检设备指标--详情
* @param startDate
* @param endDate
* @return
*/
List<InspectionEquipIndicatorsDetailVO> getInspectionEquipIndicatorsDetail(String departIds,String startDate, String endDate);
/***
* 巡检分析-巡检任务概况
* @param startDate
* @param endDate
* @return
*/
InspectionTaskOverviewVO getInspectionTaskOverview(String startDate, String endDate);
/***
* 巡检分析-巡检任务概况
* @param departIds
* @param startDate
* @param endDate
* @return
*/
List<InspectionTaskOverviewDetailVO> getInspectionTaskOverviewDetail(String departIds, String startDate, String endDate);
/***
* 巡检分析-巡检设备概况
* @param startDate
* @param endDate
......@@ -34,6 +70,15 @@ public interface IInspectionAnalysisService {
InspectionEquipOverviewVO getInspectionEquipOverview(String startDate, String endDate);
/***
* 巡检分析-巡检设备概况-详情
* @param departIds
* @param startDate
* @param endDate
* @return
*/
List<InspectionEquipIndicatorsDetailVO> getInspectionEquipOverviewDetail(String departIds, String startDate, String endDate);
/***
* 巡检分析-巡检任务异常项趋势
* @param startDate
* @param endDate
......@@ -49,4 +94,7 @@ public interface IInspectionAnalysisService {
* @return
*/
List<InspectionAbnormalItemsTrendVO> getInspectionAbnormalItemsTrendDetail(String departIds, String startDate, String endDate);
}
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/impl/InspectionAnalysisServiceImpl.java
......@@ -353,7 +353,13 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
return resultMap;
}
/***
* 巡检分析-巡检任务指标
* @param departIds
* @param startDate
* @param endDate
* @return
*/
@Override
public InspectionTaskIndicatorsVO getInspectionTaskIndicators(String startDate, String endDate) {
InspectionTaskIndicatorsVO inspectionTaskIndicatorsVO = new InspectionTaskIndicatorsVO();
......@@ -470,6 +476,18 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
return inspectionTaskIndicatorsVO;
}
/***
* 巡检分析-巡检任务指标-详情
* @param departIds
* @param startDate
* @param endDate
* @return
*/
public List<InspectionEquipIndicatorsDetailVO> getInspectionTaskIndicatorsDetail(String departIds, String startDate, String endDate){
return inspectionAnalysisMapper.getInspectionEquipIndicatorsDetail(departIds, startDate, endDate);
}
/***
* 巡检分析-巡检设备指标
* @param startDate
......@@ -513,9 +531,9 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
int abnormalInspectionEquipCount = 0;
if (inspectionPointFillGroupIdList.size() > 0) {
QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>();
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", inspectionTaskIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", inspectionPointFillGroupIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",inspectionFillGroupIdList);
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", inspectionTaskIdList);//任务id集合
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", inspectionPointFillGroupIdList);//巡检点-填报组ID
inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",inspectionFillGroupIdList);//填报组ID
inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id");
inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", "");
inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id");
......@@ -594,6 +612,22 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
return inspectionEquipIndicatorsVO;
}
/***
* 巡检分析-巡检设备指标--详情
* @param startDate
* @param endDate
* @return
*/
public List<InspectionEquipIndicatorsDetailVO> getInspectionEquipIndicatorsDetail(String departIds, String startDate, String endDate){
return inspectionAnalysisMapper.getInspectionEquipIndicatorsDetail( departIds, startDate, endDate);
}
/***
* 巡检分析-巡检任务概况
* @param startDate
* @param endDate
* @return
*/
@Override
public InspectionTaskOverviewVO getInspectionTaskOverview(String startDate, String endDate) {
InspectionTaskOverviewVO inspectionTaskOverviewVO = new InspectionTaskOverviewVO();
......@@ -699,6 +733,17 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
return inspectionTaskOverviewVO;
}
/***
* 巡检分析-巡检任务概况
* @param departIds
* @param startDate
* @param endDate
* @return
*/
public List<InspectionTaskOverviewDetailVO> getInspectionTaskOverviewDetail(String departIds, String startDate, String endDate){
return inspectionAnalysisMapper.getInspectionTaskOverviewDetail(departIds, startDate, endDate);
}
/***
* 巡检分析-巡检设备概况
* @param startDate
......@@ -812,6 +857,18 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
return inspectionEquipOverviewVO;
}
/***
* 巡检分析-巡检设备概况-详情
* @param departIds
* @param startDate
* @param endDate
* @return
*/
public List<InspectionEquipIndicatorsDetailVO> getInspectionEquipOverviewDetail(String departIds, String startDate, String endDate){
return inspectionAnalysisMapper.getInspectionEquipIndicatorsDetail( departIds, startDate, endDate);
//return null;
}
@Override
public List<InspectionAbnormalItemsTrendVO> getInspectionAbnormalItemsTrend(String startDate, String endDate) {
List<InspectionAbnormalItemsTrendVO> inspectionAbnormalItemsTrendVOList = new ArrayList<>();
......@@ -892,7 +949,7 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
* @return
*/
public List<InspectionAbnormalItemsTrendVO> getInspectionAbnormalItemsTrendDetail(String departIds, String startDate, String endDate){
return inspectionAnalysisMapper.getInspectionAbnormalItemsTrendDetail( departIds, startDate, endDate);
return inspectionAnalysisMapper.getInspectionAbnormalItemsTrendDetail( departIds, startDate, endDate);
}
public static List<String[]> getCycleList(int cycleNum, String startTime, String endTime) throws ParseException {
// System.out.println("统计的时间段为：从" + startTime + "到" + endTime);
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/vo/InspectionEquipIndicatorsDetailVO.java 0 → 100644
package com.skua.modules.inspection.vo;
import com.skua.tool.util.JSUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <pre>
* 巡检设备指标--详情
* </pre>
* @author Xie Chao
* @version 1.0，4/23/23 4:21 PM
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="巡检设备指标-详情", description="巡检设备指标-详情")
public class InspectionEquipIndicatorsDetailVO {
@ApiModelProperty(value = "厂站编号")
private String departId;
@ApiModelProperty(value = "厂站名称")
private String departName;
@ApiModelProperty(value = "应检设备数")
private Integer totalInspectionEquipCount;
@ApiModelProperty(value = "已检查数量")
private Integer checkedInspectionEquipCount;
@ApiModelProperty(value = "异常数量")
private Integer abnormalInspectionEquipCount;
@ApiModelProperty(value = "正常设备数")
private Integer normalInspectionEquipCount;
@ApiModelProperty(value = "异常项数量（问题上报）")
private Integer abnormalItemsCount;
@ApiModelProperty(value = "已处理异常项数量（问题上报）")
private Integer processedAbnormalItemsCount;
@ApiModelProperty(value = "未检设备数")
private Integer notCheckedInspectionEquipCount;
@ApiModelProperty(value = "完成率")
private String completionRate;
@ApiModelProperty(value = "未检率")
private String unCompletionRate;
@ApiModelProperty(value = "异常率")
private String abnormalRate;
@ApiModelProperty(value = "异常项处理率")
private String processedAbnormalRate;
public Integer getNormalInspectionEquipCount() {
normalInspectionEquipCount = 0 ;
normalInspectionEquipCount = checkedInspectionEquipCount - abnormalInspectionEquipCount;
return normalInspectionEquipCount;
}
public String getCompletionRate() {
completionRate = "0";//完成率
if (totalInspectionEquipCount != 0) {
completionRate = JSUtils.divide( checkedInspectionEquipCount*100 ,totalInspectionEquipCount );
}
return completionRate;
}
public Integer getNotCheckedInspectionEquipCount() {
notCheckedInspectionEquipCount = 0 ;
notCheckedInspectionEquipCount = totalInspectionEquipCount - checkedInspectionEquipCount;
return notCheckedInspectionEquipCount;
}
public String getUnCompletionRate() {
//未检率
unCompletionRate = "0";
//未检设备数量
if (totalInspectionEquipCount != 0) {
unCompletionRate = JSUtils.divide(notCheckedInspectionEquipCount *100, totalInspectionEquipCount );
}
return unCompletionRate;
}
public String getAbnormalRate() {
//异常率
abnormalRate = "0";
if (checkedInspectionEquipCount != 0) {
abnormalRate = JSUtils.divide(abnormalInspectionEquipCount *100, checkedInspectionEquipCount);
}
return abnormalRate;
}
public String getProcessedAbnormalRate() {
//异常项处理率
processedAbnormalRate = "0";
if (abnormalItemsCount != 0) {
processedAbnormalRate = JSUtils.divide(processedAbnormalItemsCount *100,abnormalItemsCount );
}
return processedAbnormalRate;
}
//覆盖率
}
sk-module-inspection/src/main/java/com/skua/modules/inspection/vo/InspectionTaskIndicatorsVO.java
......@@ -16,6 +16,8 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="巡检任务指标", description="巡检任务指标")
public class InspectionTaskIndicatorsVO {
@ApiModelProperty(value = "完成率")
private String completionRate;
@ApiModelProperty(value = "未检率")
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/vo/InspectionTaskOverviewDetailVO.java 0 → 100644
package com.skua.modules.inspection.vo;
import com.skua.tool.util.JSUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <pre>
* 巡检任务概况
* </pre>
* @author Xie Chao
* @version 1.0，4/23/23 4:21 PM
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="巡检任务概况", description="巡检任务概况")
public class InspectionTaskOverviewDetailVO {
@ApiModelProperty(value = "厂站编号")
private String departId;
@ApiModelProperty(value = "厂站名称")
private String departName;
@ApiModelProperty(value = "异常项数量（问题上报）")
private Integer abnormalItemsCount;
@ApiModelProperty(value = "已处理异常项数量（问题上报）")
private Integer processedAbnormalItemsCount;
@ApiModelProperty(value = "应检任务数")
private Integer totalInspectionTaskCount;
@ApiModelProperty(value = "已检任务数")
private Integer checkedInspectionTaskCount;
@ApiModelProperty(value = "未检任务数")
private Integer notCheckedInspectionTaskCount;
@ApiModelProperty(value = "正常任务数")
private Integer normalInspectionTaskCount;
@ApiModelProperty(value = "异常任务数")
private Integer abnormalInspectionTaskCount;
@ApiModelProperty(value = "异常项处理率")
private String processedAbnormalRate;
public String getProcessedAbnormalRate() {
//异常项处理率
processedAbnormalRate = "0";
if (abnormalItemsCount != 0) {
processedAbnormalRate = JSUtils.divide(processedAbnormalItemsCount *100, abnormalItemsCount );
}
return processedAbnormalRate;
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!