导出领料出库明细
This commit is contained in:
parent
8b938c25bb
commit
d860758ac0
|
|
@ -37,45 +37,55 @@ public class LeaseApplyDetailExport extends BaseEntity{
|
|||
|
||||
|
||||
|
||||
@ApiModelProperty(value = "申请时间")
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "发布时间", width = 20, dateFormat = "yyyy-MM-dd")
|
||||
@Excel(name = "创建时间", width = 20, dateFormat = "yyyy-MM-dd",sort=7)
|
||||
private Date releaseTime;
|
||||
|
||||
|
||||
|
||||
@ApiModelProperty(value = "实施单位")
|
||||
@Excel(name = "实施单位")
|
||||
@ApiModelProperty(value = "分公司")
|
||||
@Excel(name = "分公司",sort=1)
|
||||
private String impUnitName;
|
||||
|
||||
@ApiModelProperty(value = "物资仓库")
|
||||
@Excel(name = "物资仓库",sort=8)
|
||||
private String materialName;
|
||||
|
||||
@ApiModelProperty(value = "物资名称")
|
||||
@Excel(name = "物资名称",sort=9)
|
||||
private String typeModelName;
|
||||
|
||||
@ApiModelProperty(value = "物资型号")
|
||||
@Excel(name = "物资型号",sort=10)
|
||||
private String typeName;
|
||||
|
||||
@ApiModelProperty(value = "单位")
|
||||
@Excel(name = "单位",sort=11)
|
||||
private String unitName;
|
||||
|
||||
@ApiModelProperty(value = "出库方式")
|
||||
@Excel(name = "出库方式",sort=14)
|
||||
private String manageTypeName;
|
||||
|
||||
@ApiModelProperty(value = "领料单位")
|
||||
@Excel(name = "租赁单位")
|
||||
@Excel(name = "领料单位",sort=3)
|
||||
private String leaseUnit;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "租赁工程")
|
||||
@Excel(name = "租赁工程")
|
||||
@ApiModelProperty(value = "工程名称")
|
||||
@Excel(name = "工程名称",sort=2)
|
||||
private String leaseProject;
|
||||
|
||||
|
||||
/** 任务编号: 领料单号 */
|
||||
@ApiModelProperty(value = "领料单号")
|
||||
@Excel(name = "租赁申请单号")
|
||||
@Excel(name = "领料单号",sort=4)
|
||||
private String code;
|
||||
|
||||
|
||||
/** 领料人 */
|
||||
@Excel(name = "领料人")
|
||||
@Excel(name = "领料人",sort=5)
|
||||
@ApiModelProperty(value = "领料人")
|
||||
private String leasePerson;
|
||||
|
||||
|
|
@ -90,14 +100,17 @@ public class LeaseApplyDetailExport extends BaseEntity{
|
|||
@ApiModelProperty(value = "任务状态(定义数据字典)")
|
||||
private Integer taskStatus;
|
||||
|
||||
@Excel(name = "状态")
|
||||
@Excel(name = "状态",sort=6)
|
||||
@ApiModelProperty(value = "任务状态(定义数据字典)")
|
||||
private String taskStatusName;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "已出库数量")
|
||||
@ApiModelProperty(value = "领料数量")
|
||||
@Excel(name = "领料数量",sort=12)
|
||||
private BigDecimal alNum;
|
||||
|
||||
@ApiModelProperty(value = "出库数量")
|
||||
@Excel(name = "出库数量",sort=13)
|
||||
private BigDecimal outNum;
|
||||
|
||||
@ApiModelProperty(value = "开始时间")
|
||||
|
|
@ -110,7 +123,6 @@ public class LeaseApplyDetailExport extends BaseEntity{
|
|||
private String keyWord;
|
||||
|
||||
@ApiModelProperty(value = "备注")
|
||||
@Excel(name = "备注")
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty(value = "任务状态列表")
|
||||
|
|
|
|||
|
|
@ -190,14 +190,16 @@ public class LeaseApplyInfoController extends BaseController {
|
|||
if (leaseApplyInfo.getStartTime() != null && leaseApplyInfo.getEndTime() != null) {
|
||||
fileName = "领料记录" + leaseApplyInfo.getStartTime() + "至" + leaseApplyInfo.getEndTime();
|
||||
}
|
||||
expOutExcel(response, list, fileName);
|
||||
ExcelUtil<LeaseApplyDetailExport> util = new ExcelUtil<>(LeaseApplyDetailExport.class);
|
||||
util.exportExcel(response, list, fileName);
|
||||
// expOutExcel(response, list, fileName);
|
||||
} catch (Exception e) {
|
||||
logger.error("导出领料明细失败", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出结算单
|
||||
* 导出领料明细单
|
||||
* @param response
|
||||
* @param list
|
||||
* @param filename
|
||||
|
|
|
|||
|
|
@ -1152,6 +1152,8 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
|||
*/
|
||||
@Override
|
||||
public List<LeaseApplyDetailExport> selectLeaseApplyDetailList(LeaseApplyInfo bean) {
|
||||
Long userId = SecurityUtils.getLoginUser().getSysUser().getUserId() ;
|
||||
bean.setUserId(userId);
|
||||
List<LeaseApplyDetailExport> listAll = new ArrayList<>();
|
||||
//领料
|
||||
List<LeaseApplyDetailExport> listOne = leaseApplyDetailsMapper.selectLeaseApplyLL(bean);
|
||||
|
|
|
|||
|
|
@ -811,7 +811,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
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'
|
||||
<if test="userId != null">
|
||||
JOIN ma_type_keeper mtk ON mtk.type_id = lad.type_id AND mtk.user_id =#{userId}
|
||||
JOIN ma_type_keeper mtk ON mtk.type_id = lod.type_id AND mtk.user_id =#{userId}
|
||||
</if>
|
||||
where
|
||||
tt.task_type = '2'
|
||||
|
|
@ -860,7 +860,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
left join ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = '0'
|
||||
|
||||
<if test="userId != null">
|
||||
JOIN ma_type_keeper mtk ON mtk.type_id = lad.type_id AND mtk.user_id =#{userId}
|
||||
JOIN ma_type_keeper mtk ON mtk.type_id = lod.type_id AND mtk.user_id =#{userId}
|
||||
</if>
|
||||
where
|
||||
tt.task_type = '19'
|
||||
|
|
|
|||
Loading…
Reference in New Issue