分段绝缘器和避雷器基础数据关联部门

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbFdfxjyqController.java

@@ -112,15 +112,15 @@ public class BusJcbFdfxjyqController extends BaseController {
         WordUtils wordUtil=new WordUtils();
         //填充变量
         Map<String, Object> params = new HashMap<String, Object>();
-        params.put("${fdh}", info.getFcd());
-        params.put("${qj}", info.getQj());
-        params.put("${jcrq}", info.getJcrq());
-        params.put("${wd}", info.getWd());
-        params.put("${jcr}", info.getJcr());
-        params.put("${pointB}", info.getPointB());
-        params.put("${pointG}", info.getPointG());
-        params.put("${fcd}", info.getFcd());
-        params.put("${fddmpsd}", info.getFddmpsd());
+        params.put("${fdh}", info.getFcd().toString());
+        params.put("${qj}", info.getQj().toString());
+        params.put("${jcrq}", info.getJcrq().toString());
+        params.put("${wd}", info.getWd().toString());
+        params.put("${jcr}", info.getJcr().toString());
+        params.put("${pointB}", info.getPointB().toString());
+        params.put("${pointG}", info.getPointG().toString());
+        params.put("${fcd}", info.getFcd().toString());
+        params.put("${fddmpsd}", info.getFddmpsd().toString());
         params.put("${jybjFdjyqzjyzt}", info.getJybjFdjyqzjyzt().equals("0")?"√":"×");
         params.put("${jybjClsjyzzt}", info.getJybjClsjyzzt().equals("0")?"√":"×");
         params.put("${lbjztLs}", info.getLbjztLs().equals("0")?"√":"×");
@@ -129,6 +129,11 @@ public class BusJcbFdfxjyqController extends BaseController {
         params.put("${lbjztJcxjt}", info.getLbjztJcxjt().equals("0")?"√":"×");
         params.put("${lbjztXhj}", info.getLbjztXhj().equals("0")?"√":"×");
         params.put("${sbzt}", info.getSbzt().equals("0")?"√":"×");
+        params.put("${xlfdXlpd}", info.getXlfdXlpd().toString());
+        params.put("${xlfdWgdg}", info.getXlfdWgdg().toString());
+        params.put("${xlfdFdsxlqj}", info.getXlfdFdsxlqj().toString());
+        params.put("${xlfdFdczxlqj}", info.getXlfdFdczxlqj().toString());
+        params.put("${sdgjcztSddg}", info.getSdgjcztSddg().equals("0")?"√":"×");
 
         try{
             //填充图片信息

railway-business/src/main/java/com/railway/business/catenary/domain/BusBlq.java

@@ -25,6 +25,9 @@ public class BusBlq extends BaseEntity{
     @Length(min = 1, max = 200, message = "【段别】长度必须介于 {min} 和 {max} 之间")
     private String db;
 
+    @ApiModelProperty(value = "部门ID")
+    private String deptId;
+
     @ApiModelProperty(value = "所属部门")
     @Length(min = 1, max = 100, message = "【所属部门】长度必须介于 {min} 和 {max} 之间")
     private String bm;

railway-business/src/main/java/com/railway/business/catenary/domain/BusFdfxjyq.java

@@ -25,6 +25,9 @@ public class BusFdfxjyq extends BaseEntity{
     @Length(min = 1, max = 200, message = "【段别】长度必须介于 {min} 和 {max} 之间")
     private String db;
 
+    @ApiModelProperty(value = "部门ID")
+    private String deptId;
+
     @ApiModelProperty(value = "所属部门")
     @Length(min = 1, max = 100, message = "【所属部门】长度必须介于 {min} 和 {max} 之间")
     private String bm;

railway-business/src/main/resources/mapper/business/BusBlqMapper.xml

@@ -78,6 +78,7 @@
                 <result column="create_time" property="createTime"/>
                 <result column="update_by" property="updateBy"/>
                 <result column="update_time" property="updateTime"/>
+                <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -154,7 +155,8 @@
                 create_by,
                 create_time,
                 update_by,
-                update_time
+                update_time,
+                dept_id
     </sql>
 
     <insert id="insert" parameterType="com.railway.business.catenary.domain.BusBlq">
@@ -380,7 +382,10 @@
                     update_by,
                     </if>
                     <if test ='null != updateTime'>
-                    update_time
+                    update_time,
+                    </if>
+                    <if test ='null != deptId'>
+                        dept_id
                     </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -601,7 +606,10 @@
                     #{updateBy},
                     </if>
                     <if test ='null != updateTime'>
-                    #{updateTime}
+                    #{updateTime},
+                    </if>
+                    <if test ='null != deptId'>
+                    #{deptId}
                     </if>
         </trim>
     </insert>
@@ -687,7 +695,8 @@
                     <if test ='null != createBy'>create_by = #{createBy},</if>
                     <if test ='null != createTime'>create_time = #{createTime},</if>
                     <if test ='null != updateBy'>update_by = #{updateBy},</if>
-                    <if test ='null != updateTime'>update_time = #{updateTime}</if>
+                    <if test ='null != updateTime'>update_time = #{updateTime},</if>
+                    <if test ='null != deptId'>dept_id = #{deptId}</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -710,6 +719,9 @@
                 <if test="db!=null and db!=''">
                     and db=#{db}
                 </if>
+                <if test="deptId!=null and deptId!=''">
+                    and dept_id=#{deptId}
+                </if>
                 <if test="bm!=null and bm!=''">
                     and bm=#{bm}
                 </if>

railway-business/src/main/resources/mapper/business/BusFdfxjyqMapper.xml

@@ -52,6 +52,7 @@
                 <result column="create_time" property="createTime"/>
                 <result column="update_by" property="updateBy"/>
                 <result column="update_time" property="updateTime"/>
+                <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -102,7 +103,8 @@
                 create_by,
                 create_time,
                 update_by,
-                update_time
+                update_time,
+                dept_id
     </sql>
 
     <insert id="insert" parameterType="com.railway.business.catenary.domain.BusFdfxjyq">
@@ -250,7 +252,10 @@
                     update_by,
                     </if>
                     <if test ='null != updateTime'>
-                    update_time
+                    update_time,
+                    </if>
+                    <if test ='null != deptId'>
+                        dept_id
                     </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -393,7 +398,10 @@
                     #{updateBy},
                     </if>
                     <if test ='null != updateTime'>
-                    #{updateTime}
+                    #{updateTime},
+                    </if>
+                    <if test ='null != deptId'>
+                    #{deptId}
                     </if>
         </trim>
     </insert>
@@ -453,7 +461,8 @@
                     <if test ='null != createBy'>create_by = #{createBy},</if>
                     <if test ='null != createTime'>create_time = #{createTime},</if>
                     <if test ='null != updateBy'>update_by = #{updateBy},</if>
-                    <if test ='null != updateTime'>update_time = #{updateTime}</if>
+                    <if test ='null != updateTime'>update_time = #{updateTime},</if>
+                    <if test ='null != deptId'>dept_id = #{deptId}</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -476,6 +485,9 @@
                 <if test="db!=null and db!=''">
                     and db=#{db}
                 </if>
+                <if test="deptId!=null and deptId!=''">
+                    and dept_id=#{deptId}
+                </if>
                 <if test="bm!=null and bm!=''">
                     and bm=#{bm}
                 </if>

railway-business/src/main/resources/mapper/business/BusZzdzxxMapper.xml

@@ -709,7 +709,7 @@
 
     <select id="getList" resultMap="BaseResultMap">
         SELECT
-        a.*
+        a.*,b.dept_id,b.line_id
         FROM bus_zzdzxx a
         left join bus_station b
         on a.station_id = b.station_id