Merge branch 'master' into dev

# Conflicts:
#	hx-account/src/main/java/com/fjhx/account/entity/transaction/vo/TransactionVo.java
#	hx-account/src/main/java/com/fjhx/account/mapper/transaction/TransactionMapper.java
#	hx-account/src/main/java/com/fjhx/account/service/transaction/TransactionService.java
#	hx-account/src/main/java/com/fjhx/account/service/transaction/impl/TransactionServiceImpl.java
#	hx-account/src/main/resources/mapper/transaction/TransactionMapper.xml

hx-account/src/main/java/com/fjhx/account/controller/transaction/TransactionController.java

@@ -53,4 +53,12 @@ public class TransactionController {
         transactionService.add(transactionDto);
     }
 
+
+    /**
+     * 往来管理头部统计
+     */
+    @PostMapping("/getHeadStatistic")
+    public Map<String,Object> getHeadStatistic(@RequestBody TransactionSelectDto dto) {
+        return transactionService.getHeadStatistic(dto);
+    }
 }

hx-account/src/main/java/com/fjhx/account/entity/transaction/vo/TransactionVo.java

@@ -32,9 +32,8 @@ public class TransactionVo extends Transaction {
      */
     private String corporationName;
 
-
     /**
      * 总金额
      */
-    private BigDecimal sumAmount;
+    private BigDecimal SumAmount;
 }

hx-account/src/main/java/com/fjhx/account/service/transaction/TransactionService.java

@@ -7,7 +7,6 @@ import com.fjhx.account.entity.transaction.po.Transaction;
 import com.fjhx.account.entity.transaction.vo.TransactionVo;
 import com.ruoyi.common.core.service.BaseService;
 
-import java.util.List;
 import java.util.Map;
 
 

hx-account/src/main/resources/mapper/transaction/TransactionMapper.xml

@@ -26,7 +26,6 @@
             t.type
         FROM
             transaction t
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
-
 </mapper>

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

@@ -72,7 +72,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         BigDecimal grossProfit = commissionVo.getTotalIncome().subtract(commissionVo.getTotalExpenses());
         commissionVo.setGrossGrofit(grossProfit);
 
-        if (commissionVo.getTotalIncome().equals(BigDecimal.ZERO)) {
+        if (commissionVo.getTotalIncome().compareTo(BigDecimal.ZERO)==0||grossProfit.compareTo(BigDecimal.ZERO)==0) {
             commissionVo.setGrossRofitMargin(BigDecimal.ZERO);
         } else {
             commissionVo.setGrossRofitMargin(

hx-sale/src/main/resources/mapper/commission/CommissionMapper.xml

@@ -19,5 +19,6 @@
             IFNULL( SUM( personal_commission ), 0 ) AS personalCommission
         FROM
             commission c
+            ${ew.customSqlSegment}
     </select>
 </mapper>