优化

platform-dao/src/main/java/com/platform/dao/dto/store/OutStoreFormDTO.java

@@ -24,6 +24,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormDTO extends BaseDTO implements Serializable {
+
+    private LocalDateTime searchTimeStart;
+    private LocalDateTime searchTimeEnd;
+
     private Integer outNum;
     private String spareStoreId;
 

platform-dao/src/main/java/com/platform/dao/mapper/store/InStoreFormMapper.java

@@ -21,6 +21,8 @@ import java.util.List;
  */
 @Component
 public interface InStoreFormMapper extends MyMapper<InStoreForm> {
+    List<InStoreFormVO> getInStoreForm(InStoreFormDTO dto);
+
     List<InAndOutStoretReportVO> getInAndOutNum(InStoreFormDTO dto);
     /**
      * 分页查询

platform-dao/src/main/java/com/platform/dao/mapper/store/OutStoreFormMapper.java

@@ -1,8 +1,10 @@
 package com.platform.dao.mapper.store;
 
+import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.config.MyMapper;
 import com.platform.dao.entity.store.OutStoreForm;
+import com.platform.dao.vo.query.store.InStoreFormVO;
 import com.platform.dao.vo.query.store.OutStoreDetailVO;
 import com.platform.dao.vo.query.store.OutStoreFormVO;
 import org.apache.ibatis.annotations.Param;
@@ -18,6 +20,8 @@ import java.util.List;
  */
 @Component
 public interface OutStoreFormMapper extends MyMapper<OutStoreForm> {
+
+    List<OutStoreFormVO> getOutStoreForm(OutStoreFormDTO dto);
     /**
      * 分页查询
      * @param dto

platform-dao/src/main/java/com/platform/dao/vo/query/store/OutStoreFormVO.java

@@ -25,6 +25,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormVO extends BaseVO implements Serializable {
+    private String brand;
     private Integer outNum;
     private String spareId;
 

platform-dao/src/main/java/com/platform/dao/vo/report/InStoreFormReportVO.java

@@ -0,0 +1,40 @@
+package com.platform.dao.vo.report;
+
+import com.platform.dao.vo.query.store.InStoreFormVO;
+import com.platform.dao.vo.repair.RepairApplicationFormVO;
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author cyz
+ */
+@Data
+@Accessors(chain = true)
+public class InStoreFormReportVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 周
+     */
+    @Excel(name = "年", orderNum = "1")
+    private Integer year;
+    /**
+     * 月份
+     */
+    @Excel(name = "月份", orderNum = "2")
+    private Integer month;
+
+    /**
+     * 次数
+     */
+    @Excel(name = "次数", orderNum = "3")
+    private Integer num;
+
+    /**
+     * 明细列表
+     */
+    List<InStoreFormVO> detailList;
+}

platform-dao/src/main/java/com/platform/dao/vo/report/OutStoreFormReportVO.java

@@ -0,0 +1,40 @@
+package com.platform.dao.vo.report;
+
+import com.platform.dao.vo.query.store.InStoreFormVO;
+import com.platform.dao.vo.query.store.OutStoreFormVO;
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author cyz
+ */
+@Data
+@Accessors(chain = true)
+public class OutStoreFormReportVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 周
+     */
+    @Excel(name = "年", orderNum = "1")
+    private Integer year;
+    /**
+     * 月份
+     */
+    @Excel(name = "月份", orderNum = "2")
+    private Integer month;
+
+    /**
+     * 次数
+     */
+    @Excel(name = "次数", orderNum = "3")
+    private Integer num;
+
+    /**
+     * 明细列表
+     */
+    List<OutStoreFormVO> detailList;
+}

platform-dao/src/main/resources/mapper/store/InStoreFormMapper.xml

@@ -180,4 +180,19 @@
             </if>
         </where>
     </select>
+
+    <select id="getInStoreForm" parameterType="com.platform.dao.dto.store.InStoreFormDTO"
+            resultType="com.platform.dao.vo.query.store.InStoreFormVO">
+        select instore.*,info.brand ,info.name,info.initial_value as price,info.ggxh from
+        t_in_store_form instore
+        left join t_spare_part_info info
+        on instore.spare_id = info.id
+        <where>
+            <if test="keyword!=null and keyword!=''">
+                and (info.name like concat('%',#{keyword},'%')
+                or info.brand like concat('%',#{keyword},'%')
+                )
+            </if>
+        </where>
+    </select>
 </mapper>

platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -95,9 +95,10 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
             resultType="com.platform.dao.vo.query.store.OutStoreFormVO">
-        select outstoreform.*, store.name storeName
+        select outstoreform.*, store.name storeName,info.name as spareName
         from t_out_store_form as outstoreform
         left join t_store store on store.id = outstoreform.store_id
+        left join t_spare_part_info info on outstoreform.spare_id = info.id
         <where>
             <include refid="List_Condition"/>
             <if test="useCompany != null and useCompany != ''">
@@ -125,4 +126,19 @@
         left join t_spare_part_info spareinfo on spareinfo.id = detail.spare_id
         where form.id = #{id}
     </select>
+
+    <select id="getOutStoreForm" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
+            resultType="com.platform.dao.vo.query.store.OutStoreFormVO">
+        select outstore.*,info.brand ,info.name,info.initial_value as price,info.ggxh from
+        t_out_store_form outstore
+        left join t_spare_part_info info
+        on outstore.spare_id = info.id
+        <where>
+            <if test="keyword!=null and keyword!=''">
+                and (info.name like concat('%',#{keyword},'%')
+                or info.brand like concat('%',#{keyword},'%')
+                )
+            </if>
+        </where>
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/sqarepartmanage/SparePartInfoController.java

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.List;
 
@@ -307,15 +308,15 @@ public class SparePartInfoController {
         return new R(sparePartInfoService.getInOrOut(sparePartInfoDTO,pageNum,pageSize));
     }
 
-    /**
-     *
-     * @param sparePartInfoDTO
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @GetMapping("/getInAndOutReport")
-    public R getInAndOutReport(InStoreFormDTO dto) {
-        return new R(sparePartInfoService.getInAndOutReport(dto));
-    }
+//    /**
+//     *
+//     * @param sparePartInfoDTO
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @GetMapping("/getInAndOutReport")
+//    public R getInAndOutReport(InStoreFormDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth, @RequestParam(defaultValue = "1") Integer searchType) {
+//        return new R(sparePartInfoService.getInAndOutReport(dto,year, startMonth, endMonth));
+//    }
 }

platform-rest/src/main/java/com/platform/rest/controller/store/InStoreFormController.java

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.*;
 import lombok.AllArgsConstructor;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.rest.log.annotation.SysLog;
+
+import java.time.LocalDate;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -167,4 +169,30 @@ public class InStoreFormController {
     ExcelUtil.exportResponseDict(response, ExportInStoreFormVO.class, BeanConverterUtil.copyListProperties(list, ExportInStoreFormVO.class), "入库登记表");
   }
 
+  /**
+   * 获取分页
+   *
+   * @param pageNum 当前页码
+   * @param pageSize 每页条数
+   * @param inStoreFormDTO 入库登记表DTO
+   * @return R
+   */
+  @GetMapping("/getInStoreForm")
+  public R<AbstractPageResultBean<InStoreFormVO>> query2(InStoreFormDTO inStoreFormDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+    AbstractPageResultBean<InStoreFormVO> vo = inStoreFormService.getInStoreForm(inStoreFormDTO, pageNum, pageSize);
+    return new R<>(vo);
+  }
+
+  /**
+   *
+   * @param sparePartInfoDTO
+   * @param pageNum
+   * @param pageSize
+   * @return
+   */
+  @GetMapping("/getInStoreFormReport")
+  public R getInStoreFormReport(InStoreFormDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth) {
+    return new R(inStoreFormService.getInStoreFormReport(dto,year, startMonth, endMonth));
+  }
+
 }

platform-rest/src/main/java/com/platform/rest/controller/store/OutStoreFormController.java

@@ -1,8 +1,10 @@
 package com.platform.rest.controller.store;
 
 import com.platform.common.util.R;
+import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.entity.store.OutStoreForm;
+import com.platform.dao.vo.query.store.InStoreFormVO;
 import com.platform.service.store.OutStoreFormService;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.store.ExportOutStoreFormVO;
@@ -16,6 +18,8 @@ import org.springframework.web.bind.annotation.*;
 import lombok.AllArgsConstructor;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.rest.log.annotation.SysLog;
+
+import java.time.LocalDate;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -164,4 +168,23 @@ public class OutStoreFormController {
     ExcelUtil.exportResponseDict(response, ExportOutStoreFormVO.class, BeanConverterUtil.copyListProperties(list, ExportOutStoreFormVO.class), "出库登记单");
   }
 
+  /**
+   * 获取分页
+   *
+   * @param pageNum 当前页码
+   * @param pageSize 每页条数
+   * @param inStoreFormDTO 入库登记表DTO
+   * @return R
+   */
+  @GetMapping("/getOutStoreForm")
+  public R<AbstractPageResultBean<InStoreFormVO>> query2(OutStoreFormDTO outStoreFormDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+    AbstractPageResultBean<OutStoreFormVO> vo = outStoreFormService.getOutStoreForm(outStoreFormDTO, pageNum, pageSize);
+    return new R(vo);
+  }
+
+  @GetMapping("/getOutStoreFormReport")
+  public R getOutStoreFormReport(OutStoreFormDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth) {
+    return new R(outStoreFormService.getOutStoreFormReport(dto,year, startMonth, endMonth));
+  }
+
 }

platform-rest/src/main/java/com/platform/rest/controller/store/StoreController.java

@@ -218,6 +218,15 @@ public class StoreController {
                 Store parent = type;
                 List<Store> children = new ArrayList<Store>();
                 for(Store child: typeList){
+                    List<Store> children2 = new ArrayList<>();
+                    for (Store child2:typeList){
+
+                        if(child.getId().equals(child2.getParentId())){
+                            children2.add(child2);
+                        }
+                    }
+                    child.setChildren(children2);
+
                     if(type.getId().equals(child.getParentId())){
                         children.add(child);
                     }

platform-rest/src/main/resources/application-dev.yml

@@ -82,6 +82,8 @@ ignore:
     - /wechat/**
     - /upms/configs/**
     - /sqarepartmanage/spare-part-info/**
+    - /store/in-store-forms/**
+    - /store/out-store-forms/**
 upload:
   root-dir: D://data//xian
 

platform-service/src/main/java/com/platform/service/sqarepartmanage/SparePartInfoService.java

@@ -1,14 +1,17 @@
 package com.platform.service.sqarepartmanage;
 
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.entity.sqarepartmanage.SparePartInfo;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
 import com.platform.dao.vo.report.InAndOutStoretReportVO;
+import com.platform.dao.vo.report.RepairReport24VO;
 import com.platform.service.base.IBaseService;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -18,9 +21,9 @@ import java.util.List;
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface SparePartInfoService extends IBaseService<SparePartInfo, SparePartInfoDTO> {
-    List<InAndOutStoretReportVO> getInAndOutReport(InStoreFormDTO  dto);
 
-    AbstractPageResultBean<SparePartInfoVO> getInOrOut(SparePartInfoDTO dto,Integer pageNum,Integer pageSize);
+
+ AbstractPageResultBean<SparePartInfoVO> getInOrOut(SparePartInfoDTO dto,Integer pageNum,Integer pageSize);
 
    /**
     * 批量删除

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

@@ -43,7 +43,9 @@ import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.vo.query.check.CheckStandardSpareVO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
 import com.platform.dao.vo.query.store.InStoreFormVO;
+import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.dao.vo.report.InAndOutStoretReportVO;
+import com.platform.dao.vo.report.RepairReport24VO;
 import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.dao.vo.sb.SbModelSpareBomVO;
 import com.platform.dao.vo.spare.SparePartUsedVO;
@@ -98,17 +100,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
     private OutStoreFormMapper outStoreFormMapper;
 
 
-    @Override
-    public List<InAndOutStoretReportVO> getInAndOutReport(InStoreFormDTO dto) {
-        List<InAndOutStoretReportVO> result = inStoreFormMapper.getInAndOutNum(dto);
-        List<InAndOutStoretReportVO> reportVOS = new ArrayList<>();
-        for (InAndOutStoretReportVO vo:result){
-            if (vo.getInNum()!=null||vo.getOutNum()!=null){
-                reportVOS.add(vo);
-            }
-        }
-        return reportVOS;
-    }
+
 
     @Override
     public AbstractPageResultBean<SparePartInfoVO> getInOrOut(SparePartInfoDTO dto, Integer pageNum, Integer pageSize) {

platform-service/src/main/java/com/platform/service/store/InStoreFormService.java

@@ -16,7 +16,11 @@ import com.platform.dao.entity.store.InStoreForm;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.dao.vo.query.store.SpareBackDetailVO;
 import com.platform.dao.vo.query.store.StoreCheckJobVO;
+import com.platform.dao.vo.report.InAndOutStoretReportVO;
+import com.platform.dao.vo.report.InStoreFormReportVO;
 import com.platform.service.base.IBaseService;
+
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -26,6 +30,10 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface InStoreFormService extends IBaseService<InStoreForm, InStoreFormDTO> {
+    List<InStoreFormReportVO> getInStoreFormReport(InStoreFormDTO dto, Integer year, LocalDate startMonth, LocalDate endMonth);
+
+    AbstractPageResultBean<InStoreFormVO> getInStoreForm(InStoreFormDTO dto,Integer pageNum,Integer pageSize);
+
     void spareInStore(InStoreFormDTO dto);
 
     InStoreForm saveInStoreForm(InStoreFormDTO dto);

platform-service/src/main/java/com/platform/service/store/OutStoreFormService.java

@@ -1,14 +1,20 @@
 package com.platform.service.store;
 
+import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.dto.store.SparePickFormDTO;
 import com.platform.dao.entity.sb.SbOil;
+import com.platform.dao.vo.query.store.InStoreFormVO;
 import com.platform.dao.vo.query.store.OutStoreFormVO;
 import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.entity.store.OutStoreForm;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.dao.vo.query.store.SparePickDetailVO;
 import com.platform.dao.vo.query.store.StoreCheckJobVO;
+import com.platform.dao.vo.report.InStoreFormReportVO;
+import com.platform.dao.vo.report.OutStoreFormReportVO;
 import com.platform.service.base.IBaseService;
+
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -19,6 +25,11 @@ import java.util.List;
  */
 public interface OutStoreFormService extends IBaseService<OutStoreForm, OutStoreFormDTO> {
 
+    List<OutStoreFormReportVO> getOutStoreFormReport(OutStoreFormDTO dto, Integer year, LocalDate startMonth, LocalDate endMonth);
+
+
+    AbstractPageResultBean<OutStoreFormVO> getOutStoreForm(OutStoreFormDTO dto, Integer pageNum, Integer pageSize);
+
     void spareOutStore(OutStoreFormDTO dto);
 
    /**

platform-service/src/main/java/com/platform/service/store/impl/InStoreFormServiceImpl.java

@@ -2,6 +2,7 @@ package com.platform.service.store.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.enums.DataFilterTypeEnum;
@@ -33,6 +34,9 @@ import com.platform.dao.vo.query.store.InStoreFormVO;
 import com.platform.dao.vo.query.store.SpareBackDetailVO;
 import com.platform.dao.vo.query.store.StoreCheckJobVO;
 import com.platform.dao.vo.query.store.StoreVO;
+import com.platform.dao.vo.repair.RepairApplicationFormVO;
+import com.platform.dao.vo.report.InStoreFormReportVO;
+import com.platform.dao.vo.report.RepairReport24VO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.business.PurchaseBusinessService;
 import com.platform.service.event.WorkplaceBacklogEvent;
@@ -47,9 +51,11 @@ import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -230,6 +236,64 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     }
 
 
+    @Override
+    public List<InStoreFormReportVO> getInStoreFormReport(InStoreFormDTO dto, Integer searchYear, LocalDate startMonth, LocalDate endMonth) {
+        List<Map<String, LocalDateTime>> monthStartAndEndList = new ArrayList<Map<String, LocalDateTime>>();
+        LocalDateTime searchStartTime = null;
+        LocalDateTime searchEndTime = null;
+        if (searchYear != null) {
+            LocalDate localDate = LocalDate.now();
+            int year = localDate.getYear();
+            // 如2021-10-15号码，则month=10，需要计算到11月份，需要加1
+            int month = localDate.getMonthValue();
+            if (searchYear < year) {
+                month = 12;
+                year = searchYear;
+            }
+            monthStartAndEndList = DateUtils.getMonthStartAndEndByYear(year, month);
+            // 当前年份只统计到当前月，历史年份统计全年
+            searchStartTime = DateUtils.getFirstDayOfThisYear(year);
+            searchEndTime = DateUtils.getLastDayOfMonth(year, month);
+        } else {
+            monthStartAndEndList = DateUtils.getMonthStartAndEndByYear(startMonth, endMonth);
+            searchStartTime = DateUtils.getFirstDayOfMonth(startMonth);
+            searchEndTime = DateUtils.getLastDayOfMonth(endMonth);
+        }
+
+        // 选择非计划性的订单
+//        dto.setCategory(RepairApplicationFormCategoryEnum.PLAN_NOT.getValue());
+        dto.setSearchTimeStart(searchStartTime);
+        dto.setSearchTimeEnd(searchEndTime);
+        List<InStoreFormVO> list = mapper.selectList(dto);
+        List<InStoreFormReportVO> result = new ArrayList();
+        int i = 0;
+        for (Map<String, LocalDateTime> map : monthStartAndEndList) {
+            InStoreFormReportVO vo = new InStoreFormReportVO();
+            List<InStoreFormVO> detailList = new ArrayList();
+            vo.setYear(map.get("searchStartTimeMonth").getYear());
+            vo.setMonth(map.get("searchStartTimeMonth").getMonthValue());
+            for (InStoreFormVO inStoreFormVO : list) {
+
+
+                if (inStoreFormVO.getCreatedTime().isAfter(map.get("searchStartTimeMonth")) && inStoreFormVO.getCreatedTime().isBefore(map.get("searchEndTimeMonth"))) {
+                    i++;
+                    detailList.add(inStoreFormVO);
+                }
+            }
+            vo.setNum(i);
+            vo.setDetailList(detailList);
+            result.add(vo);
+
+        }
+        return result;
+    }
+
+    @Override
+    public AbstractPageResultBean<InStoreFormVO> getInStoreForm(InStoreFormDTO dto,Integer pageNum,Integer pageSize) {
+        PageHelper.startPage(pageNum,pageSize);
+        return new MyPage<>(mapper.getInStoreForm(dto));
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void spareInStore(InStoreFormDTO model) {

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -17,6 +17,8 @@ import com.platform.dao.enums.*;
 import com.platform.dao.mapper.store.*;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.vo.query.store.*;
+import com.platform.dao.vo.report.InStoreFormReportVO;
+import com.platform.dao.vo.report.OutStoreFormReportVO;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.store.OutStoreFormService;
 import com.platform.service.store.StoreService;
@@ -29,9 +31,11 @@ import tk.mybatis.mapper.weekend.WeekendCriteria;
 import lombok.AllArgsConstructor;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -54,6 +58,65 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
     private SparePickFormMapper sparePickFormMapper;
     private SparePickDetailMapper sparePickDetailMapper;
 
+
+    @Override
+    public List<OutStoreFormReportVO> getOutStoreFormReport(OutStoreFormDTO dto, Integer searchYear, LocalDate startMonth, LocalDate endMonth) {
+        List<Map<String, LocalDateTime>> monthStartAndEndList = new ArrayList<Map<String, LocalDateTime>>();
+        LocalDateTime searchStartTime = null;
+        LocalDateTime searchEndTime = null;
+        if (searchYear != null) {
+            LocalDate localDate = LocalDate.now();
+            int year = localDate.getYear();
+            // 如2021-10-15号码，则month=10，需要计算到11月份，需要加1
+            int month = localDate.getMonthValue();
+            if (searchYear < year) {
+                month = 12;
+                year = searchYear;
+            }
+            monthStartAndEndList = DateUtils.getMonthStartAndEndByYear(year, month);
+            // 当前年份只统计到当前月，历史年份统计全年
+            searchStartTime = DateUtils.getFirstDayOfThisYear(year);
+            searchEndTime = DateUtils.getLastDayOfMonth(year, month);
+        } else {
+            monthStartAndEndList = DateUtils.getMonthStartAndEndByYear(startMonth, endMonth);
+            searchStartTime = DateUtils.getFirstDayOfMonth(startMonth);
+            searchEndTime = DateUtils.getLastDayOfMonth(endMonth);
+        }
+
+        // 选择非计划性的订单
+//        dto.setCategory(RepairApplicationFormCategoryEnum.PLAN_NOT.getValue());
+        dto.setSearchTimeStart(searchStartTime);
+        dto.setSearchTimeEnd(searchEndTime);
+        List<OutStoreFormVO> list = mapper.selectList(dto);
+        List<OutStoreFormReportVO> result = new ArrayList();
+        int i = 0;
+        for (Map<String, LocalDateTime> map : monthStartAndEndList) {
+            OutStoreFormReportVO vo = new OutStoreFormReportVO();
+            List<OutStoreFormVO> detailList = new ArrayList();
+            vo.setYear(map.get("searchStartTimeMonth").getYear());
+            vo.setMonth(map.get("searchStartTimeMonth").getMonthValue());
+            for (OutStoreFormVO outStoreFormVO : list) {
+
+
+                if (outStoreFormVO.getCreatedTime().isAfter(map.get("searchStartTimeMonth")) && outStoreFormVO.getCreatedTime().isBefore(map.get("searchEndTimeMonth"))) {
+                    i++;
+                    detailList.add(outStoreFormVO);
+                }
+            }
+            vo.setNum(i);
+            vo.setDetailList(detailList);
+            result.add(vo);
+
+        }
+        return result;
+    }
+
+    @Override
+    public AbstractPageResultBean<OutStoreFormVO> getOutStoreForm(OutStoreFormDTO dto, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum,pageSize);
+        return new MyPage<>(mapper.getOutStoreForm(dto));
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void spareOutStore(OutStoreFormDTO model) {

platform-service/src/main/java/com/platform/service/upms/impl/ScheduleJobServiceImpl.java

@@ -38,16 +38,16 @@ public class ScheduleJobServiceImpl extends BaseServiceImpl<ScheduleJobMapper, S
      */
     @PostConstruct
     public void init() {
-        List<ScheduleJob> scheduleJobList = mapper.selectAll();
-        for (ScheduleJob scheduleJob : scheduleJobList) {
-            CronTrigger cronTrigger = ScheduleUtils.getCronTrigger(scheduler, scheduleJob.getJobId());
-            //如果不存在，则创建
-            if (cronTrigger == null) {
-                ScheduleUtils.createScheduleJob(scheduler, scheduleJob);
-            } else {
-                ScheduleUtils.updateScheduleJob(scheduler, scheduleJob);
-            }
-        }
+//        List<ScheduleJob> scheduleJobList = mapper.selectAll();
+//        for (ScheduleJob scheduleJob : scheduleJobList) {
+//            CronTrigger cronTrigger = ScheduleUtils.getCronTrigger(scheduler, scheduleJob.getJobId());
+//            //如果不存在，则创建
+//            if (cronTrigger == null) {
+//                ScheduleUtils.createScheduleJob(scheduler, scheduleJob);
+//            } else {
+//                ScheduleUtils.updateScheduleJob(scheduler, scheduleJob);
+//            }
+//        }
     }
 
     @Override