股東表插入、查詢

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

@@ -155,38 +155,36 @@ 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<>();
+        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);
+            appShareholderDetailVos.add(appShareholderDetailVo);
         }
-
-        for (AppShareholderDetailVo appShareholderDetailVoOld : AppShareholderDetailVos) {
+        for (AppShareholderDetailVo appShareholderDetailVoOld : appShareholderDetailVos) {
             boolean flag = true;
-            for (AppShareholderDetailVo appShareholderDetailVoNew : AppShareholderDetailMerge) {
+            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);//给整合后集合添加子元素
+                appShareholderDetailMerge.add(appShareholderDetailVoOld);//给整合后集合添加子元素
             }
         }
-        //  dataVO.setPageSize(pageDataVO.getPageSize());
-        dataVO.setPageSize(AppShareholderDetailMerge.size());
 
+        dataVO.setPageSize(pageDataVO.getPageSize());
+        // dataVO.setPageSize(AppShareholderDetailMerge.size());
         dataVO.setPageNum(pageDataVO.getPageNum());
-        dataVO.setData(AppShareholderDetailMerge);
-        dataVO.setTotalPage(AppShareholderDetailMerge.size());
-
-        dataVO.setTotalCount(pageDataVO.getTotalCount());
-        // dataVO.setTotalPage(pageDataVO.getTotalPage());
+        dataVO.setData(appShareholderDetailMerge);
+        dataVO.setTotalPage(pageDataVO.getTotalPage());
+        //  dataVO.setTotalCount(pageDataVO.getTotalCount());
+        dataVO.setTotalPage(pageDataVO.getTotalPage());
         return dataVO;
     }
 

ace-modules/ace-admin/src/main/resources/mapper/AppShareholderDetailMapper.xml

@@ -28,4 +28,13 @@
             </otherwise>
         </choose>
     </select>
+    <select id="xx" resultType="com.github.wxiaoqi.security.admin.entity.AppShareholderDetail">
+		select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as `phone`,group_concat(company_name) as `companyName` from  app_shareholder_detail where is_quit=0 and position_id=1 group by phone
+        union ALL
+        select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as `phone`,group_concat(company_name) as `companyName`  from  app_shareholder_detail where is_quit=0 and position_id=2 group by phone
+        union ALL
+        select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as `phone`,group_concat(company_name) as `companyName`  from  app_shareholder_detail where is_quit=1 and position_id	=1 group by phone
+        union all
+        select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as `phone`,group_concat(company_name) as `companyName`  from  app_shareholder_detail where is_quit=1 and position_id	=2 group by phone
+	</select>
 </mapper>
\ No newline at end of file