凯和箱信息加字段

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TCntrno.java

@@ -97,6 +97,20 @@ public class TCntrno extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     //@Excel(name = "最新时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fUpdatetime;
+    /** 造箱时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "造箱时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBuildBoxTime;
+
+    /** 箱龄(年) */
+    @Excel(name = "箱龄(年)")
+    @JsonFormat(pattern = "yyyy")
+    private String fBoxTurtleYear;
+
+    /** 箱龄(月) */
+    @Excel(name = "箱龄(月)")
+    @JsonFormat(pattern = "MM")
+    private String fBoxTurtleMonth;
 
     /** 最新地点 */
     private String fUpdateaddress;
@@ -136,6 +150,30 @@ public class TCntrno extends BaseEntity
     //调箱动作中文名
     private String opctnstatusName;
 
+    public Date getfBuildBoxTime() {
+        return fBuildBoxTime;
+    }
+
+    public void setfBuildBoxTime(Date fBuildBoxTime) {
+        this.fBuildBoxTime = fBuildBoxTime;
+    }
+
+    public String getfBoxTurtleYear() {
+        return fBoxTurtleYear;
+    }
+
+    public void setfBoxTurtleYear(String fBoxTurtleYear) {
+        this.fBoxTurtleYear = fBoxTurtleYear;
+    }
+
+    public String getfBoxTurtleMonth() {
+        return fBoxTurtleMonth;
+    }
+
+    public void setfBoxTurtleMonth(String fBoxTurtleMonth) {
+        this.fBoxTurtleMonth = fBoxTurtleMonth;
+    }
+
     public String getfSealno() {
         return fSealno;
     }
@@ -432,6 +470,9 @@ public class TCntrno extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("fBuildBoxTime", getfBuildBoxTime())
+            .append("fBoxTurtleYear", getfBoxTurtleYear())
+            .append("fBoxTurtleMonth", getfBoxTurtleMonth())
             .toString();
     }
 }

ruoyi-shipping/src/main/resources/mapper/shipping/TCntrnoMapper.xml

@@ -23,10 +23,14 @@
         <result property="remark" column="remark"/>
         <result property="fOpctnstatus" column="f_opctnstatus"/>
         <result property="fSealno" column="f_sealno"/>
+        <result property="fBuildBoxTime"    column="f_build_box_time"    />
+        <result property="fBoxTurtleYear"    column="f_box_turtle_year"    />
+        <result property="fBoxTurtleMonth"    column="f_box_turtle_month"    />
     </resultMap>
 
     <sql id="selectTCntrnoVo">
-        select f_id, f_no, f_typeid, f_owner, f_source, f_rent, f_updatetime, f_updateaddress, f_updateEF, f_cntrstatus, case when f_status = 'T' then '正常' else '停用' end as f_status,f_opctnstatus,f_sealno,create_by, create_time, update_by, update_time, remark from t_cntrno
+        select f_id, f_no, f_typeid, f_owner, f_source, f_rent, f_updatetime, f_updateaddress, f_updateEF, f_cntrstatus, case when f_status = 'T' then '正常' else '停用' end as f_status,f_opctnstatus,f_sealno,create_by, create_time, update_by, update_time, remark,
+               f_build_box_time,f_box_turtle_year,f_box_turtle_month from t_cntrno
     </sql>
 
     <select id="selectTCntrnoList" parameterType="TCntrno" resultMap="TCntrnoResult">
@@ -50,6 +54,9 @@
             <if test='cLoadDate != null and cLoadDate[1] != null and cLoadDate[1]!= ""'>
                 and create_time &lt;= #{cLoadDate[1]}
             </if>
+            <if test="fBuildBoxTime != null "> and f_build_box_time = #{fBuildBoxTime}</if>
+            <if test="fBoxTurtleYear != null  and fBoxTurtleYear != ''"> and f_box_turtle_year = #{fBoxTurtleYear}</if>
+            <if test="fBoxTurtleMonth != null  and fBoxTurtleMonth != ''"> and f_box_turtle_month = #{fBoxTurtleMonth}</if>
         </where>
     </select>
     <select id="selectTcntrnoMessage" parameterType="TCntrno" resultMap="TCntrnoResult">
@@ -79,7 +86,10 @@
         tc.create_time,
         tc.update_by,
         tc.update_time,
-        tc.remark
+        tc.remark,
+        tc.f_build_box_time,
+        tc.f_box_turtle_year,
+        tc.f_box_turtle_month
         FROM
         t_cntrno tc
         LEFT JOIN sys_dict_data pro ON pro.dict_value = tc.f_owner
@@ -123,6 +133,9 @@
             <if test="cntrstatusName != null  and cntrstatusName != ''">and pr.dict_label = #{cntrstatusName}</if>
             <if test="updateEFName != null  and updateEFName != ''">and sdda.dict_label = #{updateEFName}</if>
             <if test="cntrsize != null ">and t.f_cntrsize = #{cntrsize}</if>
+            <if test="tc.fBuildBoxTime != null "> and tc.f_build_box_time = #{fBuildBoxTime}</if>
+            <if test="tc.fBoxTurtleYear != null  and tc.fBoxTurtleYear != ''"> and tc.f_box_turtle_year = #{fBoxTurtleYear}</if>
+            <if test="tc.fBoxTurtleMonth != null  and tc.fBoxTurtleMonth != ''"> and tc.f_box_turtle_month = #{fBoxTurtleMonth}</if>
         </where>
         ORDER BY tc.f_no,CONVERT(tc.f_updateaddress USING gbk),CONVERT(t.f_no USING gbk),
         tc.f_updateEF,tc.f_cntrstatus,tc.f_owner
@@ -156,7 +169,10 @@
         tc.create_time,
         tc.update_by,
         tc.update_time,
-        tc.remark
+        tc.remark,
+        tc.f_build_box_time,
+        tc.f_box_turtle_year,
+        tc.f_box_turtle_month
         FROM
         t_cntrno tc
         LEFT JOIN sys_dict_data pro ON pro.dict_value = tc.f_owner
@@ -197,6 +213,9 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="fBuildBoxTime != null">f_build_box_time,</if>
+            <if test="fBoxTurtleYear != null">f_box_turtle_year,</if>
+            <if test="fBoxTurtleMonth != null">f_box_turtle_month,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fId != null">#{fId},</if>
@@ -217,6 +236,9 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="fBuildBoxTime != null">#{fBuildBoxTime},</if>
+            <if test="fBoxTurtleYear != null">#{fBoxTurtleYear},</if>
+            <if test="fBoxTurtleMonth != null">#{fBoxTurtleMonth},</if>
         </trim>
     </insert>
 
@@ -240,6 +262,9 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="fBuildBoxTime != null">f_build_box_time = #{fBuildBoxTime},</if>
+            <if test="fBoxTurtleYear != null">f_box_turtle_year = #{fBoxTurtleYear},</if>
+            <if test="fBoxTurtleMonth != null">f_box_turtle_month = #{fBoxTurtleMonth},</if>
         </trim>
         where f_id = #{fId}
     </update>