Merge remote-tracking branch 'origin/dev' into dev

zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java

@@ -27,4 +27,5 @@ public class DevInfoVo extends DevInfo {
     /* 是否审核通过, ma_up_off:status, 1=通过, 2驳回 */
     private String isAudit;
     private Long searchNum;
+    private Long companyUpNum;
 }

zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java

@@ -29,6 +29,8 @@ public interface DevInfoMapper
      */
     public String getPicturesByMaId(Long maId);
 
+    public Long getCompanyUpNum(Long ownCo);
+
     /**
      * 查询设备信息列表
      * 

zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java

@@ -45,6 +45,8 @@ public class DevInfoServiceImpl implements IDevInfoService
             String[] pictureArray = pictures.split(",");
             devInfoVo.setPictures(pictureArray);
         }
+        Long companyUpNum = devInfoMapper.getCompanyUpNum(devInfoVo.getOwnCo());
+        devInfoVo.setCompanyUpNum(companyUpNum);
         return devInfoVo;
     }
 

zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml

@@ -113,6 +113,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE d.ma_id = #{maId}
         GROUP BY d.ma_id
     </select>
+
+    <select id="getCompanyUpNum" parameterType="Long" resultType="Long">
+        select count(up.ma_id) from ma_dev_info d
+        left join ma_up_off up on d.ma_id = up.ma_id and up.`status`=1
+        where d.own_co= #{ownCo}
+        GROUP BY d.own_co
+    </select>
         
     <insert id="insertDevInfo" parameterType="com.bonus.zlpt.common.core.domain.equip.DevInfo">
         insert into ma_dev_info