风险图比例-
This commit is contained in:
parent
97fe5104cc
commit
3eff952ad6
@ -667,7 +667,7 @@
|
|||||||
<select id="riskChart"
|
<select id="riskChart"
|
||||||
resultType="com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo">
|
resultType="com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo">
|
||||||
select
|
select
|
||||||
ifnull(round((t2.dangerNum-t1.dangerNum)/t1.dangerNum*100,2),0) as monthlyBasis,
|
ifnull(round((t2.dangerNum-t1.dangerNum)/t1.dangerNum*100,2),'-') as monthlyBasis,
|
||||||
t2.*
|
t2.*
|
||||||
from (
|
from (
|
||||||
<include refid="selectTotal">
|
<include refid="selectTotal">
|
||||||
|
|||||||
@ -638,7 +638,7 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
|
|||||||
vo.setGeneralRiskNum(0);
|
vo.setGeneralRiskNum(0);
|
||||||
vo.setLargerRiskNum(0);
|
vo.setLargerRiskNum(0);
|
||||||
vo.setWhichWeekOfMonth(0);
|
vo.setWhichWeekOfMonth(0);
|
||||||
vo.setMonthlyBasis(0.0D);
|
vo.setMonthlyBasis("0");
|
||||||
}
|
}
|
||||||
vo.setLastMonth(DateUtil.month(DateUtil.parse(month, "yyyy-MM")) + "月");
|
vo.setLastMonth(DateUtil.month(DateUtil.parse(month, "yyyy-MM")) + "月");
|
||||||
rsList.add(vo);
|
rsList.add(vo);
|
||||||
|
|||||||
@ -61,6 +61,6 @@ public class XzSecurityQualityInspectionRecordTotalVo {
|
|||||||
@ApiModelProperty(value = "上个月名称")
|
@ApiModelProperty(value = "上个月名称")
|
||||||
private String lastMonth;
|
private String lastMonth;
|
||||||
@ApiModelProperty(value = "月环比")
|
@ApiModelProperty(value = "月环比")
|
||||||
private Double monthlyBasis;
|
private String monthlyBasis;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -672,7 +672,7 @@
|
|||||||
<select id="riskChart"
|
<select id="riskChart"
|
||||||
resultType="com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo">
|
resultType="com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo">
|
||||||
select
|
select
|
||||||
ifnull(round((t2.dangerNum-t1.dangerNum)/t1.dangerNum*100,2),0) as monthlyBasis,
|
ifnull(round((t2.dangerNum-t1.dangerNum)/t1.dangerNum*100,2),'-') as monthlyBasis,
|
||||||
t2.*
|
t2.*
|
||||||
from (
|
from (
|
||||||
<include refid="selectTotal">
|
<include refid="selectTotal">
|
||||||
|
|||||||
@ -800,7 +800,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
|
|||||||
vo.setGeneralRiskNum(0);
|
vo.setGeneralRiskNum(0);
|
||||||
vo.setLargerRiskNum(0);
|
vo.setLargerRiskNum(0);
|
||||||
vo.setWhichWeekOfMonth(0);
|
vo.setWhichWeekOfMonth(0);
|
||||||
vo.setMonthlyBasis(0.0D);
|
vo.setMonthlyBasis("-");
|
||||||
}
|
}
|
||||||
vo.setLastMonth(DateUtil.month(DateUtil.parse(month, "yyyy-MM")) + "月");
|
vo.setLastMonth(DateUtil.month(DateUtil.parse(month, "yyyy-MM")) + "月");
|
||||||
rsList.add(vo);
|
rsList.add(vo);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user