Skip to content

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

添加站点政务同步接口

parent 3cdb4090
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7026 additions and 6127 deletions
base-manager/db/base_modules.sql
View file @ ef84ec9e
This diff is collapsed.
base-manager/doc/api.md
View file @ ef84ec9e
......@@ -1295,6 +1295,46 @@ data|Object|数据|-
```
### 同步站点相关事项
**请求URL:** site/syncGovMatterBySiteId
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 同步站点相关事项
**请求参数:**
参数名称|类型|备注|必填|其它
id|Long|站点id|是|-
**请求样例:**
```
{“id”:3}
```
**响应参数:**
参数名称 |参数类型|备注|其它
---|---|---|---
code|Integer|结果码（-1.失败，1.成功）|-
msg|String|消息|-
data|Object|数据|-
**响应消息样例:**
```
{
"code":1,
"msg":"成功"
}
```
### 根据区域查询站点列表
**请求URL:** site/getFlatSitesByAreaCode
......
base-manager/pom.xml
View file @ ef84ec9e
......@@ -25,7 +25,7 @@
</activation>
<properties>
<profiles.active>develop</profiles.active>
<profiles.server.ip>192.168.0.98</profiles.server.ip>
<profiles.server.ip>127.0.0.1</profiles.server.ip>
<profiles.server.port>17211</profiles.server.port>
<profiles.nginx.port>11071</profiles.nginx.port>
<profiles.server.gatewayport>11078</profiles.server.gatewayport>
......
base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java
View file @ ef84ec9e
package com.mortals.xhx.common.utils;
import cn.hutool.core.collection.ListUtil;
import com.alibaba.fastjson.JSON;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.xhx.ManagerBaseApplication;
import com.mortals.xhx.common.code.SourceEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.module.dept.service.DeptService;
......@@ -10,16 +12,22 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.model.MatterQuery;
import com.mortals.xhx.module.matter.service.MatterService;
import com.mortals.xhx.module.site.model.SiteEntity;
import com.mortals.xhx.module.site.model.SiteMatterEntity;
import com.mortals.xhx.module.site.model.SiteQuery;
import com.mortals.xhx.module.site.service.SiteMatterService;
import com.mortals.xhx.module.site.service.SiteService;
import lombok.AllArgsConstructor;
import lombok.CustomLog;
import lombok.extern.apachecommons.CommonsLog;
import lombok.extern.slf4j.Slf4j;
import javax.xml.transform.Source;
import java.util.List;
import java.util.stream.Collectors;
@AllArgsConstructor
@Slf4j
@CommonsLog
public class SyncGovMatterDetailThread implements Runnable {
private MatterService matterService;
......@@ -28,23 +36,56 @@ public class SyncGovMatterDetailThread implements Runnable {
private DeptService deptService;
private SiteMatterService siteMatterService;
private SiteEntity siteEntity;
private Context context;
@Override
public void run() {
log.info("同步站点事项开始.....");
Rest<String> deptRest = deptService.syncDeptBySiteId(siteEntity.getId(), context);
log.info("同步站点部门:"+ JSON.toJSONString(deptRest));
Rest<String> rest = siteService.syncMatterBySiteId(siteEntity.getId(), context);
log.info("syncMatterBySiteId:"+ JSON.toJSONString(rest));
log.info("同步事项列表:"+ JSON.toJSONString(rest));
if(rest.getCode()== YesNoEnum.YES.getValue()){
List<MatterEntity> matterEntityList = matterService.find(new MatterQuery().areaCode(siteEntity.getAreaCode()).haveGetMatterInfo("false").source(SourceEnum.政务网.getValue()));
matterEntityList.parallelStream().forEach(matterEntity -> {
List<MatterEntity> matterEntityList = matterService.find(new MatterQuery().areaCode(siteEntity.getAreaCode()).source(SourceEnum.政务网.getValue()));
List<MatterEntity> unSyncDetailMatterList = matterEntityList.stream().filter(f -> f.getHaveGetMatterInfo().equalsIgnoreCase("false")).collect(Collectors.toList());
log.info("同步站点事项到站点.....");
//查询站点事项相关
List<SiteEntity> siteEntities = siteService.find(new SiteQuery().areaCode(siteEntity.getAreaCode()));
//删除站点与政务事项相关项
for (SiteEntity site : siteEntities) {
siteMatterService.deleteBysiteIdAndSource(site.getId(),SourceEnum.政务网.getValue(), context);
}
//重新添加
for (SiteEntity site : siteEntities) {
List<SiteMatterEntity> siteMatterList = matterEntityList.stream().map(item -> {
return matterService.switchMatterToSiteMatterr(item, site.getId(), context).getData();
}).filter(f -> f != null).collect(Collectors.toList());
List<List<SiteMatterEntity>> partition = ListUtil.partition(siteMatterList, 100);
for (List<SiteMatterEntity> rests : partition) {
siteMatterService.save(rests);
}
}
log.info("同步站点事项到站点完成.....");
log.info("同步站点事项详细条数....."+unSyncDetailMatterList.size());
/* for (MatterEntity matterEntity : matterEntityList) {
matterService.buildMatterDetail(matterEntity, context);
matterService.update(matterEntity,context);
}*/
unSyncDetailMatterList.parallelStream().forEach(matterEntity -> {
matterService.buildMatterDetail(matterEntity, context);
matterService.update(matterEntity,context);
});
}
log.info("同步站点事项结束.....");
}
}
base-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java
View file @ ef84ec9e
......@@ -7,7 +7,10 @@ import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
import com.mortals.framework.util.HttpUtil;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.utils.MatterHtmlParseUtil;
import com.mortals.xhx.module.area.model.AreaEntity;
import com.mortals.xhx.module.dept.dao.DeptDao;
import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.model.DeptQuery;
......@@ -54,6 +57,11 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE
@Autowired
private MattersDeptService mattersDeptService;
@Override
protected String getExtKey(DeptEntity data) {
return data.getDeptNumber();
}
@Override
public void syncDept(String areaCode, Context context) {
List<MattersDeptEntity> deptList = mattersDeptService.find(new MattersDeptQuery());
......@@ -83,49 +91,32 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE
SiteEntity siteEntity = siteService.get(siteId, context);
if (!ObjectUtils.isEmpty(siteEntity)) {
String areaCode = siteEntity.getAreaCode();
String exp = "//ul[@class='bm-list']//li";
Map<String, String> params = new HashMap<>();
params.put("areaCode",areaCode);
// url += "?areaCode=" + areaCode;
String html;
Object result;
try {
html = HttpUtil.doGet(url, params);
//html = HttpUtil.get(url);
HtmlCleaner hc = new HtmlCleaner();
TagNode tn = hc.clean(html);
Document dom = new DomSerializer(new CleanerProperties()).createDOM(tn);
XPath xPath = XPathFactory.newInstance().newXPath();
result = xPath.evaluate(exp, dom, XPathConstants.NODESET);
if (result instanceof NodeList) {
NodeList nodeList = (NodeList) result;
for (int i = 0; i < nodeList.getLength(); i++) {
Node node = nodeList.item(i);
String deptName = node.getAttributes().getNamedItem("title").getNodeValue();
String href = StringEscapeUtils.unescapeHtml4(node.getFirstChild().getAttributes().getNamedItem("href").getNodeValue());
UrlBuilder builder = UrlBuilder.ofHttp(href, CharsetUtil.CHARSET_UTF_8);
String deptCode = builder.getQuery().get("deptCode").toString();
params.put("areaCode", areaCode);
//根据站点添加部门信息，部门编号存在时候不添加
DeptEntity deptExistEntity = deptService.selectOne(new DeptQuery().siteId(siteId).deptNumber(deptCode), context);
if (ObjectUtils.isEmpty(deptExistEntity)) {
DeptEntity deptEntity = new DeptEntity();
deptEntity.initAttrValue();
deptEntity.setDeptNumber(deptCode);
deptEntity.setSiteId(siteId);
deptEntity.setName(deptName);
deptEntity.setCreateTime(new Date());
deptEntity.setCreateUserId(1L);
deptService.save(deptEntity, context);
}
}
}
}
Rest<Map<String, String>> rest = MatterHtmlParseUtil.syncDeptBySiteId(params, url);
if (rest.getCode() == YesNoEnum.YES.getValue()) {
rest.getData().entrySet().stream().forEach(item -> {
String deptCode = item.getKey();
String deptName = item.getValue();
catch (Exception e) {
log.error("同步部门异常！siteId:" + siteId, e);
return Rest.fail(e.getMessage());
DeptEntity deptExistEntity = deptService.selectOne(new DeptQuery().siteId(siteId).deptNumber(deptCode), context);
if (ObjectUtils.isEmpty(deptExistEntity)) {
DeptEntity deptEntity = new DeptEntity();
deptEntity.initAttrValue();
deptEntity.setDeptNumber(deptCode);
deptEntity.setSiteId(siteId);
deptEntity.setName(deptName);
deptEntity.setCreateTime(new Date());
deptEntity.setCreateUserId(1L);
deptService.save(deptEntity, context);
}
});
} else {
return Rest.fail(rest.getMsg());
}
} else {
return Rest.fail("当前站点不存在！");
}
return Rest.ok("当前站点同步添加部门成功！");
}
......
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterAcceptEntity.java
View file @ ef84ec9e
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterAcceptVo;
* 事项受理条件实体对象
*
* @author zxfei
* @date 2022-01-12
* @date 2022-11-16
*/
public class MatterAcceptEntity extends MatterAcceptVo {
......@@ -21,6 +21,10 @@ public class MatterAcceptEntity extends MatterAcceptVo {
*/
private Long matterId;
/**
* 事项编码
*/
private String matterCode;
/**
* 事项名称
*/
private String matterName;
......@@ -51,6 +55,20 @@ public class MatterAcceptEntity extends MatterAcceptVo {
this.matterId = matterId;
}
/**
* 获取 事项编码
* @return String
*/
public String getMatterCode(){
return matterCode;
}
/**
* 设置 事项编码
* @param matterCode
*/
public void setMatterCode(String matterCode){
this.matterCode = matterCode;
}
/**
* 获取 事项名称
* @return String
*/
......@@ -115,6 +133,7 @@ public class MatterAcceptEntity extends MatterAcceptVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",matterId:").append(getMatterId());
sb.append(",matterCode:").append(getMatterCode());
sb.append(",matterName:").append(getMatterName());
sb.append(",content:").append(getContent());
sb.append(",source:").append(getSource());
......@@ -125,6 +144,8 @@ public class MatterAcceptEntity extends MatterAcceptVo {
this.matterId = 0L;
this.matterCode = "";
this.matterName = "";
this.content = "";
......
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterAcceptQuery.java
View file @ ef84ec9e
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
* 事项受理条件查询对象
*
* @author zxfei
* @date 2022-01-12
* @date 2022-11-16
*/
public class MatterAcceptQuery extends MatterAcceptEntity {
/** 开始 主键，自增长 */
......@@ -33,6 +33,9 @@ public class MatterAcceptQuery extends MatterAcceptEntity {
/** 基础事项表id列表 */
private List <Long> matterIdList;
/** 事项编码 */
private List<String> matterCodeList;
/** 事项名称 */
private List<String> matterNameList;
......@@ -211,6 +214,21 @@ public class MatterAcceptQuery extends MatterAcceptEntity {
this.matterIdList = matterIdList;
}
/**
* 获取 事项编码
* @return matterCodeList
*/
public List<String> getMatterCodeList(){
return this.matterCodeList;
}
/**
* 设置 事项编码
* @param matterCodeList
*/
public void setMatterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList;
}
/**
* 获取 事项名称
* @return matterNameList
......@@ -524,6 +542,25 @@ public class MatterAcceptQuery extends MatterAcceptEntity {
}
/**
* 设置 事项编码
* @param matterCode
*/
public MatterAcceptQuery matterCode(String matterCode){
setMatterCode(matterCode);
return this;
}
/**
* 设置 事项编码
* @param matterCodeList
*/
public MatterAcceptQuery matterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList;
return this;
}
/**
* 设置 事项名称
* @param matterName
......
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterChargesEntity.java
View file @ ef84ec9e
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterChargesVo;
* 事项收费标准实体对象
*
* @author zxfei
* @date 2022-01-12
* @date 2022-11-16
*/
public class MatterChargesEntity extends MatterChargesVo {
......@@ -21,6 +21,10 @@ public class MatterChargesEntity extends MatterChargesVo {
*/
private Long matterId;
/**
* 事项编码
*/
private String matterCode;
/**
* 事项名称
*/
private String matterName;
......@@ -51,6 +55,20 @@ public class MatterChargesEntity extends MatterChargesVo {
this.matterId = matterId;
}
/**
* 获取 事项编码
* @return String
*/
public String getMatterCode(){
return matterCode;
}
/**
* 设置 事项编码
* @param matterCode
*/
public void setMatterCode(String matterCode){
this.matterCode = matterCode;
}
/**
* 获取 事项名称
* @return String
*/
......@@ -93,6 +111,9 @@ public class MatterChargesEntity extends MatterChargesVo {
this.source = source;
}
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -112,6 +133,7 @@ public class MatterChargesEntity extends MatterChargesVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",matterId:").append(getMatterId());
sb.append(",matterCode:").append(getMatterCode());
sb.append(",matterName:").append(getMatterName());
sb.append(",content:").append(getContent());
sb.append(",source:").append(getSource());
......@@ -122,6 +144,8 @@ public class MatterChargesEntity extends MatterChargesVo {
this.matterId = 0L;
this.matterCode = "";
this.matterName = "";
this.content = "";
......
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterChargesQuery.java
View file @ ef84ec9e
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.MatterChargesEntity;
* 事项收费标准查询对象
*
* @author zxfei
* @date 2022-01-12
* @date 2022-11-16
*/
public class MatterChargesQuery extends MatterChargesEntity {
/** 开始 主键，自增长 */
......@@ -33,6 +33,9 @@ public class MatterChargesQuery extends MatterChargesEntity {
/** 事项基础表matter id列表 */
private List <Long> matterIdList;
/** 事项编码 */
private List<String> matterCodeList;
/** 事项名称 */
private List<String> matterNameList;
......@@ -211,6 +214,21 @@ public class MatterChargesQuery extends MatterChargesEntity {
this.matterIdList = matterIdList;
}
/**
* 获取 事项编码
* @return matterCodeList
*/
public List<String> getMatterCodeList(){
return this.matterCodeList;
}
/**
* 设置 事项编码
* @param matterCodeList
*/
public void setMatterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList;
}
/**
* 获取 事项名称
* @return matterNameList
......@@ -524,6 +542,25 @@ public class MatterChargesQuery extends MatterChargesEntity {
}
/**
* 设置 事项编码
* @param matterCode
*/
public MatterChargesQuery matterCode(String matterCode){
setMatterCode(matterCode);
return this;
}
/**
* 设置 事项编码
* @param matterCodeList
*/
public MatterChargesQuery matterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList;
return this;
}
/**
* 设置 事项名称
* @param matterName
......
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumEntity.java
View file @ ef84ec9e
......@@ -11,7 +11,7 @@ import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
* 事项申请材料实体对象
*
* @author zxfei
* @date 2022-01-17
* @date 2022-11-16
*/
public class MatterDatumEntity extends MatterDatumVo {
......@@ -21,6 +21,10 @@ public class MatterDatumEntity extends MatterDatumVo {
* 事项id
*/
private Long matterId;
/**
* 事项编码
*/
private String matterCode;
/**
* 事项名称
*/
......@@ -123,6 +127,20 @@ public class MatterDatumEntity extends MatterDatumVo {
public void setMatterId(Long matterId){
this.matterId = matterId;
}
/**
* 获取 事项编码
* @return String
*/
public String getMatterCode(){
return matterCode;
}
/**
* 设置 事项编码
* @param matterCode
*/
public void setMatterCode(String matterCode){
this.matterCode = matterCode;
}
/**
* 获取 事项名称
* @return String
......@@ -433,6 +451,7 @@ public class MatterDatumEntity extends MatterDatumVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",matterId:").append(getMatterId());
sb.append(",matterCode:").append(getMatterCode());
sb.append(",matterName:").append(getMatterName());
sb.append(",materialName:").append(getMaterialName());
sb.append(",isMust:").append(getIsMust());
......@@ -460,7 +479,9 @@ public class MatterDatumEntity extends MatterDatumVo {
this.matterId = null;
this.matterName = "";
this.matterCode = "";
this.matterName = "";
this.materialName = "";
......@@ -476,11 +497,11 @@ public class MatterDatumEntity extends MatterDatumVo {
this.paperNum = 1;
this.paperGg = "";
this.paperGg = "";
this.jianmMs = "无";
this.sealWay = "";
this.sealWay = "";
this.isjianm = "是";
......@@ -490,11 +511,11 @@ public class MatterDatumEntity extends MatterDatumVo {
this.materialSourceSm = "";
this.remarkSub = "";
this.remarkSub = "";
this.clauseContent = "";
this.clauseContent = "";
this.summary = "";
this.summary = "";
this.remark = "";
......
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumFileEntity.java
View file @ ef84ec9e
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterDatumFileVo;
* 材料附件实体对象
*
* @author zxfei
* @date 2022-01-17
* @date 2022-11-16
*/
public class MatterDatumFileEntity extends MatterDatumFileVo {
......@@ -20,6 +20,14 @@ public class MatterDatumFileEntity extends MatterDatumFileVo {
* 材料id
*/
private Long datumId;
/**
* 事项编码
*/
private String matterCode;
/**
* 材料名
*/
private String materialName;
/**
* 附件名称
*/
......@@ -29,17 +37,17 @@ public class MatterDatumFileEntity extends MatterDatumFileVo {
*/
private String fileUrl;
/**
* 附件类型 (1.示例样表，2.空白表格)
* 附件本地下载地址
*/
private Integer filetype;
private String localFileUrl;
/**
* 附件来源 (0.政务网，1.自定义)
* 附件类型 (示例样表.示例样表，空白表格.空白表格)
*/
private Integer source;
private String filetype;
/**
* 材料名
* 附件来源 (0.政务网，1.自定义)
*/
private String materialName;
private Integer source;
......@@ -58,6 +66,34 @@ public class MatterDatumFileEntity extends MatterDatumFileVo {
public void setDatumId(Long datumId){
this.datumId = datumId;
}
/**
* 获取 事项编码
* @return String
*/
public String getMatterCode(){
return matterCode;
}
/**
* 设置 事项编码
* @param matterCode
*/
public void setMatterCode(String matterCode){
this.matterCode = matterCode;
}
/**
* 获取 材料名
* @return String
*/
public String getMaterialName(){
return materialName;
}
/**
* 设置 材料名
* @param materialName
*/
public void setMaterialName(String materialName){
this.materialName = materialName;
}
/**
* 获取 附件名称
* @return String
......@@ -87,17 +123,31 @@ public class MatterDatumFileEntity extends MatterDatumFileVo {
this.fileUrl = fileUrl;
}
/**
* 获取 附件类型 (1.示例样表，2.空白表格)
* @return Integer
* 获取 附件本地下载地址
* @return String
*/
public String getLocalFileUrl(){
return localFileUrl;
}
/**
* 设置 附件本地下载地址
* @param localFileUrl
*/
public void setLocalFileUrl(String localFileUrl){
this.localFileUrl = localFileUrl;
}
/**
* 获取 附件类型 (示例样表.示例样表，空白表格.空白表格)
* @return String
*/
public Integer getFiletype(){
public String getFiletype(){
return filetype;
}
/**
* 设置 附件类型 (1.示例样表，2.空白表格)
* 设置 附件类型 (示例样表.示例样表，空白表格.空白表格)
* @param filetype
*/
public void setFiletype(Integer filetype){
public void setFiletype(String filetype){
this.filetype = filetype;
}
/**
......@@ -114,20 +164,6 @@ public class MatterDatumFileEntity extends MatterDatumFileVo {
public void setSource(Integer source){
this.source = source;
}
/**
* 获取 材料名
* @return String
*/
public String getMaterialName(){
return materialName;
}
/**
* 设置 材料名
* @param materialName
*/
public void setMaterialName(String materialName){
this.materialName = materialName;
}
......@@ -151,11 +187,13 @@ public class MatterDatumFileEntity extends MatterDatumFileVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",datumId:").append(getDatumId());
sb.append(",matterCode:").append(getMatterCode());
sb.append(",materialName:").append(getMaterialName());
sb.append(",fileName:").append(getFileName());
sb.append(",fileUrl:").append(getFileUrl());
sb.append(",localFileUrl:").append(getLocalFileUrl());
sb.append(",filetype:").append(getFiletype());
sb.append(",source:").append(getSource());
sb.append(",materialName:").append(getMaterialName());
return sb.toString();
}
......@@ -163,14 +201,18 @@ public class MatterDatumFileEntity extends MatterDatumFileVo {
this.datumId = null;
this.fileName = null;
this.matterCode = "";
this.fileUrl = null;
this.materialName = "";
this.filetype = 1;
this.fileName = "";
this.source = 1;
this.fileUrl = "";
this.materialName = "";
this.localFileUrl = "";
this.filetype = "示例样表";
this.source = 1;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumFileQuery.java
View file @ ef84ec9e
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
* 材料附件查询对象
*
* @author zxfei
* @date 2022-01-17
* @date 2022-11-16
*/
public class MatterDatumFileQuery extends MatterDatumFileEntity {
/** 开始 主键，自增长 */
......@@ -33,23 +33,23 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
/** 材料id列表 */
private List <Long> datumIdList;
/** 事项编码 */
private List<String> matterCodeList;
/** 材料名 */
private List<String> materialNameList;
/** 附件名称 */
private List<String> fileNameList;
/** 附件下载地址 */
private List<String> fileUrlList;
/** 开始 附件类型 (1.示例样表，2.空白表格) */
private Integer filetypeStart;
/** 附件本地下载地址 */
private List<String> localFileUrlList;
/** 结束 附件类型 (1.示例样表，2.空白表格) */
private Integer filetypeEnd;
/** 增加 附件类型 (1.示例样表，2.空白表格) */
private Integer filetypeIncrement;
/** 附件类型 (1.示例样表，2.空白表格)列表 */
private List <Integer> filetypeList;
/** 附件类型 (示例样表.示例样表，空白表格.空白表格) */
private List<String> filetypeList;
/** 开始 附件来源 (0.政务网，1.自定义) */
private Integer sourceStart;
......@@ -87,9 +87,6 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
/** 结束 修改时间 */
private String updateTimeEnd;
/** 材料名 */
private List<String> materialNameList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<MatterDatumFileQuery> orConditionList;
......@@ -226,6 +223,36 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
this.datumIdList = datumIdList;
}
/**
* 获取 事项编码
* @return matterCodeList
*/
public List<String> getMatterCodeList(){
return this.matterCodeList;
}
/**
* 设置 事项编码
* @param matterCodeList
*/
public void setMatterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList;
}
/**
* 获取 材料名
* @return materialNameList
*/
public List<String> getMaterialNameList(){
return this.materialNameList;
}
/**
* 设置 材料名
* @param materialNameList
*/
public void setMaterialNameList(List<String> materialNameList){
this.materialNameList = materialNameList;
}
/**
* 获取 附件名称
* @return fileNameList
......@@ -257,69 +284,35 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
this.fileUrlList = fileUrlList;
}
/**
* 获取 开始 附件类型 (1.示例样表，2.空白表格)
* @return filetypeStart
* 获取 附件本地下载地址
* @return localFileUrlList
*/
public Integer getFiletypeStart(){
return this.filetypeStart;
public List<String> getLocalFileUrlList(){
return this.localFileUrlList;
}
/**
* 设置 开始 附件类型 (1.示例样表，2.空白表格)
* @param filetypeStart
* 设置 附件本地下载地址
* @param localFileUrlList
*/
public void setFiletypeStart(Integer filetypeStart){
this.filetypeStart = filetypeStart;
public void setLocalFileUrlList(List<String> localFileUrlList){
this.localFileUrlList = localFileUrlList;
}
/**
* 获取 结束 附件类型 (1.示例样表，2.空白表格)
* @return $filetypeEnd
*/
public Integer getFiletypeEnd(){
return this.filetypeEnd;
}
/**
* 设置 结束 附件类型 (1.示例样表，2.空白表格)
* @param filetypeEnd
*/
public void setFiletypeEnd(Integer filetypeEnd){
this.filetypeEnd = filetypeEnd;
}
/**
* 获取 增加 附件类型 (1.示例样表，2.空白表格)
* @return filetypeIncrement
*/
public Integer getFiletypeIncrement(){
return this.filetypeIncrement;
}
/**
* 设置 增加 附件类型 (1.示例样表，2.空白表格)
* @param filetypeIncrement
*/
public void setFiletypeIncrement(Integer filetypeIncrement){
this.filetypeIncrement = filetypeIncrement;
}
/**
* 获取 附件类型 (1.示例样表，2.空白表格)
* 获取 附件类型 (示例样表.示例样表，空白表格.空白表格)
* @return filetypeList
*/
public List<Integer> getFiletypeList(){
public List<String> getFiletypeList(){
return this.filetypeList;
}
/**
* 设置 附件类型 (1.示例样表，2.空白表格)
* 设置 附件类型 (示例样表.示例样表，空白表格.空白表格)
* @param filetypeList
*/
public void setFiletypeList(List<Integer> filetypeList){
public void setFiletypeList(List<String> filetypeList){
this.filetypeList = filetypeList;
}
/**
* 获取 开始 附件来源 (0.政务网，1.自定义)
* @return sourceStart
......@@ -512,21 +505,6 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 材料名
* @return materialNameList
*/
public List<String> getMaterialNameList(){
return this.materialNameList;
}
/**
* 设置 材料名
* @param materialNameList
*/
public void setMaterialNameList(List<String> materialNameList){
this.materialNameList = materialNameList;
}
/**
* 设置 主键，自增长
* @param id
......@@ -618,6 +596,44 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
}
/**
* 设置 事项编码
* @param matterCode
*/
public MatterDatumFileQuery matterCode(String matterCode){
setMatterCode(matterCode);
return this;
}
/**
* 设置 事项编码
* @param matterCodeList
*/
public MatterDatumFileQuery matterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList;
return this;
}
/**
* 设置 材料名
* @param materialName
*/
public MatterDatumFileQuery materialName(String materialName){
setMaterialName(materialName);
return this;
}
/**
* 设置 材料名
* @param materialNameList
*/
public MatterDatumFileQuery materialNameList(List<String> materialNameList){
this.materialNameList = materialNameList;
return this;
}
/**
* 设置 附件名称
* @param fileName
......@@ -655,47 +671,40 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
return this;
}
/**
* 设置 附件类型 (1.示例样表，2.空白表格)
* @param filetype
*/
public MatterDatumFileQuery filetype(Integer filetype){
setFiletype(filetype);
return this;
}
/**
* 设置 开始 附件类型 (1.示例样表，2.空白表格)
* @param filetypeStart
* 设置 附件本地下载地址
* @param localFileUrl
*/
public MatterDatumFileQuery filetypeStart(Integer filetypeStart){
this.filetypeStart = filetypeStart;
public MatterDatumFileQuery localFileUrl(String localFileUrl){
setLocalFileUrl(localFileUrl);
return this;
}
/**
* 设置 结束 附件类型 (1.示例样表，2.空白表格)
* @param filetypeEnd
* 设置 附件本地下载地址
* @param localFileUrlList
*/
public MatterDatumFileQuery filetypeEnd(Integer filetypeEnd){
this.filetypeEnd = filetypeEnd;
public MatterDatumFileQuery localFileUrlList(List<String> localFileUrlList){
this.localFileUrlList = localFileUrlList;
return this;
}
/**
* 设置 增加 附件类型 (1.示例样表，2.空白表格)
* @param filetypeIncrement
* 设置 附件类型 (示例样表.示例样表，空白表格.空白表格)
* @param filetype
*/
public MatterDatumFileQuery filetypeIncrement(Integer filetypeIncrement){
this.filetypeIncrement = filetypeIncrement;
public MatterDatumFileQuery filetype(String filetype){
setFiletype(filetype);
return this;
}
/**
* 设置 附件类型 (1.示例样表，2.空白表格)
* 设置 附件类型 (示例样表.示例样表，空白表格.空白表格)
* @param filetypeList
*/
public MatterDatumFileQuery filetypeList(List<Integer> filetypeList){
public MatterDatumFileQuery filetypeList(List<String> filetypeList){
this.filetypeList = filetypeList;
return this;
}
......@@ -792,25 +801,6 @@ public class MatterDatumFileQuery extends MatterDatumFileEntity {
}
/**
* 设置 材料名
* @param materialName
*/
public MatterDatumFileQuery materialName(String materialName){
setMaterialName(materialName);
return this;
}
/**
* 设置 材料名
* @param materialNameList
*/
public MatterDatumFileQuery materialNameList(List<String> materialNameList){
this.materialNameList = materialNameList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumQuery.java
View file @ ef84ec9e
......@@ -7,7 +7,7 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity;
* 事项申请材料查询对象
*
* @author zxfei
* @date 2022-01-17
* @date 2022-11-16
*/
public class MatterDatumQuery extends MatterDatumEntity {
/** 开始 主键，自增长 */
......@@ -34,6 +34,9 @@ public class MatterDatumQuery extends MatterDatumEntity {
/** 事项id列表 */
private List <Long> matterIdList;
/** 事项编码 */
private List<String> matterCodeList;
/** 事项名称 */
private List<String> matterNameList;
......@@ -272,6 +275,21 @@ public class MatterDatumQuery extends MatterDatumEntity {
this.matterIdList = matterIdList;
}
/**
* 获取 事项编码
* @return matterCodeList
*/
public List<String> getMatterCodeList(){
return this.matterCodeList;
}
/**
* 设置 事项编码
* @param matterCodeList
*/
public void setMatterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList;
}
/**
* 获取 事项名称
* @return matterNameList
......@@ -889,6 +907,25 @@ public class MatterDatumQuery extends MatterDatumEntity {
}
/**
* 设置 事项编码
* @param matterCode
*/
public MatterDatumQuery matterCode(String matterCode){
setMatterCode(matterCode);
return this;
}
/**
* 设置 事项编码
* @param matterCodeList
*/
public MatterDatumQuery matterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList;
return this;
}
/**
* 设置 事项名称
* @param matterName
......
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterFlowlimitEntity.java
View file @ ef84ec9e
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterFlowlimitVo;
* 事项办理流程实体对象
*
* @author zxfei
* @date 2022-01-12
* @date 2022-11-16
*/
public class MatterFlowlimitEntity extends MatterFlowlimitVo {
......@@ -21,6 +21,10 @@ public class MatterFlowlimitEntity extends MatterFlowlimitVo {
*/
private Long matterId;
/**
* 事项编码
*/
private String matterCode;
/**
* 事项名称
*/
private String matterName;
......@@ -63,6 +67,20 @@ public class MatterFlowlimitEntity extends MatterFlowlimitVo {
this.matterId = matterId;
}
/**
* 获取 事项编码
* @return String
*/
public String getMatterCode(){
return matterCode;
}
/**
* 设置 事项编码
* @param matterCode
*/
public void setMatterCode(String matterCode){
this.matterCode = matterCode;
}
/**
* 获取 事项名称
* @return String
*/
......@@ -169,6 +187,7 @@ public class MatterFlowlimitEntity extends MatterFlowlimitVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",matterId:").append(getMatterId());
sb.append(",matterCode:").append(getMatterCode());
sb.append(",matterName:").append(getMatterName());
sb.append(",flowName:").append(getFlowName());
sb.append(",flowTime:").append(getFlowTime());
......@@ -182,6 +201,8 @@ public class MatterFlowlimitEntity extends MatterFlowlimitVo {
this.matterId = 0L;
this.matterCode = "";
this.matterName = "";
this.flowName = "";
......
portal-manager/pom.xml
View file @ ef84ec9e
This diff is collapsed.
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