bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
sxu 2023-12-05 13:56:18 +08:00
parent 813348c42b
commit 3ace077b37
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,4 +23,6 @@ public class DevInfoVo extends DevInfo {
private String authPhone; private String authPhone;
private String[] pictures; private String[] pictures;
private String keyWord; private String keyWord;
/* 是否审核通过, ma_up_off:status, 1=通过, 2驳回 */
private String isAudit;
} }

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

@ -11,6 +11,7 @@ import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo;
import com.bonus.zlpt.common.core.domain.equip.TypeInfo; import com.bonus.zlpt.common.core.domain.equip.TypeInfo;
import com.bonus.zlpt.common.core.utils.DateUtils; import com.bonus.zlpt.common.core.utils.DateUtils;
import com.bonus.zlpt.common.core.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.bonus.zlpt.equip.mapper.DevInfoMapper; import com.bonus.zlpt.equip.mapper.DevInfoMapper;
@ -40,8 +41,10 @@ public class DevInfoServiceImpl implements IDevInfoService
{ {
DevInfoVo devInfoVo = devInfoMapper.selectDevInfoByMaId(maId); DevInfoVo devInfoVo = devInfoMapper.selectDevInfoByMaId(maId);
String pictures = devInfoMapper.getPicturesByMaId(maId); String pictures = devInfoMapper.getPicturesByMaId(maId);
String[] pictureArray = pictures.split(","); if (StringUtils.isNotEmpty(pictures)) {
devInfoVo.setPictures(pictureArray); String[] pictureArray = pictures.split(",");
devInfoVo.setPictures(pictureArray);
}
return devInfoVo; return devInfoVo;
} }

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

@ -80,10 +80,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo"> <select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo">
select d.*,c.company_name,c.auth_phone,ty.type_name as device_name,ty.parent_name as group_name,ty.grandpa_name as type_name,col.id as collect_id select d.*,c.company_name,c.auth_phone,ty.type_name as device_name,ty.parent_name as group_name,ty.grandpa_name as type_name,col.id as collect_id, up.status as is_audit
from ma_dev_info d from ma_dev_info d
left join bm_company_info c on d.own_co = c.company_id left join bm_company_info c on d.own_co = c.company_id
left join ma_user_collect col on d.ma_id = col.ma_id left join ma_user_collect col on d.ma_id = col.ma_id
left join ma_up_off up on d.ma_id = up.ma_id
left join ( left join (
select tt.*, pp.type_name as grandpa_name from select tt.*, pp.type_name as grandpa_name from
(select t.*, p.type_name as parent_name,p.type_id as p_type_id, p.parent_id as p_parent_id (select t.*, p.type_name as parent_name,p.type_id as p_type_id, p.parent_id as p_parent_id