修改热门词汇

fill-manager/db/module.sql

@@ -184,6 +184,7 @@ CREATE TABLE mortals_xhx_matter_datum(
     `isRecommend` tinyint(2)     COMMENT '是否推荐(0.未推荐，1.推荐)',
     `total` int(8)     COMMENT '填单次数',
     `sort` int(4)     COMMENT '排序',
+    `samplePrint` int(4)     COMMENT '样表打印次数',
     `fileName` varchar(255)     COMMENT '填单的附件名称',
     `fileUrl` varchar(255)     COMMENT '填单的附件下载地址',
     `sampleName` varchar(255)     COMMENT '样表名称',

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

@@ -69,18 +69,22 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         if (StringUtils.isNotEmpty(query.getMatterName())) {
             query.setMatterName("%".concat(query.getMatterName()).concat("%"));
         }
+
+        if (StringUtils.isNotEmpty(query.getMatterFullName())) {
+            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));
         query.setOrderColList(orderColList);
 
         //添加更新热门词汇
-        HotwordEntity hotwordEntity = hotwordService.selectOne(new HotwordQuery().siteId(query.getSiteId()).hotwords(query.getMatterName()), context);
+        HotwordEntity hotwordEntity = hotwordService.selectOne(new HotwordQuery().siteId(query.getSiteId()).hotwords(query.getMatterFullName()), context);
         if (ObjectUtils.isEmpty(hotwordEntity)) {
             //新增
             hotwordEntity = new HotwordEntity();
             hotwordEntity.initAttrValue();
-            hotwordEntity.setHotwords(query.getMatterName());
+            hotwordEntity.setHotwords(query.getMatterFullName());
             hotwordEntity.setSearchCount(1);
             hotwordService.save(hotwordEntity, context);
         } else {

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

@@ -3,9 +3,9 @@ POST {{baseUrl}}/login/login
 Content-Type: application/json
 
 {
-"loginName":"admin",
-"password":"admin",
-"securityCode":"8888"
+  "loginName": "admin",
+  "password": "admin",
+  "securityCode": "8888"
 }
 
 > {%
@@ -19,8 +19,9 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-    "page":1,
-    "size":10
+  "page": 1,
+  "size": 10,
+  "materiaFullName": "测试"
 }
 
 
@@ -30,18 +31,18 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "matterId":719,
-        "deptId":818,
-        "deptCode":"h9g0zo",
-        "materialName":"dr3fuz",
-        "materiaFullName":"rf8gue",
-        "source":0,
-        "isRecommend":0,
-        "total":0,
-        "sort":0,
-        "sampleName":"qysz6s",
-        "samplePath":"igktwv",
-        "preViewPath":"b2rk0s",
+  "matterId": 719,
+  "deptId": 818,
+  "deptCode": "h9g0zo",
+  "materialName": "dr3fuz",
+  "materiaFullName": "rf8gue",
+  "source": 0,
+  "isRecommend": 0,
+  "total": 0,
+  "sort": 0,
+  "sampleName": "qysz6s",
+  "samplePath": "igktwv",
+  "preViewPath": "b2rk0s"
 }
 
 > {%

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

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###打印提交列表
+POST {{baseUrl}}/mortals/fill/matter/datum/print/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "orderId":"zxcm1e",
+    "materialId":931,
+    "materialName":"hvopoo",
+    "page":78,
+    "type":1,
+    "docPath":"onj9bb",
+    "formContent":"2lxxse",
+    "page":1,
+    "size":10
+}
+
+
+###打印提交更新与保存
+POST {{baseUrl}}/mortals/fill/matter/datum/print/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "orderId":"3v6b72",
+        "materialId":291,
+        "materialName":"v60a07",
+        "page":105,
+        "type":1,
+        "docPath":"bjwc0j",
+        "formContent":"6pstcu",
+}
+
+> {%
+client.global.set("MortalsFillMatterDatumPrint_id", JSON.parse(response.body).data.id);
+%}
+
+###打印提交查看
+GET {{baseUrl}}/mortals/fill/matter/datum/print/info?id={{MortalsFillMatterDatumPrint_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###打印提交编辑
+GET {{baseUrl}}/mortals/fill/matter/datum/print/edit?id={{MortalsFillMatterDatumPrint_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###打印提交删除
+GET {{baseUrl}}/mortals/fill/matter/datum/print/delete?id={{MortalsFillMatterDatumPrint_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

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

@@ -5,7 +5,7 @@ Content-Type: application/json
 
 {
   "loginName": "admin",
-  "password": "admin"
+  "password": "adsmile"
 }
 
 > {%