Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug2

Browse Source
master
zhaoxiaolin 6 months ago
parent fe71c70edb
commit b298ed6136
2 changed files with 62 additions and 45 deletions
Show Stats Download Patch File Download Diff File

97
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java
Unescape Escape View File

@ -210,50 +210,59 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService {
qcInterface.setYmd(nowYMD); qcInterface.setYmd(nowYMD);
Map<String, String> dtoMap = new HashMap<>(); Map<String, String> dtoMap = new HashMap<>();
// qcInterface.setYmdType("dd"); qcInterface.setYmdType("dd");
// QcInterface hz0 = qcInterfaceMapper.getProduceHz1(qcInterface); QcInterface hz0 = qcInterfaceMapper.getProduceHz1(qcInterface);
// if (hz0 != null) { if (hz0 != null) {
// dtoMap.put("todayPro", hz0.getQuality().replaceAll("\\..*", "")); dtoMap.put("todayPro", hz0.getQuality().replaceAll("\\..*", ""));
// }else{ }else{
// dtoMap.put("todayPro", "0"); dtoMap.put("todayPro", "0");
// } }
// QcInterface hz1 = qcInterfaceMapper.getProduceHz(qcInterface); QcInterface hz1 = qcInterfaceMapper.getProduceHz(qcInterface);
// if (hz1 != null) { if (hz1 != null) {
// dtoMap.put("todaySample", hz1.getSampleQuality().replaceAll("\\..*", "")); dtoMap.put("todaySample", hz1.getSampleQuality().replaceAll("\\..*", ""));
// dtoMap.put("todayNoOk", hz1.getNoOkQuality().replaceAll("\\..*", "")); dtoMap.put("todayNoOk", hz1.getNoOkQuality().replaceAll("\\..*", ""));
// BigDecimal tOkRate = (new BigDecimal(hz1.getSampleQuality()) if(!hz1.getSampleQuality().equals("0.00")){
// .subtract(new BigDecimal(hz1.getNoOkQuality())) BigDecimal tOkRate = (new BigDecimal(hz1.getSampleQuality())
// ) .subtract(new BigDecimal(hz1.getNoOkQuality()))
// .multiply(new BigDecimal(100)) )
// .divide(new BigDecimal(hz1.getSampleQuality()), 2, RoundingMode.HALF_UP); .multiply(new BigDecimal(100))
// dtoMap.put("todayOkRate", tOkRate + "%"); .divide(new BigDecimal(hz1.getSampleQuality()), 2, RoundingMode.HALF_UP);
// } dtoMap.put("todayOkRate", tOkRate + "%");
// }else{
// qcInterface.setYmdType("mm"); dtoMap.put("todayOkRate", "0%");
// QcInterface hz20 = qcInterfaceMapper.getProduceHz1(qcInterface); }
// if (hz20 != null) {
// dtoMap.put("monthPro", hz20.getQuality().replaceAll("\\..*", "")); }
// }else{
// dtoMap.put("monthPro", "0"); qcInterface.setYmdType("mm");
// } QcInterface hz20 = qcInterfaceMapper.getProduceHz1(qcInterface);
// QcInterface hz2 = qcInterfaceMapper.getProduceHz(qcInterface); if (hz20 != null) {
// if (hz2 != null) { dtoMap.put("monthPro", hz20.getQuality().replaceAll("\\..*", ""));
// dtoMap.put("monthNoOk", hz2.getNoOkQuality().replaceAll("\\..*", "")); }else{
// BigDecimal tOkRate2 = (new BigDecimal(hz2.getSampleQuality()) dtoMap.put("monthPro", "0");
// .subtract(new BigDecimal(hz2.getNoOkQuality())) }
// ) QcInterface hz2 = qcInterfaceMapper.getProduceHz(qcInterface);
// .multiply(new BigDecimal(100)) if (hz2 != null) {
// .divide(new BigDecimal(hz2.getSampleQuality()), 2, RoundingMode.HALF_UP); dtoMap.put("monthNoOk", hz2.getNoOkQuality().replaceAll("\\..*", ""));
// dtoMap.put("monthOkRate", tOkRate2 + "%"); if(!hz2.getSampleQuality().equals("0.00")){
// } BigDecimal tOkRate2 = (new BigDecimal(hz2.getSampleQuality())
/**质量看板测试开始**/ .subtract(new BigDecimal(hz2.getNoOkQuality()))
dtoMap.put("todayPro", "3800"); )
dtoMap.put("todaySample", "50"); .multiply(new BigDecimal(100))
dtoMap.put("todayNoOk", "2"); .divide(new BigDecimal(hz2.getSampleQuality()), 2, RoundingMode.HALF_UP);
dtoMap.put("todayOkRate", "96.00%"); dtoMap.put("monthOkRate", tOkRate2 + "%");
dtoMap.put("monthPro", "83600"); }else{
dtoMap.put("monthNoOk", "30"); dtoMap.put("monthOkRate", "0%");
dtoMap.put("monthOkRate", "99.96%"); }
}
// /**质量看板测试开始**/
// dtoMap.put("todayPro", "3800");
// dtoMap.put("todaySample", "50");
// dtoMap.put("todayNoOk", "2");
// dtoMap.put("todayOkRate", "96.00%");
// dtoMap.put("monthPro", "83600");
// dtoMap.put("monthNoOk", "30");
// dtoMap.put("monthOkRate", "99.96%");
// /**质量看板测试结束**/ // /**质量看板测试结束**/
return dtoMap; return dtoMap;
} }

8
op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml
Unescape Escape View File

@ -180,7 +180,15 @@
from qc_check_task_detail qctd from qc_check_task_detail qctd
left join qc_check_task qct on qctd.belong_to = qct.record_id left join qc_check_task qct on qctd.belong_to = qct.record_id
where qct.type_code = #{typeCode} and qctd.status = 'N' where qct.type_code = #{typeCode} and qctd.status = 'N'
<if test='ymdType=="yyyy"'>
and CONVERT(varchar(4),qct.income_time, 120) = SUBSTRING(#{ymd},0,5)
</if>
<if test='ymdType=="mm"'>
and CONVERT(varchar(7),qct.income_time, 120) = SUBSTRING(#{ymd},0,8)
</if>
<if test='ymdType=="dd"'>
and CONVERT(varchar(10),qct.income_time, 120) = SUBSTRING(#{ymd},0,11) and CONVERT(varchar(10),qct.income_time, 120) = SUBSTRING(#{ymd},0,11)
</if>
order by qctd.update_time desc order by qctd.update_time desc
</select> </select>
<select id="getProduceHz" resultType="com.op.quality.domain.QcInterface"> <select id="getProduceHz" resultType="com.op.quality.domain.QcInterface">

Write Preview
Loading…
Cancel
Save