[CODE]: 添加字段

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseAgreement.java

@@ -103,6 +103,12 @@ public class TWarehouseAgreement extends BaseEntity {
     private String fBillstatus;
 
     /**
+     * 审批状态,N 录入中，T审核通过
+     */
+    @Excel(name = "状态")
+    private String fStatus;
+
+    /**
      * 删除状态
      */
     @TableLogic
@@ -228,6 +234,14 @@ public class TWarehouseAgreement extends BaseEntity {
         return delFlag;
     }
 
+    public String getfStatus() {
+        return fStatus;
+    }
+
+    public void setfStatus(String fStatus) {
+        this.fStatus = fStatus;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -243,6 +257,7 @@ public class TWarehouseAgreement extends BaseEntity {
                 .append("fBegindate", getfBegindate())
                 .append("fEnddate", getfEnddate())
                 .append("fBillstatus", getfBillstatus())
+                .append("fStatus", getfStatus())
                 .append("delFlag", getDelFlag())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseAgreementServiceImpl.java

@@ -189,6 +189,8 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
             tWarehouseAgreement.setCreateBy(loginUser.getUser().getUserName());
             tWarehouseAgreement.setfDeptid(loginUser.getUser().getDeptId());
             tWarehouseAgreement.setfFeetypeid((long) fFeetypeid);
+            tWarehouseAgreement.setfStatus("0");
+            tWarehouseAgreement.setfBillstatus("1");
             tWarehouseAgreementMapper.insertTWarehouseAgreement(tWarehouseAgreement);
             fPid = tWarehouseAgreement.getfId();
         }else{
@@ -234,6 +236,8 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
             tWarehouseAgreement.setCreateBy(loginUser.getUser().getUserName());
             tWarehouseAgreement.setfDeptid(loginUser.getUser().getDeptId());
             tWarehouseAgreement.setfFeetypeid((long) fFeetypeid);
+            tWarehouseAgreement.setfStatus("0");
+            tWarehouseAgreement.setfBillstatus("1");
             tWarehouseAgreementMapper.insertTWarehouseAgreement(tWarehouseAgreement);
             fPid = tWarehouseAgreement.getfId();
         }else{

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseAgreementMapper.xml

@@ -19,6 +19,7 @@
         <result property="fBegindate" column="f_begindate"/>
         <result property="fEnddate" column="f_enddate"/>
         <result property="fBillstatus" column="f_billstatus"/>
+        <result property="fStatus" column="f_status"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -28,7 +29,7 @@
     </resultMap>
 
     <sql id="selectTWarehouseAgreementVo">
-        select f_id, f_billno,f_contractno, f_deptid, f_corpid,f_goodsid, f_stltypeid, f_feetypeid, t_packages, f_trademodeid, f_freedays, f_begindate, f_enddate, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark from t_warehouse_agreement
+        select f_id, f_billno,f_contractno, f_deptid, f_corpid,f_goodsid, f_stltypeid, f_feetypeid, t_packages, f_trademodeid, f_freedays, f_begindate, f_enddate, f_billstatus,f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_warehouse_agreement
     </sql>
 
     <select id="selectTWarehouseAgreementList" parameterType="TWarehouseAgreement"
@@ -48,6 +49,7 @@
             <if test="fBegindate != null ">and f_begindate = #{fBegindate}</if>
             <if test="fEnddate != null ">and f_enddate = #{fEnddate}</if>
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
+            <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
         </where>
     </select>
 
@@ -82,6 +84,7 @@
             <if test="fBegindate != null ">and agre.f_begindate = #{fBegindate}</if>
             <if test="fEnddate != null ">and agre.f_enddate = #{fEnddate}</if>
             <if test="fBillstatus != null  and fBillstatus != ''">and agre.f_billstatus = #{fBillstatus}</if>
+            <if test="fStatus != null  and fStatus != ''">and agre.f_status = #{fStatus}</if>
         </where>
     </select>
 
@@ -107,6 +110,7 @@
             <if test="fBegindate != null">f_begindate,</if>
             <if test="fEnddate != null">f_enddate,</if>
             <if test="fBillstatus != null">f_billstatus,</if>
+            <if test="fStatus != null">f_status,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -128,6 +132,7 @@
             <if test="fBegindate != null">#{fBegindate},</if>
             <if test="fEnddate != null">#{fEnddate},</if>
             <if test="fBillstatus != null">#{fBillstatus},</if>
+            <if test="fStatus != null">#{fStatus},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -153,6 +158,7 @@
             <if test="fBegindate != null">f_begindate = #{fBegindate},</if>
             <if test="fEnddate != null">f_enddate = #{fEnddate},</if>
             <if test="fBillstatus != null">f_billstatus = #{fBillstatus},</if>
+            <if test="fStatus != null">f_status = #{fStatus},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>