Sfoglia il codice sorgente

报警生成工单保存修改

wangli 4 anni fa
parent
commit
f15e4f116e

+ 4 - 1
operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -82,7 +82,10 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
      */
     @Override
     public Integer batchInsertByAlarms(List<WorkOrderManageByAlarmDto> workOrderManages) {
-        return workOrderManageMapper.batchInsertByAlarms(workOrderManages);
+        if(workOrderManages.size()>0){
+            return workOrderManageMapper.batchInsertByAlarms(workOrderManages);
+        }
+        return 0;
     }
 
     @Override

+ 1 - 1
sms_water/src/main/resources/mapper/MonitorDataReportMapper.xml

@@ -1171,7 +1171,7 @@
 
             where s.`STATUS`=1 and st.SCENE_TYPE_NAME = '水厂' and s.TENANT_ID =#{tenantId}
             <if test="parmType != null and  parmType == -1">
-                and dp.PARM_TYPE in (15,8,9,11,18,19)
+                and dp.PARM_TYPE in (15,8,10,11,18,19)
             </if>
             <if test="parmType != null and  parmType != -1">
                 and dp.PARM_TYPE = #{parmType}