添加公共庫

sample-form-manager/db/module.sql

@@ -6,22 +6,23 @@ DROP TABLE IF EXISTS `mortals_xhx_sheet_matter`;
 CREATE TABLE mortals_xhx_sheet_matter(
  `id` bigint(20)   AUTO_INCREMENT  COMMENT '序号，主键，自增长',
  `siteId` bigint(20)     COMMENT '站点ID',
-                                         `tid` varchar(128)     COMMENT '从政务系统来的事项id',
-                                         `tcode` varchar(128)     COMMENT '从政务系统来的事项code',
-                                         `tname` varchar(512)     COMMENT '从政务系统来的事项name',
-                                         `matterName` varchar(1024)     COMMENT '事项名称',
+ `tid` varchar(256)     COMMENT '从政务系统来的事项id',
+ `tcode` varchar(256)     COMMENT '从政务系统来的事项code',
+ `tname` varchar(2048)     COMMENT '从政务系统来的事项name',
+ `matterName` varchar(2048)     COMMENT '事项名称',
  `englishName` varchar(256)     COMMENT '英语事项名',
-                                         `matterNo` varchar(64)     COMMENT '事项编号',
+ `matterNo` varchar(512)     COMMENT '事项编号',
  `areaCode` varchar(255)     COMMENT '区域编码',
  `deptCode` varchar(255)     COMMENT '部门编号',
+ `deptName` varchar(255)     COMMENT '部门名称',
  `powerCode` varchar(255)     COMMENT '行政权力编号',
  `themeCode` varchar(255)     COMMENT '主题编号',
  `usertypeCode` varchar(255)     COMMENT '服务类型编号',
-                                         `groupName` varchar(1024)     COMMENT '事项组名',
+ `groupName` varchar(255)     COMMENT '事项组名',
  `url` varchar(1024)     COMMENT '事项详情链接',
  `haveGetMatterInfo` varchar(20)     COMMENT '是否获取事项详情',
  `belongDept` varchar(64)     COMMENT '所属部门',
-                                         `appoveObjectShow` varchar(256)     COMMENT '服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织）',
+ `appoveObjectShow` varchar(16)     COMMENT '服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织）',
  `operatScopeShow` varchar(64)     COMMENT '通办范围 （无.无，全国.全国，全市.全市，全县.全县，全镇[乡 街道].全镇[乡 街道]，跨村[社区].跨村[社区]）',
  `appoveTimeLimitShow` varchar(16)     COMMENT '办件类型（网络办件.网络办件，行政审批一般件.行政审批一般件，综合窗口件.综合窗口件）',
  `handleType` varchar(12)     COMMENT '办理形式（窗口办理.窗口办理，网上办理.网上办理）	',
@@ -85,6 +86,8 @@ CREATE TABLE mortals_xhx_sheet_matter(
 
 
 
+
+
 -- ----------------------------
 -- 事项申请材料业务表
 -- ----------------------------

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -90,7 +90,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     }
 
     private MatterEntity updateOrSave(SheetMatterEntity sheetMatterEntity, Long siteId, Context context) {
-        MatterEntity siteMatterEntity = this.selectOne(new MatterQuery().siteId(siteId).tcode(sheetMatterEntity.getTcode()));
+        MatterEntity siteMatterEntity = this.selectOne(new MatterQuery().siteId(siteId).matterNo(sheetMatterEntity.getMatterNo()));
         if (ObjectUtils.isEmpty(siteMatterEntity)) {
             MatterEntity matterEntity = new MatterEntity();
             matterEntity.initAttrValue();

sample-form-manager/src/main/java/com/mortals/xhx/module/sheet/model/SheetMatterEntity.java

@@ -11,7 +11,7 @@ import com.mortals.xhx.module.sheet.model.vo.SheetMatterVo;
  * 基础事项实体对象
  *
  * @author zxfei
- * @date 2022-11-10
+ * @date 2022-11-16
  */
 
 public class SheetMatterEntity extends SheetMatterVo {
@@ -53,6 +53,10 @@ public class SheetMatterEntity extends SheetMatterVo {
      * 部门编号
      */
     private String deptCode;
+    /**
+     * 部门名称
+     */
+    private String deptName;
     /**
      * 行政权力编号
      */
@@ -435,6 +439,20 @@ public class SheetMatterEntity extends SheetMatterVo {
     public void setDeptCode(String deptCode){
         this.deptCode = deptCode;
     }
+    /**
+     * 获取 部门名称
+     * @return String
+     */
+    public String getDeptName(){
+        return deptName;
+    }
+    /**
+     * 设置 部门名称
+     * @param deptName
+     */
+    public void setDeptName(String deptName){
+        this.deptName = deptName;
+    }
     /**
      * 获取 行政权力编号
      * @return String
@@ -1348,6 +1366,7 @@ public class SheetMatterEntity extends SheetMatterVo {
         sb.append(",matterNo:").append(getMatterNo());
         sb.append(",areaCode:").append(getAreaCode());
         sb.append(",deptCode:").append(getDeptCode());
+        sb.append(",deptName:").append(getDeptName());
         sb.append(",powerCode:").append(getPowerCode());
         sb.append(",themeCode:").append(getThemeCode());
         sb.append(",usertypeCode:").append(getUsertypeCode());
@@ -1420,19 +1439,21 @@ public class SheetMatterEntity extends SheetMatterVo {
 
         this.tid = null;
 
-        this.tcode = null;
+        this.tcode = "";
 
-        this.tname = null;
+        this.tname = "";
 
-        this.matterName = null;
+        this.matterName = "";
 
-        this.englishName = null;
+        this.englishName = "";
 
         this.matterNo = null;
 
         this.areaCode = null;
 
-        this.deptCode = null;
+        this.deptCode = "";
+
+        this.deptName = null;
 
         this.powerCode = null;
 
@@ -1444,17 +1465,17 @@ public class SheetMatterEntity extends SheetMatterVo {
 
         this.url = null;
 
-        this.haveGetMatterInfo = null;
+        this.haveGetMatterInfo = "0";
 
-        this.belongDept = null;
+        this.belongDept = "";
 
-        this.appoveObjectShow = null;
+        this.appoveObjectShow = "事业法人";
 
-        this.operatScopeShow = null;
+        this.operatScopeShow = "无";
 
-        this.appoveTimeLimitShow = null;
+        this.appoveTimeLimitShow = "网络办件";
 
-        this.handleType = null;
+        this.handleType = "窗口办理";
 
         this.legalTimeLimitShow = null;
 
@@ -1464,9 +1485,9 @@ public class SheetMatterEntity extends SheetMatterVo {
 
         this.promiseEndExplain = null;
 
-        this.isChargesShow = null;
+        this.isChargesShow = "否";
 
-        this.certificationLevelsShow = null;
+        this.certificationLevelsShow = "实名认证";
 
         this.planTakeTime = null;
 
@@ -1476,25 +1497,25 @@ public class SheetMatterEntity extends SheetMatterVo {
 
         this.windowToTheSceneNum = null;
 
-        this.isOnlineSubscribeShow = null;
+        this.isOnlineSubscribeShow = "否";
 
-        this.isExpressTakeShow = null;
+        this.isExpressTakeShow = "否";
 
-        this.isProvinceAcquisitionShow = null;
+        this.isProvinceAcquisitionShow = "否";
 
-        this.isApplyProvinceShow = null;
+        this.isApplyProvinceShow = "否";
 
         this.mustSceneExplain = null;
 
-        this.onlineType = null;
+        this.onlineType = "原件预审";
 
-        this.onlineToTheSceneNum = null;
+        this.onlineToTheSceneNum = 0;
 
-        this.onlineOperatDeep = null;
+        this.onlineOperatDeep = "互联网咨询";
 
         this.isExpressTakeOnlineShow = null;
 
-        this.isDoorTakeShow = null;
+        this.isDoorTakeShow = "否";
 
         this.onlineMustSceneExplain = null;
 
@@ -1502,7 +1523,7 @@ public class SheetMatterEntity extends SheetMatterVo {
 
         this.matterEdition = null;
 
-        this.eventTypeShow = null;
+        this.eventTypeShow = "行政许可";
 
         this.performHierarchyShow = null;
 
@@ -1510,25 +1531,25 @@ public class SheetMatterEntity extends SheetMatterVo {
 
         this.performDeptTypeShow = null;
 
-        this.goveServiceCenterShow = null;
+        this.goveServiceCenterShow = "否";
 
-        this.isConvenientCenterShow = null;
+        this.isConvenientCenterShow = "否";
 
-        this.terminalHandle = null;
+        this.terminalHandle = "是";
 
-        this.isOnline = null;
+        this.isOnline = "是";
 
-        this.isOnlinePayShow = null;
+        this.isOnlinePayShow = "是";
 
-        this.entrustmentDepartmen = null;
+        this.entrustmentDepartmen = "是";
 
         this.jointInfoShow = null;
 
-        this.matterStatus = null;
+        this.matterStatus = "在用";
 
         this.numberLimit = null;
 
-        this.type = null;
+        this.type = "";
 
         this.baseCode = null;
 
@@ -1558,6 +1579,6 @@ public class SheetMatterEntity extends SheetMatterVo {
 
         this.sort = null;
 
-        this.source = null;
+        this.source = 1;
     }
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/sheet/model/SheetMatterQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.sheet.model.SheetMatterEntity;
  * 基础事项查询对象
  *
  * @author zxfei
- * @date 2022-11-10
+ * @date 2022-11-16
  */
 public class SheetMatterQuery extends SheetMatterEntity {
     /** 开始 序号，主键，自增长 */
@@ -58,6 +58,9 @@ public class SheetMatterQuery extends SheetMatterEntity {
     /** 部门编号 */
     private List<String> deptCodeList;
 
+    /** 部门名称 */
+    private List<String> deptNameList;
+
     /** 行政权力编号 */
     private List<String> powerCodeList;
 
@@ -578,6 +581,21 @@ public class SheetMatterQuery extends SheetMatterEntity {
     public void setDeptCodeList(List<String> deptCodeList){
         this.deptCodeList = deptCodeList;
     }
+    /**
+     * 获取 部门名称
+     * @return deptNameList
+     */
+    public List<String> getDeptNameList(){
+        return this.deptNameList;
+    }
+
+    /**
+     * 设置 部门名称
+     * @param deptNameList
+     */
+    public void setDeptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+    }
     /**
      * 获取 行政权力编号
      * @return powerCodeList
@@ -2173,6 +2191,25 @@ public class SheetMatterQuery extends SheetMatterEntity {
     }
 
 
+    /**
+     * 设置 部门名称
+     * @param deptName
+     */
+    public SheetMatterQuery deptName(String deptName){
+        setDeptName(deptName);
+        return this;
+    }
+
+    /**
+     * 设置 部门名称
+     * @param deptNameList
+     */
+    public SheetMatterQuery deptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+        return this;
+    }
+
+
     /**
      * 设置 行政权力编号
      * @param powerCode

sample-form-manager/src/main/resources/sqlmap/module/sheet/SheetMatterMapper.xml

@@ -15,6 +15,7 @@
         <result property="matterNo" column="matterNo" />
         <result property="areaCode" column="areaCode" />
         <result property="deptCode" column="deptCode" />
+        <result property="deptName" column="deptName" />
         <result property="powerCode" column="powerCode" />
         <result property="themeCode" column="themeCode" />
         <result property="usertypeCode" column="usertypeCode" />
@@ -118,6 +119,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
                 a.deptCode,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
+                a.deptName,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('powerCode') or colPickMode == 1 and data.containsKey('powerCode')))">
                 a.powerCode,
             </if>
@@ -321,18 +325,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="SheetMatterEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_sheet_matter
-        (siteId,tid,tcode,tname,matterName,englishName,matterNo,areaCode,deptCode,powerCode,themeCode,usertypeCode,groupName,url,haveGetMatterInfo,belongDept,appoveObjectShow,operatScopeShow,appoveTimeLimitShow,handleType,legalTimeLimitShow,legalEndExplain,promiseTimeLimitShow,promiseEndExplain,isChargesShow,certificationLevelsShow,planTakeTime,promiseTakeTime,specialProcedure,windowToTheSceneNum,isOnlineSubscribeShow,isExpressTakeShow,isProvinceAcquisitionShow,isApplyProvinceShow,mustSceneExplain,onlineType,onlineToTheSceneNum,onlineOperatDeep,isExpressTakeOnlineShow,isDoorTakeShow,onlineMustSceneExplain,performDeptType,matterEdition,eventTypeShow,performHierarchyShow,powerSourceShow,performDeptTypeShow,goveServiceCenterShow,isConvenientCenterShow,terminalHandle,isOnline,isOnlinePayShow,entrustmentDepartmen,jointInfoShow,matterStatus,numberLimit,type,baseCode,implementCode,implementBodyCode,operateItemCode,townshipName,townshipCode,villageName,villageCode,operateTime,operateSite,cousultingShow,cousultingTelephoneShow,superviseShow,sort,source,createTime,createUserId,updateTime)
+        (siteId,tid,tcode,tname,matterName,englishName,matterNo,areaCode,deptCode,deptName,powerCode,themeCode,usertypeCode,groupName,url,haveGetMatterInfo,belongDept,appoveObjectShow,operatScopeShow,appoveTimeLimitShow,handleType,legalTimeLimitShow,legalEndExplain,promiseTimeLimitShow,promiseEndExplain,isChargesShow,certificationLevelsShow,planTakeTime,promiseTakeTime,specialProcedure,windowToTheSceneNum,isOnlineSubscribeShow,isExpressTakeShow,isProvinceAcquisitionShow,isApplyProvinceShow,mustSceneExplain,onlineType,onlineToTheSceneNum,onlineOperatDeep,isExpressTakeOnlineShow,isDoorTakeShow,onlineMustSceneExplain,performDeptType,matterEdition,eventTypeShow,performHierarchyShow,powerSourceShow,performDeptTypeShow,goveServiceCenterShow,isConvenientCenterShow,terminalHandle,isOnline,isOnlinePayShow,entrustmentDepartmen,jointInfoShow,matterStatus,numberLimit,type,baseCode,implementCode,implementBodyCode,operateItemCode,townshipName,townshipCode,villageName,villageCode,operateTime,operateSite,cousultingShow,cousultingTelephoneShow,superviseShow,sort,source,createTime,createUserId,updateTime)
         VALUES
-        (#{siteId},#{tid},#{tcode},#{tname},#{matterName},#{englishName},#{matterNo},#{areaCode},#{deptCode},#{powerCode},#{themeCode},#{usertypeCode},#{groupName},#{url},#{haveGetMatterInfo},#{belongDept},#{appoveObjectShow},#{operatScopeShow},#{appoveTimeLimitShow},#{handleType},#{legalTimeLimitShow},#{legalEndExplain},#{promiseTimeLimitShow},#{promiseEndExplain},#{isChargesShow},#{certificationLevelsShow},#{planTakeTime},#{promiseTakeTime},#{specialProcedure},#{windowToTheSceneNum},#{isOnlineSubscribeShow},#{isExpressTakeShow},#{isProvinceAcquisitionShow},#{isApplyProvinceShow},#{mustSceneExplain},#{onlineType},#{onlineToTheSceneNum},#{onlineOperatDeep},#{isExpressTakeOnlineShow},#{isDoorTakeShow},#{onlineMustSceneExplain},#{performDeptType},#{matterEdition},#{eventTypeShow},#{performHierarchyShow},#{powerSourceShow},#{performDeptTypeShow},#{goveServiceCenterShow},#{isConvenientCenterShow},#{terminalHandle},#{isOnline},#{isOnlinePayShow},#{entrustmentDepartmen},#{jointInfoShow},#{matterStatus},#{numberLimit},#{type},#{baseCode},#{implementCode},#{implementBodyCode},#{operateItemCode},#{townshipName},#{townshipCode},#{villageName},#{villageCode},#{operateTime},#{operateSite},#{cousultingShow},#{cousultingTelephoneShow},#{superviseShow},#{sort},#{source},#{createTime},#{createUserId},#{updateTime})
+        (#{siteId},#{tid},#{tcode},#{tname},#{matterName},#{englishName},#{matterNo},#{areaCode},#{deptCode},#{deptName},#{powerCode},#{themeCode},#{usertypeCode},#{groupName},#{url},#{haveGetMatterInfo},#{belongDept},#{appoveObjectShow},#{operatScopeShow},#{appoveTimeLimitShow},#{handleType},#{legalTimeLimitShow},#{legalEndExplain},#{promiseTimeLimitShow},#{promiseEndExplain},#{isChargesShow},#{certificationLevelsShow},#{planTakeTime},#{promiseTakeTime},#{specialProcedure},#{windowToTheSceneNum},#{isOnlineSubscribeShow},#{isExpressTakeShow},#{isProvinceAcquisitionShow},#{isApplyProvinceShow},#{mustSceneExplain},#{onlineType},#{onlineToTheSceneNum},#{onlineOperatDeep},#{isExpressTakeOnlineShow},#{isDoorTakeShow},#{onlineMustSceneExplain},#{performDeptType},#{matterEdition},#{eventTypeShow},#{performHierarchyShow},#{powerSourceShow},#{performDeptTypeShow},#{goveServiceCenterShow},#{isConvenientCenterShow},#{terminalHandle},#{isOnline},#{isOnlinePayShow},#{entrustmentDepartmen},#{jointInfoShow},#{matterStatus},#{numberLimit},#{type},#{baseCode},#{implementCode},#{implementBodyCode},#{operateItemCode},#{townshipName},#{townshipCode},#{villageName},#{villageCode},#{operateTime},#{operateSite},#{cousultingShow},#{cousultingTelephoneShow},#{superviseShow},#{sort},#{source},#{createTime},#{createUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_sheet_matter
-        (siteId,tid,tcode,tname,matterName,englishName,matterNo,areaCode,deptCode,powerCode,themeCode,usertypeCode,groupName,url,haveGetMatterInfo,belongDept,appoveObjectShow,operatScopeShow,appoveTimeLimitShow,handleType,legalTimeLimitShow,legalEndExplain,promiseTimeLimitShow,promiseEndExplain,isChargesShow,certificationLevelsShow,planTakeTime,promiseTakeTime,specialProcedure,windowToTheSceneNum,isOnlineSubscribeShow,isExpressTakeShow,isProvinceAcquisitionShow,isApplyProvinceShow,mustSceneExplain,onlineType,onlineToTheSceneNum,onlineOperatDeep,isExpressTakeOnlineShow,isDoorTakeShow,onlineMustSceneExplain,performDeptType,matterEdition,eventTypeShow,performHierarchyShow,powerSourceShow,performDeptTypeShow,goveServiceCenterShow,isConvenientCenterShow,terminalHandle,isOnline,isOnlinePayShow,entrustmentDepartmen,jointInfoShow,matterStatus,numberLimit,type,baseCode,implementCode,implementBodyCode,operateItemCode,townshipName,townshipCode,villageName,villageCode,operateTime,operateSite,cousultingShow,cousultingTelephoneShow,superviseShow,sort,source,createTime,createUserId,updateTime)
+        (siteId,tid,tcode,tname,matterName,englishName,matterNo,areaCode,deptCode,deptName,powerCode,themeCode,usertypeCode,groupName,url,haveGetMatterInfo,belongDept,appoveObjectShow,operatScopeShow,appoveTimeLimitShow,handleType,legalTimeLimitShow,legalEndExplain,promiseTimeLimitShow,promiseEndExplain,isChargesShow,certificationLevelsShow,planTakeTime,promiseTakeTime,specialProcedure,windowToTheSceneNum,isOnlineSubscribeShow,isExpressTakeShow,isProvinceAcquisitionShow,isApplyProvinceShow,mustSceneExplain,onlineType,onlineToTheSceneNum,onlineOperatDeep,isExpressTakeOnlineShow,isDoorTakeShow,onlineMustSceneExplain,performDeptType,matterEdition,eventTypeShow,performHierarchyShow,powerSourceShow,performDeptTypeShow,goveServiceCenterShow,isConvenientCenterShow,terminalHandle,isOnline,isOnlinePayShow,entrustmentDepartmen,jointInfoShow,matterStatus,numberLimit,type,baseCode,implementCode,implementBodyCode,operateItemCode,townshipName,townshipCode,villageName,villageCode,operateTime,operateSite,cousultingShow,cousultingTelephoneShow,superviseShow,sort,source,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.tid},#{item.tcode},#{item.tname},#{item.matterName},#{item.englishName},#{item.matterNo},#{item.areaCode},#{item.deptCode},#{item.powerCode},#{item.themeCode},#{item.usertypeCode},#{item.groupName},#{item.url},#{item.haveGetMatterInfo},#{item.belongDept},#{item.appoveObjectShow},#{item.operatScopeShow},#{item.appoveTimeLimitShow},#{item.handleType},#{item.legalTimeLimitShow},#{item.legalEndExplain},#{item.promiseTimeLimitShow},#{item.promiseEndExplain},#{item.isChargesShow},#{item.certificationLevelsShow},#{item.planTakeTime},#{item.promiseTakeTime},#{item.specialProcedure},#{item.windowToTheSceneNum},#{item.isOnlineSubscribeShow},#{item.isExpressTakeShow},#{item.isProvinceAcquisitionShow},#{item.isApplyProvinceShow},#{item.mustSceneExplain},#{item.onlineType},#{item.onlineToTheSceneNum},#{item.onlineOperatDeep},#{item.isExpressTakeOnlineShow},#{item.isDoorTakeShow},#{item.onlineMustSceneExplain},#{item.performDeptType},#{item.matterEdition},#{item.eventTypeShow},#{item.performHierarchyShow},#{item.powerSourceShow},#{item.performDeptTypeShow},#{item.goveServiceCenterShow},#{item.isConvenientCenterShow},#{item.terminalHandle},#{item.isOnline},#{item.isOnlinePayShow},#{item.entrustmentDepartmen},#{item.jointInfoShow},#{item.matterStatus},#{item.numberLimit},#{item.type},#{item.baseCode},#{item.implementCode},#{item.implementBodyCode},#{item.operateItemCode},#{item.townshipName},#{item.townshipCode},#{item.villageName},#{item.villageCode},#{item.operateTime},#{item.operateSite},#{item.cousultingShow},#{item.cousultingTelephoneShow},#{item.superviseShow},#{item.sort},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.siteId},#{item.tid},#{item.tcode},#{item.tname},#{item.matterName},#{item.englishName},#{item.matterNo},#{item.areaCode},#{item.deptCode},#{item.deptName},#{item.powerCode},#{item.themeCode},#{item.usertypeCode},#{item.groupName},#{item.url},#{item.haveGetMatterInfo},#{item.belongDept},#{item.appoveObjectShow},#{item.operatScopeShow},#{item.appoveTimeLimitShow},#{item.handleType},#{item.legalTimeLimitShow},#{item.legalEndExplain},#{item.promiseTimeLimitShow},#{item.promiseEndExplain},#{item.isChargesShow},#{item.certificationLevelsShow},#{item.planTakeTime},#{item.promiseTakeTime},#{item.specialProcedure},#{item.windowToTheSceneNum},#{item.isOnlineSubscribeShow},#{item.isExpressTakeShow},#{item.isProvinceAcquisitionShow},#{item.isApplyProvinceShow},#{item.mustSceneExplain},#{item.onlineType},#{item.onlineToTheSceneNum},#{item.onlineOperatDeep},#{item.isExpressTakeOnlineShow},#{item.isDoorTakeShow},#{item.onlineMustSceneExplain},#{item.performDeptType},#{item.matterEdition},#{item.eventTypeShow},#{item.performHierarchyShow},#{item.powerSourceShow},#{item.performDeptTypeShow},#{item.goveServiceCenterShow},#{item.isConvenientCenterShow},#{item.terminalHandle},#{item.isOnline},#{item.isOnlinePayShow},#{item.entrustmentDepartmen},#{item.jointInfoShow},#{item.matterStatus},#{item.numberLimit},#{item.type},#{item.baseCode},#{item.implementCode},#{item.implementBodyCode},#{item.operateItemCode},#{item.townshipName},#{item.townshipCode},#{item.villageName},#{item.villageCode},#{item.operateTime},#{item.operateSite},#{item.cousultingShow},#{item.cousultingTelephoneShow},#{item.superviseShow},#{item.sort},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -372,6 +376,9 @@
             <if test="(colPickMode==0 and data.containsKey('deptCode')) or (colPickMode==1 and !data.containsKey('deptCode'))">
                 a.deptCode=#{data.deptCode},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
+                a.deptName=#{data.deptName},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('powerCode')) or (colPickMode==1 and !data.containsKey('powerCode'))">
                 a.powerCode=#{data.powerCode},
             </if>
@@ -668,6 +675,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="deptName=(case" suffix="ELSE deptName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
+                        when a.id=#{item.id} then #{item.deptName}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="powerCode=(case" suffix="ELSE powerCode end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('powerCode')) or (colPickMode==1 and !item.containsKey('powerCode'))">
@@ -1424,6 +1438,21 @@
             </foreach>
         </if>
 
+        <if test="conditionParamRef.containsKey('deptName')">
+            <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
+                ${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
+            </if>
+            <if test="conditionParamRef.deptName == null">
+                ${_conditionType_} a.deptName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('deptNameList')">
+            ${_conditionType_} a.deptName in
+            <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="conditionParamRef.containsKey('powerCode')">
             <if test="conditionParamRef.powerCode != null and conditionParamRef.powerCode != ''">
                 ${_conditionType_} a.powerCode like #{${_conditionParam_}.powerCode}
@@ -2512,6 +2541,11 @@
                     <if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('deptName')">
+                    a.deptName
+                    <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('powerCode')">
                     a.powerCode
                     <if test='orderCol.powerCode != null and "DESC".equalsIgnoreCase(orderCol.powerCode)'>DESC</if>