修改气瓶系统bug

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingCheckDataUnitDto.java

 package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -53,4 +54,7 @@ public class CylinderFillingCheckDataUnitDto extends BaseDto {
 
     @ApiModelProperty(value = "充装月份")
     private String fillingMonth;
+
+    @ApiModelProperty(value = "充装年月")
+    private String fillingDate;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingCheckDataUnit.java

@@ -93,4 +93,11 @@ public class CylinderFillingCheckDataUnit extends BaseEntity {
      */
     @TableField("filling_month")
     private String fillingMonth;
+    //filling_date
+
+    /**
+     * 充装年月
+     */
+    @TableField("filling_date")
+    private String fillingDate;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -456,6 +456,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
                 String monthStr = month < 10 ? "0" + month : month + "";
                 temp.setFillingMonth(monthStr);
                 temp.setFillingYear(year);
+                temp.setFillingDate(year + "-" + monthStr);
                 Integer countThisMonth = cylinderFillingRecordServiceImpl.getFillingCountByMonth(cylinderUnit.getAppId(), c.getTime());
                 temp.setTotalSum((long) countThisMonth);
                 // 获取本月数据
@@ -495,7 +496,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
     }
 
     /**
-     * 卸液量按单位统计
+     * 充装量、卸液量按单位统计
      */
     @Transactional(rollbackFor = Exception.class)
     @Scheduled(cron = "0 0 2 * * ?")