diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
index 49ecc43..f296144 100644
--- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
+++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
@@ -31,4 +31,8 @@ public class DevInfoVo extends DevInfo {
     private Long searchNum;
     private String examinationPdf;
     private String insurancePdf;
+    /** 1上架，2下架*/
+    private String type;
+    /**上下架id*/
+    private  int upId;
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java
index 40d0c51..180fa48 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java
@@ -12,6 +12,7 @@ import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
 
 import com.bonus.zlpt.equip.api.domain.UpOff;
 import com.bonus.zlpt.equip.api.domain.dto.UpOffDto;
+import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo;
 import com.bonus.zlpt.equip.api.domain.vo.MaDevInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -107,12 +108,15 @@ public class UpOffController extends BaseController
      * 新增设备上下架管理
 
      */
-    @RequiresPermissions("equip:off:add")
+ //   @RequiresPermissions("equip:off:add")
     @Log(title = "设备上下架管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody UpOff upOff)
+    public AjaxResult add(@RequestBody List<UpOff> upOffList)
     {
-        return toAjax(upOffService.insertUpOff(upOff));
+        if (upOffList.size()==0){
+            return warn("传入参数为空！");
+        }
+        return toAjax(upOffService.insertUpOff(upOffList));
     }
 
     /**
@@ -122,27 +126,37 @@ public class UpOffController extends BaseController
     //@RequiresPermissions("equip:off:edit")
     @Log(title = "设备上下架管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody List<UpOff> upOffList)
+    public AjaxResult edit(@RequestBody UpOff upOff)
     {
-        if (upOffList.size()==0){
-            return warn("传入参数为空！");
-        }
-
-        return toAjax(upOffService.updateUpOff(upOffList));
+        return toAjax(upOffService.updateUpOff(upOff));
     }
 
     /**
      * 删除设备上下架管理
 
      */
-    @RequiresPermissions("equip:off:remove")
+ //   @RequiresPermissions("equip:off:remove")
     @Log(title = "设备上下架管理", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+	@PostMapping("/remove")
+    public AjaxResult remove(@RequestBody  Long[] ids)
     {
         return toAjax(upOffService.deleteUpOffByIds(ids));
     }
 
+    /**
+     * 商品批量上下架
+     * @param upOffList
+     * @return
+     */
+    @Log(title = "设备上下架管理", businessType = BusinessType.INSERT)
+    @PostMapping("/upOffList")
+    public AjaxResult upOffList(@RequestBody List<UpOff> upOffList)
+    {
+        if (upOffList.size()==0){
+            return warn("传入参数为空！");
+        }
+        return toAjax(upOffService.UpdateUpOffLIst(upOffList));
+    }
 
 
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UpOffMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UpOffMapper.java
index 5c8ed34..31b21d6 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UpOffMapper.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UpOffMapper.java
@@ -82,4 +82,6 @@ public interface UpOffMapper
      * @return
      */
     List<MaDevInfoVo> selectList(UpOffDto upOffDto);
+
+    void UpdateUpOffLIst(UpOff upOff);
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUpOffService.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUpOffService.java
index d594b41..b5d432c 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUpOffService.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUpOffService.java
@@ -42,21 +42,21 @@ public interface IUpOffService
      * 新增设备上下架管理
 
      * 
-     * @param upOff 设备上下架管理
+     * @param upOffList 设备上下架管理
 
      * @return 结果
      */
-    public int insertUpOff(UpOff upOff);
+    public int insertUpOff(List<UpOff> upOffList);
 
     /**
      * 修改设备上下架管理
 
      * 
-     * @param upOffList 设备上下架管理
+     * @param upOff 设备上下架管理
 
      * @return 结果
      */
-    public int updateUpOff(List<UpOff> upOffList);
+    public int updateUpOff(UpOff upOff);
 
     /**
      * 批量删除设备上下架管理
@@ -86,4 +86,6 @@ public interface IUpOffService
     List<MaDevInfoVo> selectList(UpOffDto upOffDto);
 
     List<MaDevInfoVo> selectInfo(List<Long> ids);
+
+    int UpdateUpOffLIst(List<UpOff> upOffList);
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
index 73819bc..b996ceb 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 
+import com.bonus.zlpt.common.security.utils.SecurityUtils;
 import com.bonus.zlpt.equip.api.domain.SysFileInfo;
 import com.bonus.zlpt.equip.api.domain.TypeInfo;
 import com.bonus.zlpt.equip.api.domain.UpOff;
@@ -17,6 +18,8 @@ import org.springframework.stereotype.Service;
 import com.bonus.zlpt.equip.mapper.UpOffMapper;
 import com.bonus.zlpt.equip.service.IUpOffService;
 
+import javax.annotation.Resource;
+
 /**
  * 设备上下架管理
 Service业务层处理
@@ -27,16 +30,13 @@ Service业务层处理
 @Service
 public class UpOffServiceImpl implements IUpOffService 
 {
-    @Autowired
+    @Resource
     private UpOffMapper upOffMapper;
 
-    @Autowired
+    @Resource
     private TypeInfoMapper typeInfoMapper;
 
-//    @Autowired
-//    private FileInfoMapper fileInfoMapper;
-
-    @Autowired
+    @Resource
     private SysFileInfoMapper sysFileInfoMapper;
 
     /**
@@ -73,31 +73,35 @@ public class UpOffServiceImpl implements IUpOffService
      * 新增设备上下架管理
 
      * 
-     * @param upOff 设备上下架管理
+     * @param upOffList 设备上下架管理
 
      * @return 结果
      */
     @Override
-    public int insertUpOff(UpOff upOff)
+    public int insertUpOff(List<UpOff> upOffList)
     {
-        return upOffMapper.insertUpOff(upOff);
+        String name = SecurityUtils.getUsername();
+
+        for (int i = 0; i < upOffList.size(); i++) {
+            UpOff UpOff =   upOffList.get(i);
+            UpOff.setApplyUser(name);
+         upOffMapper.insertUpOff(UpOff);
+        }
+        return 1;
     }
 
     /**
      * 修改设备上下架管理
 
      * 
-     * @param upOffList 设备上下架管理
+     * @param upOff 设备上下架管理
 
      * @return 结果
      */
     @Override
-    public int updateUpOff(List<UpOff> upOffList)
+    public int updateUpOff(UpOff upOff)
     {
-        for (int i = 0; i < upOffList.size(); i++) {
-            upOffMapper.updateUpOff(upOffList.get(i));
-        }
-        return 1;
+        return  upOffMapper.updateUpOff(upOff);
     }
 
     /**
@@ -180,4 +184,14 @@ public class UpOffServiceImpl implements IUpOffService
         return devInfoVos;
 
     }
+
+    @Override
+    public int UpdateUpOffLIst(List<UpOff> upOffList) {
+
+        for (int i = 0; i < upOffList.size(); i++) {
+            UpOff UpOff =   upOffList.get(i);
+            upOffMapper.UpdateUpOffLIst(UpOff);
+        }
+        return 1;
+    }
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
index daedc86..d67f89c 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -42,12 +42,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDevInfoList" parameterType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">
-        select d.*,t.type_name as device_name,t.parent_name as group_name,c.company_name
+        select d.*,t.type_name as device_name,t.parent_name as group_name,c.company_name ,u.type, u.id as up_id
         from ma_dev_info d
         left join (select t.*, p.type_name as parent_name
         from ma_type_info t
         left join ma_type_info p on t.parent_id=p.type_id) t on d.type_id = t.type_id
         left join bm_company_info c on d.own_co = c.company_id
+        left join  ma_up_off u on d.ma_id = u.ma_id
         <where>  
             <if test="maId != null "> and d.ma_id = #{maId}</if>
             <if test="code != null  and code != ''"> and d.code = #{code}</if>
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml
index 033af0d..4bd63f0 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml
@@ -60,24 +60,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="maId != null">ma_id,</if>
-            <if test="applyTime != null">apply_time,</if>
             <if test="applyUser != null">apply_user,</if>
             <if test="applyCompany != null">apply_company,</if>
             <if test="type != null">type,</if>
             <if test="auditUser != null">audit_user,</if>
             <if test="auditTime != null">audit_time,</if>
             <if test="status != null">status,</if>
+            apply_time
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="maId != null">#{maId},</if>
-            <if test="applyTime != null">#{applyTime},</if>
             <if test="applyUser != null">#{applyUser},</if>
             <if test="applyCompany != null">#{applyCompany},</if>
             <if test="type != null">#{type},</if>
             <if test="auditUser != null">#{auditUser},</if>
             <if test="auditTime != null">#{auditTime},</if>
             <if test="status != null">#{status},</if>
+            sysdate()
          </trim>
     </insert>
 
@@ -106,4 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <update id="UpdateUpOffLIst" parameterType="com.bonus.zlpt.equip.api.domain.UpOff">
+    update ma_up_off set type = #{type}  where ma_id = #{maId}
+    </update>
 </mapper>
\ No newline at end of file