Skip to content

G
government-platform
Commit 5b62206d authored by 赵啸非's avatar 赵啸非
Browse files
Options

一件事统一办

parent a37864d9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 31187 additions and 6139 deletions
common-lib/pom.xml
View file @ 5b62206d
......@@ -44,10 +44,10 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bus-kafka</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-bus-kafka</artifactId>-->
<!-- </dependency>-->
<dependency>
......
common-lib/src/main/java/com/mortals/xhx/common/pdu/flow/FlowTaskPdu.java
View file @ 5b62206d
......@@ -29,6 +29,15 @@ public class FlowTaskPdu implements Serializable {
@ApiModelProperty("任务名称")
private String taskName;
@ApiModelProperty("是否为子任务,0否 1是")
private Integer subTask=0;
@ApiModelProperty("父任务编号")
private String parentTaskId;
@ApiModelProperty("业务系统key")
private String businessKey;
@ApiModelProperty("任务Key")
private String taskDefKey;
......
common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowTaskFeign.java
View file @ 5b62206d
......@@ -76,6 +76,18 @@ public interface IApiFlowTaskFeign extends IFeign {
ApiResp<Map<String, Object>> processVariables(@RequestBody CommonTaskReq req);
/**
* 设置流程变量
*
* @param req
* @return
*/
@PostMapping("/api/flow/task/setProcessVariables")
ApiResp<Map<String, Object>> setProcessVariables(@RequestBody CommonTaskReq req);
/**
* 撤回流程
*
......@@ -152,6 +164,15 @@ public interface IApiFlowTaskFeign extends IFeign {
ApiResp<String> assignTask(@RequestBody TurnTaskReq req);
/**
* 加签任务
*
* @param req
* @return
*/
@PostMapping("/api/flow/task/addSign")
ApiResp<String> addSignTask(@RequestBody AddSignTaskReq req);
/**
* 获取所有可回退的节点
*
......
common-lib/src/main/java/com/mortals/xhx/feign/task/CommonTaskReq.java
View file @ 5b62206d
......@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Map;
/**
* 任务参数
......@@ -22,4 +23,11 @@ public class CommonTaskReq extends BaseTaskReq implements Serializable {
@ApiModelProperty(value = "平台系统标识" , required = true)
private String platformSn;
/**
* 启动流程变量 选填
*/
@ApiModelProperty(value = "启动流程变量")
private Map<String, Object> variables;
}
common-lib/src/main/java/com/mortals/xhx/feign/task/TurnTaskReq.java
View file @ 5b62206d
......@@ -13,7 +13,7 @@ import java.io.Serializable;
* @date: 2021/8/26 17:23
*/
@Data
@ApiModel(value = "RejectTaskReq", description = "审批参数")
@ApiModel(value = "TurnTaskReq", description = "审批参数")
public class TurnTaskReq extends BaseTaskReq implements Serializable {
/**
* 被转办人工号 必填
......
common-lib/src/main/java/com/mortals/xhx/utils/stream/messaging/ProcessTaskProcessor.java
View file @ 5b62206d
package com.mortals.xhx.utils.stream.messaging;
/**
* @author karlhoo
*/
public interface ProcessTaskProcessor extends ProcessTaskSink, ProcessTaskSource {
}
//package com.mortals.xhx.utils.stream.messaging;
//
///**
// * @author karlhoo
// */
//public interface ProcessTaskProcessor extends ProcessTaskSink, ProcessTaskSource {
//}
common-lib/src/main/java/com/mortals/xhx/utils/stream/messaging/ProcessTaskSink.java
View file @ 5b62206d
package com.mortals.xhx.utils.stream.messaging;
import org.springframework.cloud.stream.annotation.Input;
import org.springframework.messaging.SubscribableChannel;
/**
* @author karlhoo
*/
public interface ProcessTaskSink {
String INPUT = "process-task-input";
@Input(ProcessTaskSink.INPUT)
SubscribableChannel input();
}
//package com.mortals.xhx.utils.stream.messaging;
//
//import org.springframework.cloud.stream.annotation.Input;
//import org.springframework.messaging.SubscribableChannel;
//
///**
// * @author karlhoo
// */
//public interface ProcessTaskSink {
// String INPUT = "process-task-input";
//
// @Input(ProcessTaskSink.INPUT)
// SubscribableChannel input();
//}
common-lib/src/main/java/com/mortals/xhx/utils/stream/messaging/ProcessTaskSource.java
View file @ 5b62206d
package com.mortals.xhx.utils.stream.messaging;
import org.springframework.cloud.stream.annotation.Output;
import org.springframework.messaging.MessageChannel;
/**
* @author karlhoo
*/
public interface ProcessTaskSource {
String OUTPUT = "process-task-output";
@Output(ProcessTaskSource.OUTPUT)
MessageChannel output();
}
//package com.mortals.xhx.utils.stream.messaging;
//
//import org.springframework.cloud.stream.annotation.Output;
//import org.springframework.messaging.MessageChannel;
//
///**
// * @author karlhoo
// */
//public interface ProcessTaskSource {
// String OUTPUT = "process-task-output";
//
// @Output(ProcessTaskSource.OUTPUT)
// MessageChannel output();
//}
common-lib/src/main/java/com/mortals/xhx/utils/stream/service/IMessageService.java
View file @ 5b62206d
package com.mortals.xhx.utils.stream.service;
import org.springframework.messaging.MessageChannel;
import org.springframework.validation.annotation.Validated;
/**
* 发送消息到消息中间件
*
* @author karlhoo
*/
@Validated
public interface IMessageService {
/**
* 向指定通道发送消息
*
* @param messageChannel
* @param message
* @return true: 成功
*/
boolean sendMessage( MessageChannel messageChannel, String message);
/**
* 向指定通道发送消息（带messageKey）
*
* @param messageChannel
* @param message
* @param messageKey
* @return true: 成功
*/
boolean sendMessage(MessageChannel messageChannel, String message, String messageKey);
}
//package com.mortals.xhx.utils.stream.service;
//
//import org.springframework.messaging.MessageChannel;
//import org.springframework.validation.annotation.Validated;
//
//
///**
// * 发送消息到消息中间件
// *
// * @author karlhoo
// */
//@Validated
//public interface IMessageService {
// /**
// * 向指定通道发送消息
// *
// * @param messageChannel
// * @param message
// * @return true: 成功
// */
// boolean sendMessage( MessageChannel messageChannel, String message);
//
// /**
// * 向指定通道发送消息（带messageKey）
// *
// * @param messageChannel
// * @param message
// * @param messageKey
// * @return true: 成功
// */
// boolean sendMessage(MessageChannel messageChannel, String message, String messageKey);
//
// }
common-lib/src/main/java/com/mortals/xhx/utils/stream/service/impl/DefaultMessageServiceImpl.java
View file @ 5b62206d
package com.mortals.xhx.utils.stream.service.impl;
import com.mortals.xhx.utils.stream.service.IMessageService;
import lombok.extern.apachecommons.CommonsLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.kafka.support.KafkaHeaders;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.stereotype.Component;
/**
* @author karlhoo
*/
@CommonsLog
@Component
public class DefaultMessageServiceImpl implements IMessageService {
@Override
public boolean sendMessage(MessageChannel messageChannel, String message) {
return sendMessage(messageChannel, message, null);
}
@Override
public boolean sendMessage(MessageChannel messageChannel, String message, String messageKey) {
return sendMessage(messageChannel, MessageBuilder.withPayload(message).setHeader(KafkaHeaders.MESSAGE_KEY, messageKey == null ? messageKey : messageKey.getBytes()).build());
}
private boolean sendMessage(MessageChannel messageChannel, Message message) {
try {
return messageChannel.send(message);
} catch (Exception e) {
log.error(String.format("提交消息出错 messageChannel: %s, message: %s", messageChannel.toString(), message.getPayload()), e);
return false;
}
}
}
//package com.mortals.xhx.utils.stream.service.impl;
//
//import com.mortals.xhx.utils.stream.service.IMessageService;
//import lombok.extern.apachecommons.CommonsLog;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.cloud.stream.annotation.EnableBinding;
//import org.springframework.kafka.support.KafkaHeaders;
//import org.springframework.messaging.Message;
//import org.springframework.messaging.MessageChannel;
//import org.springframework.messaging.support.MessageBuilder;
//import org.springframework.stereotype.Component;
//
///**
// * @author karlhoo
// */
//@CommonsLog
//@Component
//public class DefaultMessageServiceImpl implements IMessageService {
//
// @Override
// public boolean sendMessage(MessageChannel messageChannel, String message) {
// return sendMessage(messageChannel, message, null);
// }
//
// @Override
// public boolean sendMessage(MessageChannel messageChannel, String message, String messageKey) {
// return sendMessage(messageChannel, MessageBuilder.withPayload(message).setHeader(KafkaHeaders.MESSAGE_KEY, messageKey == null ? messageKey : messageKey.getBytes()).build());
// }
//
// private boolean sendMessage(MessageChannel messageChannel, Message message) {
// try {
// return messageChannel.send(message);
// } catch (Exception e) {
// log.error(String.format("提交消息出错 messageChannel: %s, message: %s", messageChannel.toString(), message.getPayload()), e);
// return false;
// }
// }
//
//}
government-manage-ui/admin/src/api/flowable/todo.js
View file @ 5b62206d
......@@ -19,14 +19,15 @@ export function assignTask(data) {
}
// 加签任务
export function addSignTask(data) {
return normalCallPost('/task/process/addSignTask', data)
}
// 退回任务
export function returnTask(data) {
return normalCallPost('/task/process/return', data)
// return request({
// url: '/flowable/task/return',
// method: 'post',
// data: data
// })
}
// 驳回任务
......@@ -65,36 +66,22 @@ export function deployStart(deployId) {
// 查询流程定义详细
export function getDeployment(id) {
// return request({
// url: '/system/deployment/' + id,
// method: 'get'
// })
}
// 新增流程定义
export function addDeployment(data) {
// return request({
// url: '/system/deployment',
// method: 'post',
// data: data
// })
}
// 修改流程定义
export function updateDeployment(data) {
// return request({
// url: '/system/deployment',
// method: 'put',
// data: data
// })
}
// 删除流程定义
export function delDeployment(id) {
// return request({
// url: '/system/deployment/' + id,
// method: 'delete'
// })
}
// 导出流程定义
......
government-manage-ui/admin/src/router.js
View file @ 5b62206d
......@@ -43,7 +43,7 @@ const router = new Router({
...restBuilder('member', 'member'), // 一件事管理-微信人员
...restBuilder('onething', 'onething'), // 一件事管理-微信人员提交审核材料
...restBuilder('yth/onething', 'onething'), // 一件事管理-微信人员提交审核材料
//在此添加业务模块
builder('/basics/index', 'basics/index'),//事项工作台
......@@ -51,6 +51,10 @@ const router = new Router({
...restBuilder('basics/info', 'basics/info'), // 一件事管理-基本信息
...restBuilder('accept', 'accept'), // 一件事管理-申请条件
...restBuilder('flowlimit', 'flowlimit'), // 一件事管理-办理流程
//问题引导页面
builder('one/classify/list', 'one/classify/list'),//分类引导表
...restBuilder('datum', 'datum'), // 一件事管理-材料库
......
government-manage-ui/admin/src/views/flowable/task/record/index.vue
View file @ 5b62206d
......@@ -40,50 +40,85 @@
</div>
<el-descriptions
style="margin-left: 20px; margin-bottom: 20px; font-size: 14px"
style="margin-bottom: 20px; font-size: 14px"
class="margin-top"
title="申请事项信息"
:column="3"
direction="vertical"
:column="4"
:size="size"
border
>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-user"></i>
用户名
联系人
</template>
kooriookami
{{ entity.linkman }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-mobile-phone"></i>
手机号
</template>
18100000000
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-location-outline"></i>
居住地
</template>
苏州市
{{ entity.phone }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-tickets"></i>
备注
<i class="el-icon-office-building"></i>
办理方式
</template>
<el-tag size="small">学校</el-tag>
本人办理
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-office-building"></i>
联系地址
邮寄地址
</template>
江苏省苏州市吴中区吴中大道 1188 号
{{ entity.address }}
</el-descriptions-item>
</el-descriptions>
<!--附件列表-->
<el-table
v-if="datumFileList.length > 0"
class="down"
:data="datumFileList"
border
stripe
style="width: 100%; margin-top: 20px; margin-bottom: 10px"
>
<el-table-column prop="datumid" label="材料名称">
<template slot-scope="scope">
<span style="margin-left: 10px">{{
util_formatter("datumid",scope.row.datumid)
}}</span>
</template>
</el-table-column>
<el-table-column prop="file" label="文件名称"></el-table-column>
<el-table-column prop="uploadtime" label="上传时间">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span style="margin-left: 10px">{{
formatterDate(scope.row.uploadtime)
}}</span>
</template>
</el-table-column>
<el-table-column width="150px" label="操作">
<template slot-scope="scope">
<el-button size="small" type="text">
<el-link
type="primary"
@click="downloadDatumFile(scope.row.id, scope.row.file)"
>下载</el-link
>
</el-button>
</template>
</el-table-column>
</el-table>
<!--审批流程模块-->
<div
style="margin-left: 20px; margin-bottom: 20px; font-size: 14px"
......@@ -137,16 +172,27 @@
</el-radio-group>
</el-form-item>
<el-form-item label="下一步办理人" prop="targetKey" v-show="taskForm.sendUserShow">
<el-select style="width: 50%" v-model="assignee" @change="handleCheckChange" :multiple="taskForm.multiple" placeholder="请选择">
<el-option
v-for="item in userDataList"
:key="item.loginName"
:label="item.realName"
:value="item.loginName">
</el-option>
</el-select>
</el-form-item>
<el-form-item
label="下一步办理人"
prop="targetKey"
v-show="taskForm.sendUserShow"
>
<el-select
style="width: 50%"
v-model="assignee"
@change="handleCheckChange"
:multiple="taskForm.multiple"
placeholder="请选择"
>
<el-option
v-for="item in userDataList"
:key="item.loginName"
:label="item.realName"
:value="item.loginName"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<div v-show="taskForm.defaultTaskShow">
......@@ -350,6 +396,7 @@ import {
getNextFlowNode,
delegate,
assignTask,
addSignTask
} from "@/api/flowable/todo";
import flow from "@/views/flowable/task/record/flow";
import Form from "../../../../components/Form.vue";
......@@ -370,22 +417,12 @@ export default {
},
// 模型xml数据
xmlData: "",
entity: {},
taskList: [],
fileList: [],
// // 任务列表
// taskList: [{
// // 任务定义的key
// "key": "Activity_0gtu56i",
// // 任务是否完成
// "completed": false
// },
// {
// // 任务定义的key
// "key": "Activity_02fkd13",
// // 任务是否完成
// "completed": true
// }],
// 遮罩层
datumFileList: [],
dict: {},
loading: true,
flowRecordList: [], // 流程流转数据
formConfCopy: {},
......@@ -424,6 +461,13 @@ export default {
},
created() {
console.log("index", this.$route.query);
//通过业务id查询详细
this.getBusinessDetail(this.$route.query.businessKey);
this.getBusinessFiles(this.$route.query.businessKey);
this.taskForm.deployId = this.$route.query && this.$route.query.deployId;
this.taskForm.taskId = this.$route.query && this.$route.query.taskId;
this.taskForm.processInstanceId =
......@@ -520,6 +564,38 @@ export default {
return num < 10 ? "0" + num : num;
},
// 从dict字段暴力取值，取不到则返回原值
util_formatter(key, val) {
try {
return this.dict[key][val];
} catch (error) {
return val;
}
},
getBusinessDetail(id) {
//获取业务详细
this.$post("/yth/onething/view", {
id: [id],
}).then((res) => {
console.log("business", res);
this.entity = res.data.entity;
});
},
getBusinessFiles(id) {
//获取业务详细
this.$post("/datum/file/list", {
"query.tid": id,
}).then((res) => {
console.log("business", res);
this.datumFileList = res.data.result;
this.dict = Object.assign({}, this.dict, res.data.dict);
});
},
/** xml 文件 */
getModelDetail(deployId) {
// 发送请求，获取xml
......@@ -595,7 +671,7 @@ export default {
// 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
getProcessVariables(taskId).then((res) => {
// this.variables = res.data.variables;
console.log(res);
console.log("流程变量信息", res);
//console.log("variablesData",this.variablesData);
//let json=JSON.parse(res.data.data);
this.variablesData = res.data.variables;
......@@ -608,9 +684,9 @@ export default {
// 根据当前任务或者流程设计配置的下一步节点 todo 暂时未涉及到考虑网关、表达式和多节点情况
const params = { taskId: taskId };
getNextFlowNode(params).then((res) => {
console.log("nextFlow",res)
console.log("nextFlow", res);
const data = res.data;
if (data&&data.dateType=="dynamic") {
if (data && data.dateType == "dynamic") {
if (data.type === "assignee") {
// this.userDataList = res.data.userList;
} else if (data.type === "candidateUsers") {
......@@ -656,6 +732,10 @@ export default {
} else if (this.taskDialog.type === "assign") {
this.taskForm.turnToUserId = this.assignee;
this.submitAssignTask();
} else if (this.taskDialog.type === "addSign") {
console.log(this.assignee)
this.taskForm.addSignUserList = this.assignee;
this.submitAddSignTask();
}
},
......@@ -683,6 +763,18 @@ export default {
});
},
/** 加签任务 */
submitAddSignTask() {
this.$refs["taskForm"].validate((valid) => {
if (valid) {
addSignTask(this.taskForm).then((response) => {
this.$message.success(response.msg);
this.goBack();
});
}
});
},
/** 委派任务 */
handleDelegate() {
console.log("委派人员，选择目标人员，进行办理");
......@@ -691,9 +783,6 @@ export default {
this.taskDialog.visible = true;
this.taskDialog.type = "delegate";
this.taskForm.multiple = false;
//this.taskForm.delegateTaskShow = true;
// this.taskForm.defaultTaskShow = false;
},
/** 转办任务 */
handleAssign() {
......@@ -702,6 +791,14 @@ export default {
this.taskDialog.type = "assign";
this.taskForm.multiple = false;
},
handleAddSign() {
console.log("加签")
this.taskDialog.title = "加签";
this.taskDialog.visible = true;
this.taskDialog.type = "addSign";
this.taskForm.multiple = true;
},
/** 返回页面 */
goBack() {
// 关闭当前标签页并返回上个页面
......
government-manage-ui/admin/src/views/flowable/task/todo/list.vue
View file @ 5b62206d
......@@ -55,6 +55,7 @@ window.addEventListener('onmessageWS', getsocketData)
procInsId: row.procInsId,
deployId: row.deployId,
taskId: row.taskId,
businessKey:row.businessKey,
finished: true,
},
});
......
government-manage-ui/admin/src/views/healthinfo/apply/list.vue deleted 100644 → 0
View file @ a37864d9
<template>
<div class="page">
<LayoutTable :data='tableData' :config='tableConfig' />
</div>
</template>
<script>
import table from "@/assets/mixins/table";
export default {
mixins: [table],
data() {
return {
config: {
search: [
],
columns: [
{type: "selection", width: 60},
{label: "ID", prop: "id", formatter: this.formatterString},
{label: "姓名", prop: "userName"},
{label: "身份证号", prop: "idCard"},
{label: "手机号", prop: "phone"},
{label: "居住区域", prop: "area"},
{label: "详细地址", prop: "address"},
{label: "住房类型", prop: "housingType"},
{label: "是否有新冠肺炎相关症状", prop: "isPneumonia"},
{label: "当前体温", prop: "curTemperature"},
{label: "图片", prop: "pic"},
{label: "创建人ID", prop: "createUserId", formatter: this.formatterString},
{
label: "操作",
width: 180,
formatter: row => {
return (
<div><el-button type="primary" icon="el-icon-edit" round size='mini' onClick={()=>{this.toEdit(row)}}>编辑</el-button></div>
);
}
}
]
}
};
}
};
</script>
\ No newline at end of file
government-manage-ui/admin/src/views/healthinfo/apply/show.vue deleted 100644 → 0
View file @ a37864d9
？<template>
<layout-form>
<el-form :model="form" :loading="loading" :rules="rules" size='small' style="width:100%" label-width='120px' ref="form">
<el-row>
<Field label="姓名" prop="userName" v-model="form.userName" placeholder="请输入姓名"/>
<Field label="身份证号" prop="idCard" v-model="form.idCard" placeholder="请输入身份证号"/>
<Field label="手机号" prop="phone" v-model="form.phone" placeholder="请输入手机号"/>
<Field label="居住区域" prop="area" v-model="form.area" placeholder="请输入居住区域"/>
<Field label="详细地址" prop="address" v-model="form.address" placeholder="请输入详细地址"/>
<Field label="住房类型" prop="housingType" v-model="form.housingType" placeholder="请输入住房类型"/>
<Field label="是否有新冠肺炎相关症状" prop="isPneumonia" v-model="form.isPneumonia" placeholder="请输入是否有新冠肺炎相关症状"/>
<Field label="当前体温" prop="curTemperature" v-model="form.curTemperature" placeholder="请输入当前体温"/>
<Field label="图片" prop="pic" v-model="form.pic" placeholder="请输入图片"/>
<Field label="创建人ID" prop="createUserId" v-model="form.createUserId" placeholder="请输入创建人ID"/>
</el-row>
<form-buttons @submit='submitForm'/>
</el-form>
</layout-form>
</template>
<script>
import form from "@/assets/mixins/form";
export default {
mixins: [form],
data() {
return {
};
}
};
</script>
\ No newline at end of file
government-manage-ui/admin/src/views/information/list.vue deleted 100644 → 0
View file @ a37864d9
<template>
<div class="page">
<LayoutTable :data='tableData' :config='tableConfig' />
</div>
</template>
<script>
import table from "@/assets/mixins/table";
export default {
mixins: [table],
data() {
return {
config: {
search: [
],
columns: [
{type: "selection", width: 60},
{label: "主键ID", prop: "id", formatter: this.formatterString},
{label: "实施清单名称", prop: "eventName"},
{label: "实施清单编码", prop: "eventCode"},
{label: "申请人属性", prop: "applicantAttributes"},
{label: "申请人证件类型", prop: "applicantCardType"},
{label: "申请人姓名", prop: "applicantName"},
{label: "申请人证件号码", prop: "applicantCardNumbe"},
{label: "申请人手机号码", prop: "applicantPhoneNumber"},
{label: "申请人性别", prop: "applicantSex"},
{label: "机构名称", prop: "organizationName"},
{label: "机构地址", prop: "organizationAddress"},
{label: "机构性质", prop: "organizationStructure"},
{label: "机构证件类型", prop: "organizationCardType"},
{label: "机构证件编码", prop: "organizationCardNumber"},
{label: "机构代表人姓名", prop: "legalPerson"},
{label: "流程开始时间", prop: "processStartedTime", formatter: this.formatterDate},
{label: "流程结束时间", prop: "processStopTime", formatter: this.formatterDate},
{label: "地区编码", prop: "areaCode"},
{label: "部门编码", prop: "deptCode"},
{label: "办件状态", prop: "bizStatus"},
{label: "办件类型(默认0 网络办件)", prop: "doThingProperty"},
{label: "办件名称", prop: "affairName"},
{label: "申请方式默认 1 网上申请", prop: "applyType"},
{label: "是否收费", prop: "isCharge"},
{label: "申请件数；默认传1", prop: "applyNum"},
{label: "取件方式 默认1现场取件", prop: "pickupType"},
{label: "节点类型", prop: "nodeType"},
{label: "节点处理人姓名", prop: "curHandlerName"},
{label: "节点处理人id (默认-1)", prop: "addUserId"},
{label: "是否同意(默认 1是)", prop: "auditAdvice"},
{label: "拟办意见(默认 同意)", prop: "auditRemark"},
{label: "流程开始时间", prop: "genTime", formatter: this.formatterDate},
{label: "流程结束时间", prop: "completeTime", formatter: this.formatterDate},
{label: "是否推送（0 否 1是）", prop: "isReport"},
{label: "是否成功（0 否 1是）", prop: "isSuccess"},
{label: "推送失败原因", prop: "failReason"},
{label: "失败次数", prop: "failTimes"},
{label: "联系人姓名", prop: "contactName"},
{label: "联系人证件号码", prop: "contactIdCard"},
{label: "联系人证件类型", prop: "contactCardType"},
{label: "联系人联系方式", prop: "contactPhone"},
{label: "受理人姓名", prop: "acceptName"},
{label: "受理人身份证号码", prop: "acceptId"},
{label: "受理人手机号", prop: "acceptPhone"},
{label: "系统编码", prop: "systemCode"},
{label: "办件编码", prop: "officeCode"},
{label: "办件业务流水号", prop: "seriesNumber"},
{label: "流程状态名称", prop: "processStatusName"},
{label: "流程状态编码", prop: "processStatusCode"},
{
label: "操作",
width: 180,
formatter: row => {
return (
<div><el-button type="primary" icon="el-icon-edit" round size='mini' onClick={()=>{this.toEdit(row)}}>编辑</el-button></div>
);
}
}
]
}
};
}
};
</script>
\ No newline at end of file
government-manage-ui/admin/src/views/information/show.vue deleted 100644 → 0
View file @ a37864d9
？<template>
<layout-form>
<el-form :model="form" :loading="loading" :rules="rules" size='small' style="width:100%" label-width='120px' ref="form">
<el-row>
<Field label="实施清单名称" prop="eventName" v-model="form.eventName" placeholder="请输入实施清单名称"/>
<Field label="实施清单编码" prop="eventCode" v-model="form.eventCode" placeholder="请输入实施清单编码"/>
<Field label="申请人属性" prop="applicantAttributes" v-model="form.applicantAttributes" placeholder="请输入申请人属性"/>
<Field label="申请人证件类型" prop="applicantCardType" v-model="form.applicantCardType" placeholder="请输入申请人证件类型"/>
<Field label="申请人姓名" prop="applicantName" v-model="form.applicantName" placeholder="请输入申请人姓名"/>
<Field label="申请人证件号码" prop="applicantCardNumbe" v-model="form.applicantCardNumbe" placeholder="请输入申请人证件号码"/>
<Field label="申请人手机号码" prop="applicantPhoneNumber" v-model="form.applicantPhoneNumber" placeholder="请输入申请人手机号码"/>
<Field label="申请人性别" prop="applicantSex" v-model="form.applicantSex" placeholder="请输入申请人性别"/>
<Field label="机构名称" prop="organizationName" v-model="form.organizationName" placeholder="请输入机构名称"/>
<Field label="机构地址" prop="organizationAddress" v-model="form.organizationAddress" placeholder="请输入机构地址"/>
<Field label="机构性质" prop="organizationStructure" v-model="form.organizationStructure" placeholder="请输入机构性质"/>
<Field label="机构证件类型" prop="organizationCardType" v-model="form.organizationCardType" placeholder="请输入机构证件类型"/>
<Field label="机构证件编码" prop="organizationCardNumber" v-model="form.organizationCardNumber" placeholder="请输入机构证件编码"/>
<Field label="机构代表人姓名" prop="legalPerson" v-model="form.legalPerson" placeholder="请输入机构代表人姓名"/>
<Field label="流程开始时间" prop="processStartedTime" v-model="form.processStartedTime" placeholder="请输入流程开始时间"/>
<Field label="流程结束时间" prop="processStopTime" v-model="form.processStopTime" placeholder="请输入流程结束时间"/>
<Field label="地区编码" prop="areaCode" v-model="form.areaCode" placeholder="请输入地区编码"/>
<Field label="部门编码" prop="dept_code" v-model="form.dept_code" placeholder="请输入部门编码"/>
<Field label="办件状态" prop="biz_status" v-model="form.biz_status" placeholder="请输入办件状态"/>
<Field label="办件类型(默认0 网络办件)" prop="do_thing_property" v-model="form.do_thing_property" placeholder="请输入办件类型(默认0 网络办件)"/>
<Field label="办件名称" prop="affair_name" v-model="form.affair_name" placeholder="请输入办件名称"/>
<Field label="申请方式默认 1 网上申请" prop="apply_type" v-model="form.apply_type" placeholder="请输入申请方式默认 1 网上申请"/>
<Field label="是否收费" prop="is_charge" v-model="form.is_charge" placeholder="请输入是否收费"/>
<Field label="申请件数；默认传1" prop="apply_num" v-model="form.apply_num" placeholder="请输入申请件数；默认传1"/>
<Field label="取件方式 默认1现场取件" prop="pickup_type" v-model="form.pickup_type" placeholder="请输入取件方式 默认1现场取件"/>
<Field label="节点类型" prop="node_type" v-model="form.node_type" placeholder="请输入节点类型"/>
<Field label="节点处理人姓名" prop="cur_handler_name" v-model="form.cur_handler_name" placeholder="请输入节点处理人姓名"/>
<Field label="节点处理人id (默认-1)" prop="add_user_id" v-model="form.add_user_id" placeholder="请输入节点处理人id (默认-1)"/>
<Field label="是否同意(默认 1是)" prop="audit_advice" v-model="form.audit_advice" placeholder="请输入是否同意(默认 1是)"/>
<Field label="拟办意见(默认 同意)" prop="audit_remark" v-model="form.audit_remark" placeholder="请输入拟办意见(默认 同意)"/>
<Field label="流程开始时间" prop="gen_time" v-model="form.gen_time" placeholder="请输入流程开始时间"/>
<Field label="流程结束时间" prop="complete_time" v-model="form.complete_time" placeholder="请输入流程结束时间"/>
<Field label="是否推送（0 否 1是）" prop="is_report" v-model="form.is_report" placeholder="请输入是否推送（0 否 1是）"/>
<Field label="是否成功（0 否 1是）" prop="is_success" v-model="form.is_success" placeholder="请输入是否成功（0 否 1是）"/>
<Field label="推送失败原因" prop="fail_reason" v-model="form.fail_reason" placeholder="请输入推送失败原因"/>
<Field label="失败次数" prop="fail_times" v-model="form.fail_times" placeholder="请输入失败次数"/>
<Field label="联系人姓名" prop="contact_name" v-model="form.contact_name" placeholder="请输入联系人姓名"/>
<Field label="联系人证件号码" prop="contact_id_card" v-model="form.contact_id_card" placeholder="请输入联系人证件号码"/>
<Field label="联系人证件类型" prop="contact_card_type" v-model="form.contact_card_type" placeholder="请输入联系人证件类型"/>
<Field label="联系人联系方式" prop="contact_phone" v-model="form.contact_phone" placeholder="请输入联系人联系方式"/>
<Field label="受理人姓名" prop="accept_name" v-model="form.accept_name" placeholder="请输入受理人姓名"/>
<Field label="受理人身份证号码" prop="accept_id" v-model="form.accept_id" placeholder="请输入受理人身份证号码"/>
<Field label="受理人手机号" prop="accept_phone" v-model="form.accept_phone" placeholder="请输入受理人手机号"/>
<Field label="系统编码" prop="systemCode" v-model="form.systemCode" placeholder="请输入系统编码"/>
<Field label="办件编码" prop="officeCode" v-model="form.officeCode" placeholder="请输入办件编码"/>
<Field label="办件业务流水号" prop="seriesNumber" v-model="form.seriesNumber" placeholder="请输入办件业务流水号"/>
<Field label="流程状态名称" prop="processStatusName" v-model="form.processStatusName" placeholder="请输入流程状态名称"/>
<Field label="流程状态编码" prop="processStatusCode" v-model="form.processStatusCode" placeholder="请输入流程状态编码"/>
</el-row>
<form-buttons @submit='submitForm'/>
</el-form>
</layout-form>
</template>
<script>
import form from "@/assets/mixins/form";
export default {
mixins: [form],
data() {
return {
};
}
};
</script>
\ No newline at end of file
government-manage-ui/admin/vue.config.js
View file @ 5b62206d
......@@ -11,6 +11,7 @@ module.exports = {
},
lintOnSave:false,
devServer: {
inline: true,
disableHostCheck: true,
port: 8082,
hot: true,//自动保存
......
government-manager/pom.xml
View file @ 5b62206d
......@@ -85,6 +85,20 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.jsonzou</groupId>
<artifactId>jmockdata</artifactId>
<version>4.2.0</version>
</dependency>
<dependency>
<groupId>com.github.javafaker</groupId>
<artifactId>javafaker</artifactId>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
......
government-manager/src/main/java/com/mortals/xhx/ManagerApplication.java
View file @ 5b62206d
package com.mortals.xhx;
import com.mortals.framework.springcloud.boot.BaseWebApplication;
import com.mortals.xhx.utils.stream.messaging.ProcessTaskSink;
import com.mortals.xhx.utils.stream.messaging.ProcessTaskSource;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.context.annotation.ImportResource;
//import springfox.documentation.swagger2.annotations.EnableSwagger2;
......@@ -15,7 +12,7 @@ import org.springframework.context.annotation.ImportResource;
@SpringBootApplication(scanBasePackages = {"com.mortals"})
@ServletComponentScan("com.mortals")
@ImportResource(locations = {"classpath:config/spring-config.xml"})
@EnableBinding({ProcessTaskSink.class})
//@EnableBinding({ProcessTaskSink.class})
public class ManagerApplication extends BaseWebApplication {
public static void main(String[] args) {
......
government-manager/src/main/java/com/mortals/xhx/base/framework/ws/handler/HeartBeatHandler.java
View file @ 5b62206d
......@@ -5,7 +5,6 @@ import com.mortals.xhx.base.framework.ws.message.SendResponse;
import com.mortals.xhx.base.framework.ws.message.SendToOneRequest;
import com.mortals.xhx.base.framework.ws.message.SendToUserRequest;
import com.mortals.xhx.base.framework.ws.util.WebSocketUtil;
import org.apache.kafka.common.requests.HeartbeatRequest;
import org.springframework.stereotype.Component;
import org.springframework.web.socket.WebSocketSession;
......
government-manager/src/main/java/com/mortals/xhx/base/framework/ws/websocket/WebSocketHandler.java
View file @ 5b62206d
......@@ -56,7 +56,7 @@ public class WebSocketHandler extends TextWebSocketHandler implements Initializi
@Override // 对应 message 事件
public void handleTextMessage(WebSocketSession session, TextMessage textMessage) throws Exception {
logger.info("[handleMessage][session({}) 接收到一条消息({})]", session, textMessage); // 生产环境下，请设置成 debug 级别
//logger.info("[handleMessage][session({}) 接收到一条消息({})]", session, textMessage); // 生产环境下，请设置成 debug 级别
try {
// 获得消息类型
JSONObject jsonMessage = JSON.parseObject(textMessage.getPayload());
......
government-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java
View file @ 5b62206d
......@@ -9,6 +9,7 @@ import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.code.UploadFileType;
import com.mortals.xhx.tools.uid.ISeqGeneratorService;
import lombok.Getter;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
......@@ -34,6 +35,7 @@ public class UploadServiceImpl implements UploadService {
private static Log log = LogFactory.getLog(UploadServiceImpl.class);
@Value("${upload.path}")
@Getter
private String filePath;
@Autowired
......
government-manager/src/main/java/com/mortals/xhx/busiz/WxOneThingApiController.java
View file @ 5b62206d
......@@ -10,7 +10,6 @@ import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.busiz.baseinfo.BaseInfoDetail;
import com.mortals.xhx.busiz.baseinfo.BaseInfoReq;
import com.mortals.xhx.busiz.login.DatumDataReq;
import com.mortals.xhx.busiz.matters.MattersInfo;
import com.mortals.xhx.busiz.matters.MyMattersReq;
import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo;
import com.mortals.xhx.busiz.oneProblemlist.OneProblemReq;
......@@ -36,6 +35,8 @@ import com.mortals.xhx.module.datum.service.DatumFileService;
import com.mortals.xhx.module.member.model.MemberEntity;
import com.mortals.xhx.module.member.model.MemberQuery;
import com.mortals.xhx.module.member.service.MemberService;
import com.mortals.xhx.module.yth.model.YthOnethingEntity;
import com.mortals.xhx.module.yth.model.YthOnethingQuery;
import com.mortals.xhx.module.yth.service.YthOnethingService;
import lombok.extern.apachecommons.CommonsLog;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -280,7 +281,11 @@ public class WxOneThingApiController {
rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
try {
boolean delete = FileUtil.delete(req.getFile_path());
String path = req.getFile_path().replace(config.getPrepath(), "");
String filePath = uploadService.getFilePath(path);
boolean delete = FileUtil.delete(filePath);
if (!delete) {
rsp.setMsg("未找到文件");
rsp.setCode(OneThingRespCodeEnum.FAILED.getValue());
......@@ -358,14 +363,14 @@ public class WxOneThingApiController {
* @return
*/
@PostMapping("thing/my_handle")
public ApiResp<List<MattersInfo>> myHandle(MyMattersReq req) {
ApiResp<List<MattersInfo>> rsp = new ApiResp<>();
public ApiResp<List<YthOnethingEntity>> myHandle(MyMattersReq req) {
ApiResp<List<YthOnethingEntity>> rsp = new ApiResp<>();
rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
try {
//todo 我的办理
//todo 我的办理信息
List<YthOnethingEntity> list = onethingService.find(new YthOnethingQuery().openId(req.getOpen_id()));
rsp.setData(list);
} catch (Exception e) {
log.error("我的办理失败", e);
rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
......
government-manager/src/main/java/com/mortals/xhx/busiz/WxOneThingController.http
View file @ 5b62206d
......@@ -48,25 +48,16 @@ Content-Type: multipart/form-data
--WebAppBoundary--
###材料创建
POST {{baseUrl}}/m//api/one/thing/create
Content-Type: application/x-www-form-urlencoded
memberId= 1&matterid= 41&uploadtime= 683&address= 黎桥8号， 江阴， 沪 949973&linkman= fon85y&phone= 802&updateTime= 12255555&manner= 0&getnum= aumqil&number= l6xlee&optionContent= ep6etx&isRevoke= 1&siteid= 143
###发起审批
POST {{baseUrl}}/m//api/one/thing/start
POST {{baseUrl}}/m/zwfw/proced/thing/upload_datum
Content-Type: application/x-www-form-urlencoded
oneThingId= 2
is_agent=0&open_id=aldadfijakdjkdknnciemdmdiadkkdmakd&manner=0&matterid=1&region_id=1&option_content=v1ia4x&phone=15719864910&name=正豪.丁&siteid=501&file_arr[0].datumid=3&file_arr[0].file=/upload/download/12312.jpg&idcard=510106198907211830
###发起审批
POST {{baseUrl}}/m/zwfw/proced/thing/upload_datum
###查询我的办理
POST {{baseUrl}}/m/zwfw/proced/thing/my_handle
Content-Type: application/x-www-form-urlencoded
is_agent=0&open_id=aldadfijakdjkdknnciemdmdiadkkdmakd&manner=0&matterid=1&region_id=1&option_content=v1ia4x&phone=15719864910&name=正豪.丁&siteid=501&file_arr[0].datumid=507&file_arr[0].file=3sh8vt&idcard=510106198907211830
open_id= aldadfijakdjkdknnciemdmdiadkkdmakd
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/common/code/TreeTypeEnum.java
View file @ 5b62206d
......@@ -7,9 +7,9 @@ import java.util.Map;
public enum TreeTypeEnum implements IBaseEnum{
DIR(0, "el-icon-folder"),
BOM (1, "el-icon-document"),
BOM_ITEM(2, "el-icon-s-tools");
TOPIC(0, "el-icon-folder"),
CLASSIFY (1, "el-icon-document"),
CLASSIFYOPTION(2, "el-icon-s-tools");
private int value;
private String desc;
......
government-manager/src/main/java/com/mortals/xhx/daemon/demo/RequestDispatchController.http
View file @ 5b62206d
......@@ -54,21 +54,7 @@ Content-Type: application/json
POST {{baseUrl}}/m/test/form
Content-Type: application/json
{
"entity":{
"formName":"test"
},
"id":[
1
],
"pageInfo":{
"currPage":2,
"prePageResult":100
},
"query":{
"formName":"111"
}
}
{}
###readImage
......
government-manager/src/main/java/com/mortals/xhx/daemon/demo/RequestDispatchController.java
View file @ 5b62206d
......@@ -3,10 +3,18 @@ package com.mortals.xhx.daemon.demo;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.func.VoidFunc0;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.PhoneUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.github.javafaker.*;
import com.github.jsonzou.jmockdata.JMockData;
import com.github.jsonzou.jmockdata.MockConfig;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.ThreadPool;
import com.mortals.xhx.common.model.RequestTaskReq;
import com.mortals.xhx.common.pdu.api.ApiReqPdu;
import com.mortals.xhx.common.pdu.api.ApiRespPdu;
......@@ -18,14 +26,19 @@ import com.mortals.xhx.module.form.web.FormForm;
import io.github.yedaxia.apidocs.Docs;
import io.github.yedaxia.apidocs.DocsConfig;
import lombok.extern.apachecommons.CommonsLog;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import reactor.core.publisher.Flux;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
/**
......@@ -65,23 +78,8 @@ public class RequestDispatchController {
return respPdu;
}
/**
* afdaf
*
* @param form
* @return
*/
@PostMapping("/form")
public ApiRespPdu form(@RequestBody FormForm form) {
ApiRespPdu<String> respPdu = new ApiRespPdu<>();
try {
respPdu.setData(JSON.toJSONString(form, SerializerFeature.DisableCircularReferenceDetect));
} catch (Exception e) {
log.error("error", e);
}
return respPdu;
}
/**
* adfafafd
......
government-manager/src/main/java/com/mortals/xhx/module/datum/web/DatumController.java
View file @ 5b62206d
......@@ -2,6 +2,7 @@ package com.mortals.xhx.module.datum.web;
import cn.hutool.core.io.IoUtil;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.upload.service.UploadService;
......@@ -9,6 +10,7 @@ import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.pdu.flow.FlowSaveXmlPdu;
import com.mortals.xhx.module.basics.web.BasicsForm;
import com.mortals.xhx.module.datum.model.DatumQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -22,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
import java.util.stream.Collectors;
/**
......@@ -42,6 +45,8 @@ public class DatumController extends BaseCRUDJsonMappingController<DatumService,
private ParamService paramService;
@Autowired
private UploadService uploadService;
@Autowired
private DatumService datumService;
public DatumController() {
super.setFormClass(DatumForm.class);
......@@ -61,6 +66,7 @@ public class DatumController extends BaseCRUDJsonMappingController<DatumService,
this.addDict(model, "paperGg", paramService.getParamByFirstOrganize(Constant.Param_paperGg));
this.addDict(model, "jianmMs", paramService.getParamByFirstOrganize(Constant.Param_jianmMs));
this.addDict(model, "sealWay", paramService.getParamByFirstOrganize(Constant.Param_sealWay));
//this.addDict(model, "datumn", datumService.find(new DatumQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(),y->y.getMaterialName())));
}
......@@ -86,4 +92,10 @@ public class DatumController extends BaseCRUDJsonMappingController<DatumService,
return ret.toJSONString();
}
@Override
protected int doListAfter(HttpServletRequest request, HttpServletResponse response, DatumForm form, Map<String, Object> model, Context context) throws AppException {
return super.doListAfter(request, response, form, model, context);
}
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/datum/web/DatumFileController.java
View file @ 5b62206d
package com.mortals.xhx.module.datum.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.datum.model.DatumQuery;
import com.mortals.xhx.module.datum.service.DatumService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.mortals.framework.web.BaseCRUDJsonMappingController;
import com.mortals.xhx.module.datum.model.DatumFileEntity;
import com.mortals.xhx.module.datum.service.DatumFileService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>Title: 申请材料附件表</p>
......@@ -18,10 +28,22 @@ import com.mortals.xhx.module.datum.service.DatumFileService;
@RestController
@RequestMapping("datum/file")
public class DatumFileController extends BaseCRUDJsonMappingController<DatumFileService,DatumFileForm,DatumFileEntity,Long> {
@Autowired
private DatumService datumService;
public DatumFileController(){
super.setFormClass(DatumFileForm.class);
super.setModuleDesc("申请材料附件表");
}
@Override
protected void init(HttpServletRequest request, HttpServletResponse response, DatumFileForm form, Map<String, Object> model, Context context) {
this.addDict(model, "datumid", datumService.find(new DatumQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getMaterialName())));
}
@Override
protected int doListAfter(HttpServletRequest request, HttpServletResponse response, DatumFileForm form, Map<String, Object> model, Context context) throws AppException {
return super.doListAfter(request, response, form, model, context);
}
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/one/dao/OneClassifyDao.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.one.model.OneClassifyEntity;
/**
* <p>Title: 分类引导表</p>
* <p>Description: OneClassifyDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface OneClassifyDao extends ICRUDDao<OneClassifyEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/OneClassifyTopicalDao.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.one.model.OneClassifyTopicalEntity;
/**
* <p>Title: 分类引导主题中间表</p>
* <p>Description: OneClassifyTopicalDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface OneClassifyTopicalDao extends ICRUDDao<OneClassifyTopicalEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/OneMaterialDao.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.one.model.OneMaterialEntity;
/**
* <p>Title: 目录清单应交材料表</p>
* <p>Description: OneMaterialDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface OneMaterialDao extends ICRUDDao<OneMaterialEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/YthMatterDao.java → government-manager/src/main/java/com/mortals/xhx/module/one/dao/OneMatterDao.java
View file @ 5b62206d
package com.mortals.xhx.module.yth.dao;
package com.mortals.xhx.module.one.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.yth.model.YthMatterEntity;
import com.mortals.xhx.module.one.model.OneMatterEntity;
/**
* <p>Title: 事项表</p>
* <p>Description: YthMatterDao DAO接口 </p>
* <p>Description: OneMatterDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface YthMatterDao extends ICRUDDao<YthMatterEntity,Long>{
public interface OneMatterDao extends ICRUDDao<OneMatterEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/OneMatterLabelDao.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.one.model.OneMatterLabelEntity;
/**
* <p>Title: 事项标签关联表</p>
* <p>Description: OneMatterLabelDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface OneMatterLabelDao extends ICRUDDao<OneMatterLabelEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/OneMatterResultDao.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.one.model.OneMatterResultEntity;
/**
* <p>Title: 事项结果表</p>
* <p>Description: OneMatterResultDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface OneMatterResultDao extends ICRUDDao<OneMatterResultEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/OneMatterSiteDao.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.one.model.OneMatterSiteEntity;
/**
* <p>Title: 站点事项关联表</p>
* <p>Description: OneMatterSiteDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface OneMatterSiteDao extends ICRUDDao<OneMatterSiteEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/OneSiteDao.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.one.model.OneSiteEntity;
/**
* <p>Title: 站点表</p>
* <p>Description: OneSiteDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface OneSiteDao extends ICRUDDao<OneSiteEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/OneTopicalDao.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.one.model.OneTopicalEntity;
/**
* <p>Title: 主题表</p>
* <p>Description: OneTopicalDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface OneTopicalDao extends ICRUDDao<OneTopicalEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/OneVillageDao.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.one.model.OneVillageEntity;
/**
* <p>Title: </p>
* <p>Description: OneVillageDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface OneVillageDao extends ICRUDDao<OneVillageEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/ibatis/OneClassifyDaoImpl.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.one.dao.OneClassifyDao;
import com.mortals.xhx.module.one.model.OneClassifyEntity;
/**
* <p>Title: 分类引导表</p>
* <p>Description: OneClassifyDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("oneClassifyDao")
public class OneClassifyDaoImpl extends BaseCRUDDaoMybatis<OneClassifyEntity,Long> implements OneClassifyDao {
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/ibatis/OneClassifyTopicalDaoImpl.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.one.dao.OneClassifyTopicalDao;
import com.mortals.xhx.module.one.model.OneClassifyTopicalEntity;
/**
* <p>Title: 分类引导主题中间表</p>
* <p>Description: OneClassifyTopicalDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("oneClassifyTopicalDao")
public class OneClassifyTopicalDaoImpl extends BaseCRUDDaoMybatis<OneClassifyTopicalEntity,Long> implements OneClassifyTopicalDao {
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/ibatis/OneMaterialDaoImpl.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.one.dao.OneMaterialDao;
import com.mortals.xhx.module.one.model.OneMaterialEntity;
/**
* <p>Title: 目录清单应交材料表</p>
* <p>Description: OneMaterialDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("oneMaterialDao")
public class OneMaterialDaoImpl extends BaseCRUDDaoMybatis<OneMaterialEntity,Long> implements OneMaterialDao {
}
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/ibatis/YthMatterDaoImpl.java → government-manager/src/main/java/com/mortals/xhx/module/one/dao/ibatis/OneMatterDaoImpl.java
View file @ 5b62206d
package com.mortals.xhx.module.yth.dao.ibatis;
package com.mortals.xhx.module.one.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.yth.dao.YthMatterDao;
import com.mortals.xhx.module.yth.model.YthMatterEntity;
import com.mortals.xhx.module.one.dao.OneMatterDao;
import com.mortals.xhx.module.one.model.OneMatterEntity;
/**
* <p>Title: 事项表</p>
* <p>Description: YthMatterDaoImpl DAO接口 </p>
* <p>Description: OneMatterDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("ythMatterDao")
public class YthMatterDaoImpl extends BaseCRUDDaoMybatis<YthMatterEntity,Long> implements YthMatterDao {
@Repository("oneMatterDao")
public class OneMatterDaoImpl extends BaseCRUDDaoMybatis<OneMatterEntity,Long> implements OneMatterDao {
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/ibatis/OneMatterLabelDaoImpl.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.one.dao.OneMatterLabelDao;
import com.mortals.xhx.module.one.model.OneMatterLabelEntity;
/**
* <p>Title: 事项标签关联表</p>
* <p>Description: OneMatterLabelDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("oneMatterLabelDao")
public class OneMatterLabelDaoImpl extends BaseCRUDDaoMybatis<OneMatterLabelEntity,Long> implements OneMatterLabelDao {
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/ibatis/OneMatterResultDaoImpl.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.one.dao.OneMatterResultDao;
import com.mortals.xhx.module.one.model.OneMatterResultEntity;
/**
* <p>Title: 事项结果表</p>
* <p>Description: OneMatterResultDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("oneMatterResultDao")
public class OneMatterResultDaoImpl extends BaseCRUDDaoMybatis<OneMatterResultEntity,Long> implements OneMatterResultDao {
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/ibatis/OneMatterSiteDaoImpl.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.one.dao.OneMatterSiteDao;
import com.mortals.xhx.module.one.model.OneMatterSiteEntity;
/**
* <p>Title: 站点事项关联表</p>
* <p>Description: OneMatterSiteDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("oneMatterSiteDao")
public class OneMatterSiteDaoImpl extends BaseCRUDDaoMybatis<OneMatterSiteEntity,Long> implements OneMatterSiteDao {
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/ibatis/OneSiteDaoImpl.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.one.dao.OneSiteDao;
import com.mortals.xhx.module.one.model.OneSiteEntity;
/**
* <p>Title: 站点表</p>
* <p>Description: OneSiteDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("oneSiteDao")
public class OneSiteDaoImpl extends BaseCRUDDaoMybatis<OneSiteEntity,Long> implements OneSiteDao {
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/ibatis/OneTopicalDaoImpl.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.one.dao.OneTopicalDao;
import com.mortals.xhx.module.one.model.OneTopicalEntity;
/**
* <p>Title: 主题表</p>
* <p>Description: OneTopicalDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("oneTopicalDao")
public class OneTopicalDaoImpl extends BaseCRUDDaoMybatis<OneTopicalEntity,Long> implements OneTopicalDao {
}
government-manager/src/main/java/com/mortals/xhx/module/one/dao/ibatis/OneVillageDaoImpl.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.one.dao.OneVillageDao;
import com.mortals.xhx.module.one.model.OneVillageEntity;
/**
* <p>Title: </p>
* <p>Description: OneVillageDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("oneVillageDao")
public class OneVillageDaoImpl extends BaseCRUDDaoMybatis<OneVillageEntity,Long> implements OneVillageDao {
}
government-manager/src/main/java/com/mortals/xhx/module/one/model/OneClassifyEntity.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.model;
import java.util.Date;
import com.mortals.framework.model.BaseEntityLong;
/**
*
* Description:OneClassify
* date: 2021-9-13 21:43:20
*/
public class OneClassifyEntity extends OneClassifyEntityExt{
private static final long serialVersionUID = 1631540600146L;
/**
* 分类名称
*/
private String classifyName;
/**
* 分类引导提问
*/
private String tName;
/**
* 分类级别
*/
private Integer classifyLevel;
/**
* 业务ID
*/
private String businessId;
/**
* 事项ID
*/
private String matterIds;
/**
* 站点ID
*/
private Long siteId;
/**
* 父级ID
*/
private Long parentId;
/**
* 分类备注
*/
private String sortRemarks;
/**
* 是否叶子节点，0否，1是 默认0
*/
private Integer isLeaf;
/**
* 是否删除
*/
private Integer deleted;
/**
* 创建人id
*/
private Long createUserId;
/**
* 创建人名称
*/
private String createUserName;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改人
*/
private Long updateUserId;
/**
* 修改人名称
*/
private String updateUserName;
/**
* 更新时间
*/
private Date updateTime;
public OneClassifyEntity(){
}
/**
* 获取 分类名称
* @return classifyName
*/
public String getClassifyName() {
return this.classifyName;
}
/**
* 设置 分类名称
* @param classifyName
*/
public void setClassifyName(String classifyName) {
this.classifyName = classifyName;
}
/**
* 获取 分类引导提问
* @return tName
*/
public String getTName() {
return this.tName;
}
/**
* 设置 分类引导提问
* @param tName
*/
public void setTName(String tName) {
this.tName = tName;
}
/**
* 获取 分类级别
* @return classifyLevel
*/
public Integer getClassifyLevel() {
return this.classifyLevel;
}
/**
* 设置 分类级别
* @param classifyLevel
*/
public void setClassifyLevel(Integer classifyLevel) {
this.classifyLevel = classifyLevel;
}
/**
* 获取 业务ID
* @return businessId
*/
public String getBusinessId() {
return this.businessId;
}
/**
* 设置 业务ID
* @param businessId
*/
public void setBusinessId(String businessId) {
this.businessId = businessId;
}
/**
* 获取 事项ID
* @return matterIds
*/
public String getMatterIds() {
return this.matterIds;
}
/**
* 设置 事项ID
* @param matterIds
*/
public void setMatterIds(String matterIds) {
this.matterIds = matterIds;
}
/**
* 获取 站点ID
* @return siteId
*/
public Long getSiteId() {
return this.siteId;
}
/**
* 设置 站点ID
* @param siteId
*/
public void setSiteId(Long siteId) {
this.siteId = siteId;
}
/**
* 获取 父级ID
* @return parentId
*/
public Long getParentId() {
return this.parentId;
}
/**
* 设置 父级ID
* @param parentId
*/
public void setParentId(Long parentId) {
this.parentId = parentId;
}
/**
* 获取 分类备注
* @return sortRemarks
*/
public String getSortRemarks() {
return this.sortRemarks;
}
/**
* 设置 分类备注
* @param sortRemarks
*/
public void setSortRemarks(String sortRemarks) {
this.sortRemarks = sortRemarks;
}
/**
* 获取 是否叶子节点，0否，1是 默认0
* @return isLeaf
*/
public Integer getIsLeaf() {
return this.isLeaf;
}
/**
* 设置 是否叶子节点，0否，1是 默认0
* @param isLeaf
*/
public void setIsLeaf(Integer isLeaf) {
this.isLeaf = isLeaf;
}
/**
* 获取 是否删除
* @return deleted
*/
public Integer getDeleted() {
return this.deleted;
}
/**
* 设置 是否删除
* @param deleted
*/
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/**
* 获取 创建人id
* @return createUserId
*/
public Long getCreateUserId() {
return this.createUserId;
}
/**
* 设置 创建人id
* @param createUserId
*/
public void setCreateUserId(Long createUserId) {
this.createUserId = createUserId;
}
/**
* 获取 创建人名称
* @return createUserName
*/
public String getCreateUserName() {
return this.createUserName;
}
/**
* 设置 创建人名称
* @param createUserName
*/
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
/**
* 获取 创建时间
* @return createTime
*/
public Date getCreateTime() {
return this.createTime;
}
/**
* 设置 创建时间
* @param createTime
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* 获取 修改人
* @return updateUserId
*/
public Long getUpdateUserId() {
return this.updateUserId;
}
/**
* 设置 修改人
* @param updateUserId
*/
public void setUpdateUserId(Long updateUserId) {
this.updateUserId = updateUserId;
}
/**
* 获取 修改人名称
* @return updateUserName
*/
public String getUpdateUserName() {
return this.updateUserName;
}
/**
* 设置 修改人名称
* @param updateUserName
*/
public void setUpdateUserName(String updateUserName) {
this.updateUserName = updateUserName;
}
/**
* 获取 更新时间
* @return updateTime
*/
public Date getUpdateTime() {
return this.updateTime;
}
/**
* 设置 更新时间
* @param updateTime
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null)
return false;
if (obj instanceof OneClassifyEntity) {
OneClassifyEntity tmp = (OneClassifyEntity) obj;
if (this.getId().longValue() == tmp.getId().longValue()) {
return true;
}
}
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb
.append(",id:").append(getId())
.append(",classifyName:").append(getClassifyName())
.append(",tName:").append(getTName())
.append(",classifyLevel:").append(getClassifyLevel())
.append(",businessId:").append(getBusinessId())
.append(",matterIds:").append(getMatterIds())
.append(",siteId:").append(getSiteId())
.append(",parentId:").append(getParentId())
.append(",sortRemarks:").append(getSortRemarks())
.append(",isLeaf:").append(getIsLeaf())
.append(",deleted:").append(getDeleted())
.append(",createUserId:").append(getCreateUserId())
.append(",createUserName:").append(getCreateUserName())
.append(",createTime:").append(getCreateTime())
.append(",updateUserId:").append(getUpdateUserId())
.append(",updateUserName:").append(getUpdateUserName())
.append(",updateTime:").append(getUpdateTime())
;
return sb.toString();
}
public void initAttrValue(){
this.classifyName = null;
this.tName = null;
this.classifyLevel = null;
this.businessId = null;
this.matterIds = null;
this.siteId = null;
this.parentId = null;
this.sortRemarks = null;
this.isLeaf = null;
this.deleted = null;
this.createUserId = null;
this.createUserName = null;
this.createTime = null;
this.updateUserId = null;
this.updateUserName = null;
this.updateTime = null;
}
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/one/model/OneClassifyEntityExt.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.model;
import com.mortals.framework.model.BaseEntityLong;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.util.List;
/**
*
* Description:OneClassify
* date: 2021-9-13 16:21:34
*/
@Setter
@Getter
public class OneClassifyEntityExt extends BaseEntityLong{
private List<OneClassifyEntity> children;
private boolean hasChildren;
private String matterNames;
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/one/model/OneClassifyTopicalEntity.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.model;
import java.util.Date;
import com.mortals.framework.model.BaseEntityLong;
/**
*
* Description:OneClassifyTopical
* date: 2021-9-13 16:21:34
*/
public class OneClassifyTopicalEntity extends BaseEntityLong{
private static final long serialVersionUID = 1631521294913L;
/**
* 主题id
*/
private Long topicalId;
/**
* 分类引导id
*/
private Long classifyId;
/**
* 分类引导排序
*/
private Integer classifyRank;
/**
* 终端主题包图标（建议图标尺寸为290px*180px，格式为png）
*/
private String terminalIcon;
/**
* 移动主题包图标（建议图标尺寸为42px*42px，格式为png）
*/
private String moveIcon;
/**
* 承诺办结方式（1 即办，2 工作日）
*/
private Integer overWay;
/**
* 承诺办结时限
*/
private String overTime;
/**
* 站点id
*/
private Long siteId;
/**
* 事项id(多个事项以逗号隔开)
*/
private String matterId;
/**
* 到现场次数
*/
private Integer presenceNum;
/**
*
*/
private Integer deleted;
/**
* 创建人id
*/
private Long createUserId;
/**
* 创建人名称
*/
private String createUserName;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改人
*/
private Long updateUserId;
/**
* 修改人名称
*/
private String updateUserName;
/**
* 更新时间
*/
private Date updateTime;
public OneClassifyTopicalEntity(){
}
/**
* 获取 主题id
* @return topicalId
*/
public Long getTopicalId() {
return this.topicalId;
}
/**
* 设置 主题id
* @param topicalId
*/
public void setTopicalId(Long topicalId) {
this.topicalId = topicalId;
}
/**
* 获取 分类引导id
* @return classifyId
*/
public Long getClassifyId() {
return this.classifyId;
}
/**
* 设置 分类引导id
* @param classifyId
*/
public void setClassifyId(Long classifyId) {
this.classifyId = classifyId;
}
/**
* 获取 分类引导排序
* @return classifyRank
*/
public Integer getClassifyRank() {
return this.classifyRank;
}
/**
* 设置 分类引导排序
* @param classifyRank
*/
public void setClassifyRank(Integer classifyRank) {
this.classifyRank = classifyRank;
}
/**
* 获取 终端主题包图标（建议图标尺寸为290px*180px，格式为png）
* @return terminalIcon
*/
public String getTerminalIcon() {
return this.terminalIcon;
}
/**
* 设置 终端主题包图标（建议图标尺寸为290px*180px，格式为png）
* @param terminalIcon
*/
public void setTerminalIcon(String terminalIcon) {
this.terminalIcon = terminalIcon;
}
/**
* 获取 移动主题包图标（建议图标尺寸为42px*42px，格式为png）
* @return moveIcon
*/
public String getMoveIcon() {
return this.moveIcon;
}
/**
* 设置 移动主题包图标（建议图标尺寸为42px*42px，格式为png）
* @param moveIcon
*/
public void setMoveIcon(String moveIcon) {
this.moveIcon = moveIcon;
}
/**
* 获取 承诺办结方式（1 即办，2 工作日）
* @return overWay
*/
public Integer getOverWay() {
return this.overWay;
}
/**
* 设置 承诺办结方式（1 即办，2 工作日）
* @param overWay
*/
public void setOverWay(Integer overWay) {
this.overWay = overWay;
}
/**
* 获取 承诺办结时限
* @return overTime
*/
public String getOverTime() {
return this.overTime;
}
/**
* 设置 承诺办结时限
* @param overTime
*/
public void setOverTime(String overTime) {
this.overTime = overTime;
}
/**
* 获取 站点id
* @return siteId
*/
public Long getSiteId() {
return this.siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId) {
this.siteId = siteId;
}
/**
* 获取 事项id(多个事项以逗号隔开)
* @return matterId
*/
public String getMatterId() {
return this.matterId;
}
/**
* 设置 事项id(多个事项以逗号隔开)
* @param matterId
*/
public void setMatterId(String matterId) {
this.matterId = matterId;
}
/**
* 获取 到现场次数
* @return presenceNum
*/
public Integer getPresenceNum() {
return this.presenceNum;
}
/**
* 设置 到现场次数
* @param presenceNum
*/
public void setPresenceNum(Integer presenceNum) {
this.presenceNum = presenceNum;
}
/**
* 获取
* @return deleted
*/
public Integer getDeleted() {
return this.deleted;
}
/**
* 设置
* @param deleted
*/
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/**
* 获取 创建人id
* @return createUserId
*/
public Long getCreateUserId() {
return this.createUserId;
}
/**
* 设置 创建人id
* @param createUserId
*/
public void setCreateUserId(Long createUserId) {
this.createUserId = createUserId;
}
/**
* 获取 创建人名称
* @return createUserName
*/
public String getCreateUserName() {
return this.createUserName;
}
/**
* 设置 创建人名称
* @param createUserName
*/
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
/**
* 获取 创建时间
* @return createTime
*/
public Date getCreateTime() {
return this.createTime;
}
/**
* 设置 创建时间
* @param createTime
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* 获取 修改人
* @return updateUserId
*/
public Long getUpdateUserId() {
return this.updateUserId;
}
/**
* 设置 修改人
* @param updateUserId
*/
public void setUpdateUserId(Long updateUserId) {
this.updateUserId = updateUserId;
}
/**
* 获取 修改人名称
* @return updateUserName
*/
public String getUpdateUserName() {
return this.updateUserName;
}
/**
* 设置 修改人名称
* @param updateUserName
*/
public void setUpdateUserName(String updateUserName) {
this.updateUserName = updateUserName;
}
/**
* 获取 更新时间
* @return updateTime
*/
public Date getUpdateTime() {
return this.updateTime;
}
/**
* 设置 更新时间
* @param updateTime
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null)
return false;
if (obj instanceof OneClassifyTopicalEntity) {
OneClassifyTopicalEntity tmp = (OneClassifyTopicalEntity) obj;
if (this.getId().longValue() == tmp.getId().longValue()) {
return true;
}
}
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb
.append(",id:").append(getId())
.append(",topicalId:").append(getTopicalId())
.append(",classifyId:").append(getClassifyId())
.append(",classifyRank:").append(getClassifyRank())
.append(",terminalIcon:").append(getTerminalIcon())
.append(",moveIcon:").append(getMoveIcon())
.append(",overWay:").append(getOverWay())
.append(",overTime:").append(getOverTime())
.append(",siteId:").append(getSiteId())
.append(",matterId:").append(getMatterId())
.append(",presenceNum:").append(getPresenceNum())
.append(",deleted:").append(getDeleted())
.append(",createUserId:").append(getCreateUserId())
.append(",createUserName:").append(getCreateUserName())
.append(",createTime:").append(getCreateTime())
.append(",updateUserId:").append(getUpdateUserId())
.append(",updateUserName:").append(getUpdateUserName())
.append(",updateTime:").append(getUpdateTime())
;
return sb.toString();
}
public void initAttrValue(){
this.topicalId = null;
this.classifyId = null;
this.classifyRank = null;
this.terminalIcon = null;
this.moveIcon = null;
this.overWay = null;
this.overTime = null;
this.siteId = null;
this.matterId = null;
this.presenceNum = null;
this.deleted = null;
this.createUserId = null;
this.createUserName = null;
this.createTime = null;
this.updateUserId = null;
this.updateUserName = null;
this.updateTime = null;
}
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/model/YthAcceptEntity.java → government-manager/src/main/java/com/mortals/xhx/module/one/model/OneVillageEntity.java
View file @ 5b62206d
package com.mortals.xhx.module.yth.model;
package com.mortals.xhx.module.one.model;
import java.util.Date;
import com.mortals.framework.model.BaseEntityLong;
/**
*
* Description:YthAccept
* date: 2021-9-7 10:49:11
* Description:OneVillage
* date: 2021-9-13 16:21:35
*/
public class YthAcceptEntity extends BaseEntityLong{
private static final long serialVersionUID = 1630982951439L;
public class OneVillageEntity extends BaseEntityLong{
private static final long serialVersionUID = 1631521295060L;
/**
* 受理标准
*
*/
private String content;
private Long siteid;
/**
* 事项id
*
*/
private Long matterid;
private String name;
/**
*
*/
private String tid;
private String areaCode;
/**
* 创建时间
......@@ -36,50 +36,50 @@ public class YthAcceptEntity extends BaseEntityLong{
*/
private String createUser;
public YthAcceptEntity(){
public OneVillageEntity(){
}
/**
* 获取 受理标准
* @return content
* 获取
* @return siteid
*/
public String getContent() {
return this.content;
public Long getSiteid() {
return this.siteid;
}
/**
* 设置 受理标准
* @param content
* 设置
* @param siteid
*/
public void setContent(String content) {
this.content = content;
public void setSiteid(Long siteid) {
this.siteid = siteid;
}
/**
* 获取 事项id
* @return matterid
* 获取
* @return name
*/
public Long getMatterid() {
return this.matterid;
public String getName() {
return this.name;
}
/**
* 设置 事项id
* @param matterid
* 设置
* @param name
*/
public void setMatterid(Long matterid) {
this.matterid = matterid;
public void setName(String name) {
this.name = name;
}
/**
* 获取
* @return tid
* @return areaCode
*/
public String getTid() {
return this.tid;
public String getAreaCode() {
return this.areaCode;
}
/**
* 设置
* @param tid
* @param areaCode
*/
public void setTid(String tid) {
this.tid = tid;
public void setAreaCode(String areaCode) {
this.areaCode = areaCode;
}
/**
* 获取 创建时间
......@@ -118,8 +118,8 @@ public class YthAcceptEntity extends BaseEntityLong{
public boolean equals(Object obj) {
if (obj == null)
return false;
if (obj instanceof YthAcceptEntity) {
YthAcceptEntity tmp = (YthAcceptEntity) obj;
if (obj instanceof OneVillageEntity) {
OneVillageEntity tmp = (OneVillageEntity) obj;
if (this.getId().longValue() == tmp.getId().longValue()) {
return true;
}
......@@ -131,9 +131,9 @@ public class YthAcceptEntity extends BaseEntityLong{
StringBuilder sb = new StringBuilder("");
sb
.append(",id:").append(getId())
.append(",content:").append(getContent())
.append(",matterid:").append(getMatterid())
.append(",tid:").append(getTid())
.append(",siteid:").append(getSiteid())
.append(",name:").append(getName())
.append(",areaCode:").append(getAreaCode())
.append(",createTime:").append(getCreateTime())
.append(",createUser:").append(getCreateUser())
;
......@@ -141,15 +141,10 @@ public class YthAcceptEntity extends BaseEntityLong{
}
public void initAttrValue(){
this.content = null;
this.matterid = null;
this.tid = null;
this.siteid = null;
this.name = null;
this.areaCode = null;
this.createTime = null;
this.createUser = null;
}
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/one/service/OneClassifyService.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.one.model.OneClassifyEntity;
/**
* <p>Title: 分类引导表</p>
* <p>Description: OneClassifyService service接口 </p>
* <p>Copyright: Copyright &reg; </p>
* @version 1.0.0
*/
public interface OneClassifyService extends ICRUDService<OneClassifyEntity,Long>{
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/one/service/OneClassifyTopicalService.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.one.model.OneClassifyTopicalEntity;
/**
* <p>Title: 分类引导主题中间表</p>
* <p>Description: OneClassifyTopicalService service接口 </p>
* <p>Copyright: Copyright &reg; </p>
* @version 1.0.0
*/
public interface OneClassifyTopicalService extends ICRUDService<OneClassifyTopicalEntity,Long>{
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/one/service/OneMaterialService.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.one.model.OneMaterialEntity;
/**
* <p>Title: 目录清单应交材料表</p>
* <p>Description: OneMaterialService service接口 </p>
* <p>Copyright: Copyright &reg; </p>
* @version 1.0.0
*/
public interface OneMaterialService extends ICRUDService<OneMaterialEntity,Long>{
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/one/service/OneMatterLabelService.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.one.model.OneMatterLabelEntity;
/**
* <p>Title: 事项标签关联表</p>
* <p>Description: OneMatterLabelService service接口 </p>
* <p>Copyright: Copyright &reg; </p>
* @version 1.0.0
*/
public interface OneMatterLabelService extends ICRUDService<OneMatterLabelEntity,Long>{
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/one/service/OneMatterResultService.java 0 → 100644
View file @ 5b62206d
package com.mortals.xhx.module.one.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.one.model.OneMatterResultEntity;
/**
* <p>Title: 事项结果表</p>
* <p>Description: OneMatterResultService service接口 </p>
* <p>Copyright: Copyright &reg; </p>
* @version 1.0.0
*/
public interface OneMatterResultService extends ICRUDService<OneMatterResultEntity,Long>{
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/service/YthMatterService.java → government-manager/src/main/java/com/mortals/xhx/module/one/service/OneMatterService.java
View file @ 5b62206d
package com.mortals.xhx.module.yth.service;
package com.mortals.xhx.module.one.service;
import com.mortals.framework.service.ICRUDCacheService;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.yth.model.YthMatterEntity;
import com.mortals.xhx.module.one.model.OneMatterEntity;
/**
* <p>Title: 事项表</p>
* <p>Description: YthMatterService service接口 </p>
* <p>Description: OneMatterService service接口 </p>
* <p>Copyright: Copyright &reg; </p>
* @version 1.0.0
*/
public interface YthMatterService extends ICRUDService<YthMatterEntity,Long>{
public interface OneMatterService extends ICRUDCacheService<OneMatterEntity,Long> {
}
\ No newline at end of file
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