Commit 1312f0d3 authored by 赵啸非's avatar 赵啸非

添加公共庫

parent 9662b31b
......@@ -270,7 +270,6 @@
:materialsInfo="materialsInfo"
></PreviewMaterials>
<!-- 公共库 -->
<CommonLib :depList="depList" :libVisible.sync="libVisible"></CommonLib>
</div>
......
......@@ -118,11 +118,15 @@ export default {
data() {
return {
api: process.env.VUE_APP_API_BASE_URL + "/",
siteId: local.getLocal("sampleSiteId")
? local.getLocal("sampleSiteId")
: "",
form: {
materialName: "", // 材料名称
materiaFullName: "", // 材料全名
source: 1, // 来源
matterId: "", // 事项id
siteId: this.siteId, // 站點id
matterNo: "", // 事项编号
fileName: "", // 附件名称
fileUrl: "", // 附件地址
......
......@@ -117,27 +117,29 @@ CREATE TABLE mortals_xhx_matter
-- 事项申请材料业务表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_matter_datum`;
CREATE TABLE mortals_xhx_matter_datum
(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键,自增长',
`matterId` bigint(20) COMMENT '事项matter id',
`deptId` bigint(20) COMMENT '部门ID',
`deptCode` varchar(64) COMMENT '部门编号',
`materialName` varchar(1024) NOT NULL COMMENT '材料名',
`materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
`source` tinyint(2) COMMENT '事项来源(0.政务网,1.自定义)',
`isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐,1.推荐)',
`total` int(8) COMMENT '填单次数',
`sort` int(4) COMMENT '排序',
`sampleName` varchar(255) COMMENT '样表名称',
`samplePath` varchar(255) COMMENT '样表地址',
`preViewPath` varchar(255) COMMENT '样表预览地址',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`)
CREATE TABLE mortals_xhx_matter_datum(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键,自增长',
`matterId` bigint(20) COMMENT '事项matter id',
`siteId` bigint(20) COMMENT '站点ID',
`deptId` bigint(20) COMMENT '部门ID',
`deptCode` varchar(64) COMMENT '部门编号',
`materialName` varchar(1024) NOT NULL COMMENT '材料名',
`materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
`source` tinyint(2) COMMENT '事项来源(0.政务网,1.自定义)',
`isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐,1.推荐)',
`total` int(8) COMMENT '填单次数',
`sort` int(4) COMMENT '排序',
`sampleName` varchar(255) COMMENT '样表名称',
`samplePath` varchar(255) COMMENT '样表地址',
`preViewPath` varchar(255) COMMENT '样表预览地址',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料业务';
-- ----------------------------
-- 事项材料公共库表
-- ----------------------------
......
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterDatumVo;
* 事项申请材料业务实体对象
*
* @author zxfei
* @date 2022-11-10
* @date 2022-11-11
*/
public class MatterDatumEntity extends MatterDatumVo {
......@@ -20,6 +20,10 @@ public class MatterDatumEntity extends MatterDatumVo {
* 事项matter id
*/
private Long matterId;
/**
* 站点ID
*/
private Long siteId;
/**
* 部门ID
*/
......@@ -82,6 +86,20 @@ public class MatterDatumEntity extends MatterDatumVo {
public void setMatterId(Long matterId){
this.matterId = matterId;
}
/**
* 获取 站点ID
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点ID
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
* 获取 部门ID
* @return Long
......@@ -259,6 +277,7 @@ public class MatterDatumEntity extends MatterDatumVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",matterId:").append(getMatterId());
sb.append(",siteId:").append(getSiteId());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptCode:").append(getDeptCode());
sb.append(",materialName:").append(getMaterialName());
......@@ -277,6 +296,8 @@ public class MatterDatumEntity extends MatterDatumVo {
this.matterId = null;
this.siteId = null;
this.deptId = null;
this.deptCode = "";
......
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity;
* 事项申请材料业务查询对象
*
* @author zxfei
* @date 2022-11-10
* @date 2022-11-11
*/
public class MatterDatumQuery extends MatterDatumEntity {
/** 开始 主键,自增长 */
......@@ -33,6 +33,18 @@ public class MatterDatumQuery extends MatterDatumEntity {
/** 事项matter id列表 */
private List <Long> matterIdList;
/** 开始 站点ID */
private Long siteIdStart;
/** 结束 站点ID */
private Long siteIdEnd;
/** 增加 站点ID */
private Long siteIdIncrement;
/** 站点ID列表 */
private List <Long> siteIdList;
/** 开始 部门ID */
private Long deptIdStart;
......@@ -271,6 +283,70 @@ public class MatterDatumQuery extends MatterDatumEntity {
this.matterIdList = matterIdList;
}
/**
* 获取 开始 站点ID
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点ID
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点ID
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点ID
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点ID
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点ID
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点ID
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点ID
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 开始 部门ID
* @return deptIdStart
......@@ -899,6 +975,51 @@ public class MatterDatumQuery extends MatterDatumEntity {
return this;
}
/**
* 设置 站点ID
* @param siteId
*/
public MatterDatumQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点ID
* @param siteIdStart
*/
public MatterDatumQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点ID
* @param siteIdEnd
*/
public MatterDatumQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点ID
* @param siteIdIncrement
*/
public MatterDatumQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点ID
* @param siteIdList
*/
public MatterDatumQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 部门ID
* @param deptId
......
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