优化

platform-dao/src/main/java/com/platform/dao/mapper/longyanpurchaseorder/LongYanPurchaseOrderMapper.java

@@ -4,6 +4,7 @@ import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO;
 import com.platform.dao.config.MyMapper;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
 import com.platform.dao.vo.query.longyanpurchaseorder.LongYanPurchaseOrderVO;
+import com.platform.dao.vo.report.LongYanPurchaseOrderByConditionReportVO;
 import com.platform.dao.vo.report.LongYanPurchaseOrderReportVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -20,6 +21,10 @@ import java.util.List;
  */
 @Component
 public interface LongYanPurchaseOrderMapper extends MyMapper<LongYanPurchaseOrder> {
+    List<LongYanPurchaseOrderByConditionReportVO> getReportByCptcode(LongYanPurchaseOrderDTO dto);
+    List<LongYanPurchaseOrderByConditionReportVO> getReportByCbustype(LongYanPurchaseOrderDTO dto);
+    List<LongYanPurchaseOrderByConditionReportVO> getReportByOldOrNew(LongYanPurchaseOrderDTO dto);
+    List<LongYanPurchaseOrderByConditionReportVO> getReportByCdepcode(LongYanPurchaseOrderDTO dto);
     BigDecimal getPurchaseOrderCount1(LongYanPurchaseOrderDTO dto);
 
     LongYanPurchaseOrderVO getById(@Param("id") String id);

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

@@ -0,0 +1,22 @@
+package com.platform.dao.vo.report;
+
+import com.platform.dao.vo.query.preparation.PreparationVO;
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author cyz
+ */
+@Data
+@Accessors(chain = true)
+public class LongYanPurchaseOrderByConditionReportVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String type;
+    private Integer num;
+
+}

platform-dao/src/main/resources/mapper/longyanpurchaseorder/LongYanPurchaseOrderMapper.xml

@@ -137,4 +137,45 @@
             <include refid="List_Condition" />
         </where>
     </select>
+
+    <select id="getReportByCptcode" parameterType="com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO"
+            resultType="com.platform.dao.vo.report.LongYanPurchaseOrderByConditionReportVO">
+        select cptCode as type,count(1) as num
+        from t_long_yan_purchase_order
+        <where>
+            <include refid="List_Condition" />
+        </where>
+        group by
+        cptCode
+    </select>
+    <select id="getReportByCbustype" parameterType="com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO"
+            resultType="com.platform.dao.vo.report.LongYanPurchaseOrderByConditionReportVO">
+        select cbustype as type,count(1) as num
+        from t_long_yan_purchase_order
+        <where>
+            <include refid="List_Condition" />
+        </where>
+        group by
+        cbustype
+    </select>
+    <select id="getReportByOldOrNew" parameterType="com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO"
+            resultType="com.platform.dao.vo.report.LongYanPurchaseOrderByConditionReportVO">
+        select old_or_new as type,count(1) as num
+        from t_long_yan_purchase_order
+        <where>
+            <include refid="List_Condition" />
+        </where>
+        group by
+        old_or_new
+    </select>
+    <select id="getReportByCdepcode" parameterType="com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO"
+            resultType="com.platform.dao.vo.report.LongYanPurchaseOrderByConditionReportVO">
+        select cdepcode as type,count(1) as num
+        from t_long_yan_purchase_order
+        <where>
+            <include refid="List_Condition" />
+        </where>
+        group by
+        cdepcode
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/longyanpurchaseorder/LongYanPurchaseOrderController.java

@@ -241,4 +241,10 @@ public class LongYanPurchaseOrderController {
     ExcelUtil.exportResponseDict(response, ExportLongYanPurchaseOrderVO.class, BeanConverterUtil.copyListProperties(longYanPurchaseOrderVOS, ExportLongYanPurchaseOrderVO.class), "龙岩采购单详情报表统计导出");
   }
 
+  @GetMapping("/getPieByCondition")
+  @SysLog("龙岩采购单根据时间查询")
+  public R getPieByCondition(LongYanPurchaseOrderDTO dto) {
+    return new R(longYanPurchaseOrderService.getPieByCondition(dto)) ;
+  }
+
 }

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

@@ -88,6 +88,7 @@ ignore:
     - /sb/positions/**
     - /preparation/preparations/**
     - /longyanpurchaseorder/detail/**
+    - /longyanpurchaseorder/order/**
 platform:
   slf4j:
     data: D://xajg

platform-service/src/main/java/com/platform/service/longyanpurchaseorder/LongYanPurchaseOrderService.java

@@ -6,6 +6,7 @@ import com.platform.dao.vo.query.longyanpurchaseorder.LongYanPurchaseOrderVO;
 import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.dao.vo.report.LongYanPurchaseOrderByConditionReportVO;
 import com.platform.dao.vo.report.LongYanPurchaseOrderByTimeExport;
 import com.platform.dao.vo.report.LongYanPurchaseOrderReportVO;
 import com.platform.dao.vo.sb.SbInfoVO;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 龙岩采购单表 service
@@ -24,6 +26,9 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface LongYanPurchaseOrderService extends IBaseService<LongYanPurchaseOrder, LongYanPurchaseOrderDTO> {
+    Map<Integer,List<LongYanPurchaseOrderByConditionReportVO>> getPieByCondition(LongYanPurchaseOrderDTO dto);
+
+
     List<LongYanPurchaseOrderByTimeExport> exportPurchaseByTime(LongYanPurchaseOrderDTO dto, Integer year, LocalDate startMonth, LocalDate endMonth);
     LongYanPurchaseOrderVO getById(String id);
 

platform-service/src/main/java/com/platform/service/longyanpurchaseorder/impl/LongYanPurchaseOrderServiceImpl.java

@@ -30,6 +30,7 @@ import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseOrderMapper;
 import com.platform.dao.vo.query.preparation.PreparationVO;
 import com.platform.dao.vo.report.AllPreparationReportVO;
+import com.platform.dao.vo.report.LongYanPurchaseOrderByConditionReportVO;
 import com.platform.dao.vo.report.LongYanPurchaseOrderByTimeExport;
 import com.platform.dao.vo.report.LongYanPurchaseOrderReportVO;
 import com.platform.dao.vo.sb.SbInfoVO;
@@ -48,6 +49,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -73,6 +75,20 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
         super.deleteByPrimaryKey(id);
     }
 
+    @Override
+    public Map<Integer,List<LongYanPurchaseOrderByConditionReportVO>> getPieByCondition(LongYanPurchaseOrderDTO dto) {
+        List<LongYanPurchaseOrderByConditionReportVO> reportVO1 = mapper.getReportByCptcode(dto);
+        List<LongYanPurchaseOrderByConditionReportVO> reportVO2 = mapper.getReportByCbustype(dto);
+        List<LongYanPurchaseOrderByConditionReportVO> reportVO3 = mapper.getReportByOldOrNew(dto);
+        List<LongYanPurchaseOrderByConditionReportVO> reportVO4 = mapper.getReportByCdepcode(dto);
+        Map<Integer,List<LongYanPurchaseOrderByConditionReportVO>> map = new HashMap<>();
+        map.put(1,reportVO1);
+        map.put(2,reportVO2);
+        map.put(3,reportVO3);
+        map.put(4,reportVO4);
+        return map;
+    }
+
     @Override
     public List<LongYanPurchaseOrderByTimeExport> exportPurchaseByTime(LongYanPurchaseOrderDTO dto, Integer searchYear, LocalDate startMonth, LocalDate endMonth) {
         List<Map<String, LocalDateTime>> monthStartAndEndList = new ArrayList<Map<String, LocalDateTime>>();