Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/module/app/dao/ibatis/AppDatasetDaoImpl.java

@@ -36,8 +36,9 @@ public class AppDatasetDaoImpl extends BaseCRUDDaoMybatis<AppDatasetEntity,Long>
         } else if (pageInfo.getPrePageResult() == -1) {
             list = this.getSqlSession().selectList(this.getSqlId(SQLID_CUSTOM_LIST), paramDto);
         } else {
-            RowBounds rowBounds = new RowBounds(pageInfo.getBeginIndex(), pageInfo.getPrePageResult());
-            list = this.getSqlSession().selectList(this.getSqlId(SQLID_CUSTOM_LIST), this.cpyQueryParamDto(paramDto), rowBounds);
+            list = this.getSqlSession().selectList(this.getSqlId(SQLID_CUSTOM_LIST), paramDto);
+/*            RowBounds rowBounds = new RowBounds(pageInfo.getBeginIndex(), pageInfo.getPrePageResult());
+            list = this.getSqlSession().selectList(this.getSqlId(SQLID_CUSTOM_LIST), this.cpyQueryParamDto(paramDto), rowBounds);*/
         }
         pageInfo.setTotalResult(count);
         result.setPageInfo(pageInfo);

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java

@@ -62,22 +62,33 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
 
     @Override
     protected void doListBefore(AppDatasetEntity query, Map<String, Object> model, Context context) throws AppException {
-     /*   if(!ObjectUtils.isEmpty(query.getOrConditionList())){
+        if (!ObjectUtils.isEmpty(query.getOrConditionList())) {
             AppDatasetQuery appDatasetQuery = new AppDatasetQuery();
-            appDatasetQuery.setAndConditionList(query.getOrConditionList());
+            appDatasetQuery.setOrConditionList(query.getOrConditionList());
             appDatasetQuery.setAppId(query.getAppId());
 
             PageInfo pageInfo = this.buildPageInfo(query);
             Result<AppInfoFieldEntity> customResult = this.service.findCustomList(appDatasetQuery, pageInfo, context);
+            //根据查询条件的数量去除数量不足的结果
+            int count = query.getOrConditionList().size();
             List<Long> datasetIdList = customResult.getList().stream().map(item -> item.getDatasetId()).collect(Collectors.toList());
-            if (!ObjectUtils.isEmpty(datasetIdList)) {
-                query.setIdList(datasetIdList);
+            Map<Long, Long> collect = datasetIdList.stream().collect(Collectors.groupingBy(x -> x, Collectors.counting()));
+            List<Long> dataSets = collect.entrySet().stream().map(entrySet -> {
+                if (entrySet.getValue() == count) {
+                    return entrySet.getKey();
+                } else {
+                    return null;
+                }
+            }).filter(f -> f != null).collect(Collectors.toList());
+            if (!ObjectUtils.isEmpty(dataSets)) {
+                query.setIdList(dataSets);
+            }else{
+                query.setIdList(ListUtil.toList(0L));
             }
             query.setOrConditionList(null);
+        }
 
-        }*/
-
-        if (!ObjectUtils.isEmpty(query.getFieldCode())||!ObjectUtils.isEmpty(query.getFieldName())) {
+        if (!ObjectUtils.isEmpty(query.getFieldCode()) || !ObjectUtils.isEmpty(query.getFieldName())) {
             AppDatasetQuery appDatasetQuery = new AppDatasetQuery();
             appDatasetQuery.setFieldCode(query.getFieldCode());
             appDatasetQuery.setFieldName(query.getFieldName());
@@ -90,7 +101,7 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
             List<Long> datasetIdList = customResult.getList().stream().map(item -> item.getDatasetId()).collect(Collectors.toList());
             if (!ObjectUtils.isEmpty(datasetIdList)) {
                 query.setIdList(datasetIdList);
-            }else{
+            } else {
                 query.setIdList(ListUtil.toList(0L));
             }
         }

base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java

@@ -20,10 +20,12 @@ public class WorkmanEntity extends WorkmanVo {
     /**
      * 登录用户名
      */
+    @Excel(name = "用户名")
     private String loginName;
     /**
      * 密码
      */
+    @Excel(name = "密码")
     private String loginPwd;
     /**
      * 部门id号
@@ -52,14 +54,17 @@ public class WorkmanEntity extends WorkmanVo {
     /**
      * 姓名
      */
+    @Excel(name = "姓名")
     private String name;
     /**
      * 工号
      */
+    @Excel(name = "工号")
     private String number;
     /**
      * 职务
      */
+    @Excel(name = "职务")
     private String userpost;
     /**
      * 职称
@@ -68,10 +73,12 @@ public class WorkmanEntity extends WorkmanVo {
     /**
      * 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)
      */
+    @Excel(name = "政治面貌 ",combo={"中共党员","中共预备党员","共青团员","普通居民","其它"}, readConverterExp = "0=中共党员,1=中共预备党员,2=共青团员,3=普通居民,4=其它")
     private Integer politicalstatus;
     /**
      * 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)
      */
+    @Excel(name = "党员 ",combo={"非党员","党员","党员示范岗","党员先锋岗"}, readConverterExp = "0=非党员,1=党员,2=党员示范岗,3=党员先锋岗")
     private Integer dangyuan;
     /**
      * 党员扩展
@@ -88,14 +95,17 @@ public class WorkmanEntity extends WorkmanVo {
     /**
      * 手机
      */
+    @Excel(name = "手机")
     private String mobile;
     /**
      * 星级
      */
+    @Excel(name = "星级")
     private Integer starlevel;
     /**
      * 个人简介
      */
+    @Excel(name = "个人简介")
     private String summary;
     /**
      * 照片
@@ -104,14 +114,17 @@ public class WorkmanEntity extends WorkmanVo {
     /**
      * 岗位职责
      */
+    @Excel(name = "岗位职责")
     private String duty;
     /**
      * 服务承诺
      */
+    @Excel(name = "服务承诺")
     private String promise;
     /**
      * 办理事项
      */
+    @Excel(name = "办理事项")
     private String business;
     /**
      * 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）

base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http

@@ -35,6 +35,9 @@ Content-Type: application/json
     {
       "fieldName": "制定机关",
       "fieldValue": "%四川省人民政府%"
+    },{
+      "fieldName": "标题",
+      "fieldValue": "%管理办法%"
     }
   ],
   "page": 1,