no message

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachine.java

@@ -209,7 +209,7 @@ public class KxsMachine extends Model<KxsMachine> implements Serializable {
     /**
      * 状态 0在库 1出库
      */
-    @Schema(description = "状态 0在库 1出库")
+    @Schema(description = "状态 0在库 1出库 2已退回 3可回收 4回收中 5已回收 6已预发")
     private Integer status;
 
     /**

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineRecycleListVO.java

@@ -35,8 +35,11 @@ public class MachineRecycleListVO implements Serializable {
      */
     @Schema(description = "循环结束时间")
     private LocalDateTime recycleEndTime;
-
-
+    /**
+     * 品牌id
+     */
+    @Schema(description = "品牌id")
+    private int brandId;
 
 
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/MachineController.java

@@ -180,6 +180,17 @@ public class MachineController {
         return R.ok(kxsMachineService.recycleList(page, param));
     }
 
+    /**
+     * 可回收机具品牌列表
+     *
+     * @return 机具可回收列表
+     */
+    @GetMapping("/recycleBrandList")
+    public R recycleBrandList() {
+
+        return R.ok(kxsMachineService.recycleBrandList());
+    }
+
     /**
      * 可回收数量 内部调用
      *

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.product.api.dto.kxsapp.machine.*;
 import com.kxs.product.api.model.KxsMachine;
 import com.kxs.product.api.vo.kxsapp.machine.*;
+import com.kxs.system.api.vo.kxsapp.RecycleBrandListVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -119,5 +120,12 @@ public interface KxsMachineMapper extends BaseMapper<KxsMachine> {
      * @return {@link List}<{@link KxsMachine}>
      */
     List<KxsMachine> selectExpireDeductList(LocalDateTime endDay);
+
+    /**
+     * 可回收机具品牌列表
+     * @param userId 用户id
+     * @return 机具可回收列表
+     */
+    List<RecycleBrandListVO> recycleBrandList(Long userId);
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineService.java

@@ -137,5 +137,12 @@ public interface KxsMachineService extends IService<KxsMachine> {
      * @param para 段落
      */
     void recycleMachineSchedule(String para);
+    /**
+     * 可回收机具品牌列表
+     *
+     * @return 机具可回收列表
+     */
+    Object recycleBrandList();
+
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineServiceImpl.java

@@ -23,6 +23,7 @@ import com.kxs.product.biz.mapper.*;
 import com.kxs.product.biz.service.KxsMachineService;
 import com.kxs.store.api.feign.RemoteKxsStoreService;
 import com.kxs.system.api.feign.RemoteOldService;
+import com.kxs.system.api.vo.kxsapp.RecycleBrandListVO;
 import com.kxs.user.api.feign.RemoteKxsUserService;
 import com.kxs.user.api.model.KxsUser;
 import lombok.RequiredArgsConstructor;
@@ -335,6 +336,12 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
         }
     }
 
+    @Override
+    public Object recycleBrandList() {
+        Long userId = SecurityUtils.getUser().getId();
+        return baseMapper.recycleBrandList(userId);
+    }
+
 
 }
 

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsMachineMapper.xml

@@ -133,14 +133,21 @@
             </if>
         </where>
     </select>
+
     <select id="recyclePageList" resultType="com.kxs.product.api.vo.kxsapp.machine.MachineRecycleListVO">
-        select recycle_end_time, pos_sn from kxs_machine
-        where del_flag = 0 and status = 3 and user_id = #{query.userId}
+        select recycle_end_time, pos_sn, brand_id from kxs_machine
+        where del_flag = 0
+          and status = 3
+          and user_id = #{query.userId}
         <if test="query.posSn != null and query.posSn != ''">
             and pos_sn like concat('%', #{query.posSn}, '%')
         </if>
+        <if test="query.brandId != null and query.brandId != ''">
+            and brand_id = #{query.brandId}
+        </if>
         order by recycle_end_time desc
     </select>
+
     <select id="activateMachineMonthTotal"
             resultType="com.kxs.product.api.vo.kxsapp.machine.StoreActMachineMonthTotalVO">
         select * from
@@ -200,5 +207,13 @@
           order by recycle_end_time desc
           limit 1000
     </select>
+    <select id="recycleBrandList" resultType="com.kxs.system.api.vo.kxsapp.RecycleBrandListVO">
+        select DISTINCT kb.id,kb.name from kxs_machine km
+        left join  kxs_brand kb on km.brand_id = kb.id
+        where km.del_flag = 0
+        and km.status = 3
+        and km.user_id = #{query.userId}
+    </select>
+
 
 </mapper>

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/kxsapp/RecycleBrandListVO.java

@@ -0,0 +1,9 @@
+package com.kxs.system.api.vo.kxsapp;
+
+import lombok.Data;
+
+@Data
+public class RecycleBrandListVO {
+    private int id;
+    private String name;
+}

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsSchoolMenuServiceImpl.java

@@ -31,7 +31,7 @@ public class KxsSchoolMenuServiceImpl extends ServiceImpl<KxsSchoolMenuMapper, K
     private final KxsSchoolStudyMapper kxsSchoolStudyMapper;
     @Override
     public Object firstMenu() {
-        List<KxsSchoolMenu> list = list(Wrappers.emptyWrapper());
+        List<KxsSchoolMenu> list = list(Wrappers.<KxsSchoolMenu>query().lambda().isNotNull(KxsSchoolMenu::getPid).ne(KxsSchoolMenu::getPid,0));
         ArrayList<SchoolFirstMenuVO> schoolFirstMenuVOS = new ArrayList<>();
         for (KxsSchoolMenu kxsSchoolMenu : list) {
             SchoolFirstMenuVO schoolFirstMenuVO = new SchoolFirstMenuVO();
@@ -41,7 +41,7 @@ public class KxsSchoolMenuServiceImpl extends ServiceImpl<KxsSchoolMenuMapper, K
             schoolFirstMenuVO.setChildCount(count);//下级数量
             //获取当前时间
             LocalDateTime now = LocalDateTime.now();
-            // 获取当前时间之前三天的时间
+            //获取当前时间之前三天的时间
             LocalDateTime threeDaysBefore = now.minusDays(3);
             List<KxsSchoolStudy> kxsSchoolStudies = kxsSchoolStudyMapper.selectList(Wrappers.<KxsSchoolStudy>query().lambda().eq(KxsSchoolStudy::getMenuId,kxsSchoolMenu.getId()).between(KxsSchoolStudy::getCreateTime, threeDaysBefore, now));
             //三天内存在数据则返回有更新

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsCampMapper.xml

@@ -38,6 +38,8 @@
         group by a.id
         order by id desc
     </select>
+
+
     <select id="selectByUserId" resultType="com.kxs.system.api.model.KxsCampUser">
         SELECT a.id, a.status, a.camp_num, a.camp_type, a.pic_url, a.title
         from kxs_camp a

kxs-user/kxs-user-biz/pom.xml

@@ -178,6 +178,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>15</source>
+                    <target>15</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>