1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FreightInfo.java

@@ -142,6 +142,73 @@ public class FreightInfo extends BaseModel<FreightInfo> {
      */
     @TableField(exist = false)
     private List<FreightInfo> formList;
+    /**
+     * 1月
+     */
+    @TableField(exist = false)
+    private String Jan;
+    /**
+     * 2月
+     */
+    @TableField(exist = false)
+    private String Feb;
+    /**
+     * 3月
+     */
+    @TableField(exist = false)
+    private String Mar;
+    /**
+     * 4月
+     */
+    @TableField(exist = false)
+    private String Apr;
+    /**
+     * 5月
+     */
+    @TableField(exist = false)
+    private String May;
+    /**
+     * 6月
+     */
+    @TableField(exist = false)
+    private String June;
+    /**
+     * 7月
+     */
+    @TableField(exist = false)
+    private String July;
+    /**
+     * 8月
+     */
+    @TableField(exist = false)
+    private String Aug;
+    /**
+     * 9月
+     */
+    @TableField(exist = false)
+    private String Sept;
+    /**
+     * 10月
+     */
+    @TableField(exist = false)
+    private String Oct;
+    /**
+     * 11月
+     */
+    @TableField(exist = false)
+    private String Nov;
+    /**
+     * 12月
+     */
+    @TableField(exist = false)
+    private String Dece;
+    /**
+     * 合计
+     */
+    @TableField(exist = false)
+    private String total;
+
+
 
 
     @Override

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FreightInfoServiceImpl.java

@@ -53,8 +53,8 @@ public class FreightInfoServiceImpl extends ServiceImpl<FreightInfoMapper, Freig
         //类型
         pageView.put("searchType", freightInfo.getSearchType());
         pageView.put("year", freightInfo.getYear());
-//        List<FreightInfo> dataList = baseMapper.getListByCondition(pageView);
-//        freightInfo1.setDataList(dataList);
+        List<FreightInfo> dataList = baseMapper.getListByCondition(pageView);
+        freightInfo1.setDataList(dataList);
         List<FreightInfo> formList = baseMapper.getFormListByCondition(pageView);
         freightInfo1.setFormList(formList);
         return freightInfo1;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/EntityAnalyse.java

@@ -422,7 +422,7 @@ public class EntityAnalyse {
         Double doubleValue1 = Double.parseDouble(new DecimalFormat("0.000").format(hyFreightSettlementInfo.getAmountMoney())) * 1000;
         int intValue1 = doubleValue1.intValue();
         financial.put("monetaryAmount", intValue1);
-        financial.put("dateTime", f.format(hyFreightSettlementInfo.getArrivalDate()));
+        financial.put("dateTime", f.format(hyFreightSettlementInfo.getPaymentDate()));
         financial.put("payFile", EntityAnalyse.uploadImage(EntityAnalyse.urlToFile(new URL(hyFreightSettlementInfo.getPaymentVoucher())), hyFreightSettlementInfo.getToken()));
         financialList.add(financial);
         params.put("financialList",financialList);

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/FreightInfoMapper.xml

@@ -30,7 +30,7 @@
     <!-- 根据条件查询利润柱形图 -->
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.FreightInfo">
-        <if test="year != null and year != ''">
+        <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
                 SELECT IFNULL(SUM(b.profit)/10000, 0 ) profit, aa.date create_date
                 FROM (SELECT @cdate := date_add( @cdate, INTERVAL - 1 DAY ) date