ソースを参照

优化 修改指令状态

java110 5 年 前
コミット
dc43543db1

+ 6 - 1
java110-db/src/main/resources/mapper/hardwareAdapation/MachineTranslateServiceDaoImplMapper.xml

@@ -292,13 +292,18 @@
             </if>
         </set>
         where
-        t.machine_code= #{machineCode}
+        <if test="machineCode !=null and machineCode != ''">
+            t.machine_code= #{machineCode}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
         <if test="objId !=null and objId != ''">
             and t.obj_id= #{objId}
         </if>
+        <if test="machineTranslateId !=null and machineTranslateId != ''">
+            and t.machine_translate_id= #{machineTranslateId}
+        </if>
     </update>
 
 </mapper>

+ 1 - 0
service-api/src/main/java/com/java110/api/listener/machineTranslate/MachineGetTaskInfoListener.java

@@ -97,6 +97,7 @@ public class MachineGetTaskInfoListener extends BaseMachineListener {
                 MachineTranslateDto tmpMtDto = new MachineTranslateDto();
                 tmpMtDto.setMachineTranslateId(tmpM.getMachineTranslateId());
                 tmpMtDto.setCommunityId(tmpM.getCommunityId());
+                tmpMtDto.setMachineCode(tmpM.getMachineCode());
                 tmpMtDto.setState(STATE_TRANSLATEING);
                 machineTranslateInnerServiceSMOImpl.updateMachineTranslateState(tmpMtDto);
             }