xiongchao 3 年之前
父節點
當前提交
50d7da42bf

+ 16 - 1
platform-dao/src/main/java/com/platform/dao/dto/sb/SbInfoDTO.java

@@ -63,7 +63,22 @@ public class SbInfoDTO extends BaseDTO implements Serializable {
      * 财务编码
      */
     private String financingNo;
-
+    /**
+     * 财务编码/固定资产编号
+     */
+    private String financingNoTwo;
+    /**
+     * 财务编码/固定资产编号
+     */
+    private String financingNoThird;
+    /**
+     * 财务编码/固定资产编号
+     */
+    private String financingNoFour;
+    /**
+     * 财务编码/固定资产编号
+     */
+    private String financingNoFive;
     /**
      * 设备名称
      */

+ 16 - 0
platform-dao/src/main/java/com/platform/dao/entity/sb/SbInfo.java

@@ -85,6 +85,22 @@ public class SbInfo implements Serializable {
      * 财务编码/固定资产编号
      */
     private String financingNo;
+    /**
+     * 财务编码/固定资产编号
+     */
+    private String financingNoTwo;
+    /**
+     * 财务编码/固定资产编号
+     */
+    private String financingNoThird;
+    /**
+     * 财务编码/固定资产编号
+     */
+    private String financingNoFour;
+    /**
+     * 财务编码/固定资产编号
+     */
+    private String financingNoFive;
     /**
      * 设备原值/购置价值
      */

+ 16 - 0
platform-dao/src/main/java/com/platform/dao/vo/sb/SbInfoVO.java

@@ -51,6 +51,22 @@ public class SbInfoVO extends BaseVO implements Serializable {
      * 财务编码
      */
     private String financingNo;
+    /**
+     * 财务编码/固定资产编号
+     */
+    private String financingNoTwo;
+    /**
+     * 财务编码/固定资产编号
+     */
+    private String financingNoThird;
+    /**
+     * 财务编码/固定资产编号
+     */
+    private String financingNoFour;
+    /**
+     * 财务编码/固定资产编号
+     */
+    private String financingNoFive;
     /**
      * 设备型号
      */

+ 20 - 4
platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -2,7 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.platform.dao.mapper.sb.SbInfoMapper">
     <sql id="Base_Column_List">
-        id, no, financing_no, name, model_id,
+        id, no,
+financing_no,
+sb.financing_no_two,
+sb.financing_no_third,
+sb.financing_no_four,
+sb.financing_no_five,
+name, model_id,
         is_child,
         is_show,
         type_id, level, initial_value, current_value, cut_value,
@@ -61,7 +67,13 @@
     </sql>
 
     <sql id="Left_Column">
-        sb.id, sb.no, sb.financing_no, sb.name,  sb.initial_value,
+        sb.id, sb.no,
+sb.financing_no_two,
+sb.financing_no_third,
+sb.financing_no_four,
+sb.financing_no_five,
+sb.financing_no,
+sb.name,  sb.initial_value,
         sb.current_value, sb.cut_value,
         sb.is_child,
         sb.parent_id,
@@ -160,7 +172,9 @@
         <if test="likeDeptCode != null and likeDeptCode!=''">
             and sdDept.dept_code like concat(#{likeDeptCode},'%')
         </if>
-
+        <if test="financingNo != null and financingNo!=''">
+            and sb.financing_no like concat(#{financingNo},'%')
+        </if>
         <if test="positionIds != null">
             AND sb.position_id in
             <foreach item="item" index="index" collection="positionIds" open="(" close=")" separator=",">
@@ -268,7 +282,9 @@
         <if test="likeDeptCode != null and likeDeptCode!=''">
             and sdDept.dept_code like concat(#{likeDeptCode},'%')
         </if>
-
+        <if test="financingNo != null and financingNo!=''">
+            and sb.financing_no like concat(#{financingNo},'%')
+        </if>
         <if test="positionIds != null">
             AND sb.position_id in
             <foreach item="item" index="index" collection="positionIds" open="(" close=")" separator=",">