[CODE]: 基础资料新增字段

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TWarehouseController.java

@@ -156,7 +156,7 @@ public class TWarehouseController extends BaseController {
     @RepeatSubmit
     public AjaxResult edit(@Validated @RequestBody TWarehouse tWarehouse) {
         if (UserConstants.NOT_UNIQUE.equals(tWarehouseService.checkNameUnique(tWarehouse))) {
-            return AjaxResult.error("新增仓库'" + tWarehouse.getfNo() + "'失败，仓库已存在");
+            return AjaxResult.error("修改仓库'" + tWarehouse.getfNo() + "'失败，仓库已存在");
         }
         tWarehouse.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(tWarehouseService.updateTWarehouses(tWarehouse));

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TCorps.java

@@ -193,6 +193,13 @@ public class TCorps extends BaseEntity {
     @TableLogic
     private String delFlag;
 
+    /**
+     * 客户类别
+     */
+    @Excel(name = "客户类别")
+    private String fTypename;
+
+
     public void setfId(Long fId) {
         this.fId = fId;
     }
@@ -425,6 +432,14 @@ public class TCorps extends BaseEntity {
         return delFlag;
     }
 
+    public String getfTypename() {
+        return fTypename;
+    }
+
+    public void setfTypename(String fTypename) {
+        this.fTypename = fTypename;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TFees.java

@@ -62,6 +62,12 @@ public class TFees extends BaseEntity {
     @TableLogic
     private String delFlag;
 
+    /**
+     * 收付方向
+     */
+    @Excel(name = "收付方向")
+    private String fDc;
+
     public void setfId(Long fId) {
         this.fId = fId;
     }
@@ -126,6 +132,14 @@ public class TFees extends BaseEntity {
         return delFlag;
     }
 
+    public String getfDc() {
+        return fDc;
+    }
+
+    public void setfDc(String fDc) {
+        this.fDc = fDc;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

ruoyi-warehouse/src/main/resources/mapper/basicData/TCorpsMapper.xml

@@ -39,10 +39,11 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="fTypename" column="f_typename"/>
     </resultMap>
 
     <sql id="selectTCorpsVo">
-        select f_id, f_typeid, f_no, f_name, f_cname, f_ename, f_tel, f_fax, f_email, f_manage, f_addr, f_eaddr, f_scale, f_province, f_city, f_stltypeid, f_stldays, f_contractno, f_contractb, f_contracte, f_tax, f_invtel, f_invaddr, f_bankno, f_bankname, f_ubankno, f_ubankname, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_corps
+        select f_id, f_typeid, f_no, f_name, f_cname, f_ename, f_tel, f_fax, f_email, f_manage, f_addr, f_eaddr, f_scale, f_province, f_city, f_stltypeid, f_stldays, f_contractno, f_contractb, f_contracte, f_tax, f_invtel, f_invaddr, f_bankno, f_bankname, f_ubankno, f_ubankname, f_status, del_flag, create_by, create_time, update_by, update_time, remark ,f_typename from t_corps
     </sql>
 
     <select id="selectTCorpsList" parameterType="TCorps" resultMap="TCorpsResult">
@@ -76,6 +77,7 @@
             <if test="fUbankname != null  and fUbankname != ''">and f_ubankname like concat('%', #{fUbankname}, '%')
             </if>
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
+            <if test="fTypename != null  and fTypename != ''">and f_typename like concat('%', #{fTypename}, '%') </if>
         </where>
         ORDER BY  CONVERT(f_name USING gbk) asc
     </select>
@@ -121,6 +123,7 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="fTypename != null">f_typename,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fTypeid != null">#{fTypeid},</if>
@@ -156,6 +159,7 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="fTypename != null">#{fTypename},</if>
         </trim>
     </insert>
 
@@ -195,6 +199,7 @@
             <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="fTypename != null">f_typename = #{fTypename},</if>
         </trim>
         where f_id = #{fId}
     </update>

ruoyi-warehouse/src/main/resources/mapper/basicData/TFeesMapper.xml

@@ -18,10 +18,11 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="fDc" column="f_dc"/>
     </resultMap>
 
     <sql id="selectTFeesVo">
-        select f_id, f_no, f_name, f_feetype, f_feeunitid, f_currency, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_fees
+        select f_id, f_no, f_name, f_feetype, f_feeunitid, f_currency, f_status, del_flag, create_by, create_time, update_by, update_time, remark,f_dc from t_fees
     </sql>
 
     <select id="selectTFeesList" parameterType="TFees" resultMap="TFeesResult">
@@ -33,6 +34,7 @@
             <if test="fFeeunitid != null ">and f_feeunitid = #{fFeeunitid}</if>
             <if test="fCurrency != null  and fCurrency != ''">and f_currency like concat('%', #{fCurrency}, '%')</if>
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
+            <if test="fDc != null  and fDc != ''">and f_dc like concat('%', #{fDc}, '%') </if>
         </where>
         ORDER BY CONVERT(f_name USING gbk) asc
     </select>
@@ -57,6 +59,7 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="fDc != null and fDc != ''">f_dc,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fNo != null and fNo != ''">#{fNo},</if>
@@ -71,6 +74,7 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="fDc != null ">#{fDc},</if>
         </trim>
     </insert>
 
@@ -89,6 +93,7 @@
             <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="fDc != null and fDc != ''">f_dc = #{fDc},</if>
         </trim>
         where f_id = #{fId}
     </update>