diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java index 67f80b0..3360e58 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java @@ -87,7 +87,7 @@ public class PartyEventMaintainController { @ApiOperation("后台查询列表") @PostMapping("/styleProject/list") - public BaseResponse> queryStyleAndProject(@RequestBody EventMaintainInVO inVO) { + public BaseResponse> queryStyleAndProject(@RequestBody(required = false) EventMaintainInVO inVO) { return BaseResponse.success(eventStyleService.queryStyleAndProject(inVO)); } @@ -103,6 +103,7 @@ public class PartyEventMaintainController { public BaseResponse sendStyleOrProject(@RequestParam("id") String id,@RequestParam("status") String status) { return BaseResponse.success(eventStyleService.sendStyleOrProject(id, status)); } + @ApiOperation("删除风采或项目") @GetMapping("/styleProject/delete") public BaseResponse deleteStyleOrProject(@RequestParam("id") String id) { @@ -112,12 +113,12 @@ public class PartyEventMaintainController { @ApiOperation("后台查询列表") @PostMapping("/suggestion/list") - public BaseResponse> querySuggestion(@RequestBody EventMaintainInVO inVO) { + public BaseResponse> querySuggestion(@RequestBody(required = false) EventMaintainInVO inVO) { return BaseResponse.success(eventContactSuggestionService.querySuggestion(inVO)); } @GetMapping(value = "/suggestion/export/") - public BaseResponse export(@RequestParam("ids") List ids) { + public BaseResponse export(@RequestParam(value = "ids",required = false) List ids) { ExcelTable table = eventContactSuggestionService.export(ids); ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); HttpServletResponse response = requestAttributes.getResponse(); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactSuggestionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactSuggestionServiceImpl.java index ca43644..265b054 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactSuggestionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactSuggestionServiceImpl.java @@ -58,6 +58,9 @@ public class EventContactSuggestionServiceImpl extends ServiceImpl querySuggestion(EventMaintainInVO inVO) { + if (ObjectUtil.isNull(inVO)) { + return this.list(); + } LambdaQueryWrapper query = Wrappers.lambdaQuery(); if (ObjectUtil.isNotNull(inVO.getStartTime())) { query.gt(EventContactSuggestion::getCreateTime, inVO.getStartTime()); @@ -81,41 +84,22 @@ public class EventContactSuggestionServiceImpl extends ServiceImpl list = this.list(query); Map titleMap = new LinkedHashMap<>(16); - titleMap.put("num", "num"); - titleMap.put("contact_name", "联系人名称"); - titleMap.put("suggestion_type", "意见类型"); - titleMap.put("suggestion_content", "意见内容"); + titleMap.put("num", "序号"); + titleMap.put("contactName", "联系人名称"); + titleMap.put("suggestionType", "意见类型"); + titleMap.put("suggestionContent", "意见内容"); titleMap.put("instructions", "补充说明"); - titleMap.put("suggestion_sponsor", "意见提出人"); - titleMap.put("suggestion_sponsor_id", "意见提出人id"); - titleMap.put("suggestion_sponsor_unit", "意见提出人组织机构"); - titleMap.put("remark", "备注"); - titleMap.put("create_time", "创建时间"); + titleMap.put("suggestionSponsor", "意见提出人"); + titleMap.put("suggestionSponsorId", "意见提出人id"); + titleMap.put("suggestionSponsorUnit", "意见提出人组织机构"); + titleMap.put("createTime", "创建时间"); titleMap.put("company", "公司"); //制作表格 ExcelTable table = new ExcelTable("第一页"); DateFormat df = new SimpleDateFormat("yyyyMMddhhmmss"); - table.setFileName("表" + df.format(new Date())); - /*第0行*/ - ExcelTr tr0 = new ExcelTr(); - tr0.setHeight(800); - tr0.add(new ExcelTd().setTdValue("表").setIsRowMerge(true).setRowMergeNum(8).setCellStyleKey("name")); - table.add(tr0); - /*第一行*/ - ExcelTr tr1 = new ExcelTr(); - tr1.setHeight(480); - tr1.add(new ExcelTd().setTdValue("序号").setCellStyleKey("title1")); - tr1.add(new ExcelTd().setTdValue("联系人名称").setCellStyleKey("title1")); - tr1.add(new ExcelTd().setTdValue("意见类型").setCellStyleKey("title1")); - tr1.add(new ExcelTd().setTdValue("意见内容").setCellStyleKey("title1")); - tr1.add(new ExcelTd().setTdValue("补充说明").setCellStyleKey("title1")); - tr1.add(new ExcelTd().setTdValue("意见提出人").setCellStyleKey("title1")); - tr1.add(new ExcelTd().setTdValue("意见提出人公司").setCellStyleKey("title1")); - tr1.add(new ExcelTd().setTdValue("意见提出人组织机构").setCellStyleKey("title1")); - tr1.add(new ExcelTd().setTdValue("备注").setCellStyleKey("title1")); - tr1.add(new ExcelTd().setTdValue("创建时间").setCellStyleKey("title1")); + table.setFileName(df.format(new Date())); + - table.add(tr1); /*第4行开始投递数据表头*/ ExcelTr tr4 = new ExcelTr(); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java index 9c387ff..1a91a74 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java @@ -65,28 +65,28 @@ public class EventMockDataServiceImpl extends ServiceImpl list = this.list(query.eq(EventMockData::getStatus, "1")); list.forEach(l -> { String dataPy = l.getDataPy(); - if ("ddjyze".equals(dataPy)) { + if ("ddjyze".equals(dataPy) && StrUtil.isNotBlank(inVO.getDdjyze())) { l.setDataValue(inVO.getDdjyze()); } - if ("ddzsl".equals(dataPy)) { + if ("ddzsl".equals(dataPy) && StrUtil.isNotBlank(inVO.getDdzsl())) { l.setDataValue(inVO.getDdzsl()); } - if ("spsl".equals(dataPy)) { + if ("spsl".equals(dataPy) && StrUtil.isNotBlank(inVO.getSpsl())) { l.setDataValue(inVO.getSpsl()); } - if ("xysl".equals(dataPy)) { + if ("xysl".equals(dataPy) && StrUtil.isNotBlank(inVO.getXysl())) { l.setDataValue(inVO.getXysl()); } - if ("yxdy".equals(dataPy)) { + if ("yxdy".equals(dataPy) && StrUtil.isNotBlank(inVO.getYxdy())) { l.setDataValue(inVO.getYxdy()); } - if ("ftrs".equals(dataPy)) { + if ("ftrs".equals(dataPy) && StrUtil.isNotBlank(inVO.getFtrs())) { l.setDataValue(inVO.getFtrs()); } - if ("bzxq".equals(dataPy)) { + if ("bzxq".equals(dataPy) && StrUtil.isNotBlank(inVO.getBzxq())) { l.setDataValue(inVO.getBzxq()); } - if ("gjknxm".equals(dataPy)) { + if ("gjknxm".equals(dataPy) && StrUtil.isNotBlank(inVO.getGjknxm())) { l.setDataValue(inVO.getGjknxm()); } }); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java index 3b0d204..fd9c4df 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java @@ -86,55 +86,58 @@ public class EventStyleServiceImpl extends ServiceImpl queryStyleAndProject(EventMaintainInVO inVO) { - if (ObjectUtil.isNotNull(inVO)) { - inVO = new EventMaintainInVO(); + List styleList = new ArrayList<>(); + List subjectList = new ArrayList<>(); + LambdaQueryWrapper queryStyle = Wrappers.lambdaQuery(); + queryStyle.ne(EventStyle::getDeleteFlag, "1"); + + LambdaQueryWrapper queryProject = Wrappers.lambdaQuery(); + queryProject.ne(EventSubject::getDeleteFlag, "1"); + if (ObjectUtil.isNull(inVO)) { + styleList = this.list(queryStyle); + subjectList = eventSubjectService.list(queryProject); + } else { + if (StrUtil.isNotBlank(inVO.getType()) && !"3".equals(inVO.getType()) ) { + if (StrUtil.isNotBlank(inVO.getTitle())) { + queryStyle.like(EventStyle::getTitle, inVO.getTitle()); + } + if (StrUtil.isNotBlank(inVO.getType())) { + queryStyle.eq(EventStyle::getBanner, "1".equals(inVO.getType()) ? "1" : "0"); + } + if (StrUtil.isNotBlank(inVO.getStatus())) { + queryStyle.eq(EventStyle::getStatus, inVO.getStatus()); + } + if (ObjectUtil.isNotNull(inVO.getStartTime())) { + queryStyle.gt(EventStyle::getSendTime, inVO.getStartTime()); + } + + if (ObjectUtil.isNotNull(inVO.getEndTime())) { + queryStyle.lt(EventStyle::getSendTime, inVO.getEndTime()); + } + styleList = this.list(queryStyle); + } + + + if (StrUtil.isNotBlank(inVO.getType()) && !"1".equals(inVO.getType()) && !"2".equals(inVO.getType())) { + + if (StrUtil.isNotBlank(inVO.getTitle())) { + queryProject.like(EventSubject::getTitle, inVO.getTitle()); + } + + if (StrUtil.isNotBlank(inVO.getStatus())) { + queryProject.eq(EventSubject::getStatus, inVO.getStatus()); + } + if (ObjectUtil.isNotNull(inVO.getStartTime())) { + queryProject.gt(EventSubject::getSendTime, inVO.getStartTime()); + } + + if (ObjectUtil.isNotNull(inVO.getEndTime())) { + queryProject.lt(EventSubject::getSendTime, inVO.getEndTime()); + } + subjectList = eventSubjectService.list(queryProject); + } } List outVOList = new ArrayList<>(); - List styleList = new ArrayList<>(); - if (StrUtil.isNotBlank(inVO.getType()) && !"3".equals(inVO.getType()) ) { - - LambdaQueryWrapper queryStyle = Wrappers.lambdaQuery(); - queryStyle.ne(EventStyle::getDeleteFlag, "1"); - if (StrUtil.isNotBlank(inVO.getTitle())) { - queryStyle.like(EventStyle::getTitle, inVO.getTitle()); - } - if (StrUtil.isNotBlank(inVO.getType())) { - queryStyle.eq(EventStyle::getBanner, "1".equals(inVO.getType()) ? "1" : "0"); - } - if (StrUtil.isNotBlank(inVO.getStatus())) { - queryStyle.eq(EventStyle::getStatus, inVO.getStatus()); - } - if (ObjectUtil.isNotNull(inVO.getStartTime())) { - queryStyle.gt(EventStyle::getSendTime, inVO.getStartTime()); - } - - if (ObjectUtil.isNotNull(inVO.getEndTime())) { - queryStyle.lt(EventStyle::getSendTime, inVO.getEndTime()); - } - styleList = this.list(queryStyle); - } - - List subjectList = new ArrayList<>(); - if (StrUtil.isNotBlank(inVO.getType()) && !"1".equals(inVO.getType()) && !"2".equals(inVO.getType())) { - - LambdaQueryWrapper queryProject = Wrappers.lambdaQuery(); - queryProject.ne(EventSubject::getDeleteFlag, "1"); - if (StrUtil.isNotBlank(inVO.getTitle())) { - queryProject.like(EventSubject::getTitle, inVO.getTitle()); - } - - if (StrUtil.isNotBlank(inVO.getStatus())) { - queryProject.eq(EventSubject::getStatus, inVO.getStatus()); - } - if (ObjectUtil.isNotNull(inVO.getStartTime())) { - queryProject.gt(EventSubject::getSendTime, inVO.getStartTime()); - } - - if (ObjectUtil.isNotNull(inVO.getEndTime())) { - queryProject.lt(EventSubject::getSendTime, inVO.getEndTime()); - } - subjectList = eventSubjectService.list(queryProject); - } if (!styleList.isEmpty()) { styleList.forEach(s -> outVOList.add( @@ -167,7 +170,7 @@ public class EventStyleServiceImpl extends ServiceImpl