Commit e045d909 by jiang'yun

修改

parent dd70451e
...@@ -52,7 +52,7 @@ public class TpRyInfoServiceImpl implements ITpRyInfoService ...@@ -52,7 +52,7 @@ public class TpRyInfoServiceImpl implements ITpRyInfoService
List<TpRyInfo> tpRyInfos = tpRyInfoMapper.selectTpRyInfoList(tpRyInfo); List<TpRyInfo> tpRyInfos = tpRyInfoMapper.selectTpRyInfoList(tpRyInfo);
for (TpRyInfo item : tpRyInfos) { for (TpRyInfo item : tpRyInfos) {
List<TpRyInfoCb> cbList = tpRyInfoMapper.selectTpRyInfoCbList(item.getId()); List<TpRyInfoCb> cbList = tpRyInfoMapper.selectTpRyInfoCbList(item.getId());
if(cbList.size()>0){ if(!cbList.isEmpty()){
List<String> collect = cbList.stream().map(TpRyInfoCb::getTprymc).collect(Collectors.toList()); List<String> collect = cbList.stream().map(TpRyInfoCb::getTprymc).collect(Collectors.toList());
item.setTpry(String.join(",", collect)); item.setTpry(String.join(",", collect));
} }
......
...@@ -80,16 +80,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -80,16 +80,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where (adzh =#{adzh} or username = #{tyzh} ) where (adzh =#{adzh} or username = #{tyzh} )
</select> </select>
<select id="tplist" resultType="com.ruoyi.system.domain.TpRyInfoCb"> <select id="tplist" resultType="com.ruoyi.system.domain.TpRyInfoCb">
select ssbk,tprymc,count(id) sl from select a.ssbk, a.name tprymc, count(b.id) sl
tp_ry_info_cb from tp_btpry_info a
where 1=1 left join
<if test="tprymc!=null and tprymc!=''"> tp_ry_info_cb b on a.id = b.tpryid
and tprymc like concat('%',#{tprymc},'%') where 1 = 1
</if>
<if test="ssbk!=null and ssbk!=''"> <if test="ssbk!=null and ssbk!=''">
and ssbk like concat('%',#{ssbk},'%') and a.ssbk like concat('%',#{ssbk},'%')
</if> </if>
group by ssbk,tprymc group by a.ssbk, a.name
</select> </select>
<insert id="insertTpRyInfo" parameterType="TpRyInfo" useGeneratedKeys="true" keyProperty="id"> <insert id="insertTpRyInfo" parameterType="TpRyInfo" useGeneratedKeys="true" keyProperty="id">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment