diff --git a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java index 4c716e810..4840499ba 100644 --- a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java +++ b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java @@ -75,9 +75,22 @@ public class QueryGenerator { * @return */ public static QueryWrapper initQueryWrapper(T searchObj, Map parameterMap, List excludeFields) { + return initQueryWrapper(searchObj, parameterMap, excludeFields, null); + } + + /** + * 获取查询条件构造器QueryWrapper实例 通用查询条件已被封装完成 + * + * @param searchObj + * @param parameterMap + * @param excludeFields 排除属性（eg：ReflectionUtil.getFieldNameList) + * @param likeFields like属性 + * @return + */ + public static QueryWrapper initQueryWrapper(T searchObj, Map parameterMap, List excludeFields, List likeFields) { long start = System.currentTimeMillis(); QueryWrapper queryWrapper = new QueryWrapper(); - installMplus(queryWrapper, searchObj, parameterMap, excludeFields); + installMplus(queryWrapper, searchObj, parameterMap, excludeFields, likeFields); log.info("---查询条件构造器初始化完成,耗时:" + (System.currentTimeMillis() - start) + "毫秒----"); return queryWrapper; } @@ -91,6 +104,10 @@ public class QueryGenerator { * @param excludeFields 排除属性 */ public static void installMplus(QueryWrapper queryWrapper, Object searchObj, Map parameterMap, List excludeFields) { + installMplus(queryWrapper, searchObj, parameterMap, excludeFields, null); + } + + public static void installMplus(QueryWrapper queryWrapper, Object searchObj, Map parameterMap, List excludeFields, List likeFields) { /* * 注意:权限查询由前端配置数据规则 当一个人有多个所属部门时候 可以在规则配置包含条件 orgCode 包含 #{sys_org_code} @@ -112,6 +129,13 @@ public class QueryGenerator { continue; } + //模糊查询 + if (likeFields != null && likeFields.contains(name)) { + Object v = PropertyUtils.getSimpleProperty(searchObj, name); + queryWrapper.like(v != null, name, v); + continue; + } + // 添加 判断是否有区间值 String endValue = null, beginValue = null; if (parameterMap != null && parameterMap.containsKey(name + BEGIN)) { diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractController.java index 2c42c3ffa..33f7f366b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractController.java @@ -1,48 +1,47 @@ package com.zhgd.xmgl.modules.gt.controller; -import com.zhgd.xmgl.modules.gt.entity.GtMaterialContract; -import com.zhgd.xmgl.modules.gt.service.IGtMaterialContractService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.oConvertUtils; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import com.zhgd.xmgl.modules.gt.entity.GtMaterialContract; +import com.zhgd.xmgl.modules.gt.service.IGtMaterialContractService; +import com.zhgd.xmgl.util.ReflectionUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - +import org.apache.commons.lang3.StringUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.Arrays; +import java.util.List; +import java.util.Map; - /** +/** * @Title: Controller * @Description: 合同 * @author： pds - * @date： 2023-04-18 + * @date： 2023-04-18 * @version： V1.0 */ @RestController @@ -50,221 +49,231 @@ import com.alibaba.fastjson.JSON; @Slf4j @Api(tags = "GtMaterial合同") public class GtMaterialContractController { - @Autowired - private IGtMaterialContractService gtMaterialContractService; + @Autowired + private IGtMaterialContractService gtMaterialContractService; - /** - * 分页列表查询 - * @param gtMaterialContract - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @ApiOperation(value = " 分页列表查询合同信息", notes = "分页列表查询合同信息", httpMethod="GET") - @GetMapping(value = "/page") - public Result> queryPageList(GtMaterialContract gtMaterialContract, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + /** + * 分页列表查询 + * + * @param gtMaterialContract + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = " 分页列表查询合同信息", notes = "分页列表查询合同信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(GtMaterialContract gtMaterialContract, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialContract, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = gtMaterialContractService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialContract, req.getParameterMap() + , ReflectionUtil.getFieldNameList(GtMaterialContract::getContractName)); + queryWrapper.lambda() + .like(StringUtils.isNotBlank(gtMaterialContract.getContractName()), GtMaterialContract::getContractName, gtMaterialContract.getContractName()); + Page page = new Page(pageNo, pageSize); + IPage pageList = gtMaterialContractService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } - /** - * 列表查询 - * @param gtMaterialContract - * @param pageNo 页码 - * @param pageSize 条数 - * @param req - * @return - */ - @ApiOperation(value = " 列表查询合同信息", notes = "列表查询合同信息", httpMethod="GET") - @GetMapping(value = "/list") - public Result> queryList(GtMaterialContract gtMaterialContract, - HttpServletRequest req) { + /** + * 列表查询 + * + * @param gtMaterialContract + * @param pageNo 页码 + * @param pageSize 条数 + * @param req + * @return + */ + @ApiOperation(value = " 列表查询合同信息", notes = "列表查询合同信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(GtMaterialContract gtMaterialContract, + HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialContract, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialContract, req.getParameterMap()); return Result.success(gtMaterialContractService.list(queryWrapper)); - } + } - /** - * 添加 - * @param gtMaterialContract - * @return - */ - @ApiOperation(value = " 添加合同信息", notes = "添加合同信息" , httpMethod="POST") - @PostMapping(value = "/add") - public Result add(@RequestBody GtMaterialContract gtMaterialContract) { - Result result = new Result(); - try { - gtMaterialContractService.save(gtMaterialContract); - result.success("添加成功！"); - } catch (Exception e) { - e.printStackTrace(); - log.info(e.getMessage()); - result.error500("操作失败"); - } - return result; - } + /** + * 添加 + * + * @param gtMaterialContract + * @return + */ + @ApiOperation(value = " 添加合同信息", notes = "添加合同信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody GtMaterialContract gtMaterialContract) { + Result result = new Result(); + try { + gtMaterialContractService.save(gtMaterialContract); + result.success("添加成功！"); + } catch (Exception e) { + e.printStackTrace(); + log.info(e.getMessage()); + result.error500("操作失败"); + } + return result; + } - /** - * 编辑 - * @param gtMaterialContract - * @return - */ - @ApiOperation(value = "编辑合同信息", notes = "编辑合同信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody GtMaterialContract gtMaterialContract) { - Result result = new Result(); - GtMaterialContract gtMaterialContractEntity = gtMaterialContractService.getById(gtMaterialContract.getId()); - if(gtMaterialContractEntity==null) { - result.error500("未找到对应实体"); - }else { - gtMaterialContractService.updateById(gtMaterialContract); - result.success("修改成功!"); - } + /** + * 编辑 + * + * @param gtMaterialContract + * @return + */ + @ApiOperation(value = "编辑合同信息", notes = "编辑合同信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody GtMaterialContract gtMaterialContract) { + Result result = new Result(); + GtMaterialContract gtMaterialContractEntity = gtMaterialContractService.getById(gtMaterialContract.getId()); + if (gtMaterialContractEntity == null) { + result.error500("未找到对应实体"); + } else { + gtMaterialContractService.updateById(gtMaterialContract); + result.success("修改成功!"); + } - return result; - } + return result; + } - /** - * 通过id删除 - * @param id - * @return - */ - @ApiOperation(value = "删除合同信息", notes = "删除合同信息" , httpMethod="POST") - @PostMapping(value = "/delete") - public Result delete(@RequestBody String id) { - JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); - id = String.valueOf(jsonObject.get("id")); - Result result = new Result(); - GtMaterialContract gtMaterialContract = gtMaterialContractService.getById(id); - if(gtMaterialContract==null) { - result.error500("未找到对应实体"); - }else { - boolean ok = gtMaterialContractService.removeById(id); - if(ok) { - result.success("删除成功!"); - } - } + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除合同信息", notes = "删除合同信息", httpMethod = "POST") + @PostMapping(value = "/delete") + public Result delete(@RequestBody String id) { + JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); + id = String.valueOf(jsonObject.get("id")); + Result result = new Result(); + GtMaterialContract gtMaterialContract = gtMaterialContractService.getById(id); + if (gtMaterialContract == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = gtMaterialContractService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } - return result; - } + return result; + } - /** - * 批量删除 - * @param ids - * @return - */ - @ApiOperation(value = "批量删除合同信息", notes = "批量删除合同信息", httpMethod="POST") + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value = "批量删除合同信息", notes = "批量删除合同信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "合同ID字符串", paramType = "query", required = true, dataType = "String") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); - if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); - }else { - this.gtMaterialContractService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); - } - return result; - } + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + Result result = new Result(); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + this.gtMaterialContractService.removeByIds(Arrays.asList(ids.split(","))); + result.success("删除成功!"); + } + return result; + } - /** - * 通过id查询 - * @param id - * @return - */ - @ApiOperation(value = "通过id查询合同信息", notes = "通过id查询合同信息" , httpMethod="GET") - @ApiImplicitParam(name = "id", value = "合同ID", paramType = "query", required = true, dataType = "Integer") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); - GtMaterialContract gtMaterialContract = gtMaterialContractService.getById(id); - if(gtMaterialContract==null) { - result.error500("未找到对应实体"); - }else { - result.setResult(gtMaterialContract); - result.setSuccess(true); - } - return result; - } + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询合同信息", notes = "通过id查询合同信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "合同ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + GtMaterialContract gtMaterialContract = gtMaterialContractService.getById(id); + if (gtMaterialContract == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(gtMaterialContract); + result.setSuccess(true); + } + return result; + } - /** - * 导出excel - * - * @param request - * @param response - */ - @ApiOperation(value = "导出excel合同信息", notes = "导出excel合同信息" , httpMethod="POST") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - GtMaterialContract gtMaterialContract = JSON.parseObject(deString, GtMaterialContract.class); - queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialContract, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } + /** + * 导出excel + * + * @param request + * @param response + */ + @ApiOperation(value = "导出excel合同信息", notes = "导出excel合同信息", httpMethod = "POST") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = null; + try { + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, "UTF-8"); + GtMaterialContract gtMaterialContract = JSON.parseObject(deString, GtMaterialContract.class); + queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialContract, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } - //Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - List pageList = gtMaterialContractService.list(queryWrapper); - //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "合同列表"); - mv.addObject(NormalExcelConstants.CLASS, GtMaterialContract.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("合同列表数据", "导出人:Jeecg", "导出信息")); - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - return mv; - } + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = gtMaterialContractService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "合同列表"); + mv.addObject(NormalExcelConstants.CLASS, GtMaterialContract.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("合同列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @ApiOperation(value = "通过excel导入合同信息", notes = "通过excel导入合同信息", httpMethod="POST") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List listGtMaterialContracts = ExcelImportUtil.importExcel(file.getInputStream(), GtMaterialContract.class, params); - for (GtMaterialContract gtMaterialContractExcel : listGtMaterialContracts) { - gtMaterialContractService.save(gtMaterialContractExcel); - } - return Result.ok("文件导入成功！数据行数：" + listGtMaterialContracts.size()); - } catch (Exception e) { - log.error(e.getMessage()); - return Result.error("文件导入失败！"); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.ok("文件导入失败！"); - } + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @ApiOperation(value = "通过excel导入合同信息", notes = "通过excel导入合同信息", httpMethod = "POST") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listGtMaterialContracts = ExcelImportUtil.importExcel(file.getInputStream(), GtMaterialContract.class, params); + for (GtMaterialContract gtMaterialContractExcel : listGtMaterialContracts) { + gtMaterialContractService.save(gtMaterialContractExcel); + } + return Result.ok("文件导入成功！数据行数：" + listGtMaterialContracts.size()); + } catch (Exception e) { + log.error(e.getMessage()); + return Result.error("文件导入失败！"); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.ok("文件导入失败！"); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceController.java index 8d73719c6..6a68febbf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceController.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.gt.controller; import com.zhgd.xmgl.modules.gt.entity.GtMaterialDevice; +import com.zhgd.xmgl.util.ReflectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -68,7 +69,8 @@ public class GtMaterialDeviceController { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialDevice, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialDevice, req.getParameterMap(), null, + ReflectionUtil.getFieldNameList(GtMaterialDevice::getDeviceName)); Page page = new Page(pageNo, pageSize); IPage pageList = gtMaterialDeviceService.page(page, queryWrapper); result.setSuccess(true); diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialInOutWarehouseController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialInOutWarehouseController.java index 0bdd9208b..c2f440088 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialInOutWarehouseController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialInOutWarehouseController.java @@ -1,48 +1,47 @@ package com.zhgd.xmgl.modules.gt.controller; -import com.zhgd.xmgl.modules.gt.entity.GtMaterialInOutWarehouse; -import com.zhgd.xmgl.modules.gt.service.IGtMaterialInOutWarehouseService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.oConvertUtils; - +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import com.zhgd.xmgl.modules.gt.entity.GtMaterialInOutWarehouse; +import com.zhgd.xmgl.modules.gt.service.IGtMaterialInOutWarehouseService; +import com.zhgd.xmgl.util.ReflectionUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - +import org.apache.commons.lang3.StringUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.Arrays; +import java.util.List; +import java.util.Map; - /** +/** * @Title: Controller * @Description: 出入库 * @author： pds - * @date： 2023-04-18 + * @date： 2023-04-18 * @version： V1.0 */ @RestController @@ -50,221 +49,235 @@ import com.alibaba.fastjson.JSONObject; @Slf4j @Api(tags = "GtMaterial出入库") public class GtMaterialInOutWarehouseController { - @Autowired - private IGtMaterialInOutWarehouseService gtMaterialInOutWarehouseService; + @Autowired + private IGtMaterialInOutWarehouseService gtMaterialInOutWarehouseService; - /** - * 分页列表查询 - * @param gtMaterialInOutWarehouse - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @ApiOperation(value = " 分页列表查询出入库信息", notes = "分页列表查询出入库信息", httpMethod="GET") - @GetMapping(value = "/page") - public Result> queryPageList(GtMaterialInOutWarehouse gtMaterialInOutWarehouse, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + /** + * 分页列表查询 + * + * @param gtMaterialInOutWarehouse + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = " 分页列表查询出入库信息", notes = "分页列表查询出入库信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(GtMaterialInOutWarehouse gtMaterialInOutWarehouse, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialInOutWarehouse, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = gtMaterialInOutWarehouseService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialInOutWarehouse, req.getParameterMap() + , null, ReflectionUtil.getFieldNameList(GtMaterialInOutWarehouse::getNumber, GtMaterialInOutWarehouse::getCategory, GtMaterialInOutWarehouse::getVendor, + GtMaterialInOutWarehouse::getLotNumber, GtMaterialInOutWarehouse::getWarehouse, GtMaterialInOutWarehouse::getDepartment, GtMaterialInOutWarehouse::getHandler + , GtMaterialInOutWarehouse::getCustomer)); + queryWrapper.lambda() + .ge(gtMaterialInOutWarehouse.getCreateTime() != null, GtMaterialInOutWarehouse::getUpdateTime, gtMaterialInOutWarehouse.getCreateTime()) + .le(gtMaterialInOutWarehouse.getEndTime() != null, GtMaterialInOutWarehouse::getUpdateTime, gtMaterialInOutWarehouse.getEndTime()) + .orderByDesc(GtMaterialInOutWarehouse::getId); + Page page = new Page(pageNo, pageSize); + IPage pageList = gtMaterialInOutWarehouseService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } - /** - * 列表查询 - * @param gtMaterialInOutWarehouse - * @param pageNo 页码 - * @param pageSize 条数 - * @param req - * @return - */ - @ApiOperation(value = " 列表查询出入库信息", notes = "列表查询出入库信息", httpMethod="GET") - @GetMapping(value = "/list") - public Result> queryList(GtMaterialInOutWarehouse gtMaterialInOutWarehouse, - HttpServletRequest req) { + /** + * 列表查询 + * + * @param gtMaterialInOutWarehouse + * @param pageNo 页码 + * @param pageSize 条数 + * @param req + * @return + */ + @ApiOperation(value = " 列表查询出入库信息", notes = "列表查询出入库信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(GtMaterialInOutWarehouse gtMaterialInOutWarehouse, + HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialInOutWarehouse, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialInOutWarehouse, req.getParameterMap()); return Result.success(gtMaterialInOutWarehouseService.list(queryWrapper)); - } + } - /** - * 添加 - * @param gtMaterialInOutWarehouse - * @return - */ - @ApiOperation(value = " 添加出入库信息", notes = "添加出入库信息" , httpMethod="POST") - @PostMapping(value = "/add") - public Result add(@RequestBody GtMaterialInOutWarehouse gtMaterialInOutWarehouse) { - Result result = new Result(); - try { - gtMaterialInOutWarehouseService.save(gtMaterialInOutWarehouse); - result.success("添加成功！"); - } catch (Exception e) { - e.printStackTrace(); - log.info(e.getMessage()); - result.error500("操作失败"); - } - return result; - } + /** + * 添加 + * + * @param gtMaterialInOutWarehouse + * @return + */ + @ApiOperation(value = " 添加出入库信息", notes = "添加出入库信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody GtMaterialInOutWarehouse gtMaterialInOutWarehouse) { + Result result = new Result(); + try { + gtMaterialInOutWarehouseService.save(gtMaterialInOutWarehouse); + result.success("添加成功！"); + } catch (Exception e) { + e.printStackTrace(); + log.info(e.getMessage()); + result.error500("操作失败"); + } + return result; + } - /** - * 编辑 - * @param gtMaterialInOutWarehouse - * @return - */ - @ApiOperation(value = "编辑出入库信息", notes = "编辑出入库信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody GtMaterialInOutWarehouse gtMaterialInOutWarehouse) { - Result result = new Result(); - GtMaterialInOutWarehouse gtMaterialInOutWarehouseEntity = gtMaterialInOutWarehouseService.getById(gtMaterialInOutWarehouse.getId()); - if(gtMaterialInOutWarehouseEntity==null) { - result.error500("未找到对应实体"); - }else { - gtMaterialInOutWarehouseService.updateById(gtMaterialInOutWarehouse); - result.success("修改成功!"); - } + /** + * 编辑 + * + * @param gtMaterialInOutWarehouse + * @return + */ + @ApiOperation(value = "编辑出入库信息", notes = "编辑出入库信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody GtMaterialInOutWarehouse gtMaterialInOutWarehouse) { + Result result = new Result(); + GtMaterialInOutWarehouse gtMaterialInOutWarehouseEntity = gtMaterialInOutWarehouseService.getById(gtMaterialInOutWarehouse.getId()); + if (gtMaterialInOutWarehouseEntity == null) { + result.error500("未找到对应实体"); + } else { + gtMaterialInOutWarehouseService.updateById(gtMaterialInOutWarehouse); + result.success("修改成功!"); + } - return result; - } + return result; + } - /** - * 通过id删除 - * @param id - * @return - */ - @ApiOperation(value = "删除出入库信息", notes = "删除出入库信息" , httpMethod="POST") - @PostMapping(value = "/delete") - public Result delete(@RequestBody String id) { - JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); - id = String.valueOf(jsonObject.get("id")); - Result result = new Result(); - GtMaterialInOutWarehouse gtMaterialInOutWarehouse = gtMaterialInOutWarehouseService.getById(id); - if(gtMaterialInOutWarehouse==null) { - result.error500("未找到对应实体"); - }else { - boolean ok = gtMaterialInOutWarehouseService.removeById(id); - if(ok) { - result.success("删除成功!"); - } - } + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除出入库信息", notes = "删除出入库信息", httpMethod = "POST") + @PostMapping(value = "/delete") + public Result delete(@RequestBody String id) { + JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); + id = String.valueOf(jsonObject.get("id")); + Result result = new Result(); + GtMaterialInOutWarehouse gtMaterialInOutWarehouse = gtMaterialInOutWarehouseService.getById(id); + if (gtMaterialInOutWarehouse == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = gtMaterialInOutWarehouseService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } - return result; - } + return result; + } - /** - * 批量删除 - * @param ids - * @return - */ - @ApiOperation(value = "批量删除出入库信息", notes = "批量删除出入库信息", httpMethod="POST") + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value = "批量删除出入库信息", notes = "批量删除出入库信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "出入库ID字符串", paramType = "query", required = true, dataType = "String") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); - if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); - }else { - this.gtMaterialInOutWarehouseService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); - } - return result; - } + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + Result result = new Result(); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + this.gtMaterialInOutWarehouseService.removeByIds(Arrays.asList(ids.split(","))); + result.success("删除成功!"); + } + return result; + } - /** - * 通过id查询 - * @param id - * @return - */ - @ApiOperation(value = "通过id查询出入库信息", notes = "通过id查询出入库信息" , httpMethod="GET") - @ApiImplicitParam(name = "id", value = "出入库ID", paramType = "query", required = true, dataType = "Integer") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); - GtMaterialInOutWarehouse gtMaterialInOutWarehouse = gtMaterialInOutWarehouseService.getById(id); - if(gtMaterialInOutWarehouse==null) { - result.error500("未找到对应实体"); - }else { - result.setResult(gtMaterialInOutWarehouse); - result.setSuccess(true); - } - return result; - } + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询出入库信息", notes = "通过id查询出入库信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "出入库ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + GtMaterialInOutWarehouse gtMaterialInOutWarehouse = gtMaterialInOutWarehouseService.getById(id); + if (gtMaterialInOutWarehouse == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(gtMaterialInOutWarehouse); + result.setSuccess(true); + } + return result; + } - /** - * 导出excel - * - * @param request - * @param response - */ - @ApiOperation(value = "导出excel出入库信息", notes = "导出excel出入库信息" , httpMethod="POST") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - GtMaterialInOutWarehouse gtMaterialInOutWarehouse = JSON.parseObject(deString, GtMaterialInOutWarehouse.class); - queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialInOutWarehouse, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } + /** + * 导出excel + * + * @param request + * @param response + */ + @ApiOperation(value = "导出excel出入库信息", notes = "导出excel出入库信息", httpMethod = "POST") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = null; + try { + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, "UTF-8"); + GtMaterialInOutWarehouse gtMaterialInOutWarehouse = JSON.parseObject(deString, GtMaterialInOutWarehouse.class); + queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialInOutWarehouse, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } - //Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - List pageList = gtMaterialInOutWarehouseService.list(queryWrapper); - //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "出入库列表"); - mv.addObject(NormalExcelConstants.CLASS, GtMaterialInOutWarehouse.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("出入库列表数据", "导出人:Jeecg", "导出信息")); - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - return mv; - } + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = gtMaterialInOutWarehouseService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "出入库列表"); + mv.addObject(NormalExcelConstants.CLASS, GtMaterialInOutWarehouse.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("出入库列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @ApiOperation(value = "通过excel导入出入库信息", notes = "通过excel导入出入库信息", httpMethod="POST") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List listGtMaterialInOutWarehouses = ExcelImportUtil.importExcel(file.getInputStream(), GtMaterialInOutWarehouse.class, params); - for (GtMaterialInOutWarehouse gtMaterialInOutWarehouseExcel : listGtMaterialInOutWarehouses) { - gtMaterialInOutWarehouseService.save(gtMaterialInOutWarehouseExcel); - } - return Result.ok("文件导入成功！数据行数：" + listGtMaterialInOutWarehouses.size()); - } catch (Exception e) { - log.error(e.getMessage()); - return Result.error("文件导入失败！"); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.ok("文件导入失败！"); - } + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @ApiOperation(value = "通过excel导入出入库信息", notes = "通过excel导入出入库信息", httpMethod = "POST") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listGtMaterialInOutWarehouses = ExcelImportUtil.importExcel(file.getInputStream(), GtMaterialInOutWarehouse.class, params); + for (GtMaterialInOutWarehouse gtMaterialInOutWarehouseExcel : listGtMaterialInOutWarehouses) { + gtMaterialInOutWarehouseService.save(gtMaterialInOutWarehouseExcel); + } + return Result.ok("文件导入成功！数据行数：" + listGtMaterialInOutWarehouses.size()); + } catch (Exception e) { + log.error(e.getMessage()); + return Result.error("文件导入失败！"); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.ok("文件导入失败！"); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPurchaseDemandPlanningController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPurchaseDemandPlanningController.java index b23ad2869..56de158fc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPurchaseDemandPlanningController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPurchaseDemandPlanningController.java @@ -1,48 +1,47 @@ package com.zhgd.xmgl.modules.gt.controller; -import com.zhgd.xmgl.modules.gt.entity.GtMaterialPurchaseDemandPlanning; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.oConvertUtils; -import com.zhgd.xmgl.modules.gt.service.IGtMaterialPurchaseDemandPlanningService; - +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import com.zhgd.xmgl.modules.gt.entity.GtMaterialPurchaseDemandPlanning; +import com.zhgd.xmgl.modules.gt.service.IGtMaterialPurchaseDemandPlanningService; +import com.zhgd.xmgl.util.ReflectionUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - +import org.apache.commons.lang3.StringUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.Arrays; +import java.util.List; +import java.util.Map; - /** +/** * @Title: Controller * @Description: 采购需求计划 * @author： pds - * @date： 2023-04-18 + * @date： 2023-04-18 * @version： V1.0 */ @RestController @@ -50,221 +49,233 @@ import com.alibaba.fastjson.JSONObject; @Slf4j @Api(tags = "GtMaterial采购需求计划") public class GtMaterialPurchaseDemandPlanningController { - @Autowired - private IGtMaterialPurchaseDemandPlanningService gtMaterialPurchaseDemandPlanningService; + @Autowired + private IGtMaterialPurchaseDemandPlanningService gtMaterialPurchaseDemandPlanningService; - /** - * 分页列表查询 - * @param gtMaterialPurchaseDemandPlanning - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @ApiOperation(value = " 分页列表查询采购需求计划信息", notes = "分页列表查询采购需求计划信息", httpMethod="GET") - @GetMapping(value = "/page") - public Result> queryPageList(GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialPurchaseDemandPlanning, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = gtMaterialPurchaseDemandPlanningService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + /** + * 分页列表查询 + * + * @param gtMaterialPurchaseDemandPlanning + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = " 分页列表查询采购需求计划信息", notes = "分页列表查询采购需求计划信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialPurchaseDemandPlanning, req.getParameterMap() + , ReflectionUtil.getFieldNameList(GtMaterialPurchaseDemandPlanning::getMaterialName, GtMaterialPurchaseDemandPlanning::getSpecificationAndModel)); + queryWrapper.lambda() + .like(StringUtils.isNotBlank(gtMaterialPurchaseDemandPlanning.getMaterialName()), GtMaterialPurchaseDemandPlanning::getMaterialName, gtMaterialPurchaseDemandPlanning.getMaterialName()) + .like(StringUtils.isNotBlank(gtMaterialPurchaseDemandPlanning.getSpecificationAndModel()), GtMaterialPurchaseDemandPlanning::getSpecificationAndModel, gtMaterialPurchaseDemandPlanning.getSpecificationAndModel()); - /** - * 列表查询 - * @param gtMaterialPurchaseDemandPlanning - * @param pageNo 页码 - * @param pageSize 条数 - * @param req - * @return - */ - @ApiOperation(value = " 列表查询采购需求计划信息", notes = "列表查询采购需求计划信息", httpMethod="GET") - @GetMapping(value = "/list") - public Result> queryList(GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning, - HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = gtMaterialPurchaseDemandPlanningService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialPurchaseDemandPlanning, req.getParameterMap()); + /** + * 列表查询 + * + * @param gtMaterialPurchaseDemandPlanning + * @param pageNo 页码 + * @param pageSize 条数 + * @param req + * @return + */ + @ApiOperation(value = " 列表查询采购需求计划信息", notes = "列表查询采购需求计划信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning, + HttpServletRequest req) { + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialPurchaseDemandPlanning, req.getParameterMap()); return Result.success(gtMaterialPurchaseDemandPlanningService.list(queryWrapper)); - } + } - /** - * 添加 - * @param gtMaterialPurchaseDemandPlanning - * @return - */ - @ApiOperation(value = " 添加采购需求计划信息", notes = "添加采购需求计划信息" , httpMethod="POST") - @PostMapping(value = "/add") - public Result add(@RequestBody GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning) { - Result result = new Result(); - try { - gtMaterialPurchaseDemandPlanningService.save(gtMaterialPurchaseDemandPlanning); - result.success("添加成功！"); - } catch (Exception e) { - e.printStackTrace(); - log.info(e.getMessage()); - result.error500("操作失败"); - } - return result; - } + /** + * 添加 + * + * @param gtMaterialPurchaseDemandPlanning + * @return + */ + @ApiOperation(value = " 添加采购需求计划信息", notes = "添加采购需求计划信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning) { + Result result = new Result(); + try { + gtMaterialPurchaseDemandPlanningService.save(gtMaterialPurchaseDemandPlanning); + result.success("添加成功！"); + } catch (Exception e) { + e.printStackTrace(); + log.info(e.getMessage()); + result.error500("操作失败"); + } + return result; + } - /** - * 编辑 - * @param gtMaterialPurchaseDemandPlanning - * @return - */ - @ApiOperation(value = "编辑采购需求计划信息", notes = "编辑采购需求计划信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning) { - Result result = new Result(); - GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanningEntity = gtMaterialPurchaseDemandPlanningService.getById(gtMaterialPurchaseDemandPlanning.getId()); - if(gtMaterialPurchaseDemandPlanningEntity==null) { - result.error500("未找到对应实体"); - }else { - gtMaterialPurchaseDemandPlanningService.updateById(gtMaterialPurchaseDemandPlanning); - result.success("修改成功!"); - } + /** + * 编辑 + * + * @param gtMaterialPurchaseDemandPlanning + * @return + */ + @ApiOperation(value = "编辑采购需求计划信息", notes = "编辑采购需求计划信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning) { + Result result = new Result(); + GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanningEntity = gtMaterialPurchaseDemandPlanningService.getById(gtMaterialPurchaseDemandPlanning.getId()); + if (gtMaterialPurchaseDemandPlanningEntity == null) { + result.error500("未找到对应实体"); + } else { + gtMaterialPurchaseDemandPlanningService.updateById(gtMaterialPurchaseDemandPlanning); + result.success("修改成功!"); + } - return result; - } + return result; + } - /** - * 通过id删除 - * @param id - * @return - */ - @ApiOperation(value = "删除采购需求计划信息", notes = "删除采购需求计划信息" , httpMethod="POST") - @PostMapping(value = "/delete") - public Result delete(@RequestBody String id) { - JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); - id = String.valueOf(jsonObject.get("id")); - Result result = new Result(); - GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning = gtMaterialPurchaseDemandPlanningService.getById(id); - if(gtMaterialPurchaseDemandPlanning==null) { - result.error500("未找到对应实体"); - }else { - boolean ok = gtMaterialPurchaseDemandPlanningService.removeById(id); - if(ok) { - result.success("删除成功!"); - } - } + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除采购需求计划信息", notes = "删除采购需求计划信息", httpMethod = "POST") + @PostMapping(value = "/delete") + public Result delete(@RequestBody String id) { + JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); + id = String.valueOf(jsonObject.get("id")); + Result result = new Result(); + GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning = gtMaterialPurchaseDemandPlanningService.getById(id); + if (gtMaterialPurchaseDemandPlanning == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = gtMaterialPurchaseDemandPlanningService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } - return result; - } + return result; + } - /** - * 批量删除 - * @param ids - * @return - */ - @ApiOperation(value = "批量删除采购需求计划信息", notes = "批量删除采购需求计划信息", httpMethod="POST") + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value = "批量删除采购需求计划信息", notes = "批量删除采购需求计划信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "采购需求计划ID字符串", paramType = "query", required = true, dataType = "String") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); - if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); - }else { - this.gtMaterialPurchaseDemandPlanningService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); - } - return result; - } + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + Result result = new Result(); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + this.gtMaterialPurchaseDemandPlanningService.removeByIds(Arrays.asList(ids.split(","))); + result.success("删除成功!"); + } + return result; + } - /** - * 通过id查询 - * @param id - * @return - */ - @ApiOperation(value = "通过id查询采购需求计划信息", notes = "通过id查询采购需求计划信息" , httpMethod="GET") - @ApiImplicitParam(name = "id", value = "采购需求计划ID", paramType = "query", required = true, dataType = "Integer") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); - GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning = gtMaterialPurchaseDemandPlanningService.getById(id); - if(gtMaterialPurchaseDemandPlanning==null) { - result.error500("未找到对应实体"); - }else { - result.setResult(gtMaterialPurchaseDemandPlanning); - result.setSuccess(true); - } - return result; - } + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询采购需求计划信息", notes = "通过id查询采购需求计划信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "采购需求计划ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning = gtMaterialPurchaseDemandPlanningService.getById(id); + if (gtMaterialPurchaseDemandPlanning == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(gtMaterialPurchaseDemandPlanning); + result.setSuccess(true); + } + return result; + } - /** - * 导出excel - * - * @param request - * @param response - */ - @ApiOperation(value = "导出excel采购需求计划信息", notes = "导出excel采购需求计划信息" , httpMethod="POST") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning = JSON.parseObject(deString, GtMaterialPurchaseDemandPlanning.class); - queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialPurchaseDemandPlanning, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } + /** + * 导出excel + * + * @param request + * @param response + */ + @ApiOperation(value = "导出excel采购需求计划信息", notes = "导出excel采购需求计划信息", httpMethod = "POST") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = null; + try { + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, "UTF-8"); + GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanning = JSON.parseObject(deString, GtMaterialPurchaseDemandPlanning.class); + queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialPurchaseDemandPlanning, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } - //Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - List pageList = gtMaterialPurchaseDemandPlanningService.list(queryWrapper); - //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "采购需求计划列表"); - mv.addObject(NormalExcelConstants.CLASS, GtMaterialPurchaseDemandPlanning.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("采购需求计划列表数据", "导出人:Jeecg", "导出信息")); - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - return mv; - } + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = gtMaterialPurchaseDemandPlanningService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "采购需求计划列表"); + mv.addObject(NormalExcelConstants.CLASS, GtMaterialPurchaseDemandPlanning.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("采购需求计划列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @ApiOperation(value = "通过excel导入采购需求计划信息", notes = "通过excel导入采购需求计划信息", httpMethod="POST") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List listGtMaterialPurchaseDemandPlannings = ExcelImportUtil.importExcel(file.getInputStream(), GtMaterialPurchaseDemandPlanning.class, params); - for (GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanningExcel : listGtMaterialPurchaseDemandPlannings) { - gtMaterialPurchaseDemandPlanningService.save(gtMaterialPurchaseDemandPlanningExcel); - } - return Result.ok("文件导入成功！数据行数：" + listGtMaterialPurchaseDemandPlannings.size()); - } catch (Exception e) { - log.error(e.getMessage()); - return Result.error("文件导入失败！"); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.ok("文件导入失败！"); - } + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @ApiOperation(value = "通过excel导入采购需求计划信息", notes = "通过excel导入采购需求计划信息", httpMethod = "POST") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listGtMaterialPurchaseDemandPlannings = ExcelImportUtil.importExcel(file.getInputStream(), GtMaterialPurchaseDemandPlanning.class, params); + for (GtMaterialPurchaseDemandPlanning gtMaterialPurchaseDemandPlanningExcel : listGtMaterialPurchaseDemandPlannings) { + gtMaterialPurchaseDemandPlanningService.save(gtMaterialPurchaseDemandPlanningExcel); + } + return Result.ok("文件导入成功！数据行数：" + listGtMaterialPurchaseDemandPlannings.size()); + } catch (Exception e) { + log.error(e.getMessage()); + return Result.error("文件导入失败！"); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.ok("文件导入失败！"); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSupplierEvaluationRecordController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSupplierEvaluationRecordController.java index e7e36cb67..f62723043 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSupplierEvaluationRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSupplierEvaluationRecordController.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.gt.controller; import com.zhgd.xmgl.modules.gt.service.IGtMaterialSupplierEvaluationRecordService; +import com.zhgd.xmgl.util.ReflectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -23,6 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -68,7 +70,10 @@ public class GtMaterialSupplierEvaluationRecordController { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialSupplierEvaluationRecord, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialSupplierEvaluationRecord, req.getParameterMap() + , ReflectionUtil.getFieldNameList(GtMaterialSupplierEvaluationRecord::getVendorName)); + queryWrapper.lambda() + .like(StringUtils.isNotBlank(gtMaterialSupplierEvaluationRecord.getVendorName()), GtMaterialSupplierEvaluationRecord::getVendorName, gtMaterialSupplierEvaluationRecord.getVendorName()); Page page = new Page(pageNo, pageSize); IPage pageList = gtMaterialSupplierEvaluationRecordService.page(page, queryWrapper); result.setSuccess(true); diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderController.java index ac9721e84..af032019e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderController.java @@ -1,48 +1,47 @@ package com.zhgd.xmgl.modules.gt.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.gt.entity.GtMaterialTender; import com.zhgd.xmgl.modules.gt.service.IGtMaterialTenderService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.xmgl.util.ReflectionUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - +import org.apache.commons.lang3.StringUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.Arrays; +import java.util.List; +import java.util.Map; - /** +/** * @Title: Controller * @Description: 招标 * @author： pds - * @date： 2023-04-18 + * @date： 2023-04-18 * @version： V1.0 */ @RestController @@ -50,221 +49,231 @@ import com.alibaba.fastjson.JSONObject; @Slf4j @Api(tags = "GtMaterial招标") public class GtMaterialTenderController { - @Autowired - private IGtMaterialTenderService gtMaterialTenderService; + @Autowired + private IGtMaterialTenderService gtMaterialTenderService; - /** - * 分页列表查询 - * @param gtMaterialTender - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @ApiOperation(value = " 分页列表查询招标信息", notes = "分页列表查询招标信息", httpMethod="GET") - @GetMapping(value = "/page") - public Result> queryPageList(GtMaterialTender gtMaterialTender, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialTender, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = gtMaterialTenderService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + /** + * 分页列表查询 + * + * @param gtMaterialTender + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = " 分页列表查询招标信息", notes = "分页列表查询招标信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(GtMaterialTender gtMaterialTender, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialTender, req.getParameterMap() + , ReflectionUtil.getFieldNameList(GtMaterialTender::getTenderName)); + queryWrapper.lambda() + .like(StringUtils.isNotBlank(gtMaterialTender.getTenderName()), GtMaterialTender::getTenderName, gtMaterialTender.getTenderName()); + Page page = new Page(pageNo, pageSize); + IPage pageList = gtMaterialTenderService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } - /** - * 列表查询 - * @param gtMaterialTender - * @param pageNo 页码 - * @param pageSize 条数 - * @param req - * @return - */ - @ApiOperation(value = " 列表查询招标信息", notes = "列表查询招标信息", httpMethod="GET") - @GetMapping(value = "/list") - public Result> queryList(GtMaterialTender gtMaterialTender, - HttpServletRequest req) { + /** + * 列表查询 + * + * @param gtMaterialTender + * @param pageNo 页码 + * @param pageSize 条数 + * @param req + * @return + */ + @ApiOperation(value = " 列表查询招标信息", notes = "列表查询招标信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(GtMaterialTender gtMaterialTender, + HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialTender, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialTender, req.getParameterMap()); return Result.success(gtMaterialTenderService.list(queryWrapper)); - } + } - /** - * 添加 - * @param gtMaterialTender - * @return - */ - @ApiOperation(value = " 添加招标信息", notes = "添加招标信息" , httpMethod="POST") - @PostMapping(value = "/add") - public Result add(@RequestBody GtMaterialTender gtMaterialTender) { - Result result = new Result(); - try { - gtMaterialTenderService.save(gtMaterialTender); - result.success("添加成功！"); - } catch (Exception e) { - e.printStackTrace(); - log.info(e.getMessage()); - result.error500("操作失败"); - } - return result; - } + /** + * 添加 + * + * @param gtMaterialTender + * @return + */ + @ApiOperation(value = " 添加招标信息", notes = "添加招标信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody GtMaterialTender gtMaterialTender) { + Result result = new Result(); + try { + gtMaterialTenderService.save(gtMaterialTender); + result.success("添加成功！"); + } catch (Exception e) { + e.printStackTrace(); + log.info(e.getMessage()); + result.error500("操作失败"); + } + return result; + } - /** - * 编辑 - * @param gtMaterialTender - * @return - */ - @ApiOperation(value = "编辑招标信息", notes = "编辑招标信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody GtMaterialTender gtMaterialTender) { - Result result = new Result(); - GtMaterialTender gtMaterialTenderEntity = gtMaterialTenderService.getById(gtMaterialTender.getId()); - if(gtMaterialTenderEntity==null) { - result.error500("未找到对应实体"); - }else { - gtMaterialTenderService.updateById(gtMaterialTender); - result.success("修改成功!"); - } + /** + * 编辑 + * + * @param gtMaterialTender + * @return + */ + @ApiOperation(value = "编辑招标信息", notes = "编辑招标信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody GtMaterialTender gtMaterialTender) { + Result result = new Result(); + GtMaterialTender gtMaterialTenderEntity = gtMaterialTenderService.getById(gtMaterialTender.getId()); + if (gtMaterialTenderEntity == null) { + result.error500("未找到对应实体"); + } else { + gtMaterialTenderService.updateById(gtMaterialTender); + result.success("修改成功!"); + } - return result; - } + return result; + } - /** - * 通过id删除 - * @param id - * @return - */ - @ApiOperation(value = "删除招标信息", notes = "删除招标信息" , httpMethod="POST") - @PostMapping(value = "/delete") - public Result delete(@RequestBody String id) { - JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); - id = String.valueOf(jsonObject.get("id")); - Result result = new Result(); - GtMaterialTender gtMaterialTender = gtMaterialTenderService.getById(id); - if(gtMaterialTender==null) { - result.error500("未找到对应实体"); - }else { - boolean ok = gtMaterialTenderService.removeById(id); - if(ok) { - result.success("删除成功!"); - } - } + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除招标信息", notes = "删除招标信息", httpMethod = "POST") + @PostMapping(value = "/delete") + public Result delete(@RequestBody String id) { + JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); + id = String.valueOf(jsonObject.get("id")); + Result result = new Result(); + GtMaterialTender gtMaterialTender = gtMaterialTenderService.getById(id); + if (gtMaterialTender == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = gtMaterialTenderService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } - return result; - } + return result; + } - /** - * 批量删除 - * @param ids - * @return - */ - @ApiOperation(value = "批量删除招标信息", notes = "批量删除招标信息", httpMethod="POST") + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value = "批量删除招标信息", notes = "批量删除招标信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "招标ID字符串", paramType = "query", required = true, dataType = "String") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); - if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); - }else { - this.gtMaterialTenderService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); - } - return result; - } + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + Result result = new Result(); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + this.gtMaterialTenderService.removeByIds(Arrays.asList(ids.split(","))); + result.success("删除成功!"); + } + return result; + } - /** - * 通过id查询 - * @param id - * @return - */ - @ApiOperation(value = "通过id查询招标信息", notes = "通过id查询招标信息" , httpMethod="GET") - @ApiImplicitParam(name = "id", value = "招标ID", paramType = "query", required = true, dataType = "Integer") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); - GtMaterialTender gtMaterialTender = gtMaterialTenderService.getById(id); - if(gtMaterialTender==null) { - result.error500("未找到对应实体"); - }else { - result.setResult(gtMaterialTender); - result.setSuccess(true); - } - return result; - } + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询招标信息", notes = "通过id查询招标信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "招标ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + GtMaterialTender gtMaterialTender = gtMaterialTenderService.getById(id); + if (gtMaterialTender == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(gtMaterialTender); + result.setSuccess(true); + } + return result; + } - /** - * 导出excel - * - * @param request - * @param response - */ - @ApiOperation(value = "导出excel招标信息", notes = "导出excel招标信息" , httpMethod="POST") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - GtMaterialTender gtMaterialTender = JSON.parseObject(deString, GtMaterialTender.class); - queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialTender, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } + /** + * 导出excel + * + * @param request + * @param response + */ + @ApiOperation(value = "导出excel招标信息", notes = "导出excel招标信息", httpMethod = "POST") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = null; + try { + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, "UTF-8"); + GtMaterialTender gtMaterialTender = JSON.parseObject(deString, GtMaterialTender.class); + queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialTender, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } - //Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - List pageList = gtMaterialTenderService.list(queryWrapper); - //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "招标列表"); - mv.addObject(NormalExcelConstants.CLASS, GtMaterialTender.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("招标列表数据", "导出人:Jeecg", "导出信息")); - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - return mv; - } + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = gtMaterialTenderService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "招标列表"); + mv.addObject(NormalExcelConstants.CLASS, GtMaterialTender.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("招标列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @ApiOperation(value = "通过excel导入招标信息", notes = "通过excel导入招标信息", httpMethod="POST") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List listGtMaterialTenders = ExcelImportUtil.importExcel(file.getInputStream(), GtMaterialTender.class, params); - for (GtMaterialTender gtMaterialTenderExcel : listGtMaterialTenders) { - gtMaterialTenderService.save(gtMaterialTenderExcel); - } - return Result.ok("文件导入成功！数据行数：" + listGtMaterialTenders.size()); - } catch (Exception e) { - log.error(e.getMessage()); - return Result.error("文件导入失败！"); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.ok("文件导入失败！"); - } + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @ApiOperation(value = "通过excel导入招标信息", notes = "通过excel导入招标信息", httpMethod = "POST") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listGtMaterialTenders = ExcelImportUtil.importExcel(file.getInputStream(), GtMaterialTender.class, params); + for (GtMaterialTender gtMaterialTenderExcel : listGtMaterialTenders) { + gtMaterialTenderService.save(gtMaterialTenderExcel); + } + return Result.ok("文件导入成功！数据行数：" + listGtMaterialTenders.size()); + } catch (Exception e) { + log.error(e.getMessage()); + return Result.error("文件导入失败！"); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.ok("文件导入失败！"); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialVendorController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialVendorController.java index 9c3d215ba..baba8b3f4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialVendorController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialVendorController.java @@ -1,48 +1,47 @@ package com.zhgd.xmgl.modules.gt.controller; -import com.zhgd.xmgl.modules.gt.service.IGtMaterialVendorService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.gt.entity.GtMaterialVendor; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.xmgl.modules.gt.service.IGtMaterialVendorService; +import com.zhgd.xmgl.util.ReflectionUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - +import org.apache.commons.lang3.StringUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.Arrays; +import java.util.List; +import java.util.Map; - /** +/** * @Title: Controller * @Description: 供应商 * @author： pds - * @date： 2023-04-18 + * @date： 2023-04-18 * @version： V1.0 */ @RestController @@ -50,221 +49,236 @@ import com.alibaba.fastjson.JSONObject; @Slf4j @Api(tags = "GtMaterial供应商") public class GtMaterialVendorController { - @Autowired - private IGtMaterialVendorService gtMaterialVendorService; + @Autowired + private IGtMaterialVendorService gtMaterialVendorService; - /** - * 分页列表查询 - * @param gtMaterialVendor - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @ApiOperation(value = " 分页列表查询供应商信息", notes = "分页列表查询供应商信息", httpMethod="GET") - @GetMapping(value = "/page") - public Result> queryPageList(GtMaterialVendor gtMaterialVendor, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialVendor, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = gtMaterialVendorService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + /** + * 分页列表查询 + * + * @param gtMaterialVendor + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = " 分页列表查询供应商信息", notes = "分页列表查询供应商信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(GtMaterialVendor gtMaterialVendor, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialVendor, req.getParameterMap() + , ReflectionUtil.getFieldNameList(GtMaterialVendor::getLookupCode, GtMaterialVendor::getVendorName, GtMaterialVendor::getTaxpayerIdentificationNumber, + GtMaterialVendor::getContact, GtMaterialVendor::getContactNumber)); + queryWrapper.lambda() + .like(StringUtils.isNotBlank(gtMaterialVendor.getLookupCode()), GtMaterialVendor::getLookupCode, gtMaterialVendor.getLookupCode()) + .like(StringUtils.isNotBlank(gtMaterialVendor.getVendorName()), GtMaterialVendor::getVendorName, gtMaterialVendor.getVendorName()) + .like(StringUtils.isNotBlank(gtMaterialVendor.getTaxpayerIdentificationNumber()), GtMaterialVendor::getTaxpayerIdentificationNumber, gtMaterialVendor.getTaxpayerIdentificationNumber()) + .like(StringUtils.isNotBlank(gtMaterialVendor.getContact()), GtMaterialVendor::getContact, gtMaterialVendor.getContact()) + .like(StringUtils.isNotBlank(gtMaterialVendor.getContactNumber()), GtMaterialVendor::getContactNumber, gtMaterialVendor.getContactNumber()); + Page page = new Page(pageNo, pageSize); + IPage pageList = gtMaterialVendorService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } - /** - * 列表查询 - * @param gtMaterialVendor - * @param pageNo 页码 - * @param pageSize 条数 - * @param req - * @return - */ - @ApiOperation(value = " 列表查询供应商信息", notes = "列表查询供应商信息", httpMethod="GET") - @GetMapping(value = "/list") - public Result> queryList(GtMaterialVendor gtMaterialVendor, - HttpServletRequest req) { + /** + * 列表查询 + * + * @param gtMaterialVendor + * @param pageNo 页码 + * @param pageSize 条数 + * @param req + * @return + */ + @ApiOperation(value = " 列表查询供应商信息", notes = "列表查询供应商信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(GtMaterialVendor gtMaterialVendor, + HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialVendor, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialVendor, req.getParameterMap()); return Result.success(gtMaterialVendorService.list(queryWrapper)); - } + } - /** - * 添加 - * @param gtMaterialVendor - * @return - */ - @ApiOperation(value = " 添加供应商信息", notes = "添加供应商信息" , httpMethod="POST") - @PostMapping(value = "/add") - public Result add(@RequestBody GtMaterialVendor gtMaterialVendor) { - Result result = new Result(); - try { - gtMaterialVendorService.save(gtMaterialVendor); - result.success("添加成功！"); - } catch (Exception e) { - e.printStackTrace(); - log.info(e.getMessage()); - result.error500("操作失败"); - } - return result; - } + /** + * 添加 + * + * @param gtMaterialVendor + * @return + */ + @ApiOperation(value = " 添加供应商信息", notes = "添加供应商信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody GtMaterialVendor gtMaterialVendor) { + Result result = new Result(); + try { + gtMaterialVendorService.save(gtMaterialVendor); + result.success("添加成功！"); + } catch (Exception e) { + e.printStackTrace(); + log.info(e.getMessage()); + result.error500("操作失败"); + } + return result; + } - /** - * 编辑 - * @param gtMaterialVendor - * @return - */ - @ApiOperation(value = "编辑供应商信息", notes = "编辑供应商信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody GtMaterialVendor gtMaterialVendor) { - Result result = new Result(); - GtMaterialVendor gtMaterialVendorEntity = gtMaterialVendorService.getById(gtMaterialVendor.getId()); - if(gtMaterialVendorEntity==null) { - result.error500("未找到对应实体"); - }else { - gtMaterialVendorService.updateById(gtMaterialVendor); - result.success("修改成功!"); - } + /** + * 编辑 + * + * @param gtMaterialVendor + * @return + */ + @ApiOperation(value = "编辑供应商信息", notes = "编辑供应商信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody GtMaterialVendor gtMaterialVendor) { + Result result = new Result(); + GtMaterialVendor gtMaterialVendorEntity = gtMaterialVendorService.getById(gtMaterialVendor.getId()); + if (gtMaterialVendorEntity == null) { + result.error500("未找到对应实体"); + } else { + gtMaterialVendorService.updateById(gtMaterialVendor); + result.success("修改成功!"); + } - return result; - } + return result; + } - /** - * 通过id删除 - * @param id - * @return - */ - @ApiOperation(value = "删除供应商信息", notes = "删除供应商信息" , httpMethod="POST") - @PostMapping(value = "/delete") - public Result delete(@RequestBody String id) { - JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); - id = String.valueOf(jsonObject.get("id")); - Result result = new Result(); - GtMaterialVendor gtMaterialVendor = gtMaterialVendorService.getById(id); - if(gtMaterialVendor==null) { - result.error500("未找到对应实体"); - }else { - boolean ok = gtMaterialVendorService.removeById(id); - if(ok) { - result.success("删除成功!"); - } - } + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除供应商信息", notes = "删除供应商信息", httpMethod = "POST") + @PostMapping(value = "/delete") + public Result delete(@RequestBody String id) { + JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); + id = String.valueOf(jsonObject.get("id")); + Result result = new Result(); + GtMaterialVendor gtMaterialVendor = gtMaterialVendorService.getById(id); + if (gtMaterialVendor == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = gtMaterialVendorService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } - return result; - } + return result; + } - /** - * 批量删除 - * @param ids - * @return - */ - @ApiOperation(value = "批量删除供应商信息", notes = "批量删除供应商信息", httpMethod="POST") + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value = "批量删除供应商信息", notes = "批量删除供应商信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "供应商ID字符串", paramType = "query", required = true, dataType = "String") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); - if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); - }else { - this.gtMaterialVendorService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); - } - return result; - } + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + Result result = new Result(); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + this.gtMaterialVendorService.removeByIds(Arrays.asList(ids.split(","))); + result.success("删除成功!"); + } + return result; + } - /** - * 通过id查询 - * @param id - * @return - */ - @ApiOperation(value = "通过id查询供应商信息", notes = "通过id查询供应商信息" , httpMethod="GET") - @ApiImplicitParam(name = "id", value = "供应商ID", paramType = "query", required = true, dataType = "Integer") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); - GtMaterialVendor gtMaterialVendor = gtMaterialVendorService.getById(id); - if(gtMaterialVendor==null) { - result.error500("未找到对应实体"); - }else { - result.setResult(gtMaterialVendor); - result.setSuccess(true); - } - return result; - } + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询供应商信息", notes = "通过id查询供应商信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "供应商ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + GtMaterialVendor gtMaterialVendor = gtMaterialVendorService.getById(id); + if (gtMaterialVendor == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(gtMaterialVendor); + result.setSuccess(true); + } + return result; + } - /** - * 导出excel - * - * @param request - * @param response - */ - @ApiOperation(value = "导出excel供应商信息", notes = "导出excel供应商信息" , httpMethod="POST") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - GtMaterialVendor gtMaterialVendor = JSON.parseObject(deString, GtMaterialVendor.class); - queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialVendor, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } + /** + * 导出excel + * + * @param request + * @param response + */ + @ApiOperation(value = "导出excel供应商信息", notes = "导出excel供应商信息", httpMethod = "POST") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = null; + try { + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, "UTF-8"); + GtMaterialVendor gtMaterialVendor = JSON.parseObject(deString, GtMaterialVendor.class); + queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialVendor, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } - //Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - List pageList = gtMaterialVendorService.list(queryWrapper); - //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "供应商列表"); - mv.addObject(NormalExcelConstants.CLASS, GtMaterialVendor.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("供应商列表数据", "导出人:Jeecg", "导出信息")); - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - return mv; - } + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = gtMaterialVendorService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "供应商列表"); + mv.addObject(NormalExcelConstants.CLASS, GtMaterialVendor.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("供应商列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @ApiOperation(value = "通过excel导入供应商信息", notes = "通过excel导入供应商信息", httpMethod="POST") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List listGtMaterialVendors = ExcelImportUtil.importExcel(file.getInputStream(), GtMaterialVendor.class, params); - for (GtMaterialVendor gtMaterialVendorExcel : listGtMaterialVendors) { - gtMaterialVendorService.save(gtMaterialVendorExcel); - } - return Result.ok("文件导入成功！数据行数：" + listGtMaterialVendors.size()); - } catch (Exception e) { - log.error(e.getMessage()); - return Result.error("文件导入失败！"); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.ok("文件导入失败！"); - } + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @ApiOperation(value = "通过excel导入供应商信息", notes = "通过excel导入供应商信息", httpMethod = "POST") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listGtMaterialVendors = ExcelImportUtil.importExcel(file.getInputStream(), GtMaterialVendor.class, params); + for (GtMaterialVendor gtMaterialVendorExcel : listGtMaterialVendors) { + gtMaterialVendorService.save(gtMaterialVendorExcel); + } + return Result.ok("文件导入成功！数据行数：" + listGtMaterialVendors.size()); + } catch (Exception e) { + log.error(e.getMessage()); + return Result.error("文件导入失败！"); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.ok("文件导入失败！"); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialInOutWarehouse.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialInOutWarehouse.java index 6f4000089..841a3c03e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialInOutWarehouse.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialInOutWarehouse.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.gt.entity; import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -91,14 +92,26 @@ public class GtMaterialInOutWarehouse implements Serializable { private java.lang.String projectSn ; /**创建时间（制单时间）*/ @Excel(name = "创建时间（制单时间）", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="创建时间（制单时间）") - private java.util.Date createTime ; - /**更新时间*/ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间（制单时间）") + private java.util.Date createTime; + /** + * 更新时间 + */ @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="更新时间") - private java.util.Date updateTime ; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private java.util.Date updateTime; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date startTime; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date endTime; } diff --git a/src/main/resources/application-zjwj-gsx.properties b/src/main/resources/application-zjwj-gsx.properties new file mode 100644 index 000000000..53df47132 --- /dev/null +++ b/src/main/resources/application-zjwj-gsx.properties @@ -0,0 +1,74 @@ +#http.port=30250 +http.port=65000 +#spring.datasource.url=jdbc:mysql://124.71.178.44:3306/wisdomsite_lgdc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true +#spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC +#spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true +#spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true +#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +#spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true +spring.datasource.url=jdbc:mysql://localhost:3306/wisdomsite_zjwj?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) +spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==) +server.port=30000 +#server.port=30246 +basePath=C:/jxj/prod/backEnd/itbgpImage/ +server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/ +#arcsoft.dllPath=D:/hz/wisdomSite/src/main/resources/dll +#basePath=F:/zhgd/itbgpImage/ +#server.tomcat.basedir=F:/zhgd/tempImage/ +#arcsoft.dllPath=F:/zhgd/dll +arcsoft.dllPath=C:/jxj/prod/backEnd/dll +security.enable=false +isGetStandardData=false +isGetEnvironmentData=false +isGetFaceFeatureDate=false +#\u6D77\u5EB7\u89C6\u9891\u62A5\u8B66\u56FE\u7247IP\u7AEF\u53E3\u66FF\u6362 +video.alarm.newUrl=223.82.100.80:6040 +wx-appid= +wx-AppSecret= +mqtt-scope=zjsjTopic +serverUrl=http://124.71.67.160:8088/ +#serverUrl=http://182.90.224.237:7000 +#serverUrl=http://127.0.0.1:6023 +#\u89C6\u9891\u5206\u6790url +video-analysis-url= +server.ssl.enabled=false +#\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A +defaultZwComapnySn= +#\u6587\u4EF6\u5B58\u50A8\u914D\u7F6E +#\u9ED8\u8BA4\u4F7F\u7528\u7684\u5B58\u50A8\u5E73\u53F0 +spring.file-storage.default-platform=local +#".min.jpg" #\u7F29\u7565\u56FE\u540E\u7F00\uFF0C\u4F8B\u5982\u3010.min.jpg\u3011\u3010.png\u3011 +spring.file-storage.thumbnail-suffix=.jpg +# \u672C\u5730\u5B58\u50A8\uFF0C\u4E0D\u4F7F\u7528\u7684\u60C5\u51B5\u4E0B\u53EF\u4EE5\u4E0D\u5199 +# \u5B58\u50A8\u5E73\u53F0\u6807\u8BC6 +spring.file-storage.local[0].platform=local +#\u542F\u7528\u5B58\u50A8 +spring.file-storage.local[0].enable-storage=true +#\u542F\u7528\u8BBF\u95EE\uFF08\u7EBF\u4E0A\u8BF7\u4F7F\u7528 Nginx \u914D\u7F6E\uFF0C\u6548\u7387\u66F4\u9AD8\uFF09 +spring.file-storage.local[0].enable-access=false +# \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D +spring.file-storage.local[0].domain= +# \u5B58\u50A8\u5730\u5740 +spring.file-storage.local[0].base-path=C:/jxj/prod/backEnd/itbgpImage/ +# \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6 +spring.file-storage.local[0].path-patterns= +spring.file-storage.aliyun-oss[0].platform=aliyun-oss +spring.file-storage.aliyun-oss[0].enable-storage=false +spring.file-storage.aliyun-oss[0].access-key= +spring.file-storage.aliyun-oss[0].secret-key= +spring.file-storage.aliyun-oss[0].end-point= +spring.file-storage.aliyun-oss[0].bucket-name= +# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/ +spring.file-storage.aliyun-oss[0].domain= +spring.file-storage.aliyun-oss[0].base-path= +# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D +spring.boot.admin.client.instance.service-url=http://localhost:18070 +spring.boot.admin.client.instance.name=zjsj +# \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740 +double-carbon.water-data-url=http://test.cesms.net +double-carbon.ammeter-data-url=http://test.cesms.net +license.licensePath=C:/jxj/prod/backEnd/license/license.lic +license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore +#\u9AD8\u652F\u6A21\u7684tcp\u670D\u52A1\u7AEF\u7684\u7AEF\u53E3\u53F7 +high_formwork.netty.port=15333