提交相关代码

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractServiceImpl.java

@@ -132,12 +132,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             if (pageIndex!=null){
                 pageStart = (pageIndex -1) * pageSize;
             }
-            if (StringUtils.isNotBlank(number)){
-                number = "%" + number + "%";
-            }
-            if (StringUtils.isNotBlank(name)){
-                name = "%" + name + "%";
-            }
+//            if (StringUtils.isNotBlank(number)){
+//                number = "%" + number + "%";
+//            }
+//            if (StringUtils.isNotBlank(name)){
+//                name = "%" + name + "%";
+//            }
             List<Contract> contracts = contractMapper.selectContract(user.getCompanyId(), pageStart, pageSize, number, name , typeName , status, startDate,endDate, paymentStartDate, paymentEndDate, secTypeId,customerOrg,finishStatus);
             Long totalCnt = contractMapper.selectContractCnt(user.getCompanyId(), number, name, typeName, status, startDate, endDate, paymentStartDate, paymentEndDate, secTypeId,customerOrg,finishStatus);
             for (Contract contract : contracts) {

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ContractMapper.xml

@@ -66,7 +66,7 @@
         <if test="customerOrg!=null">
             and cc.customer_org like  CONCAT('%', #{customerOrg}, '%')
         </if>
-        order by contract.id desc
+        order by contract.number desc
         <if test="pageStart!=null and pageSize!=null">
             limit #{pageStart},#{pageSize}
         </if>

fhKeeper/formulahousekeeper/webttkuaiban/src/main/java/com/firerock/webttkuaiban/demos/mapper/ArticleMapper.java

@@ -18,7 +18,7 @@ public interface ArticleMapper {
 
     List<Article> relatedList(@Param("strings")List<String> strings,@Param("articleId")Integer articleId);
 
-    @Select("select id,title,content,category_ids,create_time,product_id,profile,viewCount from article where id = #{id}")
+    @Select("select id,title,content,category_ids,create_time,product_id,profile,view_count from article where id = #{id}")
     Article getArticleById(Integer id);
 
     @Update(" update article set view_count = view_count + 1 where id= #{id}")

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/css/knowledgeField.css

@@ -7,7 +7,7 @@
 }
 .knowledgeFieldCon .knowledgeField {
   flex: 1;
-  margin: 2.1875rem;
+  margin: 2.1875rem 6.5rem;
   background: #fff;
   border-radius: 0.25rem;
   display: flex;
@@ -79,7 +79,7 @@
   margin-right: 1.25rem;
 }
 .knowledgeFieldCon .knowledgeField .knowledgeField-content .knowledgeField-content-item .textContent {
-  width: 97.5rem;
+  width: 88.5rem;
 }
 .knowledgeFieldCon .knowledgeField .knowledgeField-content .knowledgeField-content-item .textContent .textContentTitle {
   color: #000000;
@@ -169,6 +169,14 @@
   letter-spacing: 0px;
   text-align: center;
   padding-top: 1.5rem;
+  position: relative;
+}
+.knowledgeFieldCon .knowledgeDetails .knowledgeDetails-left .knowledgeDetails-left-title .previewTwo {
+  position: absolute;
+  font-size: 0.875rem;
+  color: #7b7b7b;
+  top: 0;
+  right: 0;
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-left .knowledgeDetails-left-con {
   padding: 0 1.875rem 0.9375rem 1.875rem;
@@ -187,7 +195,7 @@
   margin-right: 1rem;
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-left .knowledgeDetails-left-con .timeContent span {
-  color: #000000;
+  color: #7b7b7b;
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-left .knowledgeDetails-left-con .readUse .text {
   font-size: 1rem;
@@ -209,7 +217,7 @@
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-left .knowledgeDetails-left-con li {
   font-family: Microsoft YaHei UI;
   font-weight: regular;
-  font-size: 1rem;
+  font-size: 0.875rem;
   line-height: normal;
   margin-right: 1.0625rem;
 }
@@ -220,7 +228,6 @@
   color: #3396fb;
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-left .hypertextContent {
-  background: #f6f6f6;
   padding: 1.875rem;
   margin: 0 1.875rem;
   flex: 1;
@@ -277,6 +284,12 @@
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-right .latestList {
   width: 100%;
 }
+.knowledgeFieldCon .knowledgeDetails .knowledgeDetails-right .latestList a {
+  margin-bottom: 1rem;
+}
+.knowledgeFieldCon .knowledgeDetails .knowledgeDetails-right .latestList a:last-child {
+  margin-bottom: 0;
+}
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-right .latestList .latestList-item {
   width: 100%;
   display: flex;

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/css/knowledgeField.less

@@ -7,7 +7,7 @@
   // 知识园地
   .knowledgeField {
     flex: 1;
-    margin: 2.1875rem;
+    margin: 2.1875rem 6.5rem;
     background: #fff;
     border-radius: 0.25rem;
     display: flex;
@@ -82,7 +82,7 @@
           margin-right: 1.25rem;
         }
         .textContent {
-          width: 97.5rem;
+          width: 88.5rem;
           .textContentTitle {
             color: #000000;
             font-family: Microsoft YaHei UI;
@@ -175,6 +175,14 @@
         letter-spacing: 0px;
         text-align: center;
         padding-top: 1.5rem;
+        position: relative;
+        .previewTwo {
+          position: absolute;
+          font-size: .875rem;
+          color: #7b7b7b;
+          top: 0;
+          right: 0;
+        }
       }
 
       .knowledgeDetails-left-con {
@@ -192,7 +200,8 @@
             margin-right: 1rem;
           }
           span {
-            color: #000000;
+            // color: #000000;
+            color: #7b7b7b;
           }
         }
         .readUse {
@@ -217,7 +226,7 @@
         li {
           font-family: Microsoft YaHei UI;
           font-weight: regular;
-          font-size: 1rem;
+          font-size: .875rem;
           line-height: normal;
           // margin-right: 2.0625rem;
           margin-right: 1.0625rem;
@@ -231,7 +240,7 @@
       }
 
       .hypertextContent {
-        background: #f6f6f6;
+        // background: #f6f6f6;
         padding: 1.875rem;
         // overflow-y: auto;
         margin: 0 1.875rem;
@@ -291,6 +300,12 @@
       }
       .latestList {
         width: 100%;
+        a {
+          margin-bottom: 1rem;
+          &:last-child {
+            margin-bottom: 0;
+          }
+        }
         .latestList-item {
           width: 100%;
           display: flex;

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/knowledge.ftl

@@ -54,6 +54,7 @@
                     <p>${ item.profile }</p>
                     <div class="textContentUnderstand">
                       <div class="textContentUnderstandText">发布于：${item.createTimeStr}</div>
+                      <div class="textContentUnderstandText">预览量：${item.viewCount}</div>
                       <!-- <button class="linkButtonss" onclick="learnMore(${item.id})">了解详情></button> -->
                       <a class="linkButtonss" href="/articleTemplate/articleDetail?id=${item.id}">查看详情></a>
                     </div>

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/knowledgeDetails.ftl

@@ -37,7 +37,10 @@
         <img src="/image/ions/zuos.png" />
       </div>
       <div class="knowledgeDetails-left">
-        <div class="knowledgeDetails-left-title">${article.title}</div>
+        <div class="knowledgeDetails-left-title">
+          ${article.title}
+          <div class="previewTwo">预览量：${article.viewCount}</div>
+        </div>
         <div class="dividingLine"></div>
         <div class="knowledgeDetails-left-con">
           <div class="flex distribution">