综合查询
This commit is contained in:
parent
24e508ec17
commit
5c2d2f6119
|
|
@ -144,6 +144,7 @@ public class StoreLogAspect {
|
|||
bmStorageLog.setManageType(String.valueOf(leaseOutDetails.getManageType()));
|
||||
bmStorageLog.setTypeModelName(leaseOutDetails.getTypeName());
|
||||
bmStorageLog.setPreStoreNum(leaseOutDetails.getPreStoreNum());
|
||||
bmStorageLog.setAgreementId(leaseOutDetails.getAgreementId());
|
||||
//数量类型设备
|
||||
if (leaseOutDetails.getManageType().equals(MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId())) {
|
||||
bmStorageLog.setOutNum(leaseOutDetails.getInputNum());
|
||||
|
|
|
|||
|
|
@ -102,4 +102,7 @@ public class LeaseOutDetails extends BaseEntity {
|
|||
|
||||
@ApiModelProperty(value = "发布批次")
|
||||
private String publishTask;
|
||||
|
||||
@ApiModelProperty(value = "协议id")
|
||||
private Long agreementId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,4 +98,13 @@ public class OutRecordInfo {
|
|||
|
||||
@ApiModelProperty(value = "装备管理方式")
|
||||
private String manageType;
|
||||
|
||||
@ApiModelProperty(value = "三级ID")
|
||||
private Integer thirdTypeId;
|
||||
|
||||
@ApiModelProperty(value = "二级ID")
|
||||
private Integer secondTypeId;
|
||||
|
||||
@ApiModelProperty(value = "一级ID")
|
||||
private Integer firstTypeId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -442,6 +442,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService {
|
|||
BigDecimal outNum = record.getOutNum();
|
||||
sltAgreementInfo.setNum(num.add(outNum));
|
||||
res = sltAgreementInfoMapper.updSltInfo(sltAgreementInfo);
|
||||
record.setAgreementId(sltAgreementInfo.getAgreementId());
|
||||
} else {
|
||||
String agreementId = " ";
|
||||
agreementId = tmTaskAgreementMapper.getAgreementId(taskId);
|
||||
|
|
@ -462,6 +463,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService {
|
|||
}
|
||||
}
|
||||
res = sltAgreementInfoMapper.insSltInfo(record, agreementId, maType);
|
||||
record.setAgreementId(Long.valueOf(agreementId));
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,6 +120,17 @@ public class TypeController extends BaseController {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询一级列表
|
||||
* @param maTypeVo
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "查询一级列表")
|
||||
@GetMapping("/getListLevel")
|
||||
public AjaxResult getListLevel(MaTypeVo maTypeVo) {
|
||||
return typeService.getListLevel(maTypeVo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据物资仓库ID查询施工类型
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -189,4 +189,11 @@ public interface TypeMapper {
|
|||
* @return
|
||||
*/
|
||||
List<Type> selectMaTypeThreeLists(Long agreementId);
|
||||
|
||||
/**
|
||||
* 查询一级列表
|
||||
* @param maTypeVo
|
||||
* @return
|
||||
*/
|
||||
List<MaTypeVo> getListLevel(MaTypeVo maTypeVo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -130,4 +130,11 @@ public interface ITypeService {
|
|||
* @return
|
||||
*/
|
||||
List<Type> getEquipmentThreeTypes(Long typeId, Long agreementId);
|
||||
|
||||
/**
|
||||
* 查询一级列表
|
||||
* @param maTypeVo
|
||||
* @return
|
||||
*/
|
||||
AjaxResult getListLevel(MaTypeVo maTypeVo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -183,6 +183,17 @@ public class TypeServiceImpl implements ITypeService {
|
|||
return list;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询一级列表
|
||||
* @param maTypeVo
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public AjaxResult getListLevel(MaTypeVo maTypeVo) {
|
||||
List<MaTypeVo> maTypeVos = typeMapper.getListLevel(maTypeVo);
|
||||
return AjaxResult.success(maTypeVos);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<MaTypeSelectVo> selectMaTypeListByHouseId(Long houseId) {
|
||||
|
|
|
|||
|
|
@ -321,11 +321,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
WHEN bs.out_type = '2' THEN '二维码'
|
||||
WHEN bs.out_type = '3' THEN '标准箱'
|
||||
ELSE '未知入库方式'
|
||||
END AS outStyle
|
||||
END AS outStyle,
|
||||
mt3.type_id as firstTypeId,
|
||||
mt2.type_id as secondTypeId
|
||||
FROM
|
||||
bm_storage_log bs
|
||||
LEFT JOIN tm_task_agreement tta ON tta.task_id = bs.task_id
|
||||
LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
|
||||
LEFT JOIN bm_agreement_info bai ON bai.agreement_id = bs.agreement_id
|
||||
LEFT JOIN bm_project bpl ON bpl.pro_id = bai.project_id
|
||||
LEFT JOIN sys_dept sd on sd.dept_id = bpl.imp_unit
|
||||
LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
|
||||
|
|
@ -333,6 +334,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
AND mt.del_flag = '0'
|
||||
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
|
||||
AND mt1.del_flag = '0'
|
||||
LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id
|
||||
AND mt2.del_flag = '0'
|
||||
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id
|
||||
AND mt3.del_flag = '0'
|
||||
LEFT JOIN tm_task tt ON bs.task_id = tt.task_id
|
||||
WHERE bs.out_num != 0
|
||||
<if test="unitId != null">
|
||||
|
|
@ -358,6 +363,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="typeModelName != null and typeModelName != ''">
|
||||
and bs.type_model_name like CONCAT('%',#{typeModelName},'%')
|
||||
</if>
|
||||
<if test="firstTypeId != null ">
|
||||
and mt3.type_id = #{firstTypeId}
|
||||
</if>
|
||||
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
|
||||
AND bs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
|
||||
</if>
|
||||
|
|
|
|||
|
|
@ -918,4 +918,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
WHERE sai.agreement_id = #{agreementId}
|
||||
AND sai.STATUS = '0')
|
||||
</select>
|
||||
|
||||
<select id="getListLevel" resultType="com.bonus.material.ma.domain.vo.MaTypeVo">
|
||||
SELECT
|
||||
type_id AS typeId,
|
||||
type_name AS typeName
|
||||
FROM
|
||||
ma_type
|
||||
WHERE `level` = '1'
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue