公共资源交易中心可视化界面bug修复

src/main/java/com/cqut/stack/bn/service/impl/AreaTransactionServiceImpl.java

@@ -23,6 +23,7 @@ import com.cqut.stack.bn.pojo.vo.resourceTrade.GetRecentlyCategoryTradeTrendVO;
 import com.cqut.stack.bn.service.AreaTransactionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -135,8 +136,8 @@ public class AreaTransactionServiceImpl extends ServiceImpl<AreaTransactionMappe
     @Override
     public AreaTransaction getCurrentAreaTradeInfo(GetCurrentAreaTradeInfoDTO dto) {
         LambdaQueryWrapper<AreaTransaction> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(AreaTransaction::getStatDate,dto.getYear())
-                .eq(AreaTransaction::getAreaName,dto.getAreaName());
+        queryWrapper.like(ObjectUtil.isNotEmpty(dto.getYear()),AreaTransaction::getStatDate,dto.getYear())
+                .eq(StringUtils.isNotEmpty(dto.getAreaName()),AreaTransaction::getAreaName,dto.getAreaName());
         List<AreaTransaction> list = this.list(queryWrapper);
         double transactionAmount = 0;
         double saveAmount = 0;

src/main/resources/mapper/AreaTransactionMapper.xml

@@ -40,14 +40,14 @@
     <select id="getCategoryTradeInfo"
             resultType="com.cqut.stack.bn.pojo.vo.resourceTrade.GetCategoryTradeInfoVO">
         SELECT
-        SUM(transaction_amount) AS transactionAmount,
-        SUM(transaction_count) AS transactionCount,
-        transaction_type
+            SUM(transaction_amount) AS transactionAmount,
+            SUM(transaction_count) AS transactionCount,
+            transaction_type
         FROM
-        `area_transaction`
+            `area_transaction`
         <where>
             <if test="dto.year != null">
-                YEAR(stat_date = #{dto.year}
+                YEAR(stat_date) = #{dto.year}
             </if>
         </where>
         GROUP BY transaction_type