完善

platform-dao/src/main/java/com/platform/dao/enums/ArticleTypeEnum.java

@@ -40,7 +40,11 @@ public enum ArticleTypeEnum {
     /**
      * 信息咨询
      */
-    XXZX(7);
+    XXZX(7),
+    /**
+     * 常用下载
+     */
+    CYXZ(8);
     private Integer value;
 
 }

platform-dao/src/main/java/com/platform/dao/vo/ArticleVO.java

@@ -123,4 +123,12 @@ public class ArticleVO implements Serializable {
      * 成功案例
      */
     List<Article> list6;
+    /**
+     * 信息咨询
+     */
+    List<Article> list7;
+    /**
+     * 常用下载
+     */
+    List<Article> list8;
 }

platform-dao/src/main/resources/application-daoDev.yml

@@ -5,9 +5,8 @@ spring:
         driver-class-name: com.mysql.cj.jdbc.Driver
         url: jdbc:mysql://123.60.19.203:5006/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
         username: root
-        # password: mysql?123!@MYSQL
+        # password: mysql?MYSQLmoniu123
         password: mysql?MYSQLmoniu123
-        # password: sbgld@QYKH@$_e^mysqlv
         filters: wall,stat
         filter:
           stat:

platform-service/src/main/java/com/platform/service/operate/impl/ArticleServiceImpl.java

@@ -91,6 +91,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleMapper, Article,
         types.add(ArticleTypeEnum.XXJX.getValue());
         types.add(ArticleTypeEnum.HYZX.getValue());
         types.add(ArticleTypeEnum.CGAL.getValue());
+        types.add(ArticleTypeEnum.CYXZ.getValue());
         record.setTypes(types);
         List<Article> list = mapper.selectArticleFrontInfo(record);
         ArticleVO vo = new ArticleVO();
@@ -101,6 +102,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleMapper, Article,
         List<Article> list5 = new ArrayList<Article>();
         List<Article> list6 = new ArrayList<Article>();
         List<Article> list7 = new ArrayList<Article>();
+        List<Article> list8 = new ArrayList<Article>();
         list.forEach(item->{
             if(ArticleTypeEnum.JJFA.getValue().equals(item.getType())){
                 list1.add(item);
@@ -114,8 +116,10 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleMapper, Article,
                 list5.add(item);
             }else if(ArticleTypeEnum.CGAL.getValue().equals(item.getType())){
                 list6.add(item);
-            }else{
+            }else if(ArticleTypeEnum.XXZX.getValue().equals(item.getType())){
                 list7.add(item);
+            }else if(ArticleTypeEnum.CYXZ.getValue().equals(item.getType())){
+                list8.add(item);
             }
         });
         vo.setList1(list1);
@@ -124,7 +128,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleMapper, Article,
         vo.setList4(list4);
         vo.setList5(list5);
         vo.setList6(list6);
-        vo.setList6(list7);
+        vo.setList7(list7);
+        vo.setList8(list8);
         return vo;
     }
 

platform-service/src/main/java/com/platform/service/sqarepartmanage/impl/SparePartInfoServiceImpl.java

@@ -692,7 +692,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
         List<String> ids = detailList.stream().map(SbModelSpareBomDTO::getId).collect(Collectors.toList());
         ids = ids.stream().filter(item -> StringUtils.isNotBlank(item)).collect(Collectors.toList());
         if (!CollectionUtils.isEmpty(ids) && ids.size() > 0) {
-            detailWeekend.weekendCriteria().andNotIn(SbModelSpareBom::getId, ids);
+            detailWeekend.weekendCriteria().andNotIn(SbModelSpareBom::getId, ids).andEqualTo(SbModelSpareBom::getSpareId, model.getId());
             sbModelSpareBomMapper.deleteByExample(detailWeekend);
         } else {
             // 全部刪除:说明id为空，全部删除了