1.报表统计bug

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -1893,7 +1893,7 @@ public class CommonServiceImpl implements ICommonService {
      * 设备分类
      *
      * @param type 1，设备种类  2，设备类别  3，设备品种
-     * @return
+     * .c@return
      */
     @Override
     public List<EquipmentCategory> equipmentClassification(String type) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/ReportAnalysisServiceImpl.java

@@ -172,7 +172,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
     private Long countDocumentNum(List<JgBizCountDataBO> countDataBOList, int code, JgBizCountDataDto c) {
         return countDataBOList.stream().filter(d -> Objects.equals(d.getReceiveCompanyCode(), c.getReceiveCompanyCode()) &&
                 Objects.equals(d.getEquList(), c.getEquList()) && Objects.equals(d.getEquCategory(), c.getEquCategory()) &&
-                Objects.equals(d.getEquCategory(), c.getEquCategory()) &&
+                Objects.equals(d.getEquDefine(), c.getEquDefine()) &&
                 Objects.equals(d.getBizType(), c.getBizType()) &&
                 d.getStatus().equals(String.valueOf(code))).mapToLong(JgBizCountDataBO::getNum).sum();
 
@@ -181,7 +181,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
     private Long countDocumentNum(List<JgBizCountDataBO> countDataBOList, List<String> statusList, JgBizCountDataDto c) {
         return countDataBOList.stream().filter(d -> Objects.equals(d.getReceiveCompanyCode(), c.getReceiveCompanyCode()) &&
                 Objects.equals(d.getEquList(), c.getEquList()) && Objects.equals(d.getEquCategory(), c.getEquCategory()) &&
-                Objects.equals(d.getEquCategory(), c.getEquCategory()) &&
+                Objects.equals(d.getEquDefine(), c.getEquDefine()) &&
                 Objects.equals(d.getBizType(), c.getBizType()) &&
                 statusList.contains(d.getStatus())).mapToLong(JgBizCountDataBO::getNum).sum();