添加了产品看板

hx-account/src/main/java/com/fjhx/account/entity/account/bo/AccountRunningWaterBo.java

@@ -3,8 +3,6 @@ package com.fjhx.account.entity.account.bo;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Getter;
 import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.Date;
 

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -215,6 +215,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
                 accountRunningWaterVo.setCurrency(dictTenantDataVoList.get(0).getDictValue());
             }
         }
+
         //导出Excel
         List<AccountRunningWaterBo> accountRunningWaterBos = BeanUtil.copyToList(records, AccountRunningWaterBo.class);
         ExcelUtil.export(httpServletResponse, accountRunningWaterBos, AccountRunningWaterBo.class);

hx-account/src/main/resources/mapper/account/AccountRunningWaterMapper.xml

@@ -34,7 +34,22 @@
     </select>
     <select id="getList" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
         select
-            arw.*,
+            arw.id,
+            arw.account_management_id,
+            arw.status,
+            arw.business_id,
+            IF(arw.status =20,CONCAT("-",arw.amount),arw.amount) amount,
+            arw.currency,
+            arw.name,
+            arw.received,
+            arw.opening_bank,
+            arw.account_opening,
+            arw.transaction_time,
+            arw.remarks,
+            arw.create_user,
+            arw.create_time,
+            arw.update_user,
+            arw.update_time,
             am.alias accountManagementName
         from account_running_water arw
                  left join  account_management am on arw.account_management_id = am.id

hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -231,18 +231,18 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
         //存放报价的数据；
         List<Map<String, Object>> contractList = new ArrayList<>();
 
-        dto.setBeginTime(DateUtil.format(DateUtil.offsetMonth(new Date(), -12), "yy-MM"));
-        dto.setEndTime(DateUtil.format(new Date(), "yy-MM"));
+        dto.setBeginTime(DateUtil.format(DateUtil.offsetMonth(new Date(), -12), "yyyy-MM"));
+        dto.setEndTime(DateUtil.format(new Date(), "yyyy-MM"));
         //查询指定客户的每月报价总额
         List<SaleQuotationVo> saleQuotationVoList = this.getAmount(dto);
 
         Map<String, List<SaleQuotationVo>> saleQuotationVoMap = saleQuotationVoList.stream()
-                .collect(Collectors.groupingBy(item -> DateUtil.format(item.getCreateTime(), "yyyy-MM")));
+                .collect(Collectors.groupingBy(SaleQuotationVo::getTime));
 
         //查询指定客户的每月合同总额
         List<ContractVo> contractVoList = contractService.getAmount(dto);
         Map<String, List<ContractVo>> contractVoMap = contractVoList.stream()
-                .collect(Collectors.groupingBy(item -> DateUtil.format(item.getCreateTime(), "yyyy-MM")));
+                .collect(Collectors.groupingBy(ContractVo::getTime));
 
         //赋值每个月的值
         for (String month : monthBetweenDate) {

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -120,7 +120,7 @@
 
         FROM
             contract cc
-                LEFT JOIN bytesailing_base.area_info ai ON cc.buy_country_id = ai.id
+                LEFT JOIN bytesailing_base.customize_area ai ON cc.buy_country_id = ai.id
             ${ew.customSqlSegment}
     </select>
 
@@ -130,7 +130,7 @@
             bc.name corporationName
         FROM
             contract cc
-                LEFT JOIN bytesailing_common.corporation bc ON cc.buy_corporation_id = bc.id
+                LEFT JOIN bytesailing_customer.customer bc ON cc.buy_corporation_id = bc.id
             ${ew.customSqlSegment}
     </select>