修改热门词汇

fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumInfo.java

+package com.mortals.xhx.module.matter.model;
+
+import com.mortals.xhx.module.matter.model.vo.MatterDatumVo;
+import lombok.Data;
+
+/**
+ * 事项申请材料实体对象
+ *
+ * @author zxfei
+ * @date 2022-12-07
+ */
+@Data
+public class MatterDatumInfo {
+
+
+    /**
+     * 站点id
+     */
+    private Long siteId;
+    /**
+     * 事项matter id
+     */
+    private Long matterId;
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+    /**
+     * 部门名称
+     */
+    private String deptName;
+    /**
+     * 材料名
+     */
+    private String materialName;
+    /**
+     * 材料全名
+     */
+    private String materiaFullName;
+    /**
+     * 事项来源(0.政务网，1.自定义)
+     */
+    private Integer source;
+    /**
+     * 是否推荐(0.未推荐，1.推荐)
+     */
+    private Integer isRecommend;
+    /**
+     * 样表打印次数
+     */
+    private Integer samplePrint;
+
+    /**
+     * 样表名称
+     */
+    private String sampleName;
+    /**
+     * 样表地址
+     */
+    private String samplePath;
+    /**
+     * 样表预览地址
+     */
+    private String preViewPath;
+
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -74,8 +74,8 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
             query.setMatterName("%".concat(query.getMatterFullName()).concat("%"));
         }
         List<OrderCol> orderColList = new ArrayList<>();
-        orderColList.add(new OrderCol("createTime",OrderCol.DESCENDING));
         orderColList.add(new OrderCol("isRecommend",OrderCol.DESCENDING));
+        orderColList.add(new OrderCol("createTime",OrderCol.DESCENDING));
         query.setOrderColList(orderColList);
 
         //添加更新热门词汇

fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

@@ -9,6 +9,7 @@ import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.key.ParamKey;
+import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.common.utils.MemoryPagination;
 import com.mortals.xhx.common.utils.StringUtils;
 import com.mortals.xhx.module.baseset.model.BasesetEntity;
@@ -17,8 +18,10 @@ import com.mortals.xhx.module.baseset.service.BasesetService;
 import com.mortals.xhx.module.hotword.model.HotwordEntity;
 import com.mortals.xhx.module.hotword.model.HotwordQuery;
 import com.mortals.xhx.module.hotword.service.HotwordService;
+import com.mortals.xhx.module.matter.model.MatterDatumInfo;
 import com.mortals.xhx.module.matter.model.MatterDatumQuery;
 import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -158,10 +161,8 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
         int code = VALUE_RESULT_SUCCESS;
         try {
             if (StringUtils.isNotEmpty(query.getMateriaFullName())) {
-                query.setMatterName("%".concat(query.getMateriaFullName()).concat("%"));
+                query.setMateriaFullName("%".concat(query.getMateriaFullName()).concat("%"));
             }
-            //PageInfo pageInfo = buildPageInfo(query);
-
             BasesetEntity basesetEntity = basesetService.selectOne(new BasesetQuery().siteId(query.getSiteId()));
             int blankCount = basesetEntity == null ? 20 : basesetEntity.getPrintDisplay(); //空白样表数量
             PageInfo pageInfo = new PageInfo();
@@ -169,7 +170,14 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
             Result<MatterDatumEntity> result = this.service.find(query, pageInfo, context);
             //内存分页
             List<MatterDatumEntity> pagination = MemoryPagination.pagination(result.getList(), query.getPage(), query.getSize());
-            model.put(KEY_RESULT_DATA, pagination);
+
+            List<MatterDatumInfo> collect = pagination.stream().map(item -> {
+                MatterDatumInfo matterDatumInfo = new MatterDatumInfo();
+                BeanUtils.copyProperties(item, matterDatumInfo, BeanUtil.getNullPropertyNames(item));
+                return matterDatumInfo;
+            }).collect(Collectors.toList());
+
+            model.put(KEY_RESULT_DATA, collect);
             model.put(PAGEINFO_KEY, result.getPageInfo());
 
             model.put(MESSAGE_INFO, busiDesc + "成功");

fill-manager/src/test/java/com/mortals/httpclient/matter/MatterDatumController.http

@@ -33,7 +33,7 @@ Content-Type: application/json
 
 {
   "siteId": 3,
-  "page": 2,
+  "page": 1,
   "size": 10
 }