From 1fa9dbb7cf18ec2157b9b4bf4f7a3ed1a3238fa7 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Wed, 6 Jul 2022 15:46:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20=20?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=85=9A=E6=94=AF=E9=83=A8=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartyEventMaintainController.java | 8 +-- .../PartyMemberEventController.java | 2 +- .../entity/EventPartyBranch.java | 4 +- .../entity/EventQueryInVO.java | 6 ++ .../entity/EventRightDataVO.java | 42 ++++++++++++++ .../service/EventMockDataService.java | 4 +- .../service/impl/EventContactServiceImpl.java | 4 +- .../impl/EventMockDataServiceImpl.java | 56 ++++++++++++++++--- .../impl/EventPartyBranchServiceImpl.java | 4 +- 9 files changed, 112 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventRightDataVO.java 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 9094a1f..fa5852e 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 @@ -66,15 +66,15 @@ public class PartyEventMaintainController { @ApiOperation("更新右侧栏数据") @PostMapping("/save/rightData") - public BaseResponse saveRightData(@RequestBody List list) { - return BaseResponse.success(eventMockDataService.saveRightData(list)); + public BaseResponse saveRightData(@RequestBody EventRightDataVO inVO) { + return BaseResponse.success(eventMockDataService.saveRightData(inVO)); } @ApiOperation("查询右侧栏数据") @PostMapping("/query/rightData") - public BaseResponse> queryRightData() { - return BaseResponse.success(eventMockDataService.list()); + public BaseResponse queryRightData() { + return BaseResponse.success(eventMockDataService.queryRightData()); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java index a46c941..25d1ea3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java @@ -53,7 +53,7 @@ public class PartyMemberEventController { @ApiOperation("活动联系人列表-按公司分组") @GetMapping("/eventContact/group") - public BaseResponse>> getEventContactGroup(@RequestParam(value = "param") String param) { + public BaseResponse>> getEventContactGroup(@RequestParam(value = "param", required = false) String param) { return BaseResponse.success(eventContactService.getEventContactGroup(param)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java index 6571b3f..6682614 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java @@ -36,13 +36,13 @@ public class EventPartyBranch implements Serializable { /** * 党支部编码 */ - @ApiModelProperty(value = "党支部编码") + @ApiModelProperty(value = "省编码") private String branchCode; /** * 党支部名称 */ - @ApiModelProperty(value = "党支部名称") + @ApiModelProperty(value = "省名称") private String branchName; /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java index ec4b504..c834196 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java @@ -35,5 +35,11 @@ public class EventQueryInVO implements Serializable { * 所属党支部名称 */ @ApiModelProperty(value = "所属党支部名称") + private String belongBranchName; + + /** + * 所属省名称 + */ + @ApiModelProperty(value = "所属省名称") private String branchName; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventRightDataVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventRightDataVO.java new file mode 100644 index 0000000..e5a444c --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventRightDataVO.java @@ -0,0 +1,42 @@ +package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 实体类 EventRightDataOutVO + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +public class EventRightDataVO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "订单交易总额") + private String ddjyze; + @ApiModelProperty(value = "订单总数量") + private String ddzsl; + @ApiModelProperty(value = "商品数量") + private String spsl; + @ApiModelProperty(value = "协议数量") + private String xysl; + @ApiModelProperty(value = "一线调研") + private String yxdy; + @ApiModelProperty(value = "访谈人数") + private String ftrs; + @ApiModelProperty(value = "保障需求") + private String bzxq; + @ApiModelProperty(value = "攻坚克难项目") + private String gjknxm; + +} + + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java index 8b407d8..e92c5b6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMockData; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventRightDataVO; import java.util.List; @@ -15,6 +16,7 @@ public interface EventMockDataService extends IService{ List getProfessionalDataList(); - boolean saveRightData(List list); + boolean saveRightData(EventRightDataVO inVO); + EventRightDataVO queryRightData(); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java index d7ba32f..9a5a103 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java @@ -28,7 +28,9 @@ public class EventContactServiceImpl extends ServiceImpl> getEventContactGroup(String param) { LambdaQueryWrapper query = Wrappers.lambdaQuery(); query.eq(EventContact::getStatus, "1"); - query.eq(EventContact::getContactUnit, param); + if (StrUtil.isNotBlank(param)) { + query.eq(EventContact::getContactUnit, param); + } return this.list(query).stream().sorted(Comparator.comparing(EventContact::getSort)).collect(Collectors.groupingBy(EventContact::getContactUnit,LinkedHashMap::new,Collectors.toList())); } 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 5d24f76..9c387ff 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 @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventMockDataMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMockData; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventRightDataVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventMockDataService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventPartyBranchService; @@ -17,6 +18,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -58,14 +60,54 @@ public class EventMockDataServiceImpl extends ServiceImpl list) { - List collect = list.stream().map(EventMockData::getDataPy).collect(Collectors.toList()); - Map map = list.stream().collect(Collectors.toMap(EventMockData::getDataPy, EventMockData::getDataValue, (o1,o2) -> o2)); + public boolean saveRightData(EventRightDataVO inVO) { LambdaQueryWrapper query = Wrappers.lambdaQuery(); - query.in(EventMockData::getDataPy, collect); - List dataList = this.list(query); - dataList.forEach(l -> l.setDataValue(map.get(l.getDataPy()))); + List list = this.list(query.eq(EventMockData::getStatus, "1")); + list.forEach(l -> { + String dataPy = l.getDataPy(); + if ("ddjyze".equals(dataPy)) { + l.setDataValue(inVO.getDdjyze()); + } + if ("ddzsl".equals(dataPy)) { + l.setDataValue(inVO.getDdzsl()); + } + if ("spsl".equals(dataPy)) { + l.setDataValue(inVO.getSpsl()); + } + if ("xysl".equals(dataPy)) { + l.setDataValue(inVO.getXysl()); + } + if ("yxdy".equals(dataPy)) { + l.setDataValue(inVO.getYxdy()); + } + if ("ftrs".equals(dataPy)) { + l.setDataValue(inVO.getFtrs()); + } + if ("bzxq".equals(dataPy)) { + l.setDataValue(inVO.getBzxq()); + } + if ("gjknxm".equals(dataPy)) { + l.setDataValue(inVO.getGjknxm()); + } + }); + return this.saveOrUpdateBatch(list); + } - return this.saveOrUpdateBatch(dataList); + @Override + public EventRightDataVO queryRightData() { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + List list = this.list(query.eq(EventMockData::getStatus, "1")); + Map dataMap = list.stream().collect(Collectors.toMap(EventMockData::getDataPy, Function.identity())); + EventRightDataVO dataVO = new EventRightDataVO(); + dataVO.setDdjyze(dataMap.get("ddjyze").getDataValue()); + dataVO.setDdzsl(dataMap.get("ddzsl").getDataValue()); + dataVO.setSpsl(dataMap.get("spsl").getDataValue()); + dataVO.setXysl(dataMap.get("xysl").getDataValue()); + dataVO.setYxdy(dataMap.get("yxdy").getDataValue()); + dataVO.setFtrs(dataMap.get("ftrs").getDataValue()); + dataVO.setBzxq(dataMap.get("bzxq").getDataValue()); + dataVO.setGjknxm(dataMap.get("gjknxm").getDataValue()); + + return dataVO; } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java index 686054b..f9898b5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java @@ -105,8 +105,8 @@ public class EventPartyBranchServiceImpl extends ServiceImpl w.like(EventPartyBranch::getContactName, inVO.getParam())