1 供需平衡-气量监管-增加 日历字段

zh-baseversion-system/src/main/java/com/zehong/system/domain/TSupBalGasSup.java

@@ -56,6 +56,11 @@ public class TSupBalGasSup extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date fRepDate;
 
+
+    /** 日历日期*/
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date calendarDate;
+
     /** 是否删除(0正常，1删除) */
     @Excel(name = "是否删除(0正常，1删除)")
     private String isDel;
@@ -195,6 +200,14 @@ public class TSupBalGasSup extends BaseEntity
         this.endRepDate = endRepDate;
     }
 
+    public Date getCalendarDate() {
+        return calendarDate;
+    }
+
+    public void setCalendarDate(Date calendarDate) {
+        this.calendarDate = calendarDate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

zh-baseversion-system/src/main/resources/mapper/system/TSupBalGasSupMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="isDel"    column="is_del"    />
         <result property="remarks"    column="remarks"    />
+        <result property="calendarDate"    column="f_calendar_date"    />
     </resultMap>
 
     <sql id="selectTSupBalGasSupVo">
@@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sup.update_time,
             sup.is_del,
             sup.remarks,
+            sup.f_calendar_date,
             en.enterprise_name as enterpriseName
         FROM
             t_sup_bal_gas_sup sup
@@ -56,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fRepStatus != null  and fRepStatus != ''"> and sup.f_rep_status = #{fRepStatus}</if>
             <if test="beginRepDate != null and endRepDate != null">and sup.f_rep_date between #{beginRepDate} and #{endRepDate}</if>
             <if test="enterpriseName != null  and enterpriseName != ''"> and en.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="calendarDate != null"> and f_calendar_date = #{calendarDate}</if>
         </where>
     </select>
 
@@ -104,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="isDel != null">is_del,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="calendarDate != null">f_calendar_date,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fCompanyInfoId != null and fCompanyInfoId != ''">#{fCompanyInfoId},</if>
@@ -120,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="calendarDate != null">#{calendarDate},</if>
          </trim>
     </insert>
 
@@ -140,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="calendarDate != null">f_calendar_date = #{calendarDate},</if>
         </trim>
         where f_gas_sup_id = #{fGasSupId}
     </update>