tzs的tz_cylinder_filling_data_unit表新增filling_date字段

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Value;
+
 import java.util.Date;
 
 /**
@@ -42,4 +44,6 @@ public class CylinderFillingDataUnitDto  extends BaseDto {
     @ApiModelProperty(value = "充装月份")
     private String fillingMonth;
 
+    @ApiModelProperty(value = "充装日期")
+    private String fillingDate;
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -64,4 +65,9 @@ public class CylinderFillingDataUnit extends BaseEntity {
 	@TableField("filling_month")
     private String fillingMonth;
 
+    /**
+     * 充装日期
+     */
+    @TableField("filling_date")
+    private String fillingDate;
 }

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

@@ -441,6 +441,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
 				String monthStr = month < 10 ? "0" + month : month + "";
 				temp.setFillingYear(year);
 				temp.setFillingMonth(monthStr);
+				temp.setFillingDate(year+"-"+monthStr);
 				// 本月
 				Double thisMonth = cylinderFillingRecordServiceImpl.getFillingSumByMonth(cylinderUnit.getAppId(),
 						calendar.getTime());