xiugai

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -1185,4 +1185,17 @@ public class UniversalController extends BaseRESTfulController {
         Map<String,Object> responseMap = universalService.submitSteel(map);
         return responseMap;
     }
+
+    @ApiOperation("表格查询显示和隐藏")
+    @PostMapping("/getColumnShowHidden")
+    public Map<String,Object> getColumnShowHidden(@RequestBody(required = false) Map<String,Object> map) {
+        Map<String,Object>  responseMap = universalService.getColumnShowHidden(map);
+        return responseMap;
+    }
+
+    @ApiOperation("切换列的显示与隐藏")
+    @PostMapping("updateColumnShowHidden")
+    public RESTfulResult updateColumnShowHidden(@RequestBody Map<String,Object> map){
+        return success(universalService.updateColumnShowHidden(map));
+    }
 }

src/main/java/com/steerinfo/dil/mapper/DilRoleOrgcodeTableMapper.java

@@ -0,0 +1,15 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.DilRoleOrgcodeTable;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface DilRoleOrgcodeTableMapper extends IBaseMapper<DilRoleOrgcodeTable, BigDecimal> {
+
+    @Select("select seq__dilTableColumn.nextval from dual")
+    BigDecimal getPrimaryId();
+}

src/main/java/com/steerinfo/dil/mapper/DilTableColumnRoleMapper.java

@@ -0,0 +1,13 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.DilTableColumnRole;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface DilTableColumnRoleMapper extends IBaseMapper<DilTableColumnRole, BigDecimal> {
+    BigDecimal selectColumnId(String s, String tableName);
+
+}

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -284,4 +284,10 @@ public interface UniversalMapper {
 
     Map<String, Object> getSteelReportDetailsBySmId(BigDecimal saleOrderMaterialId);
 
+    List<String> getColumnHiddenData(Map<String, Object> map);
+
+    List<Map<String, Object>> getColumnShowData(Map<String, Object> map);
+
+    List<Map<String, Object>> getColumnAllData(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/model/DilRoleOrgcodeTable.java

@@ -0,0 +1,93 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+@ApiModel(value="机构与列的展示关系")
+public class DilRoleOrgcodeTable implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(PRIMARY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal primaryId;
+
+    /**
+     * 机构关系(ORG_CODE,VARCHAR,200)
+     */
+    @ApiModelProperty(value="机构关系",required=false)
+    private String orgCode;
+
+    /**
+     * 用户名称(USER_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="用户名称",required=false)
+    private String userName;
+
+    /**
+     * 列ID(COLUMN_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="列ID",required=false)
+    private BigDecimal columnId;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.primaryId;
+    }
+
+    @Override
+    public void setId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public BigDecimal getPrimaryId() {
+        return primaryId;
+    }
+
+    public void setPrimaryId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode == null ? null : orgCode.trim();
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    public BigDecimal getColumnId() {
+        return columnId;
+    }
+
+    public void setColumnId(BigDecimal columnId) {
+        this.columnId = columnId;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", primaryId=").append(primaryId);
+        sb.append(", orgCode=").append(orgCode);
+        sb.append(", userName=").append(userName);
+        sb.append(", columnId=").append(columnId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/model/DilTableColumnRole.java

@@ -0,0 +1,78 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+@ApiModel(value="表列权限")
+public class DilTableColumnRole implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(PRIMARY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal primaryId;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 列名(COLUMN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="列名",required=false)
+    private String columnName;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.primaryId;
+    }
+
+    @Override
+    public void setId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public BigDecimal getPrimaryId() {
+        return primaryId;
+    }
+
+    public void setPrimaryId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getColumnName() {
+        return columnName;
+    }
+
+    public void setColumnName(String columnName) {
+        this.columnName = columnName == null ? null : columnName.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", primaryId=").append(primaryId);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", columnName=").append(columnName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -26,4 +26,8 @@ public interface UniversalService {
     List<String> getTest(Map<String, Object> map);
 
     Map<String, Object> submitSteel(Map<String, Object> map);
+
+    Map<String, Object> getColumnShowHidden(Map<String, Object> map);
+
+    int updateColumnShowHidden(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -3,7 +3,10 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.feign.JoinFeign;
+import com.steerinfo.dil.mapper.DilRoleOrgcodeTableMapper;
+import com.steerinfo.dil.mapper.DilTableColumnRoleMapper;
 import com.steerinfo.dil.mapper.UniversalMapper;
+import com.steerinfo.dil.model.DilRoleOrgcodeTable;
 import com.steerinfo.dil.service.UniversalService;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.ESUtil;
@@ -39,6 +42,12 @@ public class UniversalServiceImpl implements UniversalService {
     @Resource
     private UniversalMapper universalMapper;
 
+    @Resource
+    private DilRoleOrgcodeTableMapper dilRoleOrgcodeTableMapper;
+
+    @Resource
+    private DilTableColumnRoleMapper dilTableColumnRoleMapper;
+
     @Autowired
     private JoinFeign joinFeign;
 
@@ -405,4 +414,39 @@ public class UniversalServiceImpl implements UniversalService {
         resMap.put("responseMapFailed",responseMapFailedList);
         return resMap;
     }
+
+    @Override
+    public Map<String, Object> getColumnShowHidden(Map<String, Object> map) {
+        Map<String, Object> responseMap = new HashMap<>();
+        List<Map<String,Object>> columnShowData = universalMapper.getColumnShowData(map);
+        List<Map<String,Object>> columnAllData = universalMapper.getColumnAllData(map);
+        List<String> columnHiddenData = universalMapper.getColumnHiddenData(map);
+        responseMap.put("columnShowData",columnShowData);
+        responseMap.put("columnAllData",columnAllData);
+        responseMap.put("columnHiddenData",columnHiddenData);
+        return responseMap;
+    }
+
+    @Override
+    public int updateColumnShowHidden(Map<String, Object> map) {
+        int i = 0 ;
+        //首先删除原来的列
+        i += dilRoleOrgcodeTableMapper.deleteBySelectiveElement(map);
+        List<String> columnHiddenData = (List<String>) map.get("columnHiddenData");
+        List<DilRoleOrgcodeTable> mapList = new ArrayList<>();
+        for (String s : columnHiddenData) {
+            DilRoleOrgcodeTable dilRoleOrgcodeTable = new DilRoleOrgcodeTable();
+            BigDecimal columnId = dilTableColumnRoleMapper.selectColumnId(s,map.get("tableName").toString());
+            dilRoleOrgcodeTable.setColumnId(columnId);
+            dilRoleOrgcodeTable.setUserName(map.get("userName").toString());
+            dilRoleOrgcodeTable.setOrgCode(map.get("orgCode").toString());
+            dilRoleOrgcodeTable.setPrimaryId(dilRoleOrgcodeTableMapper.getPrimaryId());
+            mapList.add(dilRoleOrgcodeTable);
+        }
+        if(mapList.size() > 0) {
+            //然后再批量新增进去
+            i += dilRoleOrgcodeTableMapper.batchInsert(mapList);
+        }
+        return i;
+    }
 }

src/main/resources/application-prod.yml

@@ -26,7 +26,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:

src/main/resources/com/steerinfo/dil/mapper/DilRoleOrgcodeTableMapper.xml

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.DilRoleOrgcodeTableMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+    <id column="PRIMARY_ID" jdbcType="DECIMAL" property="primaryId" />
+    <result column="ORG_CODE" jdbcType="VARCHAR" property="orgCode" />
+    <result column="USER_NAME" jdbcType="VARCHAR" property="userName" />
+    <result column="COLUMN_ID" jdbcType="DECIMAL" property="columnId" />
+  </resultMap>
+  <sql id="columns">
+    PRIMARY_ID, ORG_CODE, USER_NAME, COLUMN_ID
+  </sql>
+  <sql id="columns_alias">
+    t.PRIMARY_ID, t.ORG_CODE, t.USER_NAME, t.COLUMN_ID
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DIL_ROLE_ORGCODE_TABLE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DIL_ROLE_ORGCODE_TABLE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="primaryId != null">
+        and PRIMARY_ID = #{primaryId}
+      </if>
+      <if test="orgCode != null and orgCode != ''">
+        and ORG_CODE = #{orgCode}
+      </if>
+      <if test="userName != null and userName != ''">
+        and USER_NAME = #{userName}
+      </if>
+      <if test="columnId != null">
+        and COLUMN_ID = #{columnId}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="primaryId != null">
+        and PRIMARY_ID = #{primaryId}
+      </if>
+      <if test="orgCode != null and orgCode != ''">
+        and ORG_CODE LIKE '%${orgCode}%'
+      </if>
+      <if test="userName != null and userName != ''">
+        and USER_NAME LIKE '%${userName}%'
+      </if>
+      <if test="columnId != null">
+        and COLUMN_ID = #{columnId}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from DIL_ROLE_ORGCODE_TABLE
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DIL_ROLE_ORGCODE_TABLE
+    where 1!=1 
+      <if test="orgCode != null and orgCode != ''">
+        or ORG_CODE = #{orgCode}
+      </if>
+      <if test="userName != null and userName != ''">
+        or USER_NAME = #{userName}
+      </if>
+      <if test="columnId != null">
+        or COLUMN_ID = #{columnId}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+    insert into DIL_ROLE_ORGCODE_TABLE (PRIMARY_ID, ORG_CODE, USER_NAME, 
+      COLUMN_ID)
+    values (#{primaryId,jdbcType=DECIMAL}, #{orgCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
+      #{columnId,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+    insert into DIL_ROLE_ORGCODE_TABLE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="primaryId != null">
+        PRIMARY_ID,
+      </if>
+      <if test="orgCode != null">
+        ORG_CODE,
+      </if>
+      <if test="userName != null">
+        USER_NAME,
+      </if>
+      <if test="columnId != null">
+        COLUMN_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="primaryId != null">
+        #{primaryId,jdbcType=DECIMAL},
+      </if>
+      <if test="orgCode != null">
+        #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="columnId != null">
+        #{columnId,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+    update DIL_ROLE_ORGCODE_TABLE
+    set ORG_CODE = #{orgCode,jdbcType=VARCHAR},
+      USER_NAME = #{userName,jdbcType=VARCHAR},
+      COLUMN_ID = #{columnId,jdbcType=DECIMAL}
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+    update DIL_ROLE_ORGCODE_TABLE
+    <set>
+      <if test="orgCode != null">
+        ORG_CODE = #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        USER_NAME = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="columnId != null">
+        COLUMN_ID = #{columnId,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into DIL_ROLE_ORGCODE_TABLE 
+      (PRIMARY_ID, 
+      ORG_CODE, USER_NAME, COLUMN_ID
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.primaryId,jdbcType=DECIMAL}, 
+      #{item.orgCode,jdbcType=VARCHAR}, #{item.userName,jdbcType=VARCHAR}, #{item.columnId,jdbcType=DECIMAL}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DIL_ROLE_ORGCODE_TABLE
+     set
+       PRIMARY_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+          when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryId,jdbcType=DECIMAL}
+       </foreach>
+       ,ORG_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+          when #{item.primaryId,jdbcType=DECIMAL} then #{item.orgCode,jdbcType=VARCHAR}
+       </foreach>
+       ,USER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+          when #{item.primaryId,jdbcType=DECIMAL} then #{item.userName,jdbcType=VARCHAR}
+       </foreach>
+       ,COLUMN_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+          when #{item.primaryId,jdbcType=DECIMAL} then #{item.columnId,jdbcType=DECIMAL}
+       </foreach>
+     where PRIMARY_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.primaryId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DIL_ROLE_ORGCODE_TABLE
+    where PRIMARY_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/resources/com/steerinfo/dil/mapper/DilTableColumnRoleMapper.xml

@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.DilTableColumnRoleMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilTableColumnRole">
+    <id column="PRIMARY_ID" jdbcType="DECIMAL" property="primaryId" />
+    <result column="TABLE_NAME" jdbcType="VARCHAR" property="tableName" />
+    <result column="COLUMN_NAME" jdbcType="VARCHAR" property="columnName" />
+  </resultMap>
+  <sql id="columns">
+    PRIMARY_ID, TABLE_NAME, COLUMN_NAME
+  </sql>
+  <sql id="columns_alias">
+    t.PRIMARY_ID, t.TABLE_NAME, t.COLUMN_NAME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DIL_TABLE_COLUMN_ROLE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DIL_TABLE_COLUMN_ROLE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="primaryId != null">
+        and PRIMARY_ID = #{primaryId}
+      </if>
+      <if test="tableName != null and tableName != ''">
+        and TABLE_NAME = #{tableName}
+      </if>
+      <if test="columnName != null and columnName != ''">
+        and COLUMN_NAME = #{columnName}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="primaryId != null">
+        and PRIMARY_ID = #{primaryId}
+      </if>
+      <if test="tableName != null and tableName != ''">
+        and TABLE_NAME LIKE '%${tableName}%'
+      </if>
+      <if test="columnName != null and columnName != ''">
+        and COLUMN_NAME LIKE '%${columnName}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from DIL_TABLE_COLUMN_ROLE
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DIL_TABLE_COLUMN_ROLE
+    where 1!=1 
+      <if test="tableName != null and tableName != ''">
+        or TABLE_NAME = #{tableName}
+      </if>
+      <if test="columnName != null and columnName != ''">
+        or COLUMN_NAME = #{columnName}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
+    insert into DIL_TABLE_COLUMN_ROLE (PRIMARY_ID, TABLE_NAME, COLUMN_NAME
+      )
+    values (#{primaryId,jdbcType=DECIMAL}, #{tableName,jdbcType=VARCHAR}, #{columnName,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
+    insert into DIL_TABLE_COLUMN_ROLE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="primaryId != null">
+        PRIMARY_ID,
+      </if>
+      <if test="tableName != null">
+        TABLE_NAME,
+      </if>
+      <if test="columnName != null">
+        COLUMN_NAME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="primaryId != null">
+        #{primaryId,jdbcType=DECIMAL},
+      </if>
+      <if test="tableName != null">
+        #{tableName,jdbcType=VARCHAR},
+      </if>
+      <if test="columnName != null">
+        #{columnName,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
+    update DIL_TABLE_COLUMN_ROLE
+    set TABLE_NAME = #{tableName,jdbcType=VARCHAR},
+      COLUMN_NAME = #{columnName,jdbcType=VARCHAR}
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
+    update DIL_TABLE_COLUMN_ROLE
+    <set>
+      <if test="tableName != null">
+        TABLE_NAME = #{tableName,jdbcType=VARCHAR},
+      </if>
+      <if test="columnName != null">
+        COLUMN_NAME = #{columnName,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into DIL_TABLE_COLUMN_ROLE 
+      (PRIMARY_ID, 
+      TABLE_NAME, COLUMN_NAME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.primaryId,jdbcType=DECIMAL}, 
+      #{item.tableName,jdbcType=VARCHAR}, #{item.columnName,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DIL_TABLE_COLUMN_ROLE
+     set
+       PRIMARY_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+          when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryId,jdbcType=DECIMAL}
+       </foreach>
+       ,TABLE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+          when #{item.primaryId,jdbcType=DECIMAL} then #{item.tableName,jdbcType=VARCHAR}
+       </foreach>
+       ,COLUMN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+          when #{item.primaryId,jdbcType=DECIMAL} then #{item.columnName,jdbcType=VARCHAR}
+       </foreach>
+     where PRIMARY_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.primaryId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DIL_TABLE_COLUMN_ROLE
+    where PRIMARY_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="selectColumnId" resultType="java.math.BigDecimal" parameterType="string">
+    SELECT PRIMARY_ID FROM DIL_TABLE_COLUMN_ROLE
+    WHERE TABLE_NAME = #{tableName}
+    AND COLUMN_NAME = #{s}
+  </select>
+</mapper>

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1473,11 +1473,14 @@
         WHERE RC.CONSIGNEE_COMPANY_NAME = #{consigneeName}
     </select>
     <select id="getColumnNoRoutList" resultType="java.lang.String" parameterType="map">
-        select DTCR.COLUMN_NAME from DIL_ROLE_ORGCODE_TABLE DROT
-        left join DIL_TABLE_COLUMN_ROLE DTCR
+        select DTCR.COLUMN_NAME from DIL_TABLE_COLUMN_ROLE DTCR
+        left join DIL_ROLE_ORGCODE_TABLE DROT
         ON DTCR.PRIMARY_ID = DROT.COLUMN_ID
-        WHERE DROT.ORG_CODE = #{orgCode}
-        AND DTCR.TABLE_NAME = #{tableName}
+        WHERE
+        DTCR.TABLE_NAME = #{tableName}
+        <if test="orgCode != null">
+            and DROT.ORG_CODE = #{orgCode}
+        </if>
     </select>
     <select id="getWareHouseNameLike" resultType="java.util.Map">
         SELECT
@@ -1574,4 +1577,34 @@
         WHERE ASO.SALE_TYPE = 1
           AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
     </select>
+    <select id="getColumnShowData" resultType="java.util.Map" parameterType="map">
+        SELECT DTCR.COLUMN_NAME "key",
+               DTCR.COLUMN_NAME "label"
+        FROM DIL_TABLE_COLUMN_ROLE DTCR
+        LEFT JOIN DIL_ROLE_ORGCODE_TABLE DROT on DTCR.PRIMARY_ID = DROT.COLUMN_ID
+        WHERE
+        DTCR.TABLE_NAME = #{tableName}
+        <if test="userName != null">
+            AND nvl(DROT.USER_NAME,'0') != #{userName}
+        </if>
+    </select>
+    <select id="getColumnHiddenData" resultType="string" parameterType="map">
+        SELECT DTCR.COLUMN_NAME FROM DIL_TABLE_COLUMN_ROLE DTCR
+        LEFT JOIN DIL_ROLE_ORGCODE_TABLE DROT on DTCR.PRIMARY_ID = DROT.COLUMN_ID
+        WHERE
+        DTCR.TABLE_NAME = #{tableName}
+        <if test="userName != null">
+            AND DROT.USER_NAME = #{userName}
+        </if>
+        <if test="orgCode != null">
+            AND DROT.ORG_CODE = #{orgCode}
+        </if>
+    </select>
+    <select id="getColumnAllData" resultType="java.util.Map" parameterType="map">
+        SELECT DTCR.COLUMN_NAME "key",
+               DTCR.COLUMN_NAME "label"
+        FROM DIL_TABLE_COLUMN_ROLE DTCR
+        WHERE
+            DTCR.TABLE_NAME = #{tableName}
+    </select>
 </mapper>