优化

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

@@ -11,7 +11,6 @@ import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -24,6 +23,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class InStoreFormDTO extends BaseDTO implements Serializable {
+    private String YearMonth;
     private String spareName;
     private LocalDateTime searchTimeStart;
     private LocalDateTime searchTimeEnd;

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

@@ -5,6 +5,7 @@ import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.config.MyMapper;
 import com.platform.dao.entity.store.InStoreDetail;
 import com.platform.dao.entity.store.InStoreForm;
+import com.platform.dao.vo.export.store.ExportInStoreSpareNumVO;
 import com.platform.dao.vo.query.store.InStoreDetailVO;
 import com.platform.dao.vo.query.store.InStoreFormVO;
 import com.platform.dao.vo.report.InAndOutStoretReportVO;
@@ -21,6 +22,7 @@ import java.util.List;
  */
 @Component
 public interface InStoreFormMapper extends MyMapper<InStoreForm> {
+    List<ExportInStoreSpareNumVO> getInStoreSpareNum(InStoreFormDTO dto);
     List<InStoreFormVO> getInStoreForm(InStoreFormDTO dto);
 
     List<InAndOutStoretReportVO> getInAndOutNum(InStoreFormDTO dto);

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

@@ -4,6 +4,8 @@ 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.export.store.ExportInStoreSpareNumVO;
+import com.platform.dao.vo.export.store.ExportOutStoreSpareNumVO;
 import com.platform.dao.vo.query.store.InStoreFormVO;
 import com.platform.dao.vo.query.store.OutStoreDetailVO;
 import com.platform.dao.vo.query.store.OutStoreFormVO;
@@ -21,6 +23,8 @@ import java.util.List;
 @Component
 public interface OutStoreFormMapper extends MyMapper<OutStoreForm> {
 
+    List<ExportOutStoreSpareNumVO> getOutStoreSpareNum(OutStoreFormDTO dto);
+
     List<OutStoreFormVO> getOutStoreForm(OutStoreFormDTO dto);
     /**
      * 分页查询

platform-dao/src/main/java/com/platform/dao/vo/export/store/ExportInStoreSpareNumVO.java

@@ -0,0 +1,41 @@
+package com.platform.dao.vo.export.store;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @Description 入库详情导出VO
+ * @Author liuyu
+ * @Date 2020-06-09 10:20:31
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportInStoreSpareNumVO implements Serializable {
+    /**
+   * 备件id
+   */
+  @Excel(name = "备件id", orderNum = "1")
+  private String spareId;
+
+  /**
+   * 备件id
+   */
+  @Excel(name = "备件名称", orderNum = "2")
+  private String spareName;
+
+    /**
+   * 入库数量
+   */
+  @Excel(name = "入库数量", orderNum = "3")
+  private BigDecimal num;
+
+
+
+
+}

platform-dao/src/main/java/com/platform/dao/vo/export/store/ExportOutStoreSpareNumVO.java

@@ -0,0 +1,40 @@
+package com.platform.dao.vo.export.store;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 入库详情导出VO
+ * @Author liuyu
+ * @Date 2020-06-09 10:20:31
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportOutStoreSpareNumVO implements Serializable {
+    /**
+   * 备件id
+   */
+  @Excel(name = "备件id", orderNum = "1")
+  private String spareId;
+
+  /**
+   * 备件id
+   */
+  @Excel(name = "备件名称", orderNum = "2")
+  private String spareName;
+
+    /**
+   * 入库数量
+   */
+  @Excel(name = "入库数量", orderNum = "3")
+  private BigDecimal num;
+
+
+
+
+}

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

@@ -201,4 +201,18 @@
             </if>
         </where>
     </select>
+
+    <select id="getInStoreSpareNum" parameterType="com.platform.dao.dto.store.InStoreFormDTO"
+    resultType="com.platform.dao.vo.export.store.ExportInStoreSpareNumVO">
+        SELECT info.name as spareName, SUM(in_num) inNum FROM t_in_store_form form LEFT JOIN t_spare_part_info info ON info.id=form.spare_id
+         <where>
+             <if test="searchTimeStart!=null">
+                 and inform.created_time <![CDATA[>=]]> #{searchTimeStart}
+             </if>
+             <if test="searchTimeEnd!=null">
+                 and inform.created_time <![CDATA[<=]]> #{searchTimeEnd}
+             </if>
+         </where>
+         GROUP BY spare_id
+    </select>
 </mapper>

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

@@ -147,4 +147,18 @@
             </if>
         </where>
     </select>
+
+    <select id="getOutStoreSpareNum" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
+            resultType="com.platform.dao.vo.export.store.ExportOutStoreSpareNumVO">
+        SELECT info.name as spareName, SUM(in_num) inNum FROM t_out_store_form form LEFT JOIN t_spare_part_info info ON info.id=form.spare_id
+        <where>
+            <if test="searchTimeStart!=null">
+                and inform.created_time <![CDATA[>=]]> #{searchTimeStart}
+            </if>
+            <if test="searchTimeEnd!=null">
+                and inform.created_time <![CDATA[<=]]> #{searchTimeEnd}
+            </if>
+        </where>
+        GROUP BY spare_id
+    </select>
 </mapper>

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

@@ -4,6 +4,7 @@ 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.InStoreForm;
+import com.platform.dao.vo.export.store.ExportInStoreSpareNumVO;
 import com.platform.service.store.InStoreFormService;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.store.ExportInStoreFormVO;
@@ -195,4 +196,18 @@ public class InStoreFormController {
     return new R(inStoreFormService.getInStoreFormReport(dto,year, startMonth, endMonth));
   }
 
+  /**
+   * 入库登记表导出
+   *
+   * @param inStoreFormDTO 入库登记表DTO
+   * @return R
+   */
+  @GetMapping("/inSpareNum/export")
+  @SysLog("入库备件数量导出")
+  @PreAuthorize("@pms.hasPermission('store-in-store-forms-export')")
+  public void inSpareNumExport(HttpServletResponse response, InStoreFormDTO inStoreFormDTO, @RequestParam(required = false) Integer year, @RequestParam(required = false) Integer startMonth) {
+    List<ExportInStoreSpareNumVO> list = inStoreFormService.getInStoreSpareNum(inStoreFormDTO,year,startMonth);
+    ExcelUtil.exportResponseDict(response, ExportInStoreSpareNumVO.class, list, "月备件入库数量统计表");
+  }
+
 }

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

@@ -4,6 +4,8 @@ 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.export.store.ExportInStoreSpareNumVO;
+import com.platform.dao.vo.export.store.ExportOutStoreSpareNumVO;
 import com.platform.dao.vo.query.store.InStoreFormVO;
 import com.platform.service.store.OutStoreFormService;
 import com.platform.dao.util.ExcelUtil;
@@ -187,4 +189,18 @@ public class OutStoreFormController {
     return new R(outStoreFormService.getOutStoreFormReport(dto,year, startMonth, endMonth));
   }
 
+  /**
+   * 入库登记表导出
+   *
+   * @param inStoreFormDTO 入库登记表DTO
+   * @return R
+   */
+  @GetMapping("/outSpareNum/export")
+  @SysLog("出库备件数量导出")
+  @PreAuthorize("@pms.hasPermission('store-in-store-forms-export')")
+  public void outSpareNumExport(HttpServletResponse response, OutStoreFormDTO outStoreFormDTO, @RequestParam(required = false) Integer year, @RequestParam(required = false) Integer startMonth) {
+    List<ExportOutStoreSpareNumVO> list = outStoreFormService.getOutStoreSpareNum(outStoreFormDTO,year,startMonth);
+    ExcelUtil.exportResponseDict(response, ExportOutStoreSpareNumVO.class, list, "月备件出库数量统计表");
+  }
+
 }

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

@@ -10,6 +10,7 @@ import com.platform.dao.entity.purchase.PurchaseList;
 import com.platform.dao.entity.purchase.PurchaseOrder;
 import com.platform.dao.entity.sb.SbCheckDetail;
 import com.platform.dao.entity.sb.SbCheckForm;
+import com.platform.dao.vo.export.store.ExportInStoreSpareNumVO;
 import com.platform.dao.vo.query.store.InStoreFormVO;
 import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.entity.store.InStoreForm;
@@ -30,6 +31,8 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface InStoreFormService extends IBaseService<InStoreForm, InStoreFormDTO> {
+    List<ExportInStoreSpareNumVO> getInStoreSpareNum(InStoreFormDTO dto,Integer year,Integer month);
+
     List<InStoreFormReportVO> getInStoreFormReport(InStoreFormDTO dto, Integer year, LocalDate startMonth, LocalDate endMonth);
 
     AbstractPageResultBean<InStoreFormVO> getInStoreForm(InStoreFormDTO dto,Integer pageNum,Integer pageSize);

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

@@ -3,6 +3,8 @@ 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.export.store.ExportInStoreSpareNumVO;
+import com.platform.dao.vo.export.store.ExportOutStoreSpareNumVO;
 import com.platform.dao.vo.query.store.InStoreFormVO;
 import com.platform.dao.vo.query.store.OutStoreFormVO;
 import com.platform.dao.dto.store.OutStoreFormDTO;
@@ -25,6 +27,8 @@ import java.util.List;
  */
 public interface OutStoreFormService extends IBaseService<OutStoreForm, OutStoreFormDTO> {
 
+    List<ExportOutStoreSpareNumVO> getOutStoreSpareNum(OutStoreFormDTO dto, Integer year, Integer month);
+
     List<OutStoreFormReportVO> getOutStoreFormReport(OutStoreFormDTO dto, Integer year, LocalDate startMonth, LocalDate endMonth);
 
 

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

@@ -30,6 +30,7 @@ import com.platform.dao.mapper.store.InStoreFormMapper;
 import com.platform.dao.mapper.store.SpareBackFormMapper;
 import com.platform.dao.mapper.store.SpareStoreMapper;
 import com.platform.dao.util.MessageTemplateUtil;
+import com.platform.dao.vo.export.store.ExportInStoreSpareNumVO;
 import com.platform.dao.vo.query.store.InStoreFormVO;
 import com.platform.dao.vo.query.store.SpareBackDetailVO;
 import com.platform.dao.vo.query.store.StoreCheckJobVO;
@@ -236,6 +237,18 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     }
 
 
+    @Override
+    public List<ExportInStoreSpareNumVO> getInStoreSpareNum(InStoreFormDTO dto,Integer searchYear,Integer month) {
+        LocalDateTime searchStartTime = null;
+        LocalDateTime searchEndTime = null;
+        searchStartTime = DateUtils.getFirstDayOfMonth(searchYear,month);
+        searchEndTime = DateUtils.getLastDayOfMonth(searchYear,month);
+        dto.setSearchTimeStart(searchStartTime);
+        dto.setSearchTimeEnd(searchEndTime);
+        List<ExportInStoreSpareNumVO> numVOS = mapper.getInStoreSpareNum(dto);
+        return numVOS;
+    }
+
     @Override
     public List<InStoreFormReportVO> getInStoreFormReport(InStoreFormDTO dto, Integer searchYear, LocalDate startMonth, LocalDate endMonth) {
         List<Map<String, LocalDateTime>> monthStartAndEndList = new ArrayList<Map<String, LocalDateTime>>();
@@ -274,8 +287,6 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
             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+=(inStoreFormVO.getInNum()==null?0:inStoreFormVO.getInNum());
                     detailList.add(inStoreFormVO);

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

@@ -16,6 +16,8 @@ import com.platform.dao.entity.store.OutStoreDetail;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.store.*;
 import com.platform.dao.util.MessageTemplateUtil;
+import com.platform.dao.vo.export.store.ExportInStoreSpareNumVO;
+import com.platform.dao.vo.export.store.ExportOutStoreSpareNumVO;
 import com.platform.dao.vo.query.store.*;
 import com.platform.dao.vo.report.InStoreFormReportVO;
 import com.platform.dao.vo.report.OutStoreFormReportVO;
@@ -59,6 +61,18 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
     private SparePickDetailMapper sparePickDetailMapper;
 
 
+    @Override
+    public List<ExportOutStoreSpareNumVO> getOutStoreSpareNum(OutStoreFormDTO dto, Integer searchYear, Integer month) {
+        LocalDateTime searchStartTime = null;
+        LocalDateTime searchEndTime = null;
+        searchStartTime = DateUtils.getFirstDayOfMonth(searchYear,month);
+        searchEndTime = DateUtils.getLastDayOfMonth(searchYear,month);
+        dto.setSearchTimeStart(searchStartTime);
+        dto.setSearchTimeEnd(searchEndTime);
+        List<ExportOutStoreSpareNumVO> numVOS = mapper.getOutStoreSpareNum(dto);
+        return numVOS;
+    }
+
     @Override
     public List<OutStoreFormReportVO> getOutStoreFormReport(OutStoreFormDTO dto, Integer searchYear, LocalDate startMonth, LocalDate endMonth) {
         List<Map<String, LocalDateTime>> monthStartAndEndList = new ArrayList<Map<String, LocalDateTime>>();