lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutStoreDetailController.java
@@ -9,8 +9,11 @@ import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.tms.entity.OutStoreDetail; import org.jeecg.modules.tms.entity.vo.OutStoreDetailVo; @@ -155,12 +158,30 @@ * 导出excel * * @param request * @param outStoreDetail */ //@RequiresPermissions("org.jeecg.modules:tms_out_store_detail:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OutStoreDetail outStoreDetail) { return super.exportXls(request, outStoreDetail, OutStoreDetail.class, "工具出库流水"); public ModelAndView exportXls(HttpServletRequest request) { // Step.1 组装查询条件 Map<String, String[]> parameterMap = request.getParameterMap(); Page<OutStoreDetailVo> page = new Page<>(1, 1000000); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // Step.2 获取导出数据 IPage<OutStoreDetailVo> pageList = outStoreDetailService.queryPageList(page, parameterMap); List<OutStoreDetailVo> exportList = pageList.getRecords(); // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); //此处设置的filename无效 ,前端会重更新设置一下 mv.addObject(NormalExcelConstants.FILE_NAME, "工具出库流水"); mv.addObject(NormalExcelConstants.CLASS, OutStoreDetailVo.class); //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- ExportParams exportParams=new ExportParams("工具出库流水" + "报表", "导出人:" + sysUser.getRealname(), "工具出库流水"); //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- mv.addObject(NormalExcelConstants.PARAMS,exportParams); mv.addObject(NormalExcelConstants.DATA_LIST, exportList); return mv; } /** lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutStoreDetailVo.java
@@ -34,45 +34,62 @@ @ApiModelProperty(value = "主键") private String id; /**工具编码*/ @Excel(name = "工具编码", width = 15) @ApiModelProperty(value = "工具编码") private String toolCode; /**工具编号*/ @Excel(name = "工具编号", width = 25) @ApiModelProperty(value = "工具编号") private String toolId; /**出库类型*/ @Excel(name = "出库类型", width = 15,dicCode = "out_storehouse_type") @Dict(dicCode = "out_storehouse_type") @ApiModelProperty(value = "出库类型") private String outStorehouseType; /**库位号*/ @Excel(name = "库位号", width = 15) @ApiModelProperty(value = "库位号") private String goodsShelvesCode; /**出库数量*/ @Excel(name = "出库数量", width = 10) @ApiModelProperty(value = "出库数量") private BigDecimal outNumber; /**出库申请单号*/ @Excel(name = "出库申请单号", width = 15) @ApiModelProperty(value = "出库申请单号") private String outStorehouseId; /**出库操作方式;1.按申请单 2.手工操作*/ @Excel(name = "出库操作方式", width = 15) @ApiModelProperty(value = "出库操作方式;1.按申请单 2.手工操作") private String operateType; /**工具类型*/ @Excel(name = "工具类型", width = 15) @ApiModelProperty(value = "工具类型") private String applicationType; /**中文名称*/ @Excel(name = "中文名称", width = 15) @ApiModelProperty(value = "中文名称") private String chineseName; /**型号/图号*/ @Excel(name = "型号/图号", width = 15) @ApiModelProperty(value = "型号/图号") private String toolModel; /**刀具材料*/ @Excel(name = "刀具材料", width = 15) @ApiModelProperty(value = "刀具材料") private String toolMaterial; /**零件材料*/ @Excel(name = "零件材料", width = 15) @ApiModelProperty(value = "零件材料") private String partMaterial; /**创建人*/ @Excel(name = "创建人", width = 15) @ApiModelProperty(value = "创建人") private String createBy; /**创建时间*/ @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd HH:mm") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") @ApiModelProperty(value = "创建时间") private Date createTime; /**中文名称*/ @ApiModelProperty(value = "中文名称") private String chineseName; /**型号/图号*/ @ApiModelProperty(value = "型号/图号") private String toolModel; /**刀具材料*/ @ApiModelProperty(value = "刀具材料") private String toolMaterial; /**零件材料*/ @ApiModelProperty(value = "零件材料") private String partMaterial; } lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml
@@ -5,18 +5,27 @@ <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.vo.OutStoreDetailVo"> SELECT t1.id, t1.tool_code toolCode, t2.tool_code toolCode, t1.tool_id toolId, t1.out_storehouse_type outStorehouseType, t1.goods_shelves_code goodsShelvesCode, t1.out_number outNumber, t1.out_storehouse_id outStorehouseId, t1.operate_type operateType, case t1.operate_type when '1' then '申请单' when '2' then '手工操作' else '' end operateType, t1.create_by createBy, t1.create_time createTime, t2.chinese_name chineseName, t2.tool_model toolModel, t2.parama_table_name paramaTableName, case t3.application_type when '1' then '通用工具' when '2' then '专用工具' else '' end applicationType, <choose> <when test="ew.paramNameValuePairs.paramaTableName == '1'"> t4.tool_material toolMaterial, lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
@@ -30,6 +30,14 @@ if (classifyIds != null && classifyIds.length > 0) { queryWrapper.eq("t2.classify_id", classifyIds[0]); } String[] toolCodes = parameterMap.get("toolCode"); if (toolCodes != null && toolCodes.length > 0) { queryWrapper.like("t2.tool_code", toolCodes[0]); } String[] toolModels = parameterMap.get("toolModel"); if (toolModels != null && toolModels.length > 0) { queryWrapper.like("t2.tool_model", toolModels[0]); } queryWrapper.orderByDesc("t1.create_time"); return this.baseMapper.queryPageList(page, queryWrapper); }
