党员活动 根据党支部名称查询

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<Boolean> saveRightData(@RequestBody List<EventMockData> list) {
+    public BaseResponse<Boolean> saveRightData(@RequestBody EventRightDataVO inVO) {
-        return BaseResponse.success(eventMockDataService.saveRightData(list));
+        return BaseResponse.success(eventMockDataService.saveRightData(inVO));
     }
 
 
     @ApiOperation("查询右侧栏数据")
     @PostMapping("/query/rightData")
-    public BaseResponse<List<EventMockData>> queryRightData() {
+    public BaseResponse<EventRightDataVO> queryRightData() {
-        return BaseResponse.success(eventMockDataService.list());
+        return BaseResponse.success(eventMockDataService.queryRightData());
     }
 
 

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<Map<String, List<EventContact>>> getEventContactGroup(@RequestParam(value = "param") String param) {
+    public BaseResponse<Map<String, List<EventContact>>> getEventContactGroup(@RequestParam(value = "param", required = false) String param) {
         return BaseResponse.success(eventContactService.getEventContactGroup(param));
     }
 

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;
 
         /**

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;
 }

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;
+
+}
+
+

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<EventMockData>{
 
     List<EventMockData> getProfessionalDataList();
 
-    boolean saveRightData(List<EventMockData> list);
+    boolean saveRightData(EventRightDataVO inVO);
 
+    EventRightDataVO queryRightData();
 }

src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java

@@ -28,7 +28,9 @@ public class EventContactServiceImpl extends ServiceImpl<EventContactMapper, Eve
     public Map<String, List<EventContact>> getEventContactGroup(String param) {
         LambdaQueryWrapper<EventContact> 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()));
     }
 

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<EventMockDataMapper, E
     }
 
     @Override
-    public boolean saveRightData(List<EventMockData> list) {
+    public boolean saveRightData(EventRightDataVO inVO) {
-        List<String> collect = list.stream().map(EventMockData::getDataPy).collect(Collectors.toList());
-        Map<String, String> map = list.stream().collect(Collectors.toMap(EventMockData::getDataPy, EventMockData::getDataValue, (o1,o2) -> o2));
         LambdaQueryWrapper<EventMockData> query = Wrappers.lambdaQuery();
-        query.in(EventMockData::getDataPy, collect);
+        List<EventMockData> list = this.list(query.eq(EventMockData::getStatus, "1"));
-        List<EventMockData> dataList = this.list(query);
+        list.forEach(l -> {
-        dataList.forEach(l -> l.setDataValue(map.get(l.getDataPy())));
+            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<EventMockData> query = Wrappers.lambdaQuery();
+        List<EventMockData> list = this.list(query.eq(EventMockData::getStatus, "1"));
+        Map<String, EventMockData> 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;
     }
 }

src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java

@@ -105,8 +105,8 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
             if (StrUtil.isNotBlank(inVO.getBelongBranch())) {
                 queryMember.eq(EventPartyBranch::getBranchCode, inVO.getBelongBranch());
             }
-            if (StrUtil.isNotBlank(inVO.getBranchName())) {
+            if (StrUtil.isNotBlank(inVO.getBelongBranchName())) {
-                queryMember.like(EventPartyBranch::getBranchName, inVO.getBranchName());
+                queryMember.like(EventPartyBranch::getBranchName, inVO.getBelongBranchName());
             }
             if (StrUtil.isNotBlank(inVO.getParam())) {
                 queryMember.and(w -> w.like(EventPartyBranch::getContactName, inVO.getParam())