Skip to content

S
smart_gov_platform
Commit 7b467d17 authored by 赵啸非's avatar 赵啸非
Browse files
Options

事项添加区域字段

parent 4f61fc70
Hide whitespace changes
Inline Side-by-side
Showing with 507 additions and 1663 deletions
base-manager/db/add.sql
View file @ 7b467d17
...@@ -289,3 +289,10 @@ ALTER TABLE mortals_sys_workman ADD COLUMN `deleted` tinyint(2) DEFAULT '0' ...@@ -289,3 +289,10 @@ ALTER TABLE mortals_sys_workman ADD COLUMN `deleted` tinyint(2) DEFAULT '0'
-- ---------------------------- -- ----------------------------
ALTER TABLE mortals_sys_window ADD COLUMN `fileName` varchar (256) default "" COMMENT '附件名称' AFTER englishNameDesc; ALTER TABLE mortals_sys_window ADD COLUMN `fileName` varchar (256) default "" COMMENT '附件名称' AFTER englishNameDesc;
ALTER TABLE mortals_sys_window ADD COLUMN `filePath` varchar (256) default "" COMMENT '附件地址' AFTER fileName; ALTER TABLE mortals_sys_window ADD COLUMN `filePath` varchar (256) default "" COMMENT '附件地址' AFTER fileName;
-- ----------------------------
-- 2025-3-17
-- ----------------------------
ALTER TABLE mortals_sys_matter ADD COLUMN `areaName` varchar(255) COMMENT '区域名称';
ALTER TABLE mortals_sys_matter ADD COLUMN `areaLevel` tinyint(2) COMMENT '区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)';
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java
View file @ 7b467d17
package com.mortals.xhx.module.matter.model; package com.mortals.xhx.module.matter.model;
import java.util.*;
import java.util.List; import java.util.List;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.matter.model.vo.MatterVo; import com.mortals.xhx.module.matter.model.vo.MatterVo;
import com.mortals.xhx.module.matter.model.MatterExtEntity; import com.mortals.xhx.module.matter.model.MatterExtEntity;
import lombok.Data;
/** /**
* 基础事项实体对象 * 基础事项实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-28 * @date 2025-03-17
*/ */
@Data
public class MatterEntity extends MatterVo { public class MatterEntity extends MatterVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -55,10 +58,6 @@ public class MatterEntity extends MatterVo { ...@@ -55,10 +58,6 @@ public class MatterEntity extends MatterVo {
* 部门编号 * 部门编号
*/ */
private String deptCode; private String deptCode;
/**
* 部门名称
*/
private String deptName;
/** /**
* 行政权力编号 * 行政权力编号
*/ */
...@@ -311,6 +310,10 @@ public class MatterEntity extends MatterVo { ...@@ -311,6 +310,10 @@ public class MatterEntity extends MatterVo {
* 事项来源(0.政务网，1.自定义) * 事项来源(0.政务网，1.自定义)
*/ */
private Integer source; private Integer source;
/**
* 部门名称
*/
private String deptName;
/** /**
* 评价地址 * 评价地址
*/ */
...@@ -319,1624 +322,118 @@ public class MatterEntity extends MatterVo { ...@@ -319,1624 +322,118 @@ public class MatterEntity extends MatterVo {
* 申请地址 * 申请地址
*/ */
private String netApplyUrl; private String netApplyUrl;
/**
* 事项扩展信息
*/
private List<MatterExtEntity> matterExtList = new ArrayList<>();
;
public MatterEntity() {
}
/**
* 获取 站点ID
*
* @return Long
*/
public Long getSiteId() {
return siteId;
}
/**
* 设置 站点ID
*
* @param siteId
*/
public void setSiteId(Long siteId) {
this.siteId = siteId;
}
/**
* 获取 从政务系统来的事项id
*
* @return String
*/
public String getTid() {
return tid;
}
/**
* 设置 从政务系统来的事项id
*
* @param tid
*/
public void setTid(String tid) {
this.tid = tid;
}
/**
* 获取 从政务系统来的事项code
*
* @return String
*/
public String getTcode() {
return tcode;
}
/**
* 设置 从政务系统来的事项code
*
* @param tcode
*/
public void setTcode(String tcode) {
this.tcode = tcode;
}
/**
* 获取 从政务系统来的事项name
*
* @return String
*/
public String getTname() {
return tname;
}
/**
* 设置 从政务系统来的事项name
*
* @param tname
*/
public void setTname(String tname) {
this.tname = tname;
}
/**
* 获取 事项名称
*
* @return String
*/
public String getMatterName() {
return matterName;
}
/**
* 设置 事项名称
*
* @param matterName
*/
public void setMatterName(String matterName) {
this.matterName = matterName;
}
/**
* 获取 英语事项名
*
* @return String
*/
public String getEnglishName() {
return englishName;
}
/**
* 设置 英语事项名
*
* @param englishName
*/
public void setEnglishName(String englishName) {
this.englishName = englishName;
}
/**
* 获取 事项编号
*
* @return String
*/
public String getMatterNo() {
return matterNo;
}
/**
* 设置 事项编号
*
* @param matterNo
*/
public void setMatterNo(String matterNo) {
this.matterNo = matterNo;
}
/**
* 获取 区域编码
*
* @return String
*/
public String getAreaCode() {
return areaCode;
}
/**
* 设置 区域编码
*
* @param areaCode
*/
public void setAreaCode(String areaCode) {
this.areaCode = areaCode;
}
/**
* 获取 部门编号
*
* @return String
*/
public String getDeptCode() {
return deptCode;
}
/**
* 设置 部门编号
*
* @param deptCode
*/
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
*/
public String getPowerCode() {
return powerCode;
}
/**
* 设置 行政权力编号
*
* @param powerCode
*/
public void setPowerCode(String powerCode) {
this.powerCode = powerCode;
}
/**
* 获取 主题编号
*
* @return String
*/
public String getThemeCode() {
return themeCode;
}
/**
* 设置 主题编号
*
* @param themeCode
*/
public void setThemeCode(String themeCode) {
this.themeCode = themeCode;
}
/**
* 获取 服务类型编号
*
* @return String
*/
public String getUsertypeCode() {
return usertypeCode;
}
/**
* 设置 服务类型编号
*
* @param usertypeCode
*/
public void setUsertypeCode(String usertypeCode) {
this.usertypeCode = usertypeCode;
}
/**
* 获取 事项组名
*
* @return String
*/
public String getGroupName() {
return groupName;
}
/**
* 设置 事项组名
*
* @param groupName
*/
public void setGroupName(String groupName) {
this.groupName = groupName;
}
/**
* 获取 事项详情链接
*
* @return String
*/
public String getUrl() {
return url;
}
/**
* 设置 事项详情链接
*
* @param url
*/
public void setUrl(String url) {
this.url = url;
}
/**
* 获取 是否获取事项详情
*
* @return String
*/
public String getHaveGetMatterInfo() {
return haveGetMatterInfo;
}
/**
* 设置 是否获取事项详情
*
* @param haveGetMatterInfo
*/
public void setHaveGetMatterInfo(String haveGetMatterInfo) {
this.haveGetMatterInfo = haveGetMatterInfo;
}
/**
* 获取 所属部门
*
* @return String
*/
public String getBelongDept() {
return belongDept;
}
/**
* 设置 所属部门
*
* @param belongDept
*/
public void setBelongDept(String belongDept) {
this.belongDept = belongDept;
}
/**
* 获取 服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织）
*
* @return String
*/
public String getAppoveObjectShow() {
return appoveObjectShow;
}
/**
* 设置 服务对象 （事业法人.事业法人，社会组织法人.社会组织法人，非法人企业.非法人企业，企业法人.企业法人，自然人.自然人，其他组织.其他组织）
*
* @param appoveObjectShow
*/
public void setAppoveObjectShow(String appoveObjectShow) {
this.appoveObjectShow = appoveObjectShow;
}
/**
* 获取 通办范围 （无.无，全国.全国，全市.全市，全县.全县，全镇[乡 街道].全镇[乡 街道]，跨村[社区].跨村[社区]）
*
* @return String
*/
public String getOperatScopeShow() {
return operatScopeShow;
}
/**
* 设置 通办范围 （无.无，全国.全国，全市.全市，全县.全县，全镇[乡 街道].全镇[乡 街道]，跨村[社区].跨村[社区]）
*
* @param operatScopeShow
*/
public void setOperatScopeShow(String operatScopeShow) {
this.operatScopeShow = operatScopeShow;
}
/**
* 获取 办件类型（网络办件.网络办件，行政审批一般件.行政审批一般件，综合窗口件.综合窗口件）
*
* @return String
*/
public String getAppoveTimeLimitShow() {
return appoveTimeLimitShow;
}
/**
* 设置 办件类型（网络办件.网络办件，行政审批一般件.行政审批一般件，综合窗口件.综合窗口件）
*
* @param appoveTimeLimitShow
*/
public void setAppoveTimeLimitShow(String appoveTimeLimitShow) {
this.appoveTimeLimitShow = appoveTimeLimitShow;
}
/**
* 获取 办理形式（窗口办理.窗口办理，网上办理.网上办理）
*
* @return String
*/
public String getHandleType() {
return handleType;
}
/**
* 设置 办理形式（窗口办理.窗口办理，网上办理.网上办理）
*
* @param handleType
*/
public void setHandleType(String handleType) {
this.handleType = handleType;
}
/**
* 获取 法定办结时限
*
* @return String
*/
public String getLegalTimeLimitShow() {
return legalTimeLimitShow;
}
/**
* 设置 法定办结时限
*
* @param legalTimeLimitShow
*/
public void setLegalTimeLimitShow(String legalTimeLimitShow) {
this.legalTimeLimitShow = legalTimeLimitShow;
}
/**
* 获取 法定时限办结说明
*
* @return String
*/
public String getLegalEndExplain() {
return legalEndExplain;
}
/**
* 设置 法定时限办结说明
*
* @param legalEndExplain
*/
public void setLegalEndExplain(String legalEndExplain) {
this.legalEndExplain = legalEndExplain;
}
/**
* 获取 承诺办结时限
*
* @return String
*/
public String getPromiseTimeLimitShow() {
return promiseTimeLimitShow;
}
/**
* 设置 承诺办结时限
*
* @param promiseTimeLimitShow
*/
public void setPromiseTimeLimitShow(String promiseTimeLimitShow) {
this.promiseTimeLimitShow = promiseTimeLimitShow;
}
/**
* 获取 承诺时限办结说明
*
* @return String
*/
public String getPromiseEndExplain() {
return promiseEndExplain;
}
/**
* 设置 承诺时限办结说明
*
* @param promiseEndExplain
*/
public void setPromiseEndExplain(String promiseEndExplain) {
this.promiseEndExplain = promiseEndExplain;
}
/**
* 获取 是否收费（否.否，是.是）
*
* @return String
*/
public String getIsChargesShow() {
return isChargesShow;
}
/**
* 设置 是否收费（否.否，是.是）
*
* @param isChargesShow
*/
public void setIsChargesShow(String isChargesShow) {
this.isChargesShow = isChargesShow;
}
/** /**
* 获取 认证等级需求（实名认证.实名认证，单次面签.单次面签，每次面签.每次面签） * 区域名称
*
* @return String
*/ */
public String getCertificationLevelsShow() { private String areaName;
return certificationLevelsShow;
}
/** /**
* 设置 认证等级需求（实名认证.实名认证，单次面签.单次面签，每次面签.每次面签） * 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
*
* @param certificationLevelsShow
*/ */
public void setCertificationLevelsShow(String certificationLevelsShow) { private Integer areaLevel;
this.certificationLevelsShow = certificationLevelsShow;
}
/** /**
* 获取 计划生效日期 * 事项扩展信息
*
* @return Date
*/ */
public Date getPlanTakeTime() { private List<MatterExtEntity> matterExtList=new ArrayList<>();;
return planTakeTime; public List<MatterExtEntity> getMatterExtList(){
return matterExtList;
} }
/** public void setMatterExtList(List<MatterExtEntity> matterExtList){
* 设置 计划生效日期 this.matterExtList = matterExtList;
*
* @param planTakeTime
*/
public void setPlanTakeTime(Date planTakeTime) {
this.planTakeTime = planTakeTime;
} }
@Override
/** public int hashCode() {
* 获取 承诺生效日期 return this.getId().hashCode();
*
* @return Date
*/
public Date getPromiseTakeTime() {
return promiseTakeTime;
} }
@Override
/** public boolean equals(Object obj) {
* 设置 承诺生效日期 if (obj == null) return false;
* if (obj instanceof MatterEntity) {
* @param promiseTakeTime MatterEntity tmp = (MatterEntity) obj;
*/ if (this.getId() == tmp.getId()) {
public void setPromiseTakeTime(Date promiseTakeTime) { return true;
this.promiseTakeTime = promiseTakeTime; }
}
return false;
} }
/** public void initAttrValue(){
* 获取 特别程序 this.siteId = null;
*
* @return String
*/
public String getSpecialProcedure() {
return specialProcedure;
}
/**
* 设置 特别程序
*
* @param specialProcedure
*/
public void setSpecialProcedure(String specialProcedure) {
this.specialProcedure = specialProcedure;
}
/**
* 获取 窗口到现场次数
*
* @return Integer
*/
public Integer getWindowToTheSceneNum() {
return windowToTheSceneNum;
}
/**
* 设置 窗口到现场次数
*
* @param windowToTheSceneNum
*/
public void setWindowToTheSceneNum(Integer windowToTheSceneNum) {
this.windowToTheSceneNum = windowToTheSceneNum;
}
/**
* 获取 是否网上预约,窗口办理选（否.否，是.是）
*
* @return String
*/
public String getIsOnlineSubscribeShow() {
return isOnlineSubscribeShow;
}
/**
* 设置 是否网上预约,窗口办理选（否.否，是.是）
*
* @param isOnlineSubscribeShow
*/
public void setIsOnlineSubscribeShow(String isOnlineSubscribeShow) {
this.isOnlineSubscribeShow = isOnlineSubscribeShow;
}
/**
* 获取 物流快递,窗口办理选（否.否，是.是）
*
* @return String
*/
public String getIsExpressTakeShow() {
return isExpressTakeShow;
}
/**
* 设置 物流快递,窗口办理选（否.否，是.是）
*
* @param isExpressTakeShow
*/
public void setIsExpressTakeShow(String isExpressTakeShow) {
this.isExpressTakeShow = isExpressTakeShow;
}
/**
* 获取 是否支持全省范围就近取件（否.否，是.是）
*
* @return String
*/
public String getIsProvinceAcquisitionShow() {
return isProvinceAcquisitionShow;
}
/**
* 设置 是否支持全省范围就近取件（否.否，是.是）
*
* @param isProvinceAcquisitionShow
*/
public void setIsProvinceAcquisitionShow(String isProvinceAcquisitionShow) {
this.isProvinceAcquisitionShow = isProvinceAcquisitionShow;
}
/**
* 获取 是否支持全省范围就近办理（否.否，是.是）
*
* @return String
*/
public String getIsApplyProvinceShow() {
return isApplyProvinceShow;
}
/**
* 设置 是否支持全省范围就近办理（否.否，是.是）
*
* @param isApplyProvinceShow
*/
public void setIsApplyProvinceShow(String isApplyProvinceShow) {
this.isApplyProvinceShow = isApplyProvinceShow;
}
/**
* 获取 必须到现场原因
*
* @return String
*/
public String getMustSceneExplain() {
return mustSceneExplain;
}
/**
* 设置 必须到现场原因
*
* @param mustSceneExplain
*/
public void setMustSceneExplain(String mustSceneExplain) {
this.mustSceneExplain = mustSceneExplain;
}
/**
* 获取 网办类型（原件预审.原件预审，原件核验.原件核验，全程网办.全程网办）
*
* @return String
*/
public String getOnlineType() {
return onlineType;
}
/**
* 设置 网办类型（原件预审.原件预审，原件核验.原件核验，全程网办.全程网办）
*
* @param onlineType
*/
public void setOnlineType(String onlineType) {
this.onlineType = onlineType;
}
/**
* 获取 网办到现场次数
*
* @return Integer
*/
public Integer getOnlineToTheSceneNum() {
return onlineToTheSceneNum;
}
/**
* 设置 网办到现场次数
*
* @param onlineToTheSceneNum
*/
public void setOnlineToTheSceneNum(Integer onlineToTheSceneNum) {
this.onlineToTheSceneNum = onlineToTheSceneNum;
}
/**
* 获取 网络办理深度（互联网咨询.互联网咨询，互联网收件.互联网收件，互联网预审.互联网预审，互联网受理.互联网受理，互联网办理.互联网办理，互联网办理结果信息反馈.互联网办理结果信息反馈，其他.其他）
*
* @return String
*/
public String getOnlineOperatDeep() {
return onlineOperatDeep;
}
/**
* 设置 网络办理深度（互联网咨询.互联网咨询，互联网收件.互联网收件，互联网预审.互联网预审，互联网受理.互联网受理，互联网办理.互联网办理，互联网办理结果信息反馈.互联网办理结果信息反馈，其他.其他）
*
* @param onlineOperatDeep
*/
public void setOnlineOperatDeep(String onlineOperatDeep) {
this.onlineOperatDeep = onlineOperatDeep;
}
/**
* 获取 物流快递，网上办理选（否.否，是.是）
*
* @return String
*/
public String getIsExpressTakeOnlineShow() {
return isExpressTakeOnlineShow;
}
/**
* 设置 物流快递，网上办理选（否.否，是.是）
*
* @param isExpressTakeOnlineShow
*/
public void setIsExpressTakeOnlineShow(String isExpressTakeOnlineShow) {
this.isExpressTakeOnlineShow = isExpressTakeOnlineShow;
}
/**
* 获取 是否支持上门收取申请（否.否，是.是）
*
* @return String
*/
public String getIsDoorTakeShow() {
return isDoorTakeShow;
}
/**
* 设置 是否支持上门收取申请（否.否，是.是）
*
* @param isDoorTakeShow
*/
public void setIsDoorTakeShow(String isDoorTakeShow) {
this.isDoorTakeShow = isDoorTakeShow;
}
/**
* 获取 网上必须到现场原因
*
* @return String
*/
public String getOnlineMustSceneExplain() {
return onlineMustSceneExplain;
}
/**
* 设置 网上必须到现场原因
*
* @param onlineMustSceneExplain
*/
public void setOnlineMustSceneExplain(String onlineMustSceneExplain) {
this.onlineMustSceneExplain = onlineMustSceneExplain;
}
/**
* 获取 实施主体
*
* @return String
*/
public String getPerformDeptType() {
return performDeptType;
}
/**
* 设置 实施主体
*
* @param performDeptType
*/
public void setPerformDeptType(String performDeptType) {
this.performDeptType = performDeptType;
}
/**
* 获取 事项版本
*
* @return String
*/
public String getMatterEdition() {
return matterEdition;
}
/**
* 设置 事项版本
*
* @param matterEdition
*/
public void setMatterEdition(String matterEdition) {
this.matterEdition = matterEdition;
}
/**
* 获取 事项类型名称（行政许可.行政许可，行政处罚.行政处罚，行政强制.行政强制，行政征收.行政征收，行政给付.行政给付，行政检查.行政检查，行政确认.行政确认，行政奖励.行政奖励，行政裁决.行政裁决，其他行政权力.其他行政权力，主动服务.主动服务，依申请服务.依申请服务，咨询查询.咨询查询，未归类事项.未归类事项）
*
* @return String
*/
public String getEventTypeShow() {
return eventTypeShow;
}
/**
* 设置 事项类型名称（行政许可.行政许可，行政处罚.行政处罚，行政强制.行政强制，行政征收.行政征收，行政给付.行政给付，行政检查.行政检查，行政确认.行政确认，行政奖励.行政奖励，行政裁决.行政裁决，其他行政权力.其他行政权力，主动服务.主动服务，依申请服务.依申请服务，咨询查询.咨询查询，未归类事项.未归类事项）
*
* @param eventTypeShow
*/
public void setEventTypeShow(String eventTypeShow) {
this.eventTypeShow = eventTypeShow;
}
/**
* 获取 行使层级名称（省级.省级，市级.市级，县级.县级，镇[乡 街道].镇[乡 街道]，村[社区]级.村[社区]级）
*
* @return String
*/
public String getPerformHierarchyShow() {
return performHierarchyShow;
}
/**
* 设置 行使层级名称（省级.省级，市级.市级，县级.县级，镇[乡 街道].镇[乡 街道]，村[社区]级.村[社区]级）
*
* @param performHierarchyShow
*/
public void setPerformHierarchyShow(String performHierarchyShow) {
this.performHierarchyShow = performHierarchyShow;
}
/**
* 获取 权力来源（法定本级行使.法定本级行使，上级下放.上级下放，上级授权.上级授权，同级授权.同级授权，上级委托.上级委托，同级委托.同级委托）
*
* @return String
*/
public String getPowerSourceShow() {
return powerSourceShow;
}
/**
* 设置 权力来源（法定本级行使.法定本级行使，上级下放.上级下放，上级授权.上级授权，同级授权.同级授权，上级委托.上级委托，同级委托.同级委托）
*
* @param powerSourceShow
*/
public void setPowerSourceShow(String powerSourceShow) {
this.powerSourceShow = powerSourceShow;
}
/**
* 获取 实施主体性质（法定机关.法定机关，授权组织.授权组织，受委托组织.受委托组织）
*
* @return String
*/
public String getPerformDeptTypeShow() {
return performDeptTypeShow;
}
/**
* 设置 实施主体性质（法定机关.法定机关，授权组织.授权组织，受委托组织.受委托组织）
*
* @param performDeptTypeShow
*/
public void setPerformDeptTypeShow(String performDeptTypeShow) {
this.performDeptTypeShow = performDeptTypeShow;
}
/**
* 获取 是否进驻中心（否.否，是.是）
*
* @return String
*/
public String getGoveServiceCenterShow() {
return goveServiceCenterShow;
}
/**
* 设置 是否进驻中心（否.否，是.是）
*
* @param goveServiceCenterShow
*/
public void setGoveServiceCenterShow(String goveServiceCenterShow) {
this.goveServiceCenterShow = goveServiceCenterShow;
}
/**
* 获取 是否纳入便民服务中心（否.否，是.是）
*
* @return String
*/
public String getIsConvenientCenterShow() {
return isConvenientCenterShow;
}
/**
* 设置 是否纳入便民服务中心（否.否，是.是）
*
* @param isConvenientCenterShow
*/
public void setIsConvenientCenterShow(String isConvenientCenterShow) {
this.isConvenientCenterShow = isConvenientCenterShow;
}
/**
* 获取 自助终端办理 （否.否，是.是）
*
* @return String
*/
public String getTerminalHandle() {
return terminalHandle;
}
/**
* 设置 自助终端办理 （否.否，是.是）
*
* @param terminalHandle
*/
public void setTerminalHandle(String terminalHandle) {
this.terminalHandle = terminalHandle;
}
/**
* 获取 是否网办 （否.否，是.是）
*
* @return String
*/
public String getIsOnline() {
return isOnline;
}
/**
* 设置 是否网办 （否.否，是.是）
*
* @param isOnline
*/
public void setIsOnline(String isOnline) {
this.isOnline = isOnline;
}
/**
* 获取 支持网上支付（否.否，是.是）
*
* @return String
*/
public String getIsOnlinePayShow() {
return isOnlinePayShow;
}
/**
* 设置 支持网上支付（否.否，是.是）
*
* @param isOnlinePayShow
*/
public void setIsOnlinePayShow(String isOnlinePayShow) {
this.isOnlinePayShow = isOnlinePayShow;
}
/**
* 获取 委托部门（否.否，是.是）
*
* @return String
*/
public String getEntrustmentDepartmen() {
return entrustmentDepartmen;
}
/**
* 设置 委托部门（否.否，是.是）
*
* @param entrustmentDepartmen
*/
public void setEntrustmentDepartmen(String entrustmentDepartmen) {
this.entrustmentDepartmen = entrustmentDepartmen;
}
/**
* 获取 联办机构
*
* @return String
*/
public String getJointInfoShow() {
return jointInfoShow;
}
/**
* 设置 联办机构
*
* @param jointInfoShow
*/
public void setJointInfoShow(String jointInfoShow) {
this.jointInfoShow = jointInfoShow;
}
/**
* 获取 事项状态（停用.停用，在用.在用）
*
* @return String
*/
public String getMatterStatus() {
return matterStatus;
}
/**
* 设置 事项状态（停用.停用，在用.在用）
*
* @param matterStatus
*/
public void setMatterStatus(String matterStatus) {
this.matterStatus = matterStatus;
}
/**
* 获取 数量限制
*
* @return Long
*/
public Long getNumberLimit() {
return numberLimit;
}
/**
* 设置 数量限制
*
* @param numberLimit
*/
public void setNumberLimit(Long numberLimit) {
this.numberLimit = numberLimit;
}
/**
* 获取 主题类型
*
* @return String
*/
public String getType() {
return type;
}
/**
* 设置 主题类型
*
* @param type
*/
public void setType(String type) {
this.type = type;
}
/**
* 获取 基本编码
*
* @return String
*/
public String getBaseCode() {
return baseCode;
}
/**
* 设置 基本编码
*
* @param baseCode
*/
public void setBaseCode(String baseCode) {
this.baseCode = baseCode;
}
/**
* 获取 实施编码
*
* @return String
*/
public String getImplementCode() {
return implementCode;
}
/**
* 设置 实施编码
*
* @param implementCode
*/
public void setImplementCode(String implementCode) {
this.implementCode = implementCode;
}
/**
* 获取 实施主体编码
*
* @return String
*/
public String getImplementBodyCode() {
return implementBodyCode;
}
/**
* 设置 实施主体编码
*
* @param implementBodyCode
*/
public void setImplementBodyCode(String implementBodyCode) {
this.implementBodyCode = implementBodyCode;
}
/**
* 获取 办理项编码
*
* @return String
*/
public String getOperateItemCode() {
return operateItemCode;
}
/**
* 设置 办理项编码
*
* @param operateItemCode
*/
public void setOperateItemCode(String operateItemCode) {
this.operateItemCode = operateItemCode;
}
/**
* 获取 乡镇街道名称
*
* @return String
*/
public String getTownshipName() {
return townshipName;
}
/**
* 设置 乡镇街道名称
*
* @param townshipName
*/
public void setTownshipName(String townshipName) {
this.townshipName = townshipName;
}
/**
* 获取 乡镇街道代码
*
* @return String
*/
public String getTownshipCode() {
return townshipCode;
}
/**
* 设置 乡镇街道代码
*
* @param townshipCode
*/
public void setTownshipCode(String townshipCode) {
this.townshipCode = townshipCode;
}
/**
* 获取 村居社区名称
*
* @return String
*/
public String getVillageName() {
return villageName;
}
/**
* 设置 村居社区名称
*
* @param villageName
*/
public void setVillageName(String villageName) {
this.villageName = villageName;
}
/**
* 获取 村居社区代码
*
* @return String
*/
public String getVillageCode() {
return villageCode;
}
/**
* 设置 村居社区代码
*
* @param villageCode
*/
public void setVillageCode(String villageCode) {
this.villageCode = villageCode;
}
/**
* 获取 办理时间
*
* @return String
*/
public String getOperateTime() {
return operateTime;
}
/**
* 设置 办理时间
*
* @param operateTime
*/
public void setOperateTime(String operateTime) {
this.operateTime = operateTime;
}
/**
* 获取 办理地点
*
* @return String
*/
public String getOperateSite() {
return operateSite;
}
/**
* 设置 办理地点
*
* @param operateSite
*/
public void setOperateSite(String operateSite) {
this.operateSite = operateSite;
}
/**
* 获取 咨询方式
*
* @return String
*/
public String getCousultingShow() {
return cousultingShow;
}
/**
* 设置 咨询方式
*
* @param cousultingShow
*/
public void setCousultingShow(String cousultingShow) {
this.cousultingShow = cousultingShow;
}
/**
* 获取 咨询电话
*
* @return String
*/
public String getCousultingTelephoneShow() {
return cousultingTelephoneShow;
}
/**
* 设置 咨询电话
*
* @param cousultingTelephoneShow
*/
public void setCousultingTelephoneShow(String cousultingTelephoneShow) {
this.cousultingTelephoneShow = cousultingTelephoneShow;
}
/**
* 获取 监督投诉方式
*
* @return String
*/
public String getSuperviseShow() {
return superviseShow;
}
/**
* 设置 监督投诉方式
*
* @param superviseShow
*/
public void setSuperviseShow(String superviseShow) {
this.superviseShow = superviseShow;
}
/**
* 获取 排序
*
* @return Integer
*/
public Integer getSort() {
return sort;
}
/**
* 设置 排序
*
* @param sort
*/
public void setSort(Integer sort) {
this.sort = sort;
}
/**
* 获取 事项来源(0.政务网，1.自定义)
*
* @return Integer
*/
public Integer getSource() {
return source;
}
/**
* 设置 事项来源(0.政务网，1.自定义)
*
* @param source
*/
public void setSource(Integer source) {
this.source = source;
}
/**
* 获取 评价地址
*
* @return String
*/
public String getEvaluationUrl() {
return evaluationUrl;
}
/**
* 设置 评价地址
*
* @param evaluationUrl
*/
public void setEvaluationUrl(String evaluationUrl) {
this.evaluationUrl = evaluationUrl;
}
/**
* 获取 申请地址
*
* @return String
*/
public String getNetApplyUrl() {
return netApplyUrl;
}
/**
* 设置 申请地址
*
* @param netApplyUrl
*/
public void setNetApplyUrl(String netApplyUrl) {
this.netApplyUrl = netApplyUrl;
}
public List<MatterExtEntity> getMatterExtList() {
return matterExtList;
}
public void setMatterExtList(List<MatterExtEntity> matterExtList) {
this.matterExtList = matterExtList;
}
@Override
public int hashCode() {
return Objects.hash(this.areaCode, this.matterNo);
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof MatterEntity) {
MatterEntity tmp = (MatterEntity) obj;
if ((this.getAreaCode()+this.matterNo).equals(tmp.getAreaCode()+tmp.matterNo)) {
return true;
}
}
return false;
}
public String toString() {
StringBuilder sb = new StringBuilder("");
sb.append(",siteId:").append(getSiteId());
sb.append(",tid:").append(getTid());
sb.append(",tcode:").append(getTcode());
sb.append(",tname:").append(getTname());
sb.append(",matterName:").append(getMatterName());
sb.append(",englishName:").append(getEnglishName());
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());
sb.append(",groupName:").append(getGroupName());
sb.append(",url:").append(getUrl());
sb.append(",haveGetMatterInfo:").append(getHaveGetMatterInfo());
sb.append(",belongDept:").append(getBelongDept());
sb.append(",appoveObjectShow:").append(getAppoveObjectShow());
sb.append(",operatScopeShow:").append(getOperatScopeShow());
sb.append(",appoveTimeLimitShow:").append(getAppoveTimeLimitShow());
sb.append(",handleType:").append(getHandleType());
sb.append(",legalTimeLimitShow:").append(getLegalTimeLimitShow());
sb.append(",legalEndExplain:").append(getLegalEndExplain());
sb.append(",promiseTimeLimitShow:").append(getPromiseTimeLimitShow());
sb.append(",promiseEndExplain:").append(getPromiseEndExplain());
sb.append(",isChargesShow:").append(getIsChargesShow());
sb.append(",certificationLevelsShow:").append(getCertificationLevelsShow());
sb.append(",planTakeTime:").append(getPlanTakeTime());
sb.append(",promiseTakeTime:").append(getPromiseTakeTime());
sb.append(",specialProcedure:").append(getSpecialProcedure());
sb.append(",windowToTheSceneNum:").append(getWindowToTheSceneNum());
sb.append(",isOnlineSubscribeShow:").append(getIsOnlineSubscribeShow());
sb.append(",isExpressTakeShow:").append(getIsExpressTakeShow());
sb.append(",isProvinceAcquisitionShow:").append(getIsProvinceAcquisitionShow());
sb.append(",isApplyProvinceShow:").append(getIsApplyProvinceShow());
sb.append(",mustSceneExplain:").append(getMustSceneExplain());
sb.append(",onlineType:").append(getOnlineType());
sb.append(",onlineToTheSceneNum:").append(getOnlineToTheSceneNum());
sb.append(",onlineOperatDeep:").append(getOnlineOperatDeep());
sb.append(",isExpressTakeOnlineShow:").append(getIsExpressTakeOnlineShow());
sb.append(",isDoorTakeShow:").append(getIsDoorTakeShow());
sb.append(",onlineMustSceneExplain:").append(getOnlineMustSceneExplain());
sb.append(",performDeptType:").append(getPerformDeptType());
sb.append(",matterEdition:").append(getMatterEdition());
sb.append(",eventTypeShow:").append(getEventTypeShow());
sb.append(",performHierarchyShow:").append(getPerformHierarchyShow());
sb.append(",powerSourceShow:").append(getPowerSourceShow());
sb.append(",performDeptTypeShow:").append(getPerformDeptTypeShow());
sb.append(",goveServiceCenterShow:").append(getGoveServiceCenterShow());
sb.append(",isConvenientCenterShow:").append(getIsConvenientCenterShow());
sb.append(",terminalHandle:").append(getTerminalHandle());
sb.append(",isOnline:").append(getIsOnline());
sb.append(",isOnlinePayShow:").append(getIsOnlinePayShow());
sb.append(",entrustmentDepartmen:").append(getEntrustmentDepartmen());
sb.append(",jointInfoShow:").append(getJointInfoShow());
sb.append(",matterStatus:").append(getMatterStatus());
sb.append(",numberLimit:").append(getNumberLimit());
sb.append(",type:").append(getType());
sb.append(",baseCode:").append(getBaseCode());
sb.append(",implementCode:").append(getImplementCode());
sb.append(",implementBodyCode:").append(getImplementBodyCode());
sb.append(",operateItemCode:").append(getOperateItemCode());
sb.append(",townshipName:").append(getTownshipName());
sb.append(",townshipCode:").append(getTownshipCode());
sb.append(",villageName:").append(getVillageName());
sb.append(",villageCode:").append(getVillageCode());
sb.append(",operateTime:").append(getOperateTime());
sb.append(",operateSite:").append(getOperateSite());
sb.append(",cousultingShow:").append(getCousultingShow());
sb.append(",cousultingTelephoneShow:").append(getCousultingTelephoneShow());
sb.append(",superviseShow:").append(getSuperviseShow());
sb.append(",sort:").append(getSort());
sb.append(",source:").append(getSource());
sb.append(",evaluationUrl:").append(getEvaluationUrl());
sb.append(",netApplyUrl:").append(getNetApplyUrl());
return sb.toString();
}
public void initAttrValue() {
this.siteId = -1L;
this.tid = ""; this.tid = "";
this.tcode = ""; this.tcode = "";
this.tname = ""; this.tname = "";
this.matterName = ""; this.matterName = "";
this.englishName = ""; this.englishName = "";
this.matterNo = ""; this.matterNo = "";
this.areaCode = ""; this.areaCode = "";
this.deptCode = ""; this.deptCode = "";
this.deptName = "";
this.powerCode = ""; this.powerCode = "";
this.themeCode = ""; this.themeCode = "";
this.usertypeCode = ""; this.usertypeCode = "";
this.groupName = ""; this.groupName = "";
this.url = ""; this.url = "";
this.haveGetMatterInfo = "";
this.haveGetMatterInfo = "false";
this.belongDept = ""; this.belongDept = "";
this.appoveObjectShow = "事业法人"; this.appoveObjectShow = "事业法人";
this.operatScopeShow = "无"; this.operatScopeShow = "无";
this.appoveTimeLimitShow = "网络办件"; this.appoveTimeLimitShow = "网络办件";
this.handleType = "窗口办理"; this.handleType = "窗口办理";
this.legalTimeLimitShow = ""; this.legalTimeLimitShow = "";
this.legalEndExplain = ""; this.legalEndExplain = "";
this.promiseTimeLimitShow = ""; this.promiseTimeLimitShow = "";
this.promiseEndExplain = ""; this.promiseEndExplain = "";
this.isChargesShow = "否";
this.isChargesShow = "无";
this.certificationLevelsShow = "实名认证"; this.certificationLevelsShow = "实名认证";
this.planTakeTime = null; this.planTakeTime = null;
this.promiseTakeTime = null; this.promiseTakeTime = null;
this.specialProcedure = ""; this.specialProcedure = "";
this.windowToTheSceneNum = 0;
this.windowToTheSceneNum = null; this.isOnlineSubscribeShow = "否";
this.isExpressTakeShow = "否";
this.isOnlineSubscribeShow = "无"; this.isProvinceAcquisitionShow = "否";
this.isApplyProvinceShow = "否";
this.isExpressTakeShow = "无";
this.isProvinceAcquisitionShow = "无";
this.isApplyProvinceShow = "无";
this.mustSceneExplain = ""; this.mustSceneExplain = "";
this.onlineType = "原件预审"; this.onlineType = "原件预审";
this.onlineToTheSceneNum = 0; this.onlineToTheSceneNum = 0;
this.onlineOperatDeep = "互联网咨询"; this.onlineOperatDeep = "互联网咨询";
this.isExpressTakeOnlineShow = ""; this.isExpressTakeOnlineShow = "";
this.isDoorTakeShow = "否";
this.isDoorTakeShow = "无";
this.onlineMustSceneExplain = ""; this.onlineMustSceneExplain = "";
this.performDeptType = ""; this.performDeptType = "";
this.matterEdition = ""; this.matterEdition = "";
this.eventTypeShow = "行政许可"; this.eventTypeShow = "行政许可";
this.performHierarchyShow = ""; this.performHierarchyShow = "";
this.powerSourceShow = ""; this.powerSourceShow = "";
this.performDeptTypeShow = ""; this.performDeptTypeShow = "";
this.goveServiceCenterShow = "否";
this.goveServiceCenterShow = "无"; this.isConvenientCenterShow = "否";
this.terminalHandle = "是";
this.isConvenientCenterShow = "无"; this.isOnline = "是";
this.isOnlinePayShow = "是";
this.terminalHandle = "无"; this.entrustmentDepartmen = "是";
this.isOnline = "无";
this.isOnlinePayShow = "无";
this.entrustmentDepartmen = "无";
this.jointInfoShow = ""; this.jointInfoShow = "";
this.matterStatus = "在用"; this.matterStatus = "在用";
this.numberLimit = null; this.numberLimit = null;
this.type = ""; this.type = "";
this.baseCode = ""; this.baseCode = "";
this.implementCode = ""; this.implementCode = "";
this.implementBodyCode = ""; this.implementBodyCode = "";
this.operateItemCode = ""; this.operateItemCode = "";
this.townshipName = ""; this.townshipName = "";
this.townshipCode = ""; this.townshipCode = "";
this.villageName = ""; this.villageName = "";
this.villageCode = ""; this.villageCode = "";
this.operateTime = ""; this.operateTime = "";
this.operateSite = ""; this.operateSite = "";
this.cousultingShow = ""; this.cousultingShow = "";
this.cousultingTelephoneShow = ""; this.cousultingTelephoneShow = "";
this.superviseShow = ""; this.superviseShow = "";
this.sort = 0; this.sort = 0;
this.source = 1; this.source = 1;
this.deptName = "";
this.evaluationUrl = ""; this.evaluationUrl = "";
this.netApplyUrl = ""; this.netApplyUrl = "";
this.areaName = "";
this.areaLevel = 0;
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterQuery.java
View file @ 7b467d17
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.matter.model.MatterEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
* 基础事项查询对象 * 基础事项查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-02-20 * @date 2025-03-17
*/ */
public class MatterQuery extends MatterEntity { public class MatterQuery extends MatterEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -81,11 +81,6 @@ public class MatterQuery extends MatterEntity { ...@@ -81,11 +81,6 @@ public class MatterQuery extends MatterEntity {
/** 部门编号排除列表 */ /** 部门编号排除列表 */
private List <String> deptCodeNotList; private List <String> deptCodeNotList;
/** 部门名称 */
private List<String> deptNameList;
/** 部门名称排除列表 */
private List <String> deptNameNotList;
/** 行政权力编号 */ /** 行政权力编号 */
private List<String> powerCodeList; private List<String> powerCodeList;
...@@ -480,6 +475,11 @@ public class MatterQuery extends MatterEntity { ...@@ -480,6 +475,11 @@ public class MatterQuery extends MatterEntity {
/** 结束 修改时间 */ /** 结束 修改时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 部门名称 */
private List<String> deptNameList;
/** 部门名称排除列表 */
private List <String> deptNameNotList;
/** 评价地址 */ /** 评价地址 */
private List<String> evaluationUrlList; private List<String> evaluationUrlList;
...@@ -490,6 +490,26 @@ public class MatterQuery extends MatterEntity { ...@@ -490,6 +490,26 @@ public class MatterQuery extends MatterEntity {
/** 申请地址排除列表 */ /** 申请地址排除列表 */
private List <String> netApplyUrlNotList; private List <String> netApplyUrlNotList;
/** 区域名称 */
private List<String> areaNameList;
/** 区域名称排除列表 */
private List <String> areaNameNotList;
/** 开始 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区) */
private Integer areaLevelStart;
/** 结束 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区) */
private Integer areaLevelEnd;
/** 增加 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区) */
private Integer areaLevelIncrement;
/** 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)列表 */
private List <Integer> areaLevelList;
/** 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)排除列表 */
private List <Integer> areaLevelNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<MatterQuery> orConditionList; private List<MatterQuery> orConditionList;
...@@ -916,38 +936,6 @@ public class MatterQuery extends MatterEntity { ...@@ -916,38 +936,6 @@ public class MatterQuery extends MatterEntity {
this.deptCodeNotList = deptCodeNotList; this.deptCodeNotList = deptCodeNotList;
} }
/**
* 获取 部门名称
* @return deptNameList
*/
public List<String> getDeptNameList(){
return this.deptNameList;
}
/**
* 设置 部门名称
* @param deptNameList
*/
public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
}
/**
* 获取 部门名称
* @return deptNameNotList
*/
public List<String> getDeptNameNotList(){
return this.deptNameNotList;
}
/**
* 设置 部门名称
* @param deptNameNotList
*/
public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList;
}
/** /**
* 获取 行政权力编号 * 获取 行政权力编号
* @return powerCodeList * @return powerCodeList
...@@ -3354,6 +3342,38 @@ public class MatterQuery extends MatterEntity { ...@@ -3354,6 +3342,38 @@ public class MatterQuery extends MatterEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 部门名称
* @return deptNameList
*/
public List<String> getDeptNameList(){
return this.deptNameList;
}
/**
* 设置 部门名称
* @param deptNameList
*/
public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
}
/**
* 获取 部门名称
* @return deptNameNotList
*/
public List<String> getDeptNameNotList(){
return this.deptNameNotList;
}
/**
* 设置 部门名称
* @param deptNameNotList
*/
public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList;
}
/** /**
* 获取 评价地址 * 获取 评价地址
* @return evaluationUrlList * @return evaluationUrlList
...@@ -3418,6 +3438,119 @@ public class MatterQuery extends MatterEntity { ...@@ -3418,6 +3438,119 @@ public class MatterQuery extends MatterEntity {
this.netApplyUrlNotList = netApplyUrlNotList; this.netApplyUrlNotList = netApplyUrlNotList;
} }
/**
* 获取 区域名称
* @return areaNameList
*/
public List<String> getAreaNameList(){
return this.areaNameList;
}
/**
* 设置 区域名称
* @param areaNameList
*/
public void setAreaNameList(List<String> areaNameList){
this.areaNameList = areaNameList;
}
/**
* 获取 区域名称
* @return areaNameNotList
*/
public List<String> getAreaNameNotList(){
return this.areaNameNotList;
}
/**
* 设置 区域名称
* @param areaNameNotList
*/
public void setAreaNameNotList(List<String> areaNameNotList){
this.areaNameNotList = areaNameNotList;
}
/**
* 获取 开始 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @return areaLevelStart
*/
public Integer getAreaLevelStart(){
return this.areaLevelStart;
}
/**
* 设置 开始 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @param areaLevelStart
*/
public void setAreaLevelStart(Integer areaLevelStart){
this.areaLevelStart = areaLevelStart;
}
/**
* 获取 结束 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @return $areaLevelEnd
*/
public Integer getAreaLevelEnd(){
return this.areaLevelEnd;
}
/**
* 设置 结束 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @param areaLevelEnd
*/
public void setAreaLevelEnd(Integer areaLevelEnd){
this.areaLevelEnd = areaLevelEnd;
}
/**
* 获取 增加 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @return areaLevelIncrement
*/
public Integer getAreaLevelIncrement(){
return this.areaLevelIncrement;
}
/**
* 设置 增加 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @param areaLevelIncrement
*/
public void setAreaLevelIncrement(Integer areaLevelIncrement){
this.areaLevelIncrement = areaLevelIncrement;
}
/**
* 获取 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @return areaLevelList
*/
public List<Integer> getAreaLevelList(){
return this.areaLevelList;
}
/**
* 设置 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @param areaLevelList
*/
public void setAreaLevelList(List<Integer> areaLevelList){
this.areaLevelList = areaLevelList;
}
/**
* 获取 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @return areaLevelNotList
*/
public List<Integer> getAreaLevelNotList(){
return this.areaLevelNotList;
}
/**
* 设置 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @param areaLevelNotList
*/
public void setAreaLevelNotList(List<Integer> areaLevelNotList){
this.areaLevelNotList = areaLevelNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -3679,25 +3812,6 @@ public class MatterQuery extends MatterEntity { ...@@ -3679,25 +3812,6 @@ public class MatterQuery extends MatterEntity {
} }
/**
* 设置 部门名称
* @param deptName
*/
public MatterQuery deptName(String deptName){
setDeptName(deptName);
return this;
}
/**
* 设置 部门名称
* @param deptNameList
*/
public MatterQuery deptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
return this;
}
/** /**
* 设置 行政权力编号 * 设置 行政权力编号
* @param powerCode * @param powerCode
...@@ -5090,6 +5204,25 @@ public class MatterQuery extends MatterEntity { ...@@ -5090,6 +5204,25 @@ public class MatterQuery extends MatterEntity {
/**
* 设置 部门名称
* @param deptName
*/
public MatterQuery deptName(String deptName){
setDeptName(deptName);
return this;
}
/**
* 设置 部门名称
* @param deptNameList
*/
public MatterQuery deptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
return this;
}
/** /**
* 设置 评价地址 * 设置 评价地址
* @param evaluationUrl * @param evaluationUrl
...@@ -5127,6 +5260,79 @@ public class MatterQuery extends MatterEntity { ...@@ -5127,6 +5260,79 @@ public class MatterQuery extends MatterEntity {
return this; return this;
} }
/**
* 设置 区域名称
* @param areaName
*/
public MatterQuery areaName(String areaName){
setAreaName(areaName);
return this;
}
/**
* 设置 区域名称
* @param areaNameList
*/
public MatterQuery areaNameList(List<String> areaNameList){
this.areaNameList = areaNameList;
return this;
}
/**
* 设置 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @param areaLevel
*/
public MatterQuery areaLevel(Integer areaLevel){
setAreaLevel(areaLevel);
return this;
}
/**
* 设置 开始 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @param areaLevelStart
*/
public MatterQuery areaLevelStart(Integer areaLevelStart){
this.areaLevelStart = areaLevelStart;
return this;
}
/**
* 设置 结束 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @param areaLevelEnd
*/
public MatterQuery areaLevelEnd(Integer areaLevelEnd){
this.areaLevelEnd = areaLevelEnd;
return this;
}
/**
* 设置 增加 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @param areaLevelIncrement
*/
public MatterQuery areaLevelIncrement(Integer areaLevelIncrement){
this.areaLevelIncrement = areaLevelIncrement;
return this;
}
/**
* 设置 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @param areaLevelList
*/
public MatterQuery areaLevelList(List<Integer> areaLevelList){
this.areaLevelList = areaLevelList;
return this;
}
/**
* 设置 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
* @param areaLevelNotList
*/
public MatterQuery areaLevelNotList(List<Integer> areaLevelNotList){
this.areaLevelNotList = areaLevelNotList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @ 7b467d17
...@@ -23,6 +23,8 @@ import com.mortals.xhx.common.code.SourceEnum; ...@@ -23,6 +23,8 @@ import com.mortals.xhx.common.code.SourceEnum;
import com.mortals.xhx.common.code.YesNoEnum; import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.utils.BeanUtil; import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.common.utils.MatterDetailHtmlParseUtil; import com.mortals.xhx.common.utils.MatterDetailHtmlParseUtil;
import com.mortals.xhx.module.area.model.AreaEntity;
import com.mortals.xhx.module.area.service.AreaService;
import com.mortals.xhx.module.base.model.BaseAreaEntity; import com.mortals.xhx.module.base.model.BaseAreaEntity;
import com.mortals.xhx.module.base.model.BaseAreaQuery; import com.mortals.xhx.module.base.model.BaseAreaQuery;
import com.mortals.xhx.module.base.service.BaseAreaService; import com.mortals.xhx.module.base.service.BaseAreaService;
...@@ -120,6 +122,8 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -120,6 +122,8 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
private BaseAreaService baseAreaService; private BaseAreaService baseAreaService;
@Autowired @Autowired
private BusinessMatterService businessMatterService; private BusinessMatterService businessMatterService;
@Autowired
private AreaService areaService;
@Override @Override
...@@ -134,9 +138,21 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -134,9 +138,21 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
} }
} }
updateAreaInfo(entity);
super.saveBefore(entity, context); super.saveBefore(entity, context);
} }
private void updateAreaInfo(MatterEntity entity) {
if (!ObjectUtils.isEmpty(entity.getAreaCode())) {
AreaEntity areCache = areaService.getExtCache(entity.getAreaCode());
if (!ObjectUtils.isEmpty(areCache)) {
entity.setAreaLevel(areCache.getAreaLevel());
entity.setAreaName(areCache.getName());
}
}
}
/** /**
* @param entity * @param entity
* @param context * @param context
...@@ -161,11 +177,13 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -161,11 +177,13 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
siteThemeMatterService.save(siteThemeMatterEntity, context); siteThemeMatterService.save(siteThemeMatterEntity, context);
} }
super.saveAfter(entity, context); super.saveAfter(entity, context);
} }
@Override @Override
protected void updateBefore(MatterEntity entity, Context context) throws AppException { protected void updateBefore(MatterEntity entity, Context context) throws AppException {
updateAreaInfo(entity);
if (SourceEnum.自定义.getValue().equals(entity.getSource())) { if (SourceEnum.自定义.getValue().equals(entity.getSource())) {
if (!ObjectUtils.isEmpty(entity.getSiteId())) { if (!ObjectUtils.isEmpty(entity.getSiteId())) {
SiteEntity siteEntity = siteService.get(entity.getSiteId(), context); SiteEntity siteEntity = siteService.get(entity.getSiteId(), context);
...@@ -1763,8 +1781,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1763,8 +1781,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
public static void main(String[] args) { public static void main(String[] args) {
String sss = "实施主体性质:法定机关 是否进驻政务大厅:是 村居社区名称:无 权力来源:法定本级行使 村居社区代码:无 法定时限办结说明:自受理之日起，在法定期限内办结 行使层级:县级 到办事现场次数:0 网办类型:全程网办 实施主体:邛崃市司法局 是否网办:是 监督投诉方式:投诉电话：028-12345,028-88794281; 事项类型:公共服务 行使方式:依申请行使 承诺时限办结说明:自受理之日起，在承诺期限内办结 是否支持全省就近取件:否 是否支持预约办理:否 事项版本:16 联办机构:无 办件类型:即办件 通办范围:全省 是否支持上门收取申请材料:无 是否支持自助终端办理:否";
String sss="实施主体性质:法定机关 是否进驻政务大厅:是 村居社区名称:无 权力来源:法定本级行使 村居社区代码:无 法定时限办结说明:自受理之日起，在法定期限内办结 行使层级:县级 到办事现场次数:0 网办类型:全程网办 实施主体:邛崃市司法局 是否网办:是 监督投诉方式:投诉电话：028-12345,028-88794281; 事项类型:公共服务 行使方式:依申请行使 承诺时限办结说明:自受理之日起，在承诺期限内办结 是否支持全省就近取件:否 是否支持预约办理:否 事项版本:16 联办机构:无 办件类型:即办件 通办范围:全省 是否支持上门收取申请材料:无 是否支持自助终端办理:否";
String s = StrUtil.replaceChars(sss, ",", "，"); String s = StrUtil.replaceChars(sss, ",", "，");
System.out.println(s); System.out.println(s);
......
base-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml
View file @ 7b467d17
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
<result property="matterNo" column="matterNo" /> <result property="matterNo" column="matterNo" />
<result property="areaCode" column="areaCode" /> <result property="areaCode" column="areaCode" />
<result property="deptCode" column="deptCode" /> <result property="deptCode" column="deptCode" />
<result property="deptName" column="deptName" />
<result property="powerCode" column="powerCode" /> <result property="powerCode" column="powerCode" />
<result property="themeCode" column="themeCode" /> <result property="themeCode" column="themeCode" />
<result property="usertypeCode" column="usertypeCode" /> <result property="usertypeCode" column="usertypeCode" />
...@@ -82,12 +81,13 @@ ...@@ -82,12 +81,13 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="deptName" column="deptName" />
<result property="evaluationUrl" column="evaluationUrl" /> <result property="evaluationUrl" column="evaluationUrl" />
<result property="netApplyUrl" column="netApplyUrl" /> <result property="netApplyUrl" column="netApplyUrl" />
<result property="areaName" column="areaName" />
<result property="areaLevel" column="areaLevel" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
...@@ -121,9 +121,6 @@ ...@@ -121,9 +121,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
a.deptCode, a.deptCode,
</if> </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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('powerCode') or colPickMode == 1 and data.containsKey('powerCode')))">
a.powerCode, a.powerCode,
</if> </if>
...@@ -322,29 +319,44 @@ ...@@ -322,29 +319,44 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </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('evaluationUrl') or colPickMode == 1 and data.containsKey('evaluationUrl')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('evaluationUrl') or colPickMode == 1 and data.containsKey('evaluationUrl')))">
a.evaluationUrl, a.evaluationUrl,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('netApplyUrl') or colPickMode == 1 and data.containsKey('netApplyUrl')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('netApplyUrl') or colPickMode == 1 and data.containsKey('netApplyUrl')))">
a.netApplyUrl, a.netApplyUrl,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaName') or colPickMode == 1 and data.containsKey('areaName')))">
a.areaName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaLevel') or colPickMode == 1 and data.containsKey('areaLevel')))">
a.areaLevel,
</if>
</trim>
</sql>
<!-- 子表所有列 -->
<sql id="_columns_sub">
<trim suffixOverrides="," suffix="">
b.id,b.matterId,b.matterCode,b.matterName,b.fieldCode,b.fieldName,b.fieldValue,b.fieldType,b.fieldOrderNo,b.source,b.createTime,b.createUserId,b.updateTime,
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="MatterEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="MatterEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_matter insert into mortals_sys_matter
(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,evaluationUrl,netApplyUrl) (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,deptName,evaluationUrl,netApplyUrl,areaName,areaLevel)
VALUES VALUES
(#{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},#{evaluationUrl},#{netApplyUrl}) (#{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},#{deptName},#{evaluationUrl},#{netApplyUrl},#{areaName},#{areaLevel})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_matter insert into mortals_sys_matter
(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,evaluationUrl,netApplyUrl) (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,deptName,evaluationUrl,netApplyUrl,areaName,areaLevel)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <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.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},#{item.evaluationUrl},#{item.netApplyUrl}) (#{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.deptName},#{item.evaluationUrl},#{item.netApplyUrl},#{item.areaName},#{item.areaLevel})
</foreach> </foreach>
</insert> </insert>
...@@ -384,9 +396,6 @@ ...@@ -384,9 +396,6 @@
<if test="(colPickMode==0 and data.containsKey('deptCode')) or (colPickMode==1 and !data.containsKey('deptCode'))"> <if test="(colPickMode==0 and data.containsKey('deptCode')) or (colPickMode==1 and !data.containsKey('deptCode'))">
a.deptCode=#{data.deptCode}, a.deptCode=#{data.deptCode},
</if> </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'))"> <if test="(colPickMode==0 and data.containsKey('powerCode')) or (colPickMode==1 and !data.containsKey('powerCode'))">
a.powerCode=#{data.powerCode}, a.powerCode=#{data.powerCode},
</if> </if>
...@@ -603,12 +612,24 @@ ...@@ -603,12 +612,24 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </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('evaluationUrl')) or (colPickMode==1 and !data.containsKey('evaluationUrl'))"> <if test="(colPickMode==0 and data.containsKey('evaluationUrl')) or (colPickMode==1 and !data.containsKey('evaluationUrl'))">
a.evaluationUrl=#{data.evaluationUrl}, a.evaluationUrl=#{data.evaluationUrl},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('netApplyUrl')) or (colPickMode==1 and !data.containsKey('netApplyUrl'))"> <if test="(colPickMode==0 and data.containsKey('netApplyUrl')) or (colPickMode==1 and !data.containsKey('netApplyUrl'))">
a.netApplyUrl=#{data.netApplyUrl}, a.netApplyUrl=#{data.netApplyUrl},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('areaName')) or (colPickMode==1 and !data.containsKey('areaName'))">
a.areaName=#{data.areaName},
</if>
<if test="(colPickMode==0 and data.containsKey('areaLevel')) or (colPickMode==1 and !data.containsKey('areaLevel'))">
a.areaLevel=#{data.areaLevel},
</if>
<if test="(colPickMode==0 and data.containsKey('areaLevelIncrement')) or (colPickMode==1 and !data.containsKey('areaLevelIncrement'))">
a.areaLevel=ifnull(a.areaLevel,0) + #{data.areaLevelIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -689,13 +710,6 @@ ...@@ -689,13 +710,6 @@
</if> </if>
</foreach> </foreach>
</trim> </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),"> <trim prefix="powerCode=(case" suffix="ELSE powerCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('powerCode')) or (colPickMode==1 and !item.containsKey('powerCode'))"> <if test="(colPickMode==0 and item.containsKey('powerCode')) or (colPickMode==1 and !item.containsKey('powerCode'))">
...@@ -1188,6 +1202,13 @@ ...@@ -1188,6 +1202,13 @@
</if> </if>
</foreach> </foreach>
</trim> </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="evaluationUrl=(case" suffix="ELSE evaluationUrl end),"> <trim prefix="evaluationUrl=(case" suffix="ELSE evaluationUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('evaluationUrl')) or (colPickMode==1 and !item.containsKey('evaluationUrl'))"> <if test="(colPickMode==0 and item.containsKey('evaluationUrl')) or (colPickMode==1 and !item.containsKey('evaluationUrl'))">
...@@ -1202,6 +1223,25 @@ ...@@ -1202,6 +1223,25 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="areaName=(case" suffix="ELSE areaName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('areaName')) or (colPickMode==1 and !item.containsKey('areaName'))">
when a.id=#{item.id} then #{item.areaName}
</if>
</foreach>
</trim>
<trim prefix="areaLevel=(case" suffix="ELSE areaLevel end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('areaLevel')) or (colPickMode==1 and !item.containsKey('areaLevel'))">
when a.id=#{item.id} then #{item.areaLevel}
</when>
<when test="(colPickMode==0 and item.containsKey('areaLevelIncrement')) or (colPickMode==1 and !item.containsKey('areaLevelIncrement'))">
when a.id=#{item.id} then ifnull(a.areaLevel,0) + #{item.areaLevelIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -1262,6 +1302,7 @@ ...@@ -1262,6 +1302,7 @@
</trim> </trim>
<include refid="_orderCols_"/> <include refid="_orderCols_"/>
</select> </select>
<!-- 获取子列表 -->
...@@ -1313,6 +1354,10 @@ ...@@ -1313,6 +1354,10 @@
<!-- 条件映射-代参数 --> <!-- 条件映射-代参数 -->
<sql id="_condition_param_"> <sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/> <bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="permissionSql != null and permissionSql != ''">
${permissionSql}
</if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null"> <if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
...@@ -1541,27 +1586,6 @@ ...@@ -1541,27 +1586,6 @@
</foreach> </foreach>
</if> </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') and conditionParamRef.deptNameList.size() > 0">
${_conditionType_} a.deptName in
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('powerCode')"> <if test="conditionParamRef.containsKey('powerCode')">
<if test="conditionParamRef.powerCode != null and conditionParamRef.powerCode != ''"> <if test="conditionParamRef.powerCode != null and conditionParamRef.powerCode != ''">
${_conditionType_} a.powerCode like #{${_conditionParam_}.powerCode} ${_conditionType_} a.powerCode like #{${_conditionParam_}.powerCode}
...@@ -2960,6 +2984,27 @@ ...@@ -2960,6 +2984,27 @@
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </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') and conditionParamRef.deptNameList.size() > 0">
${_conditionType_} a.deptName in
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('evaluationUrl')"> <if test="conditionParamRef.containsKey('evaluationUrl')">
<if test="conditionParamRef.evaluationUrl != null and conditionParamRef.evaluationUrl != ''"> <if test="conditionParamRef.evaluationUrl != null and conditionParamRef.evaluationUrl != ''">
${_conditionType_} a.evaluationUrl like #{${_conditionParam_}.evaluationUrl} ${_conditionType_} a.evaluationUrl like #{${_conditionParam_}.evaluationUrl}
...@@ -3001,6 +3046,54 @@ ...@@ -3001,6 +3046,54 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('areaName')">
<if test="conditionParamRef.areaName != null and conditionParamRef.areaName != ''">
${_conditionType_} a.areaName like #{${_conditionParam_}.areaName}
</if>
<if test="conditionParamRef.areaName == null">
${_conditionType_} a.areaName is null
</if>
</if>
<if test="conditionParamRef.containsKey('areaNameList') and conditionParamRef.areaNameList.size() > 0">
${_conditionType_} a.areaName in
<foreach collection="conditionParamRef.areaNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaNameNotList') and conditionParamRef.areaNameNotList.size() > 0">
${_conditionType_} a.areaName not in
<foreach collection="conditionParamRef.areaNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaLevel')">
<if test="conditionParamRef.areaLevel != null ">
${_conditionType_} a.areaLevel = #{${_conditionParam_}.areaLevel}
</if>
<if test="conditionParamRef.areaLevel == null">
${_conditionType_} a.areaLevel is null
</if>
</if>
<if test="conditionParamRef.containsKey('areaLevelList') and conditionParamRef.areaLevelList.size() > 0">
${_conditionType_} a.areaLevel in
<foreach collection="conditionParamRef.areaLevelList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaLevelNotList') and conditionParamRef.areaLevelNotList.size() > 0">
${_conditionType_} a.areaLevel not in
<foreach collection="conditionParamRef.areaLevelNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaLevelStart') and conditionParamRef.areaLevelStart != null">
${_conditionType_} a.areaLevel <![CDATA[ >= ]]> #{${_conditionParam_}.areaLevelStart}
</if>
<if test="conditionParamRef.containsKey('areaLevelEnd') and conditionParamRef.areaLevelEnd != null">
${_conditionType_} a.areaLevel <![CDATA[ <= ]]> #{${_conditionParam_}.areaLevelEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -3061,6 +3154,13 @@ ...@@ -3061,6 +3154,13 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('areaLevelList') and conditionParamRef.areaLevelList.size() > 0">
field(a.areaLevel,
<foreach collection="conditionParamRef.areaLevelList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
a.${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
...@@ -3125,6 +3225,13 @@ ...@@ -3125,6 +3225,13 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('areaLevelList') and conditionParamRef.areaLevelList.size() > 0">
field(a.areaLevel,
<foreach collection="conditionParamRef.areaLevelList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -3176,11 +3283,6 @@ ...@@ -3176,11 +3283,6 @@
<if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if> <if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
, ,
</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')"> <if test="orderCol.containsKey('powerCode')">
a.powerCode a.powerCode
<if test='orderCol.powerCode != null and "DESC".equalsIgnoreCase(orderCol.powerCode)'>DESC</if> <if test='orderCol.powerCode != null and "DESC".equalsIgnoreCase(orderCol.powerCode)'>DESC</if>
...@@ -3511,6 +3613,11 @@ ...@@ -3511,6 +3613,11 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</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('evaluationUrl')"> <if test="orderCol.containsKey('evaluationUrl')">
a.evaluationUrl a.evaluationUrl
<if test='orderCol.evaluationUrl != null and "DESC".equalsIgnoreCase(orderCol.evaluationUrl)'>DESC</if> <if test='orderCol.evaluationUrl != null and "DESC".equalsIgnoreCase(orderCol.evaluationUrl)'>DESC</if>
...@@ -3521,6 +3628,16 @@ ...@@ -3521,6 +3628,16 @@
<if test='orderCol.netApplyUrl != null and "DESC".equalsIgnoreCase(orderCol.netApplyUrl)'>DESC</if> <if test='orderCol.netApplyUrl != null and "DESC".equalsIgnoreCase(orderCol.netApplyUrl)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('areaName')">
a.areaName
<if test='orderCol.areaName != null and "DESC".equalsIgnoreCase(orderCol.areaName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('areaLevel')">
a.areaLevel
<if test='orderCol.areaLevel != null and "DESC".equalsIgnoreCase(orderCol.areaLevel)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment