股東表插入、查詢

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppShareholderDetailVo.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.sql.Timestamp;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 @Data
@@ -49,4 +50,7 @@ public class AppShareholderDetailVo {
 
     @ApiModelProperty("股东身份名称")
     private String positionName;
+
+    @ApiModelProperty("股东身份名称")
+    private List<String> companyList;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailBiz.java

@@ -20,6 +20,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.mapreduce.GroupBy;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -31,6 +32,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Slf4j
 @Transactional
@@ -152,16 +154,31 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
         List<Integer> postionIds = data.stream().map(AppShareholderDetail::getPositionId).collect(Collectors.toList());
         Map<Integer, AppUserPosition> postionMap = appUserPositionBiz.findPostionIdAndPostionMapByIds(postionIds);
         List<AppShareholderDetailVo> AppShareholderDetailVos = new ArrayList<>();
+        List<AppShareholderDetailVo> AppShareholderDetailMerge = new ArrayList<>();
         AppShareholderDetailVo appShareholderDetailVo;
         for (AppShareholderDetail appShareholderDetail : data) {
             appShareholderDetailVo = new AppShareholderDetailVo();
+            BeanUtils.copyProperties(appShareholderDetail, appShareholderDetailVo);
             String postionName = postionMap == null ? "" : postionMap.get(appShareholderDetail.getPositionId()) == null ? "" : postionMap.get(appShareholderDetail.getPositionId()).getName();
             appShareholderDetailVo.setPositionName(postionName);
             AppShareholderDetailVos.add(appShareholderDetailVo);
         }
+
+        for (AppShareholderDetailVo appShareholderDetailVoOld : AppShareholderDetailVos) {
+            boolean flag = true;
+            for (AppShareholderDetailVo appShareholderDetailVoNew : AppShareholderDetailMerge) {
+                if (appShareholderDetailVoNew.getPhone().equals(appShareholderDetailVoOld.getPhone()) && appShareholderDetailVoNew.getIsQuit().equals(appShareholderDetailVoOld.getIsQuit())) {//判断姓名是否相同
+                    appShareholderDetailVoNew.setCompanyName(appShareholderDetailVoNew.getCompanyName() + "," + appShareholderDetailVoOld.getCompanyName());//姓名相同时，年龄相加
+                    flag = false;
+                }
+            }
+            if (flag) {
+                AppShareholderDetailMerge.add(appShareholderDetailVoOld);//给整合后集合添加子元素
+            }
+        }
         dataVO.setPageSize(pageDataVO.getPageSize());
         dataVO.setPageNum(pageDataVO.getPageNum());
-        dataVO.setData(AppShareholderDetailVos);
+        dataVO.setData(AppShareholderDetailMerge);
         dataVO.setTotalCount(pageDataVO.getTotalCount());
         dataVO.setTotalPage(pageDataVO.getTotalPage());
         return dataVO;
@@ -188,9 +205,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
             } catch (InterruptedException e) {
                 throw new BaseException("导入数据失败");
             }
-
         }
-
         return appShareholderDetail.size();
     }
 
@@ -239,10 +254,8 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                     BeanUtils.copyProperties(appShareholderDetailDTO, appShareholderDetail);
                     mapper.insertSelective(appShareholderDetail);
                 }
-
-
             } catch (ParseException e) {
-                log.error("股东导入失败：【{}】",e);
+                log.error("股东导入失败：【{}】", e);
             }
         }
     }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppShareholderDetailController.java

 package com.github.wxiaoqi.security.admin.rest.admin;
 
 import com.github.wxiaoqi.security.admin.biz.AppShareholderDetailBiz;
+import com.github.wxiaoqi.security.admin.dto.AppShareholderDetailFindDTO;
+import com.github.wxiaoqi.security.admin.vo.AppShareholderDetailVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.util.excel.ExcelImport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -55,21 +55,17 @@ public class AppShareholderDetailController {
         }
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    /**
+     * 查询
+     *
+     * @param appShareholderDetailFindDTO
+     * @return
+     */
+    @PostMapping("/page")
+    public ObjectRestResponse<PageDataVO<AppShareholderDetailVo>> findWithPage(@RequestBody AppShareholderDetailFindDTO appShareholderDetailFindDTO) {
+        PageDataVO<AppShareholderDetailVo> dataVO = appShareholderDetailBiz.findWithPage(appShareholderDetailFindDTO);
+        return ObjectRestResponse.succ(dataVO);
+    }
 
 
 }