报表,设备维修提报bug,(从设备点检跳过来object也有可能不为空)

master
赵嘉伟 3 years ago
parent c01f7e67ea
commit bfca328b9b

@ -915,6 +915,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
String user = CommonMethods.getUser();
LocalDateTime now = LocalDateTime.now();
AbnormalBill abnormalBill = getById(HandleEnum.ABNORMAL_BILL.getHandle(site, abnormalNo));
if(abnormalBill == null){
return ;
}
if(!Constants.RESPONSE.equals(abnormalBill.getStatus())){
throw new BaseException("状态不在响应中,请重新检索");
}

@ -85,6 +85,10 @@
<if test="param.item != null and param.item != ''">
AND (I.ITEM = #{param.item} OR IT.DESCRIPTION = #{param.item})
</if>
<if test="param.currentOperation != null and param.currentOperation != ''">
AND (OT2.DESCRIPTION LIKE '%${param.currentOperation}%' OR
O2.OPERATION LIKE '%${param.currentOperation}%')
</if>
<!-- <if test="param.itemDescription != null and param.itemDescription != ''">-->
<!-- AND IT.DESCRIPTION LIKE '%${param.itemDescription}%'-->
<!-- </if>-->

Loading…
Cancel
Save