This commit is contained in:
parent
69938dc39f
commit
ba6b3496d5
|
|
@ -241,5 +241,7 @@ public interface DevInfoMapper {
|
||||||
List<DevInfoVo> getOrderByCompanyId(String companyId);
|
List<DevInfoVo> getOrderByCompanyId(String companyId);
|
||||||
|
|
||||||
DevInfoVo getBuyCompanyList(DevInfoVo infoVo);
|
DevInfoVo getBuyCompanyList(DevInfoVo infoVo);
|
||||||
|
|
||||||
|
DevInfoVo selectDeptList(String companyId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -176,16 +176,22 @@ public class LargeScreenController {
|
||||||
// 根据订单id查询所买公司id和名称
|
// 根据订单id查询所买公司id和名称
|
||||||
DevInfoVo infoVo1 = devInfoMapper.getBuyCompanyList(infoVo);
|
DevInfoVo infoVo1 = devInfoMapper.getBuyCompanyList(infoVo);
|
||||||
// 如果 Map 中已经存在该公司 ID,则数量增加1
|
// 如果 Map 中已经存在该公司 ID,则数量增加1
|
||||||
orderNumMap.compute(infoVo1.getCompanyId(), (key, value) -> value == null ? 1 : value + 1);
|
if (orderNumMap.containsKey(infoVo1.getCompanyId())) {
|
||||||
|
orderNumMap.put(infoVo1.getCompanyId(), orderNumMap.get(infoVo1.getCompanyId()) + 1);
|
||||||
|
} else {
|
||||||
|
orderNumMap.put(infoVo1.getCompanyId(), 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 根据orderNumMap去遍历查询公司名称
|
// 根据orderNumMap去遍历查询公司名称
|
||||||
if (CollectionUtil.isNotEmpty(orderNumMap)) {
|
if (CollectionUtil.isNotEmpty(orderNumMap)) {
|
||||||
for (Map.Entry<String, Integer> entry : orderNumMap.entrySet()) {
|
for (Map.Entry<String, Integer> entry : orderNumMap.entrySet()) {
|
||||||
DevInfoVo vo = new DevInfoVo();
|
DevInfoVo vo = new DevInfoVo();
|
||||||
DevInfoVo devInfoVo = devInfoMapper.selectCompanyById(entry.getKey());
|
DevInfoVo devInfoVo = devInfoMapper.selectDeptList(entry.getKey());
|
||||||
vo.setCompanyId(devInfoVo.getCompanyId());
|
if (devInfoVo != null) {
|
||||||
vo.setCompanyName(devInfoVo.getCompanyName());
|
vo.setCompanyId(devInfoVo.getCompanyId());
|
||||||
|
vo.setCompanyName(devInfoVo.getCompanyName());
|
||||||
|
}
|
||||||
vo.setOrderNum(entry.getValue());
|
vo.setOrderNum(entry.getValue());
|
||||||
infoVos.add(vo);
|
infoVos.add(vo);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1186,4 +1186,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
LEFT JOIN sys_dept sd ON moi.buyer_company = sd.dept_id
|
LEFT JOIN sys_dept sd ON moi.buyer_company = sd.dept_id
|
||||||
WHERE moi.order_id = #{orderId}
|
WHERE moi.order_id = #{orderId}
|
||||||
</select>
|
</select>
|
||||||
|
<select id="selectDeptList" resultType="com.bonus.material.device.domain.vo.DevInfoVo">
|
||||||
|
SELECT
|
||||||
|
d.dept_id AS companyId,
|
||||||
|
d.dept_name AS companyName
|
||||||
|
FROM
|
||||||
|
sys_dept d
|
||||||
|
WHERE
|
||||||
|
d.dept_id = #{companyId}
|
||||||
|
AND d.del_flag = '0'
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue