no message

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/MaterialMapper.java

@@ -462,7 +462,8 @@ public interface MaterialMapper {
                                                    @Param("websits") List<String> websits,
                                                    @Param("websitId") String websitId,
                                                    @Param("startDate") String startDate,
-                                                   @Param("endDate") String endDate);
+                                                   @Param("endDate") String endDate,
+                                                   @Param("isConfirm") Boolean isConfirm);
 
     /**
      * 查询网点上个月结存金额
@@ -475,7 +476,8 @@ public interface MaterialMapper {
     List<WebsiteStockValSumBean> getLastMonthStockSumVal(@Param("companyWechatId") String companyWechatId,
                                                          @Param("websits") List<String> websits,
                                                          @Param("websitId") String websitId,
-                                                         @Param("startDate") String startDate);
+                                                         @Param("startDate") String startDate,
+                                                         @Param("isConfirm") Boolean isConfirm);
 
     List<WorkerPurchaseCategoryBean> getWorkerMonthSummaryData(@Param("companyWechatId") String companyWechatId,
                                                                @Param("startDate") String startDate,

mall-server-api/src/main/java/com/gree/mall/manager/controller/material/report/ReportController.java

@@ -136,9 +136,10 @@ public class ReportController {
     @ApiOperation(value = "月度网点采购类别")
     public ResponseHelper<List<PurchaseCategoryBean>> purchaseCategorySum(
             @ApiParam(value = "门店编号") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "采购月度") @RequestParam String month
+            @ApiParam(value = "采购月度") @RequestParam String month,
+            @ApiParam(value = "是否审核日期 true=是 false=否") @RequestParam(required = false, defaultValue = "false") Boolean isConfirm
     ) throws Exception {
-        List<PurchaseCategoryBean> purchaseCategoryBeanList = reportLogic.purchaseCategorySum(websitId, month);
+        List<PurchaseCategoryBean> purchaseCategoryBeanList = reportLogic.purchaseCategorySum(websitId, month, isConfirm);
         return ResponseHelper.success(purchaseCategoryBeanList);
     }
 
@@ -147,9 +148,10 @@ public class ReportController {
     public void exportSaleSumDetail(
             @ApiParam(value = "门店编号") @RequestParam(required = false) String websitId,
             @ApiParam(value = "采购月度") @RequestParam String month,
+            @ApiParam(value = "是否审核日期 true=是 false=否") @RequestParam(required = false, defaultValue = "false") Boolean isConfirm,
             HttpServletRequest request, HttpServletResponse response
     ) throws Exception {
-        List<PurchaseCategoryBean> purchaseCategoryBeanList = reportLogic.purchaseCategorySum(websitId, month);
+        List<PurchaseCategoryBean> purchaseCategoryBeanList = reportLogic.purchaseCategorySum(websitId, month, isConfirm);
         ExcelData excelData = reportLogic.purchaseCategorySumExport(purchaseCategoryBeanList);
         ExcelUtils.exportExcel(request,response,"月度网点采购类别" + DateUtils.formatDate1(new Date()) + ".xlsx", excelData);
     }

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/report/ReportLogic.java

@@ -407,9 +407,10 @@ public class ReportLogic {
      * 月度辅材采购类别
      * @param websitId
      * @param month
+     * @param isConfirm
      * @return
      */
-    public List<PurchaseCategoryBean> purchaseCategorySum(String websitId, String month) {
+    public List<PurchaseCategoryBean> purchaseCategorySum(String websitId, String month, Boolean isConfirm) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> websits = adminUser.getAdminWebsitIds();
         if (CollectionUtil.isEmpty(websits)
@@ -420,10 +421,10 @@ public class ReportLogic {
         String startDate = monthDateTime[0];
         String endDate = monthDateTime[1];
         // 查询网点采购汇总数据
-        List<PurchaseCategoryBean> websitePurchaseSumList = materialMapper.getMonthSummaryData(adminUser.getCompanyWechatId(), websits, websitId, startDate, endDate);
+        List<PurchaseCategoryBean> websitePurchaseSumList = materialMapper.getMonthSummaryData(adminUser.getCompanyWechatId(), websits, websitId, startDate, endDate, isConfirm);
 
         // 查询网点上个月结存金额
-        List<WebsiteStockValSumBean> websiteStockValSumList = materialMapper.getLastMonthStockSumVal(adminUser.getCompanyWechatId(), websits, websitId, startDate);
+        List<WebsiteStockValSumBean> websiteStockValSumList = materialMapper.getLastMonthStockSumVal(adminUser.getCompanyWechatId(), websits, websitId, startDate, isConfirm);
 
         Map<String, PurchaseCategoryBean> websitePurchaseSumMap = websitePurchaseSumList.stream()
                 .collect(Collectors.toMap(PurchaseCategoryBean::getWebsitId, Function.identity()));

mall-server-api/src/main/resources/mapper/MaterialMapper.xml

@@ -1247,7 +1247,10 @@
                             #{item}
                         </foreach>
                     </if>
-                    AND t1.purchase_time BETWEEN #{startDate} AND #{endDate}
+                    <choose>
+                        <when test="isConfirm != null and isConfirm">AND t1.confirm_time BETWEEN #{startDate} AND #{endDate}</when>
+                        <otherwise>AND t1.purchase_time BETWEEN #{startDate} AND #{endDate}</otherwise>
+                    </choose>
                 UNION ALL
                 SELECT
                     t1.websit_id,
@@ -1274,7 +1277,10 @@
                             #{item}
                         </foreach>
                     </if>
-                    AND t1.ret_time BETWEEN #{startDate} AND #{endDate}
+                    <choose>
+                        <when test="isConfirm != null and isConfirm">AND t1.confirm_time BETWEEN #{startDate} AND #{endDate}</when>
+                        <otherwise>AND t1.ret_time BETWEEN #{startDate} AND #{endDate}</otherwise>
+                    </choose>
                 ) t1
             GROUP BY
             t1.websit_id,