Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/WarrantyReq.java

@@ -15,6 +15,7 @@ public class WarrantyReq  extends BaseRequest {
     private String orgId;
     private String warrantyType;
     private String warrantyDays;
+    private String state;
     private String typeId;
     private String sizeId;
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/entity/VieDestoryGroup.java

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("vie_destory_group")
+public class VieDestoryGroup implements Serializable {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @TableField("size_name")
+    private String sizeName;
+
+    @TableField("type_name")
+    private String typeName;
+
+    @TableField("state")
+    private String state;
+
+    @TableField("type_id")
+    private String typeId;
+
+    @TableField("size_id")
+    private String sizeId;
+
+
+    @TableField("org_name")
+    private String orgName;
+
+    @TableField("org_id")
+    private String orgId;
+
+    @TableField("count_of_items")
+    private String countOfItems;
+
+    @TableField("warehouse_id")
+    private String warehouseId;
+
+    @TableField("warehouse_name")
+    private String warehouseName;
+
+
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/VieDestroyGroupMapper.java

+package com.junmp.jyzb.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.entity.VieDestoryGroup;
+import com.junmp.jyzb.entity.VieWarrantyGroup;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface VieDestroyGroupMapper extends BaseMapper<VieDestoryGroup> {
+
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/VieDestoryGroupService.java

+package com.junmp.jyzb.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.TjDto.WarrantyDataDto;
+import com.junmp.jyzb.api.bean.req.WarrantyReq;
+import com.junmp.jyzb.entity.VieDestoryGroup;
+import com.junmp.jyzb.entity.VieWarrantyGroup;
+import com.junmp.v2.db.api.page.PageResult;
+
+
+public interface VieDestoryGroupService extends IService<VieDestoryGroup> {
+
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/VieDestoryGroupServiceImpl.java

+package com.junmp.jyzb.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.entity.VieDestoryGroup;
+import com.junmp.jyzb.entity.VieWarrantyGroup;
+import com.junmp.jyzb.mapper.VieDestroyGroupMapper;
+import com.junmp.jyzb.mapper.VieWarrantyGroupMapper;
+import com.junmp.jyzb.service.VieDestoryGroupService;
+import com.junmp.jyzb.service.VieWarrantyGroupService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class VieDestoryGroupServiceImpl extends ServiceImpl<VieDestroyGroupMapper, VieDestoryGroup> implements VieDestoryGroupService {
+
+
+}

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/VieWarrantyGroupServiceImpl.java

@@ -8,11 +8,13 @@ import com.junmp.jyzb.api.bean.dto.InventoryDto;
 import com.junmp.jyzb.api.bean.dto.TjDto.WarrantyDataDto;
 import com.junmp.jyzb.api.bean.req.WarrantyReq;
 import com.junmp.jyzb.entity.Inventory;
+import com.junmp.jyzb.entity.VieDestoryGroup;
 import com.junmp.jyzb.entity.VieWarrantyGroup;
 import com.junmp.jyzb.entity.Warehouse;
 import com.junmp.jyzb.mapper.VieWarrantyGroupMapper;
 import com.junmp.jyzb.mapper.WarehouseMapper;
 import com.junmp.jyzb.service.VieWarrantyGroupService;
+import com.junmp.jyzb.service.WarehouseDevService;
 import com.junmp.jyzb.service.WarehouseService;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
@@ -30,23 +32,54 @@ import java.util.stream.Collectors;
 @Slf4j
 public class VieWarrantyGroupServiceImpl extends ServiceImpl<VieWarrantyGroupMapper, VieWarrantyGroup> implements VieWarrantyGroupService {
 
-
+    @Resource
+    private VieDestoryGroupServiceImpl VieDestoryGroupService;
     @Override
     public PageResult<WarrantyDataDto> WarrantyData(WarrantyReq req) {
-        LambdaQueryWrapper<VieWarrantyGroup> wrapper = createWrapper(req);
-        Page<VieWarrantyGroup> page = page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), wrapper);
-        List<VieWarrantyGroup> records = page.getRecords();
-        long size = list(wrapper).size();
-        List<WarrantyDataDto> collect = records.parallelStream()
-                .map(vieWarrantyGroup -> {
-                    WarrantyDataDto warrantyDataDto = new WarrantyDataDto();
-                    BeanPlusUtil.copyProperties(vieWarrantyGroup, warrantyDataDto);
-                    return warrantyDataDto;
-                }).collect(Collectors.toList());
-        Page<WarrantyDataDto> page1 = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
-        page1.setRecords(collect);
-        page1.setTotal(size);
-        return PageResultFactory.createPageResult(page1);
+        if(req.getWarrantyType().equals(0)||req.getWarrantyType().equals(1))
+        {
+            LambdaQueryWrapper<VieWarrantyGroup> wrapper = createWrapper(req);
+            Page<VieWarrantyGroup> page = page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), wrapper);
+            List<VieWarrantyGroup> records = page.getRecords();
+            long size = list(wrapper).size();
+            List<WarrantyDataDto> collect = records.parallelStream()
+                    .map(vieWarrantyGroup -> {
+                        WarrantyDataDto warrantyDataDto = new WarrantyDataDto();
+                        BeanPlusUtil.copyProperties(vieWarrantyGroup, warrantyDataDto);
+                        return warrantyDataDto;
+                    }).collect(Collectors.toList());
+            Page<WarrantyDataDto> page1 = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+            page1.setRecords(collect);
+            page1.setTotal(size);
+            return PageResultFactory.createPageResult(page1);
+        }
+        else
+        {
+            if (req.getWarrantyType().equals("2"))//销毁
+            {
+                req.setState("destory");
+            }
+            else//报废区
+            {
+                req.setState("broken");
+            }
+            LambdaQueryWrapper<VieDestoryGroup> DestoryWrapper = CreateDestoryWrapper(req);
+            Page<VieDestoryGroup> page = VieDestoryGroupService.page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), DestoryWrapper);
+            List<VieDestoryGroup> records = page.getRecords();
+            long size = VieDestoryGroupService.list(DestoryWrapper).size();
+            List<WarrantyDataDto> collect = records.parallelStream()
+                    .map(vieWarrantyGroup -> {
+                        WarrantyDataDto warrantyDataDto = new WarrantyDataDto();
+                        BeanPlusUtil.copyProperties(vieWarrantyGroup, warrantyDataDto);
+                        return warrantyDataDto;
+                    }).collect(Collectors.toList());
+            Page<WarrantyDataDto> page1 = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+            page1.setRecords(collect);
+            page1.setTotal(size);
+            return PageResultFactory.createPageResult(page1);
+        }
+
+
     }
     private LambdaQueryWrapper<VieWarrantyGroup> createWrapper(WarrantyReq req) {
         LambdaQueryWrapper<VieWarrantyGroup> wrapper = new LambdaQueryWrapper<>();
@@ -67,4 +100,17 @@ public class VieWarrantyGroupServiceImpl extends ServiceImpl<VieWarrantyGroupMap
         }
         return wrapper;
     }
+    private LambdaQueryWrapper<VieDestoryGroup> CreateDestoryWrapper(WarrantyReq req) {
+        LambdaQueryWrapper<VieDestoryGroup> wrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isEmpty(req)) {
+            return wrapper;
+        }
+
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getOrgId()), VieDestoryGroup::getOrgId, req.getOrgId());
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getSizeId()), VieDestoryGroup::getSizeId, req.getSizeId());
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getTypeId()), VieDestoryGroup::getTypeId, req.getTypeId());
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getWarrantyType()), VieDestoryGroup::getState, req.getState());
+
+        return wrapper;
+    }
 }

jyzb-boot/src/main/resources/application-prod.yml

@@ -32,7 +32,7 @@ knife4j:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.128:3306/db_jyzb_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://192.168.1.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
     username: root
     password: 123456