Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
This commit is contained in:
commit
69f46d8a1a
|
|
@ -211,4 +211,9 @@ public class MaterialBackApplyInfo implements Serializable {
|
|||
@Excel(name = "项目部",sort = 4)
|
||||
private String departName;
|
||||
|
||||
/**
|
||||
* 协议id集合
|
||||
*/
|
||||
private List<String> agreementIds;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -299,7 +299,7 @@ public interface MaterialLeaseInfoMapper {
|
|||
* @param bean
|
||||
* @return
|
||||
*/
|
||||
BmAgreementInfo getAgreeId(MaterialLeaseApplyInfo bean);
|
||||
List<BmAgreementInfo> getAgreeId(MaterialLeaseApplyInfo bean);
|
||||
|
||||
/**
|
||||
* 二维码出库：根据qrcode查询在库机具信息
|
||||
|
|
|
|||
|
|
@ -1410,7 +1410,7 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService {
|
|||
if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(listL5)) {
|
||||
// 优化：预先查询班组和协议信息，避免在循环中重复查询
|
||||
BmTeam team = null;
|
||||
BmAgreementInfo agreementInfo = null;
|
||||
List<BmAgreementInfo> agreementInfo = null;
|
||||
|
||||
if (StringUtils.isNotBlank(bean.getTeamName())) {
|
||||
team = getTeamByNameCached(bean.getTeamName());
|
||||
|
|
@ -1423,14 +1423,19 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService {
|
|||
|
||||
// 优化：如果有协议信息，批量查询所有类型的使用数量
|
||||
Map<Long, BigDecimal> useNumMap = new HashMap<>();
|
||||
if (agreementInfo != null && !listL5.isEmpty()) {
|
||||
if (!CollectionUtils.isEmpty(agreementInfo) && !listL5.isEmpty()) {
|
||||
// 收集所有需要查询的typeId
|
||||
List<Long> typeIds = listL5.stream()
|
||||
.map(TypeTreeNode::getTypeId)
|
||||
.collect(Collectors.toList());
|
||||
// 获取agreementInfo中的协议id
|
||||
List<Long> agreementIds = agreementInfo.stream()
|
||||
.map(BmAgreementInfo::getAgreementId)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
|
||||
// 批量查询使用数量 - 性能优化关键点
|
||||
List<Type> batchResults = typeMapper.getNumListBatch(agreementInfo.getAgreementId(), typeIds);
|
||||
List<Type> batchResults = typeMapper.getNumListBatch(agreementIds, typeIds);
|
||||
|
||||
// 转换为Map
|
||||
if (!CollectionUtils.isEmpty(batchResults)) {
|
||||
|
|
@ -1488,7 +1493,7 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService {
|
|||
* @param bean 查询参数
|
||||
* @return 协议信息
|
||||
*/
|
||||
private BmAgreementInfo getAgreementInfoCached(MaterialLeaseApplyInfo bean) {
|
||||
private List<BmAgreementInfo> getAgreementInfoCached(MaterialLeaseApplyInfo bean) {
|
||||
return materialLeaseInfoMapper.getAgreeId(bean);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -414,19 +414,17 @@ public class SelectServiceImpl implements SelectService {
|
|||
*/
|
||||
@Override
|
||||
public AjaxResult getAgreementInfoByIdBack(SelectDto dto) {
|
||||
AgreementVo vo = new AgreementVo();
|
||||
List<AgreementVo> list = new ArrayList<>();
|
||||
try {
|
||||
if (dto != null && dto.getTeamId() != null) {
|
||||
dto.setUnitId(Integer.parseInt(dto.getTeamId()));
|
||||
}
|
||||
List<AgreementVo> list = mapper.getAgreementInfoByIdBack(dto);
|
||||
if (CollectionUtils.isNotEmpty(list)) {
|
||||
vo = list.get(0);
|
||||
}
|
||||
list = mapper.getAgreementInfoByIdBack(dto);
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("往来单位id和标段工程id获取协议信息", e);
|
||||
}
|
||||
return AjaxResult.success(vo);
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -214,11 +214,11 @@ public interface TypeMapper {
|
|||
|
||||
/**
|
||||
* 批量查询数量 - 性能优化
|
||||
* @param agreementId 协议ID
|
||||
* @param agreementIds 协议ID
|
||||
* @param typeIds 类型ID列表
|
||||
* @return 类型使用数量列表
|
||||
*/
|
||||
List<Type> getNumListBatch(@Param("agreementId") Long agreementId, @Param("typeIds") List<Long> typeIds);
|
||||
List<Type> getNumListBatch(@Param("agreementIds") List<Long> agreementIds, @Param("typeIds") List<Long> typeIds);
|
||||
|
||||
/**
|
||||
* 查询物资类型管理绑定的用户列表
|
||||
|
|
|
|||
|
|
@ -195,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
WHERE
|
||||
unit_id = #{unitId}
|
||||
and project_id = #{projectId}
|
||||
limit 1
|
||||
</select>
|
||||
|
||||
<select id="selectNumByMonthClz" resultType="java.lang.Integer">
|
||||
|
|
|
|||
|
|
@ -731,7 +731,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = '0'
|
||||
LEFT JOIN clz_lease_apply_info clai ON sai.lease_id = clai.id
|
||||
WHERE
|
||||
sai.STATUS = '0' and sai.agreement_id = #{agreementId}
|
||||
sai.STATUS = '0'
|
||||
|
||||
<if test="agreementIds != null ">
|
||||
and sai.agreement_id in
|
||||
<foreach item="item" collection="agreementIds" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
|
||||
GROUP BY
|
||||
mt.type_id
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -1128,19 +1128,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="getNumListBatch" resultType="com.bonus.material.ma.domain.Type">
|
||||
SELECT
|
||||
mt.type_id as typeId,
|
||||
SUM( CASE WHEN sai.agreement_id = #{agreementId} AND sai.STATUS = '0' THEN sai.num ELSE 0 END ) AS useNum
|
||||
SUM(sai.num) AS useNum
|
||||
FROM
|
||||
ma_type mt
|
||||
LEFT JOIN clz_slt_agreement_info sai ON mt.type_id = sai.type_id
|
||||
WHERE
|
||||
mt.type_id IN
|
||||
sai.STATUS = '0'
|
||||
AND mt.type_id IN
|
||||
<foreach collection="typeIds" item="typeId" open="(" separator="," close=")">
|
||||
#{typeId}
|
||||
</foreach>
|
||||
AND EXISTS ( SELECT 1 FROM clz_slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = #{agreementId}
|
||||
AND sai2.STATUS = '0' and sai2.num > 0)
|
||||
AND sai.agreement_id in
|
||||
<foreach item="id" collection="agreementIds" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
GROUP BY
|
||||
mt.type_id
|
||||
HAVING
|
||||
useNum > 0
|
||||
</select>
|
||||
|
||||
<select id="getUserList" resultType="com.bonus.material.ma.domain.vo.MaTypeVo">
|
||||
|
|
|
|||
|
|
@ -367,6 +367,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
#{task.taskId}
|
||||
</foreach>
|
||||
</if>
|
||||
having costs > 0
|
||||
</select>
|
||||
|
||||
<select id="getScrapDetailsList" resultType="com.bonus.material.settlement.domain.SltAgreementInfo">
|
||||
|
|
@ -403,6 +404,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
#{task.taskId}
|
||||
</foreach>
|
||||
</if>
|
||||
having costs > 0
|
||||
</select>
|
||||
|
||||
<select id="getLoseList" resultType="com.bonus.material.settlement.domain.SltAgreementInfo">
|
||||
|
|
|
|||
Loading…
Reference in New Issue