【CHG】关联关系记录保存失败

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BaseLineController.java

@@ -1,13 +1,13 @@
 package com.railway.web.controller.business.baseinfo;
 
+import com.railway.business.baseinfo.domain.BaseDeptLine;
+import com.railway.business.baseinfo.domain.BaseLine;
 import com.railway.business.baseinfo.domain.vo.BaseLineQuery;
 import com.railway.business.baseinfo.domain.vo.BaseLineVo;
+import com.railway.business.baseinfo.service.IBaseLineService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
-import com.railway.common.core.domain.entity.SysDept;
 import com.railway.common.core.page.TableDataInfo;
-import com.railway.business.baseinfo.domain.BaseLine;
-import com.railway.business.baseinfo.service.IBaseLineService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
@@ -85,7 +85,7 @@ public class BaseLineController extends BaseController {
   @GetMapping(value = "/getDeptByLineId/{lineId}")
   public TableDataInfo getDeptByLineId(@PathVariable Long lineId) {
     startPage();
-    List<SysDept> list = busLineService.getDeptByLineId(lineId);
+    List<BaseDeptLine> list = busLineService.getDeptByLineId(lineId);
     return getDataTable(list);
   }
 

railway-business/src/main/java/com/railway/business/baseinfo/domain/BaseDeptLine.java

@@ -27,6 +27,9 @@ public class BaseDeptLine extends BaseEntity {
   @ApiModelProperty(value = "资产所属单位id")
   private Long deptId;
 
+  @ApiModelProperty(value = "资产所属单位名称")
+  private Long deptName;
+
   @ApiModelProperty(value = "电化开通日期")
   @Length(max = 20, message = "【电化开通日期】长度必须介于 {min} 和 {max} 之间")
   private String lineKtrq;

railway-business/src/main/java/com/railway/business/baseinfo/mapper/BaseDeptLineMapper.java

@@ -31,4 +31,9 @@ public interface BaseDeptLineMapper {
    */
   Page<BaseDeptLine> getList(@Param("lineId") Long lineId);
 
+  /**
+   * 查询列表
+   */
+  Page<BaseDeptLine> getDeptByLineId(@Param("lineId") Long lineId);
+
 }

railway-business/src/main/java/com/railway/business/baseinfo/mapper/BaseLineMapper.java

@@ -49,9 +49,5 @@ public interface BaseLineMapper {
    */
   Page<BaseLine> getListByDeptId(@Param("deptId") Long deptId);
 
-  /**
-   * 查询列表
-   */
-  Page<SysDept> getDeptByLineId(@Param("deptId") Long LineId);
 
 }

railway-business/src/main/java/com/railway/business/baseinfo/service/IBaseLineService.java

@@ -1,9 +1,9 @@
 package com.railway.business.baseinfo.service;
 
+import com.railway.business.baseinfo.domain.BaseDeptLine;
 import com.railway.business.baseinfo.domain.BaseLine;
-import com.railway.business.baseinfo.domain.vo.BaseLineVo;
 import com.railway.business.baseinfo.domain.vo.BaseLineQuery;
-import com.railway.common.core.domain.entity.SysDept;
+import com.railway.business.baseinfo.domain.vo.BaseLineVo;
 import java.util.List;
 
 /**
@@ -47,6 +47,6 @@ public interface IBaseLineService {
   /**
    * 查询列表
    */
-  List<SysDept> getDeptByLineId(Long lineId);
+  List<BaseDeptLine> getDeptByLineId(Long lineId);
 
 }

railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BaseLineServiceImpl.java

@@ -2,12 +2,11 @@ package com.railway.business.baseinfo.service.impl;
 
 import com.railway.business.baseinfo.domain.BaseDeptLine;
 import com.railway.business.baseinfo.domain.BaseLine;
-import com.railway.business.baseinfo.domain.vo.BaseLineVo;
 import com.railway.business.baseinfo.domain.vo.BaseLineQuery;
+import com.railway.business.baseinfo.domain.vo.BaseLineVo;
 import com.railway.business.baseinfo.mapper.BaseDeptLineMapper;
 import com.railway.business.baseinfo.mapper.BaseLineMapper;
 import com.railway.business.baseinfo.service.IBaseLineService;
-import com.railway.common.core.domain.entity.SysDept;
 import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.bean.BeanUtils;
@@ -83,8 +82,9 @@ public class BaseLineServiceImpl implements IBaseLineService {
   }
 
   private void saveDeptLine(List<BaseDeptLine> deptLines, Long lineId){
-    if(CollectionUtils.isEmpty(deptLines)){
+    if(CollectionUtils.isNotEmpty(deptLines)){
       for(BaseDeptLine baseDeptLine : deptLines){
+        baseDeptLine.setDeptId(baseDeptLine.getDeptId());
         baseDeptLine.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
         baseDeptLine.setLineId(lineId);
         baseDeptLine.setCreateTime(new Date());
@@ -139,7 +139,8 @@ public class BaseLineServiceImpl implements IBaseLineService {
    * 查询列表
    */
   @Override
-  public List<SysDept> getDeptByLineId(Long lineId) {
-    return null;
+  public List<BaseDeptLine> getDeptByLineId(Long lineId) {
+    return deptLineMapper.getDeptByLineId(lineId);
   }
+
 }

railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BaseStationServiceImpl.java

@@ -83,7 +83,7 @@ public class BaseStationServiceImpl implements IBaseStationService {
   }
 
   private void saveDeptStation(List<BaseDeptStation> deptStations, Long stationId){
-    if(CollectionUtils.isEmpty(deptStations)){
+    if(CollectionUtils.isNotEmpty(deptStations)){
       for(BaseDeptStation baseDeptStation : deptStations){
         baseDeptStation.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
         baseDeptStation.setStationId(stationId);

railway-business/src/main/resources/mapper/baseinfo/BaseDeptLineMapper.xml

@@ -7,6 +7,7 @@
     <result column="id" property="id"/>
     <result column="line_id" property="lineId"/>
     <result column="dept_id" property="deptId"/>
+    <result column="dept_name" property="deptName"/>
     <result column="line_ktrq" property="lineKtrq"/>
     <result column="line_start_marker" property="lineStartMarker"/>
     <result column="line_end_marker" property="lineEndMarker"/>
@@ -23,22 +24,17 @@
   </resultMap>
 
   <sql id="Base_Column_List">
-    id,
-    line_id,
-    dept_id,
-    line_ktrq,
-    line_start_marker,
-    line_end_marker,
-    line_gdfs,
-    line_xglx,
-    line_qt,
-    line_sjbh,
-    order_num,
-    del_flag,
-    create_by,
-    create_time,
-    update_by,
-    update_time
+    t.id,
+    t.line_id,
+    t.dept_id,
+    t.line_ktrq,
+    t.line_start_marker,
+    t.line_end_marker,
+    t.line_gdfs,
+    t.line_xglx,
+    t.line_qt,
+    t.line_sjbh,
+    t.order_num
   </sql>
 
   <insert id="insert" parameterType="com.railway.business.baseinfo.domain.BaseDeptLine">
@@ -47,6 +43,9 @@
       <if test='null != deptId'>
         dept_id,
       </if>
+      <if test='null != lineId'>
+        line_id,
+      </if>
       <if test='null != lineKtrq'>
         line_ktrq,
       </if>
@@ -80,17 +79,14 @@
       <if test='null != createTime'>
         create_time,
       </if>
-      <if test='null != updateBy'>
-        update_by,
-      </if>
-      <if test='null != updateTime'>
-        update_time
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test='null != deptId'>
         #{deptId},
       </if>
+      <if test='null != lineId'>
+        #{lineId},
+      </if>
       <if test='null != lineKtrq'>
         #{lineKtrq},
       </if>
@@ -124,12 +120,6 @@
       <if test='null != createTime'>
         #{createTime},
       </if>
-      <if test='null != updateBy'>
-        #{updateBy},
-      </if>
-      <if test='null != updateTime'>
-        #{updateTime}
-      </if>
     </trim>
   </insert>
 
@@ -141,12 +131,25 @@
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
-    FROM base_dept_line
+    <include refid="Base_Column_List"/>, d.dept_name
+    FROM base_dept_line t
+    LEFT JOIN sys_dept d on t.dept_id = d.dept_id
+    <where>
+      t.del_flag='0'
+      <if test="lineId!=null and lineId!=''">
+        and t.line_id=#{lineId}
+      </if>
+    </where>
+  </select>
+
+  <select id="getDeptByLineId" resultMap="BaseResultMap">
+    SELECT t.dept_id, d.dept_name
+    FROM base_dept_line t
+    LEFT JOIN sys_dept e on t.dept_id = d.dept_id
     <where>
-      del_flag='0'
+      t.del_flag='0'
       <if test="lineId!=null and lineId!=''">
-        and line_id=#{lineId}
+        and t.line_id=#{lineId}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BaseDeptStationMapper.xml

@@ -48,6 +48,9 @@
       <if test='null != lineId'>
         line_id,
       </if>
+      <if test='null != stationId'>
+        station_id,
+      </if>
       <if test='null != qjlc'>
         qjlc,
       </if>
@@ -89,6 +92,9 @@
       <if test='null != lineId'>
         #{lineId},
       </if>
+      <if test='null != stationId'>
+        #{stationId},
+      </if>
       <if test='null != qjlc'>
         #{qjlc},
       </if>

railway-business/src/main/resources/mapper/baseinfo/BaseLineMapper.xml

@@ -185,8 +185,4 @@
     </where>
   </select>
 
-  <select id="getDeptByLineId" resultType="com.railway.common.core.domain.entity.SysDept">
-
-  </select>
-
 </mapper>