fix

virgo.api/src/main/java/com/bosshand/virgo/api/operate/model/OperateDevice.java

@@ -85,7 +85,7 @@ public class OperateDevice {
     /**
      * 状态
      */
-    private int state;
+    private Integer state;
 
     /**
      * 仓库Id
@@ -304,11 +304,11 @@ public class OperateDevice {
         this.document = document;
     }
 
-    public int getState() {
+    public Integer getState() {
         return state;
     }
 
-    public void setState(int state) {
+    public void setState(Integer state) {
         this.state = state;
     }
 

virgo.api/src/main/resources/mapper/OperateDeviceLevelMapper.xml

@@ -25,6 +25,7 @@
             od.projectId as operateDevice_projectId,
             od.projectItemId as operateDevice_projectItemId,
             od.projectItemTargetId as operateDevice_projectItemTargetId,
+            od.projectItemTargetRoomId as operateDevice_projectItemTargetRoomId,
             od.name as operateDevice_name,
             od.type as operateDevice_type,
             od.designNumber as operateDevice_designNumber,
@@ -35,8 +36,17 @@
             od.deviceSerialNumber as operateDevice_deviceSerialNumber,
             od.attachment as operateDevice_attachment,
             od.remark as operateDevice_remark,
+            od.document as operateDevice_document,
+            od.state as operateDevice_state,
+            od.code as operateDevice_code,
+            od.godownId as operateDevice_godownId,
             od.modelBindType as operateDevice_modelBindType,
             od.modelBindContent as operateDevice_modelBindContent,
+            od.manufacturer as operateDevice_manufacturer,
+            od.liaison as operateDevice_liaison,
+            od.liaisonPhone as operateDevice_liaisonPhone,
+            od.entryTime as operateDevice_entryTime,
+            od.maintenanceRecord as operateDevice_maintenanceRecord,
             od.modelBindPosition as operateDevice_modelBindPosition
         FROM operate_device_level odl left join operate_device od on odl.id = od.operateDeviceLevelId
     </sql>

virgo.api/src/main/resources/mapper/OperateDeviceMapper.xml

@@ -58,7 +58,7 @@
             <if test="deviceBrand!=null">and deviceBrand=#{deviceBrand}</if>
             <if test="deviceModel!=null">and deviceModel=#{deviceModel}</if>
             <if test="deviceSerialNumber!=null">and deviceSerialNumber=#{deviceSerialNumber}</if>
-            <if test="state!=0">and state=#{state}</if>
+            <if test="state!=null">and state=#{state}</if>
 
             <if test="code!=null">and code=#{code}</if>
             <if test="godownId!=0">and godownId=#{godownId}</if>
@@ -91,7 +91,7 @@
             <if test="deviceBrand!=null">and deviceBrand=#{deviceBrand}</if>
             <if test="deviceModel!=null">and deviceModel=#{deviceModel}</if>
             <if test="deviceSerialNumber!=null">and deviceSerialNumber=#{deviceSerialNumber}</if>
-            <if test="state!=0">and state=#{state}</if>
+            <if test="state!=null">and state=#{state}</if>
 
             <if test="code!=null">and code=#{code}</if>
             <if test="godownId!=0">and godownId=#{godownId}</if>
@@ -124,7 +124,7 @@
             <if test="od.deviceBrand!=null">and deviceBrand=#{od.deviceBrand}</if>
             <if test="od.deviceModel!=null">and deviceModel=#{od.deviceModel}</if>
             <if test="od.deviceSerialNumber!=null">and deviceSerialNumber=#{od.deviceSerialNumber}</if>
-            <if test="od.state!=0">and state=#{od.state}</if>
+            <if test="od.state!=null">and state=#{od.state}</if>
 
             <if test="od.code!=null">and code=#{od.code}</if>
             <if test="od.godownId!=0">and godownId=#{od.godownId}</if>
@@ -142,10 +142,10 @@
 
     <insert id="save" parameterType="com.bosshand.virgo.api.operate.model.OperateDevice" useGeneratedKeys="true" keyProperty="id">
         INSERT into operate_device(operateDeviceLevelId, projectId, projectItemId, projectItemTargetId, projectItemTargetRoomId, name, type, designNumber, assetNumber, deviceNumber,
-                                   deviceBrand, deviceModel, deviceSerialNumber, attachment, remark, document, state,
+                                   deviceBrand, deviceModel, deviceSerialNumber, attachment, remark, document,
                                    code, godownId, modelBindType, modelBindContent, manufacturer, liaison, liaisonPhone, entryTime, maintenanceRecord, modelBindPosition)
         values(#{operateDeviceLevelId}, #{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, #{name}, #{type}, #{designNumber},
-               #{assetNumber}, #{deviceNumber}, #{deviceBrand}, #{deviceModel}, #{deviceSerialNumber}, #{attachment}, #{remark}, #{document}, #{state},
+               #{assetNumber}, #{deviceNumber}, #{deviceBrand}, #{deviceModel}, #{deviceSerialNumber}, #{attachment}, #{remark}, #{document},
                #{code}, #{godownId}, #{modelBindType}, #{modelBindContent}, #{manufacturer}, #{liaison}, #{liaisonPhone}, #{entryTime}, #{maintenanceRecord}, #{modelBindPosition})
     </insert>
 
@@ -168,7 +168,7 @@
             <if test="attachment!=null">attachment=#{attachment},</if>
             <if test="remark!=null">remark=#{remark},</if>
             <if test="document!=null">document=#{document},</if>
-            <if test="state!=0">state=#{state},</if>
+            <if test="state!=null">state=#{state},</if>
 
             <if test="godownId!=0">and godownId=#{godownId},</if>
             <if test="modelBindType!=0">and modelBindType=#{modelBindType},</if>