终端我的填单记录去重

fill-manager/src/main/java/com/mortals/xhx/module/h5/TerminalController.java

@@ -132,7 +132,17 @@ public class TerminalController extends BaseJsonBodyController {
         try {
             if(StringUtils.isNotEmpty(query.getMobile())||StringUtils.isNotEmpty(query.getIdCard())) {
                 PageInfo pageInfo = this.buildPageInfo(query);
-                this.buildPermisionSql(query);
+                if(CollectionUtils.isEmpty(query.getOrderColList())){
+                    query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+                }
+                List<UserFillHistoryEntity> listAll = userFillHistoryService.find(query);
+                List<Long> materialId = new ArrayList<>();
+                for(UserFillHistoryEntity entity:listAll){
+                    if(!materialId.contains(entity.getMaterialId())){
+                        materialId.add(entity.getMaterialId());
+                    }
+                }
+                query.setMaterialIdList(materialId);
                 Result<UserFillHistoryEntity> result = userFillHistoryService.find(query, pageInfo, this.getContext());
                 model.put("data", result.getList());
                 model.put("pageInfo", result.getPageInfo());
@@ -179,13 +189,6 @@ public class TerminalController extends BaseJsonBodyController {
         model.put("pageInfo", pageInfo);
     }
 
-    protected void buildPermisionSql(UserFillHistoryEntity query) {
-        String sql = (String)this.request.getAttribute("DATA_PERMISSION_SEARCH_SQL");
-        if (!ObjectUtils.isEmpty(sql)) {
-            query.setPermissionSql(sql);
-        }
-
-    }
 
     public static void main(String[] args) {
         try {

fill-manager/src/main/java/com/mortals/xhx/module/user/model/vo/UserFillHistoryVo.java

@@ -19,5 +19,6 @@ public class UserFillHistoryVo extends BaseEntityLong {
     /** 主键ID，主键，自增长列表 */
     private List <Long> idList;
 
-
+    /** 材料id列表 */
+    private List <Long> materialIdList;
 }
\ No newline at end of file