Skip to content

C
cloud-fb
Commit 6cdb935f by 焦凯
Options

Merge branch 'feature/sales_record_sync' into 'develop' 

销售汇总、预付款及余额汇总增加判空操作。

See merge request kunlun/xyst_dinas/xyst_dinas_backend!20
parents c312ed8b 214db6af
Showing with 30 additions and 12 deletions
backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/internal/dao/AdvancePaymentBalanceSumDaoImpl.java
......@@ -62,14 +62,14 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
if(!flag) {
hql.append(" CONTRACT.advance_balance AS e1, ");
}else {
hql.append(" 'null' AS e1, ");
hql.append(" 0.00 AS e1, ");
}
hql.append(" sum( SALESRECODE.amount ) AS f1, ");
hql.append(" CASE WHEN ARTIFICIAL.fund_type = 'DEPOSIT' THEN '' ELSE sum( ARTIFICIAL.recharge_amount ) END AS g1, "
); hql. append(" CASE WHEN REFUND.fund_type = '1' THEN '' ELSE sum( REFUND.actual_refund_amount ) END AS h1, "
hql.append(" CASE WHEN ARTIFICIAL.fund_type = 'DEPOSIT' THEN 0.00 ELSE sum( ARTIFICIAL.recharge_amount ) END AS g1, "
); hql. append(" CASE WHEN REFUND.fund_type = '1' THEN 0.00 ELSE sum( REFUND.actual_refund_amount ) END AS h1, "
); hql.append(" CONTRACT.advance_balance AS i1, ");
hql.append(" CASE WHEN ARTIFICIAL.fund_type = 'DEPOSIT' THEN sum( ARTIFICIAL.recharge_amount ) ELSE '' END AS j1, "
); hql.append(" CASE WHEN REFUND.fund_type = '1' THEN sum( REFUND.actual_refund_amount ) ELSE '' END AS q1 "
hql.append(" CASE WHEN ARTIFICIAL.fund_type = 'DEPOSIT' THEN sum( ARTIFICIAL.recharge_amount ) ELSE 0.00 END AS j1, "
); hql.append(" CASE WHEN REFUND.fund_type = '1' THEN sum( REFUND.actual_refund_amount ) ELSE 0.00 END AS q1 "
); hql.append(" from xyst_dinas_biz_organization as REGIONALCOMPANY ");//區域公司
hql.append("LEFT JOIN xyst_dinas_project_purchase_sand_company as PURCHASESANDUNIT ON PURCHASESANDUNIT.regional_company = REGIONALCOMPANY.id "
);// 购砂单位
......@@ -84,12 +84,12 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
hql. append("LEFT JOIN xyst_dinas_finance_artificial_recharge AS ARTIFICIAL ON ARTIFICIAL.regional_company = REGIONALCOMPANY.id "
).append(" AND ARTIFICIAL.contract = CONTRACT.id ")
.append(" AND ARTIFICIAL.purchase_sand_unit = PURCHASESANDUNIT.id ")
.append(" AND ( ARTIFICIAL.create_time <:dateBefore "). append(" AND ARTIFICIAL.create_time >= :nowDate ) ");// 人工充值
.append(" AND ( ARTIFICIAL.create_time < :dateBefore "). append(" AND ARTIFICIAL.create_time >= :nowDate ) ");// 人工充值
hql.
append("LEFT JOIN xyst_dinas_finance_refund AS REFUND ON REFUND.regional_company = REGIONALCOMPANY.id "
) .append(" AND REFUND.contract = CONTRACT.id ").
append(" AND REFUND.purchase_sand_company = PURCHASESANDUNIT.id ")
.append(" AND ( REFUND.create_time <:dateBefore ").append(" AND REFUND.create_time >= :nowDate ) ");// 财务退款
.append(" AND ( REFUND.create_time < :dateBefore ").append(" AND REFUND.create_time >= :nowDate ) ");// 财务退款
hql.append(" where 1=1 ").
append(" and PURCHASESANDUNIT.regional_company IS NOT NULL ");// 去掉脏数据
......@@ -113,6 +113,9 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
for (Tuple resule : resultList) {
Map<String, Object> map = new HashMap<String, Object>();
if(null == resule.get(0) || null == resule.get(1) || null == resule.get(2) ) {
continue;
}
map.put("regional_company_id", Convert.toUUID(resule.get(0)));
map.put("purchase_sand_unit_id", Convert.toUUID(resule.get(1)));
map.put("project_id", Convert.toUUID(resule.get(2)));
......@@ -121,8 +124,10 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
map.put("total_advance_payment",resule.get(5,BigDecimal.class));
map.put("advance_payment_refund_amount", resule.get(6,BigDecimal.class));
map.put("advance_balance", resule.get(7,BigDecimal.class));
map.put("total_margin", BigDecimal.valueOf(resule.get(8,Double.class)));
map.put("margin_refund", BigDecimal.valueOf(resule.get(9,Double.class)));
map.put("total_margin", resule.get(8,BigDecimal.class));
map.put("margin_refund", resule.get(9,BigDecimal.class));
//map.put("total_margin", BigDecimal.valueOf(resule.get(8,Double.class)));
//map.put("margin_refund", BigDecimal.valueOf(resule.get(9,Double.class)));
list.add(map);
}
return list;
......
backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/internal/service/AdvancePaymentBalanceSumServiceImpl.java
......@@ -8,6 +8,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.transaction.annotation.Transactional;
......@@ -47,6 +49,7 @@ public class AdvancePaymentBalanceSumServiceImpl implements AdvancePaymentBalanc
@Autowired
@Qualifier(AdvancePaymentBalanceSumConstants.SUMMARY_ENTITY)
private KClass AdvancePaymentBalanceSumClass;
private Logger logger = LoggerFactory.getLogger(this.getClass());
@Transactional
......@@ -56,8 +59,12 @@ public class AdvancePaymentBalanceSumServiceImpl implements AdvancePaymentBalanc
try {
List<Map<String, Object>> SalesRecordList = advancePaymentBalanceSumDao.getAllRelevantData(startDate,nowDate,flag);
for (Map<String, Object> mp : SalesRecordList) {
List<Map<String, Object>> advancePaymentBalanceList = advancePaymentBalanceSumDao.getAllRelevantData(startDate,nowDate,flag);
if (advancePaymentBalanceList ==null) {
logger.info("预付款与结余汇总信息，未进行存储操作!");
return true;
}
for (Map<String, Object> mp : advancePaymentBalanceList) {
KObject AdvancePaymentBalanceSum = AdvancePaymentBalanceSumClass.newInstance();
AdvancePaymentBalanceSum.set(AdvancePaymentBalanceSumConstants.ID, UUID.randomUUID());
AdvancePaymentBalanceSum.set(AdvancePaymentBalanceSumConstants.PROJECT, projectFiledDao.load((UUID) mp.get("project_id")));
......
backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/internal/service/SalesSummaryServiceImpl.java
......@@ -8,6 +8,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.transaction.annotation.Transactional;
......@@ -41,7 +43,7 @@ public class SalesSummaryServiceImpl implements SalesSummaryService {
@Autowired
@Qualifier(SalesSummaryConstants.SALES_SUMMARY_ENTITY)
private KClass SalesSummaryClass;
private Logger logger = LoggerFactory.getLogger(this.getClass());
@Transactional
@Override
......@@ -49,6 +51,10 @@ public class SalesSummaryServiceImpl implements SalesSummaryService {
boolean state = false;
try {
List<Map<String, Object>> SalesRecordList = SalesRecordDao.getAllSalesRecordByDate(dateNow, dateBefore);
if (SalesRecordList ==null) {
logger.info("销售汇总数据为空，未进行存储操作!");
return true;
}
for (Map<String, Object> mp : SalesRecordList) {
KObject SalesSummary = SalesSummaryClass.newInstance();
SalesSummary.set(SalesSummaryConstants.ID, UUID.randomUUID());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment