导入导出报表

platform-dao/src/main/java/com/platform/dao/dto/sqarepartmanage/SparePartInfoDTO.java

@@ -27,7 +27,9 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SparePartInfoDTO extends BaseDTO implements Serializable {
-    private String searchTime;
+    private String searchTimeStart;
+
+    private String searchTimeEnd;
     /**
      * 品牌
      */

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

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

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

@@ -148,7 +148,7 @@
 
     <select id="getInAndOutNum" parameterType="com.platform.dao.dto.store.InStoreFormDTO"
             resultType="com.platform.dao.vo.report.InAndOutStoretReportVO">
-        SELECT info.name ,t1.inNum,t2.outNum
+        SELECT info.name as spareName ,t1.inNum,t2.outNum
         FROM t_spare_part_info info
         LEFT JOIN (SELECT info.id spare_id,SUM(inform.in_num) inNum FROM  t_spare_part_info info LEFT JOIN t_in_store_form inform ON info.id=inform.spare_id
         <where>
@@ -156,11 +156,9 @@
                 and inform.created_time <![CDATA[>=]]> #{searchTimeStart}
             </if>
             <if test="searchTimeEnd!=null and searchTimeEnd!=null">
-                and inform.created_time <![CDATA[>=]]> #{searchTimeEnd}
-            </if>
-            <if test="spareName!=null and spareName@=''">
-                and info.name like concat('%',#{spareName},'%')
+                and inform.created_time <![CDATA[<=]]> #{searchTimeEnd}
             </if>
+
         </where>
         GROUP BY info.id) AS t1
         ON info.id=t1.spare_id
@@ -171,15 +169,16 @@
                 and outform.created_time <![CDATA[>=]]> #{searchTimeStart}
             </if>
             <if test="searchTimeEnd!=null and searchTimeEnd!=null">
-                and outform.created_time <![CDATA[>=]]> #{searchTimeEnd}
-            </if>
-            <if test="spareName!=null and spareName@=''">
-                and info.name like concat('%',#{spareName},'%')
+                and outform.created_time <![CDATA[<=]]> #{searchTimeEnd}
             </if>
         </where>
         GROUP BY info.id) AS t2
         ON info.id=t2.spare_id
-
+        <where>
+            <if test="spareName!=null and spareName!=''">
+                and info.name like concat('%',#{spareName},'%')
+            </if>
+        </where>
     </select>
 
 

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

@@ -8,6 +8,7 @@ import com.platform.common.util.StringUtils;
 import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
 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.util.ExcelUtil;
 import com.platform.dao.util.SelectUtil;
@@ -314,7 +315,7 @@ public class SparePartInfoController {
      * @return
      */
     @GetMapping("/getInAndOutReport")
-    public R getInAndOutReport(SparePartInfoDTO sparePartInfoDTO) {
-        return new R(sparePartInfoService.getInAndOutReport(sparePartInfoDTO));
+    public R getInAndOutReport(InStoreFormDTO dto) {
+        return new R(sparePartInfoService.getInAndOutReport(dto));
     }
 }

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

@@ -2,6 +2,7 @@ package com.platform.service.sqarepartmanage;
 
 import com.platform.common.bean.AbstractPageResultBean;
 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;
@@ -17,7 +18,7 @@ import java.util.List;
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface SparePartInfoService extends IBaseService<SparePartInfo, SparePartInfoDTO> {
-    List<InAndOutStoretReportVO> getInAndOutReport(SparePartInfoDTO dto);
+    List<InAndOutStoretReportVO> getInAndOutReport(InStoreFormDTO  dto);
 
     AbstractPageResultBean<SparePartInfoVO> getInOrOut(SparePartInfoDTO dto,Integer pageNum,Integer pageSize);
 

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

@@ -99,11 +99,8 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
 
 
     @Override
-    public List<InAndOutStoretReportVO> getInAndOutReport(SparePartInfoDTO dto) {
-        InStoreFormDTO inStoreFormDTO = new InStoreFormDTO();
-        inStoreFormDTO.setSearchTimeStart(LocalDateTime.parse(dto.getSearchTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        inStoreFormDTO.setSearchTimeEnd(LocalDateTime.parse(dto.getSearchTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        List<InAndOutStoretReportVO> result = inStoreFormMapper.getInAndOutNum(inStoreFormDTO);
+    public List<InAndOutStoretReportVO> getInAndOutReport(InStoreFormDTO dto) {
+        List<InAndOutStoretReportVO> result = inStoreFormMapper.getInAndOutNum(dto);
         return result;
     }