添加了报价单的数据

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

@@ -95,14 +95,17 @@ public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<Accoun
             //分拆功能 添加或者修改资金流水分拆部门表的数据
           saveOrEditAccountDeptRunningWaterDetail(accountRunningWaterVo,accountDeptRunningWater,deptRunningWaterDetailList);
         }else {//调整部门功能
+            //添加部门-资金流水关联表
             AccountDeptRunningWaterDetail accountDeptRunningWaterDetail = new AccountDeptRunningWaterDetail();
             accountDeptRunningWaterDetail.setDeptRunningWaterId(accountRunningWaterVo.getAccountDeptRunningWaterId());
             accountDeptRunningWaterDetail.setDeptId(accountRunningWaterVo.getDeptId());
             accountDeptRunningWaterDetail.setAmount(accountRunningWaterVo.getAmount());
+
+            //添加资金流水分拆部门表
+            accountDeptRunningWater.setRunningWaterId(accountRunningWaterVo.getId());
+            accountDeptRunningWater.setType("10");
             //如果部门-资金流水关联表ID不为null修改资金流水分拆部门表的数据
            if (ObjectUtil.isNotEmpty(accountRunningWaterVo.getAccountDeptRunningWaterId())){
-               accountDeptRunningWater.setRunningWaterId(accountRunningWaterVo.getId());
-               accountDeptRunningWater.setType("10");
                //查询部门-资金流水关联表的数据（获取到部门-资金流水关联表中的数据是否分拆，如果是分拆则删除资金流水分拆部门表的数据，否则修改资金流水分拆部门表的数据在添加资金流水分拆部门表的数据）
                AccountDeptRunningWater accountDeptRunningWater1 = accountDeptRunningWaterService.getById(accountRunningWaterVo.getAccountDeptRunningWaterId());
 

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

@@ -136,8 +136,6 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
 
         //查询资金流水表的信息
         QueryWrapper<Object> query = Wrappers.query();
-        Date beginTime = dto.getBeginTime();
-        Date endTime = dto.getEndTime();
         query.ge("DATE_FORMAT(ar.create_time,'%Y-%m')", DateUtil.format(dto.getBeginTime(),"yyyy-MM"));
         query.le("DATE_FORMAT(ar.create_time,'%Y-%m')", DateUtil.format(dto.getEndTime(),"yyyy-MM"));
         query.in("wd.dept_id",deptIds);

hx-customer/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -49,8 +49,8 @@
     <select id="sourceStock" resultType="com.fjhx.customer.entity.customer.vo.CustomerVo">
         SELECT
             COUNT(*) count,
-	        c.source,
-            DATE_FORMAT(c.create_time,'%Y-%m') time
+	        ifnull(c.source,-1) source,
+            ifnull(DATE_FORMAT(c.create_time,'%Y-%m'),-1) time
         FROM
             customer c
             ${ew.customSqlSegment}
@@ -59,8 +59,8 @@
     <select id="sourceIncrement" resultType="com.fjhx.customer.entity.customer.vo.CustomerVo">
         SELECT
             COUNT(*) count,
-	        c.source,
-            DATE_FORMAT(c.create_time,'%Y-%m') time
+	        ifnull(c.source,-1) source,
+            ifnull(DATE_FORMAT(c.create_time,'%Y-%m'),-1) time
         FROM
             customer c
             ${ew.customSqlSegment}

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

@@ -63,8 +63,8 @@
     <select id="contractStatistics" resultType="com.fjhx.sale.entity.sale.vo.SaleQuotationVo">
         SELECT
             COUNT(*) count,
-            c.`status`,
-             DATE_FORMAT(sq.create_time,'%Y-%m') time
+            ifnull(c.`status`,-1) status,
+            ifnull(DATE_FORMAT(sq.create_time,'%Y-%m'),-1) time
         FROM
             bytesailing_customer.customer c
               left  JOIN  contract sq ON sq.buy_corporation_id = c.id

hx-sale/src/main/resources/mapper/sale/SaleQuotationMapper.xml

@@ -115,8 +115,9 @@
     <select id="saleStatistics" resultType="com.fjhx.sale.entity.sale.vo.SaleQuotationVo">
         SELECT
             COUNT(*) count,
-            c.`status`,
-             DATE_FORMAT(sq.create_time,'%Y-%m') time
+            <!-- 防止出现null，代码报错-->
+            ifnull(c.`status`,1000) status,
+            ifnull(DATE_FORMAT(sq.create_time,'%Y-%m'),-1) time
         FROM
             bytesailing_customer.customer c
               left  JOIN  sale_quotation sq  ON sq.buy_corporation_id = c.id