Skip to content

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

一件事统一办

parent e97e352e
Hide whitespace changes
Inline Side-by-side
Showing with 3428 additions and 1888 deletions
government-manage-ui/admin/src/views/flowable/task/record/index.vue
View file @ 731df811
...@@ -27,17 +27,14 @@ ...@@ -27,17 +27,14 @@
</el-dialog> </el-dialog>
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span class="el-icon-document">基础信息</span> <span class="el-icon-document">办理信息</span>
<el-button style="float: right" type="primary" @click="goBack" <el-button style="float: right" type="primary" @click="goBack"
>返回</el-button >返回</el-button
> >
</div> </div>
<el-col :span="16" :offset="6" v-if="variableOpen"> <el-col :span="16" :offset="6" v-if="variableOpen">
<!--申请流程初始化表单模块-->
<div>
<!-- <parser :key="new Date().getTime()" :form-conf="variablesData" /> -->
</div>
<el-descriptions <el-descriptions
style="margin-bottom: 20px; font-size: 14px" style="margin-bottom: 20px; font-size: 14px"
...@@ -466,7 +463,7 @@ export default { ...@@ -466,7 +463,7 @@ export default {
this.getBusinessDetail(this.$route.query.businessKey); this.getBusinessDetail(this.$route.query.businessKey);
this.getBusinessFiles(this.$route.query.businessKey); //this.getBusinessFiles(this.$route.query.businessKey);
this.taskForm.deployId = this.$route.query && this.$route.query.deployId; this.taskForm.deployId = this.$route.query && this.$route.query.deployId;
this.taskForm.taskId = this.$route.query && this.$route.query.taskId; this.taskForm.taskId = this.$route.query && this.$route.query.taskId;
...@@ -574,7 +571,7 @@ export default { ...@@ -574,7 +571,7 @@ export default {
}, },
getBusinessDetail(id) { getBusinessDetail(id) {
//获取业务详细 //获取业务信息
this.$post("/yth/onething/view", { this.$post("/yth/onething/view", {
id: [id], id: [id],
}).then((res) => { }).then((res) => {
...@@ -584,17 +581,17 @@ export default { ...@@ -584,17 +581,17 @@ export default {
}); });
}, },
getBusinessFiles(id) { // getBusinessFiles(id) {
//获取业务详细 // //获取业务详细
this.$post("/datum/file/list", { // this.$post("/datum/file/list", {
"query.tid": id, // "query.tid": id,
}).then((res) => { // }).then((res) => {
console.log("business", res); // console.log("business", res);
this.datumFileList = res.data.result; // this.datumFileList = res.data.result;
this.dict = Object.assign({}, this.dict, res.data.dict); // this.dict = Object.assign({}, this.dict, res.data.dict);
}); // });
}, // },
/** xml 文件 */ /** xml 文件 */
getModelDetail(deployId) { getModelDetail(deployId) {
......
government-manager/src/main/java/com/mortals/xhx/busiz/BaseMapper.java
View file @ 731df811
package com.mortals.xhx.busiz; package com.mortals.xhx.busiz;
import com.mortals.framework.util.DateUtils; import com.mortals.xhx.busiz.uploadfile.SubmitDatumReq;
import com.mortals.xhx.busiz.baseinfo.BaseInfoDetail;
import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo;
import com.mortals.xhx.busiz.oneProblemlist.OptionDetailInfo;
import com.mortals.xhx.busiz.uploadfile.UploadDatumReq;
import com.mortals.xhx.busiz.wechat.WechatBaseReq; import com.mortals.xhx.busiz.wechat.WechatBaseReq;
import com.mortals.xhx.module.member.model.MemberEntity; import com.mortals.xhx.module.member.model.MemberEntity;
import com.mortals.xhx.module.yth.model.YthOnethingEntity; import com.mortals.xhx.module.yth.model.YthOnethingEntity;
...@@ -38,7 +34,6 @@ public interface BaseMapper { ...@@ -38,7 +34,6 @@ public interface BaseMapper {
@Mapping(source = "b_img", target = "BImg") @Mapping(source = "b_img", target = "BImg")
MemberEntity weChat2Entity(WechatBaseReq req); MemberEntity weChat2Entity(WechatBaseReq req);
@Mapping(source = "open_id", target = "openId") YthOnethingEntity uploadDatumReq2OneThingEntity(SubmitDatumReq req);
YthOnethingEntity uploadDatumReq2OneThingEntity(UploadDatumReq req);
} }
government-manager/src/main/java/com/mortals/xhx/busiz/BaseReq.java
View file @ 731df811
...@@ -12,6 +12,6 @@ public class BaseReq { ...@@ -12,6 +12,6 @@ public class BaseReq {
/** /**
* 微信开放id * 微信开放id
*/ */
private String open_id; private String openId;
} }
government-manager/src/main/java/com/mortals/xhx/busiz/WxOneThingApiController.java
View file @ 731df811
...@@ -2,37 +2,24 @@ package com.mortals.xhx.busiz; ...@@ -2,37 +2,24 @@ package com.mortals.xhx.busiz;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.util.FileUtil; import com.mortals.framework.util.FileUtil;
import com.mortals.xhx.base.framework.config.InterceptorConfig; import com.mortals.xhx.base.framework.config.InterceptorConfig;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.upload.service.UploadService; 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.login.DatumDataReq;
import com.mortals.xhx.busiz.matters.MyMattersReq; import com.mortals.xhx.busiz.matters.MyMattersReq;
import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo;
import com.mortals.xhx.busiz.oneProblemlist.OneProblemReq;
import com.mortals.xhx.busiz.onethinglist.OneThineInfo;
import com.mortals.xhx.busiz.onethinglist.OneThingReq; import com.mortals.xhx.busiz.onethinglist.OneThingReq;
import com.mortals.xhx.busiz.question.QuestionInfo; import com.mortals.xhx.busiz.question.QuestionInfo;
import com.mortals.xhx.busiz.question.QuestionReq; import com.mortals.xhx.busiz.question.AnswerReq;
import com.mortals.xhx.busiz.uploadfile.DeleteFileReq; import com.mortals.xhx.busiz.uploadfile.DeleteFileReq;
import com.mortals.xhx.busiz.uploadfile.UploadDatumReq; import com.mortals.xhx.busiz.uploadfile.SubmitDatumReq;
import com.mortals.xhx.common.code.ApiRespCodeEnum; import com.mortals.xhx.common.code.ApiRespCodeEnum;
import com.mortals.xhx.common.code.OneThingRespCodeEnum; import com.mortals.xhx.common.code.OneThingRespCodeEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.feign.flowable.IApiFlowInstanceFeign; import com.mortals.xhx.feign.flowable.IApiFlowInstanceFeign;
import com.mortals.xhx.feign.rsp.ApiResp; import com.mortals.xhx.feign.rsp.ApiResp;
import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.model.MatterQuery;
import com.mortals.xhx.module.member.model.MemberEntity; import com.mortals.xhx.module.member.model.MemberEntity;
import com.mortals.xhx.module.member.model.MemberQuery; import com.mortals.xhx.module.member.model.MemberQuery;
import com.mortals.xhx.module.member.service.MemberService; import com.mortals.xhx.module.member.service.MemberService;
import com.mortals.xhx.module.one.model.OneClassifyEntity;
import com.mortals.xhx.module.one.model.OneClassifyQuery;
import com.mortals.xhx.module.one.model.OneTopicalQuery;
import com.mortals.xhx.module.one.service.OneClassifyService; import com.mortals.xhx.module.one.service.OneClassifyService;
import com.mortals.xhx.module.one.service.OneClassifyTopicalService; import com.mortals.xhx.module.one.service.OneClassifyTopicalService;
import com.mortals.xhx.module.one.service.OneTopicalService; import com.mortals.xhx.module.one.service.OneTopicalService;
...@@ -40,7 +27,6 @@ import com.mortals.xhx.module.yth.model.YthOnethingEntity; ...@@ -40,7 +27,6 @@ import com.mortals.xhx.module.yth.model.YthOnethingEntity;
import com.mortals.xhx.module.yth.model.YthOnethingQuery; import com.mortals.xhx.module.yth.model.YthOnethingQuery;
import com.mortals.xhx.module.yth.service.YthOnethingService; import com.mortals.xhx.module.yth.service.YthOnethingService;
import lombok.extern.apachecommons.CommonsLog; import lombok.extern.apachecommons.CommonsLog;
import net.sf.cglib.core.CodeEmitter;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -49,11 +35,9 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -49,11 +35,9 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* 一件事微信对外服务接口 * 一件事微信对外服务接口
...@@ -112,78 +96,22 @@ public class WxOneThingApiController { ...@@ -112,78 +96,22 @@ public class WxOneThingApiController {
return rsp; return rsp;
} }
/**
* 问答数据列表
*
* @param req
* @return
*/
@PostMapping("thing/oneProblem")
public ApiResp<OneProblemInfo> oneProblemList(OneProblemReq req) {
ApiResp<OneProblemInfo> rsp = new ApiResp<>();
rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
try {
OneProblemInfo info = oneClassifyTopicalService.findAllQuestion(req.getId());
rsp.setData(info);
} catch (Exception e) {
log.error("问答数据失败", e);
rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
rsp.setMsg(e.getMessage());
return rsp;
}
log.info("响应【问答数据】【响应体】--> " + JSONObject.toJSONString(rsp));
return rsp;
}
/**
* 事项详细
*
* @param req
* @return
*/
@PostMapping("thing/oneBasicsInfo")
public ApiResp<BaseInfoDetail> oneBasicsInfo(BaseInfoReq req) {
ApiResp<BaseInfoDetail> rsp = new ApiResp<>();
rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
try {
//根据basid 查询问题库
if (ObjectUtils.isEmpty(req.getId())) {
throw new AppException("ID不能为空！");
}
// BasicsEntity entity = basicsService.get(req.getId());
// BaseInfoDetail baseInfoDetail = BaseMapper.INSTANCE.basicsEntity2Detail(entity);
// String datumIds = basicsDatumService.find(new BasicsDatumQuery().basicsId(entity.getId())).stream().map(BasicsDatumEntity::getId).map(String::valueOf).collect(Collectors.joining(","));
// baseInfoDetail.setDatum_ids(datumIds);
// rsp.setData(baseInfoDetail);
} catch (Exception e) {
log.error("事项详细失败", e);
rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
rsp.setMsg(e.getMessage());
return rsp;
}
log.info("响应【事项详细】【响应体】--> " + JSONObject.toJSONString(rsp));
return rsp;
}
/** /**
* 问答基础信息 * 问答答案提交后返回的详细结果
* *
* @param req * @param req
* @return * @return
*/ */
@PostMapping("thing/condition") @PostMapping("thing/ansResults")
public ApiResp<QuestionInfo> condition(QuestionReq req) { public ApiResp<QuestionInfo> ansResults(AnswerReq req) {
ApiResp<QuestionInfo> rsp = new ApiResp<>(); ApiResp<QuestionInfo> rsp = new ApiResp<>();
rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel()); rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue()); rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
try { try {
// QuestionInfo questionInfo = classifyOptionService.conditionQuestion(req.getOption_id(), req.getKey());
// rsp.setData(questionInfo); QuestionInfo mattersByAnswers = oneClassifyTopicalService.getMattersByAnswers(req);
rsp.setData(mattersByAnswers);
} catch (Exception e) { } catch (Exception e) {
log.error("问答基础信息失败", e); log.error("问答基础信息失败", e);
rsp.setCode(ApiRespCodeEnum.FAILED.getValue()); rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
...@@ -228,7 +156,7 @@ public class WxOneThingApiController { ...@@ -228,7 +156,7 @@ public class WxOneThingApiController {
* @param file * @param file
* @return * @return
*/ */
@PostMapping("thing/upload_file") @PostMapping("thing/uploadFile")
public ApiResp<Map<String, String>> uploadFile(@RequestParam("file") MultipartFile file) { public ApiResp<Map<String, String>> uploadFile(@RequestParam("file") MultipartFile file) {
ApiResp<Map<String, String>> rsp = new ApiResp<>(); ApiResp<Map<String, String>> rsp = new ApiResp<>();
rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel()); rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
...@@ -256,15 +184,14 @@ public class WxOneThingApiController { ...@@ -256,15 +184,14 @@ public class WxOneThingApiController {
* @param req * @param req
* @return * @return
*/ */
@PostMapping("thing/del_file") @PostMapping("thing/delFile")
public ApiResp<String> deleteFile(DeleteFileReq req) { public ApiResp<String> deleteFile(DeleteFileReq req) {
ApiResp<String> rsp = new ApiResp<>(); ApiResp<String> rsp = new ApiResp<>();
rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel()); rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue()); rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
try { try {
String path = req.getFile_path().replace(config.getPrepath(), ""); String filePath = uploadService.getFilePath(req.getFilePath());
String filePath = uploadService.getFilePath(path);
boolean delete = FileUtil.delete(filePath); boolean delete = FileUtil.delete(filePath);
if (!delete) { if (!delete) {
...@@ -290,14 +217,14 @@ public class WxOneThingApiController { ...@@ -290,14 +217,14 @@ public class WxOneThingApiController {
* @param req * @param req
* @return * @return
*/ */
@PostMapping("thing/is_phone") @PostMapping("thing/searchMember")
public ApiResp<MemberEntity> queryCustomInfo(BaseReq req) { public ApiResp<MemberEntity> searchMember(BaseReq req) {
ApiResp<MemberEntity> rsp = new ApiResp<>(); ApiResp<MemberEntity> rsp = new ApiResp<>();
rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel()); rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue()); rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
try { try {
MemberEntity memberEntity = memberService.selectOne(new MemberQuery().openId(req.getOpen_id()), null); MemberEntity memberEntity = memberService.selectOne(new MemberQuery().openId(req.getOpenId()), null);
if (ObjectUtils.isEmpty(memberEntity)) { if (ObjectUtils.isEmpty(memberEntity)) {
throw new AppException("查询用户不存在"); throw new AppException("查询用户不存在");
} }
...@@ -314,26 +241,26 @@ public class WxOneThingApiController { ...@@ -314,26 +241,26 @@ public class WxOneThingApiController {
} }
/** /**
* 文件资料上传 * 一件事办理资料提交
* *
* @param req * @param req
* @return * @return
*/ */
@PostMapping("thing/upload_datum") @PostMapping("thing/submitDatum")
public ApiResp<String> uploadDatum(UploadDatumReq req) { public ApiResp<String> submitDatum(SubmitDatumReq req) {
ApiResp<String> rsp = new ApiResp<>(); ApiResp<String> rsp = new ApiResp<>();
rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel()); rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue()); rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
try { try {
onethingService.datumUploadAndStartFlow(req); onethingService.datumUploadAndStartFlow(req);
} catch (Exception e) { } catch (Exception e) {
log.error("文件资料上传失败", e); log.error("一件事办理资料提交失败", e);
rsp.setCode(ApiRespCodeEnum.FAILED.getValue()); rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
rsp.setMsg(e.getMessage()); rsp.setMsg(e.getMessage());
return rsp; return rsp;
} }
log.info("响应【文件资料上传】【响应体】--> " + JSONObject.toJSONString(rsp)); log.info("响应【一件事办理资料提交】【响应体】--> " + JSONObject.toJSONString(rsp));
return rsp; return rsp;
} }
...@@ -343,14 +270,14 @@ public class WxOneThingApiController { ...@@ -343,14 +270,14 @@ public class WxOneThingApiController {
* @param req * @param req
* @return * @return
*/ */
@PostMapping("thing/my_handle") @PostMapping("thing/myHandle")
public ApiResp<List<YthOnethingEntity>> myHandle(MyMattersReq req) { public ApiResp<List<YthOnethingEntity>> myHandle(MyMattersReq req) {
ApiResp<List<YthOnethingEntity>> rsp = new ApiResp<>(); ApiResp<List<YthOnethingEntity>> rsp = new ApiResp<>();
rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel()); rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue()); rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
try { try {
//todo 我的办理信息 //todo 我的办理信息
List<YthOnethingEntity> list = onethingService.find(new YthOnethingQuery().openId(req.getOpen_id())); List<YthOnethingEntity> list = onethingService.find(new YthOnethingQuery().openId(req.getOpenId()));
rsp.setData(list); rsp.setData(list);
} catch (Exception e) { } catch (Exception e) {
log.error("我的办理失败", e); log.error("我的办理失败", e);
......
government-manager/src/main/java/com/mortals/xhx/busiz/WxOneThingController.http
View file @ 731df811
###列表查询 ###主题包列表
POST {{baseUrl}}/m/zwfw/proced/thing/oneTopiclist POST {{baseUrl}}/m/zwfw/proced/thing/oneTopiclist
Content-Type: application/x-www-form-urlencoded Content-Type: application/x-www-form-urlencoded
type=1 type=1
###主题包列表
POST {{baseUrl}}/m/zwfw/proced/thing/one_list
Content-Type: application/x-www-form-urlencoded
page=1&limit=10&keywords=打广告
###问答数据 ###问答数据
POST {{baseUrl}}/m/zwfw/proced/thing/oneProblem POST {{baseUrl}}/m/zwfw/proced/thing/oneProblem
Content-Type: application/x-www-form-urlencoded Content-Type: application/x-www-form-urlencoded
id= 1 id=1
###事项详细数据 ###事项详细数据
POST {{baseUrl}}/m/zwfw/proced/thing/oneBasicsInfo POST {{baseUrl}}/m/zwfw/proced/thing/oneBasicsInfo
Content-Type: application/x-www-form-urlencoded Content-Type: application/x-www-form-urlencoded
id= 1 id=1
###根据openid 查询用户 ###根据openid 查询用户
POST {{baseUrl}}/m/zwfw/proced/thing/is_phone POST {{baseUrl}}/m/zwfw/proced/thing/searchMember
Content-Type: application/x-www-form-urlencoded Content-Type: application/x-www-form-urlencoded
open_id= dafdadfasfdaf openId=abc
###问答基础数据 ###问答基础数据
POST {{baseUrl}}/m/zwfw/proced/thing/condition POST {{baseUrl}}/m/zwfw/proced/thing/ansResults
Content-Type: application/x-www-form-urlencoded Content-Type: application/x-www-form-urlencoded
option_id= 59&key= (1&2&3) optionIds[0]=17&optionIds[1]=20
###微信用户校验创建更新 ###微信用户校验创建更新
POST {{baseUrl}}/m/zwfw/wechatinter/base/checkCard POST {{baseUrl}}/m/zwfw/wechatinter/base/checkCard
Content-Type: application/x-www-form-urlencoded Content-Type: application/x-www-form-urlencoded
sitenum= 123&openid= aldadfijakdjkdknnciemdmdiadkkdmakd&idcard= 510106197907211830&tel= 028-83182408&name= 张三&file= 123&z_img= 123&b_img= 123&siteid= 12 sitenum=123&openid=aldadfijakdjkdknnciemdmdiadkkdmakd&idcard= 510106197907211830&tel= 028-83182408&name= 张三&file= 123&z_img= 123&b_img= 123&siteid= 12
###测试文件上传 ###测试文件上传
POST {{baseUrl}}/m/zwfw/proced/thing/upload_file POST {{baseUrl}}/m/zwfw/proced/thing/uploadFile
Content-Type: multipart/form-data; boundary=WebAppBoundary Content-Type: multipart/form-data; boundary=WebAppBoundary
--WebAppBoundary --WebAppBoundary
...@@ -55,17 +48,21 @@ Content-Type: multipart/form-data ...@@ -55,17 +48,21 @@ Content-Type: multipart/form-data
< ./test.xlsx < ./test.xlsx
--WebAppBoundary-- --WebAppBoundary--
###删除文件
POST {{baseUrl}}/m/zwfw/proced/thing/delFile
Content-Type: application/x-www-form-urlencoded
filePath=/uploads/oneys/625703530623135744.xlsx
###发起审批 ###一件事一次办材料提交
POST {{baseUrl}}/m/zwfw/proced/thing/upload_datum POST {{baseUrl}}/m/zwfw/proced/thing/submitDatum
Content-Type: application/x-www-form-urlencoded 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=3&file_arr[0].file=/upload/download/12312.jpg&idcard=510106198907211830 classifyTopicId=1&siteId=1&openId=abc&isAgent=0&idcard=361620199707288337&matterReqList[0].attachmentList[0].filepath=/uploads/oneys/625710918952546304.xlsx&name=张三&matterReqList[0].matterid=1&phone=15978345833&matterReqList[0].attachmentList[0].fileName=test.xlsx&manner=0&matterReqList[0].attachmentList[0].datumId=1
###查询我的办理 ###查询我的办理
POST {{baseUrl}}/m/zwfw/proced/thing/my_handle POST {{baseUrl}}/m/zwfw/proced/thing/myHandle
Content-Type: application/x-www-form-urlencoded Content-Type: application/x-www-form-urlencoded
open_id= aldadfijakdjkdknnciemdmdiadkkdmakd openId=abc
\ No newline at end of file \ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/busiz/question/AcceptInfo.java
View file @ 731df811
...@@ -5,6 +5,7 @@ import lombok.Data; ...@@ -5,6 +5,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
/** /**
* 受理条件
* @author: zxfei * @author: zxfei
* @date: 2021/9/6 13:59 * @date: 2021/9/6 13:59
* @description: * @description:
...@@ -12,27 +13,20 @@ import java.util.Date; ...@@ -12,27 +13,20 @@ import java.util.Date;
@Data @Data
public class AcceptInfo { public class AcceptInfo {
private Long id;
/** /**
* 模板标题 * 事项id
*/ */
private String title; private Long matterId;
/** /**
* 申请条件 * 受理条件
*/ */
private String content; private String title;
/** /**
* 基础表one_basics id * 受理条件
*/ */
private Long basics_id; private String content;
/**
* 创建时间
*/
private Long create_time;
} }
government-manager/src/main/java/com/mortals/xhx/busiz/question/QuestionReq.java → government-manager/src/main/java/com/mortals/xhx/busiz/question/AnswerReq.java
View file @ 731df811
...@@ -6,21 +6,22 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -6,21 +6,22 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* 问答问题 * 问答问题答案
* *
* @author: zxfei * @author: zxfei
* @date: 2021/9/6 9:26 * @date: 2021/9/6 9:26
*/ */
@Data @Data
@ApiModel(value = "QuestionReq", description = "回答问题请求参数") @ApiModel(value = "QuestionReq", description = "回答问题请求参数")
public class QuestionReq extends BaseReq implements Serializable { public class AnswerReq extends BaseReq implements Serializable {
/** /**
* 问答最后最后选项ID * 问答最后答案选项ID（多问题线）
*/ */
@ApiModelProperty(value = "问答最后最后选项ID") @ApiModelProperty(value = "问答最后最后选项ids")
private Long option_id; private List<Long> optionIds;
/** /**
* 问题路线id? * 问题路线id?
......
government-manager/src/main/java/com/mortals/xhx/busiz/question/DatumDownloadInfo.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.busiz.question;
import lombok.Data;
/**
* 材料附件下载详细
* @author: zxfei
* @date: 2021/9/6 14:06
* @description:
**/
@Data
public class DatumDownloadInfo {
/**
* 材料id
*/
private Long datumid;
/**
* 附件名称
*/
private String fileName;
/**
* 附件下载地址
*/
private String fileUrl;
/**
* 附件类型 1 示例样表 2空白表格 默认1
*/
private Integer filetype;
}
government-manager/src/main/java/com/mortals/xhx/busiz/question/DatumInfo.java
View file @ 731df811
...@@ -2,13 +2,20 @@ package com.mortals.xhx.busiz.question; ...@@ -2,13 +2,20 @@ package com.mortals.xhx.busiz.question;
import lombok.Data; import lombok.Data;
import java.util.Date;
import java.util.List;
/** /**
* 材料详细
* @author: zxfei * @author: zxfei
* @date: 2021/9/6 14:06 * @date: 2021/9/6 14:06
* @description: * @description:
**/ **/
@Data @Data
public class DatumInfo { public class DatumInfo {
/**
* 材料id
*/
private Long id; private Long id;
/** /**
* 材料名 * 材料名
...@@ -16,44 +23,35 @@ public class DatumInfo { ...@@ -16,44 +23,35 @@ public class DatumInfo {
private String materialName; private String materialName;
/** /**
* 基础表one_basics id * 事项Id
*/
private Long basics_id;
/**
* 事项表yth_matter id 表示从一体化获取的材料
*/ */
private Long matterid; private Long matterId;
/**
* 材料表yth_datum id 表示从一体化获取的材料
*/
private Long datum_id;
/** /**
* 材料形式 * 材料形式
*/ */
private Integer materialProperty; private String materialProperty;
/** /**
* 是否必交，0 否 1 是 默认0 * 是否必交，0 否 1 是 默认0
*/ */
private Integer isMust; private String isMust;
/** /**
* 材料类型 * 材料类型
*/ */
private Integer materialType; private String materialType;
/** /**
* 电子材料格式 * 电子材料格式
*/ */
private Integer electronicgs; private String electronicgs;
/** /**
* 材料来源渠道 * 材料来源渠道
*/ */
private Integer materialSource; private String materialSource;
/** /**
* 纸质材料份数 * 纸质材料份数
...@@ -63,32 +61,28 @@ public class DatumInfo { ...@@ -63,32 +61,28 @@ public class DatumInfo {
/** /**
* 纸质材料规格 * 纸质材料规格
*/ */
private Integer paperGg; private String paperGg;
/** /**
* 减免模式 * 减免模式
*/ */
private Integer jianmMs; private String jianmMs;
/** /**
* 盖章方式 * 盖章方式
*/ */
private Integer sealWay; private String sealWay;
/** /**
* 是否减免 * 是否减免
*/ */
private Integer isjianm; private String isjianm;
/** /**
* 材料是否容缺 * 材料是否容缺
*/ */
private Integer isLack; private String isLack;
/**
* 材料地址
*/
private String yb_url;
/** /**
* 来源渠道说明 * 来源渠道说明
...@@ -115,11 +109,13 @@ public class DatumInfo { ...@@ -115,11 +109,13 @@ public class DatumInfo {
*/ */
private String summary; private String summary;
/** /**
* 0正常 1删除 * 材料创建时间
*/ */
private Integer valid; private Date createTime;
private Long create_time; private List<DatumDownloadInfo> attachList;
} }
government-manager/src/main/java/com/mortals/xhx/busiz/question/FlowLimitinfo.java → government-manager/src/main/java/com/mortals/xhx/busiz/question/FlowLimitInfo.java
View file @ 731df811
...@@ -8,30 +8,32 @@ import lombok.Data; ...@@ -8,30 +8,32 @@ import lombok.Data;
* @description: * @description:
**/ **/
@Data @Data
public class FlowLimitinfo { public class FlowLimitInfo {
private Long id;
/** /**
* 模板标题 * 事项matter id
*/ */
private String title; private Long matterId;
/** /**
* 办理流程 * 办理流程
*/ */
private String content; private String flowName;
/**
* 办理时长
*/
private String flowTime;
/** /**
* 基础表one_basics id * 转外时限
*/ */
private Long basics_id; private String flowTurnOut;
/** /**
* 创建时间 * 办理流程说明
*/ */
private Long create_time; private String flowDesc;
} }
government-manager/src/main/java/com/mortals/xhx/busiz/question/MatterInfo.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.busiz.question;
import lombok.Data;
/**
* 事项
*
* @author: zxfei
* @date: 2021/9/6 14:05
* @description:
**/
@Data
public class MatterInfo {
/**
* 事项id
*/
private Long id;
/**
* 事项名称
*/
private String matterName;
}
government-manager/src/main/java/com/mortals/xhx/busiz/question/QAndAInfo.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.busiz.question;
import lombok.Data;
/**
* 常见问题
*
* @author: zxfei
* @date: 2021/9/6 14:05
* @description:
**/
@Data
public class QAndAInfo {
/**
* 事项id
*/
private Long matterId;
/**
* 问题
*/
private String question;
/**
* 回答
*/
private String answer;
}
government-manager/src/main/java/com/mortals/xhx/busiz/question/QuestionInfo.java
View file @ 731df811
...@@ -5,6 +5,7 @@ import lombok.Data; ...@@ -5,6 +5,7 @@ import lombok.Data;
import java.util.List; import java.util.List;
/** /**
* 问题结果
* @author: zxfei * @author: zxfei
* @date: 2021/9/6 13:58 * @date: 2021/9/6 13:58
* @description: * @description:
...@@ -12,14 +13,30 @@ import java.util.List; ...@@ -12,14 +13,30 @@ import java.util.List;
@Data @Data
public class QuestionInfo { public class QuestionInfo {
private BasicsInfo basicsInfo; /**
* 事项列表列表
private List<AcceptInfo> accept; */
private List<MatterInfo> matterInfoList;
private List<FlowLimitinfo> flowlimit;
/**
* 受理条件列表
private List<DatumInfo> datum; */
private List<AcceptInfo> acceptInfoList;
/**
* 办理流程列表
*/
private List<FlowLimitInfo> flowLimitInfoList;
/**
* 事项材料列表
*/
private List<DatumInfo> datumInfoList;
/**
* 常见问题列表
*/
private List<QAndAInfo> qAndAInfoList;
} }
government-manager/src/main/java/com/mortals/xhx/busiz/uploadfile/DeleteFileReq.java
View file @ 731df811
...@@ -21,7 +21,7 @@ public class DeleteFileReq extends BaseReq implements Serializable { ...@@ -21,7 +21,7 @@ public class DeleteFileReq extends BaseReq implements Serializable {
* 文件路径 * 文件路径
*/ */
@ApiModelProperty(value = "文件路径") @ApiModelProperty(value = "文件路径")
private String file_path; private String filePath;
} }
government-manager/src/main/java/com/mortals/xhx/busiz/uploadfile/MatterReq.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.busiz.uploadfile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 办理事项提交
*
* @author: zxfei
* @date: 2021/9/6 9:26
*/
@Data
@ApiModel(value = "MatterReq", description = "事项提交参数")
public class MatterReq implements Serializable {
/**
* 事项ID
*/
@ApiModelProperty(value = "事项ID")
private Long matterid;
/**
* 申请材料列表
*
*/
@ApiModelProperty(value = "申请材料附件列表")
private List<UploadFileInfo> attachmentList;
}
government-manager/src/main/java/com/mortals/xhx/busiz/uploadfile/UploadDatumReq.java → government-manager/src/main/java/com/mortals/xhx/busiz/uploadfile/SubmitDatumReq.java
View file @ 731df811
...@@ -9,32 +9,29 @@ import java.io.Serializable; ...@@ -9,32 +9,29 @@ import java.io.Serializable;
import java.util.List; import java.util.List;
/** /**
* 文件资料上传 * 办理材料提交
* *
* @author: zxfei * @author: zxfei
* @date: 2021/9/6 9:26 * @date: 2021/9/6 9:26
*/ */
@Data @Data
@ApiModel(value = "UploadDatumReq", description = "请求参数") @ApiModel(value = "SubmitDatumReq", description = "请求参数")
public class UploadDatumReq extends BaseReq implements Serializable { public class SubmitDatumReq extends BaseReq implements Serializable {
/**
* 事项ID
*/
@ApiModelProperty(value = "事项ID")
private Long matterid;
/** /**
* siteid * 申请主题包id
*/ */
@ApiModelProperty(value = "村数据下的站点id") @ApiModelProperty(value = "申请主题包id")
private Long siteid; private Long classifyTopicId;
/** /**
* 问答内容 * 站点ID
*/ */
@ApiModelProperty(value = "问答内容") @ApiModelProperty(value = "村数据下的站点id")
private String option_content; private Long siteId;
/** /**
...@@ -59,7 +56,7 @@ public class UploadDatumReq extends BaseReq implements Serializable { ...@@ -59,7 +56,7 @@ public class UploadDatumReq extends BaseReq implements Serializable {
* 0本人办理 1代办 * 0本人办理 1代办
*/ */
@ApiModelProperty(value = "0本人办理 1代办") @ApiModelProperty(value = "0本人办理 1代办")
private Integer is_agent; private Integer isAgent;
/** /**
* 0自主取件 1代办领取 (取件方式) * 0自主取件 1代办领取 (取件方式)
...@@ -67,17 +64,12 @@ public class UploadDatumReq extends BaseReq implements Serializable { ...@@ -67,17 +64,12 @@ public class UploadDatumReq extends BaseReq implements Serializable {
@ApiModelProperty(value = "0 自主取件 1 代办领取 (取件方式)") @ApiModelProperty(value = "0 自主取件 1 代办领取 (取件方式)")
private Integer manner; private Integer manner;
/**
* 村ID
*/
@ApiModelProperty(value = "村ID")
private Long region_id;
/** /**
* 申请材料附件列表 * 申请事项列表
* *
*/ */
@ApiModelProperty(value = "申请材料附件列表") @ApiModelProperty(value = "申请事项列表")
private List<UploadFileInfo> file_arr; private List<MatterReq> matterReqList;
} }
government-manager/src/main/java/com/mortals/xhx/busiz/uploadfile/UploadFileInfo.java
View file @ 731df811
...@@ -3,6 +3,7 @@ package com.mortals.xhx.busiz.uploadfile; ...@@ -3,6 +3,7 @@ package com.mortals.xhx.busiz.uploadfile;
import lombok.Data; import lombok.Data;
/** /**
* 上传材料信息
* @author: zxfei * @author: zxfei
* @date: 2021/9/7 15:04 * @date: 2021/9/7 15:04
* @description: * @description:
...@@ -10,7 +11,19 @@ import lombok.Data; ...@@ -10,7 +11,19 @@ import lombok.Data;
@Data @Data
public class UploadFileInfo { public class UploadFileInfo {
private Long datumid; /**
* 材料id
*/
private Long datumId;
private String file; /**
* 附件名称
*/
private String fileName;
/**
* 附件存储地址
*/
private String filepath;
} }
government-manager/src/main/java/com/mortals/xhx/daemon/demo/RequestDispatchController.java
View file @ 731df811
...@@ -227,14 +227,14 @@ public class RequestDispatchController { ...@@ -227,14 +227,14 @@ public class RequestDispatchController {
chargesEntity.setCreateTime(new Date()); chargesEntity.setCreateTime(new Date());
matterChargesService.save(chargesEntity); matterChargesService.save(chargesEntity);
MatterFlowlimitEntity flowlimitEntity = new MatterFlowlimitEntity(); // MatterFlowlimitEntity flowlimitEntity = new MatterFlowlimitEntity();
flowlimitEntity.setMatterId(item.getId()); // flowlimitEntity.setMatterId(item.getId());
flowlimitEntity.setTitle(item.getName()); // flowlimitEntity.setTitle(item.getName());
flowlimitEntity.setContent(mattersDetailEntity.getProcessBllc()); // flowlimitEntity.setContent(mattersDetailEntity.getProcessBllc());
flowlimitEntity.setSource(0); // flowlimitEntity.setSource(0);
flowlimitEntity.setCreateUser("system"); // flowlimitEntity.setCreateUser("system");
flowlimitEntity.setCreateTime(new Date()); // flowlimitEntity.setCreateTime(new Date());
matterFlowlimitService.save(flowlimitEntity); // matterFlowlimitService.save(flowlimitEntity);
MatterIntermediaryEntity intermediaryEntity = new MatterIntermediaryEntity(); MatterIntermediaryEntity intermediaryEntity = new MatterIntermediaryEntity();
intermediaryEntity.setMatterId(item.getId()); intermediaryEntity.setMatterId(item.getId());
......
government-manager/src/main/java/com/mortals/xhx/daemon/demo/RequestInstanceController.http
View file @ 731df811
...@@ -18,8 +18,21 @@ Content-Type: application/json ...@@ -18,8 +18,21 @@ Content-Type: application/json
{} {}
### 解析申请条件 ### 解析常见问题
POST {{baseUrl}}/m/test/datumn POST {{baseUrl}}/m/test/question
Content-Type: application/json
{}
### 解析办理条件
POST {{baseUrl}}/m/test/accept
Content-Type: application/json
{}
### 解析办理流程
POST {{baseUrl}}/m/test/flow
Content-Type: application/json Content-Type: application/json
{} {}
government-manager/src/main/java/com/mortals/xhx/daemon/demo/RequestMatterController.java
View file @ 731df811
...@@ -12,9 +12,7 @@ import com.mortals.xhx.common.model.RequestTaskReq; ...@@ -12,9 +12,7 @@ import com.mortals.xhx.common.model.RequestTaskReq;
import com.mortals.xhx.common.pdu.api.ApiReqPdu; import com.mortals.xhx.common.pdu.api.ApiReqPdu;
import com.mortals.xhx.common.pdu.api.ApiRespPdu; import com.mortals.xhx.common.pdu.api.ApiRespPdu;
import com.mortals.xhx.feign.flowable.IApiFlowInstanceFeign; import com.mortals.xhx.feign.flowable.IApiFlowInstanceFeign;
import com.mortals.xhx.module.matter.model.MatterDatumEntity; import com.mortals.xhx.module.matter.model.*;
import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
import com.mortals.xhx.module.matter.model.MatterDetailQuery;
import com.mortals.xhx.module.matter.service.*; import com.mortals.xhx.module.matter.service.*;
import com.mortals.xhx.module.matters.service.MattersDetailService; import com.mortals.xhx.module.matters.service.MattersDetailService;
import com.mortals.xhx.module.matters.service.MattersService; import com.mortals.xhx.module.matters.service.MattersService;
...@@ -26,10 +24,8 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -26,10 +24,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList; import java.util.*;
import java.util.Date; import java.util.stream.Collectors;
import java.util.HashMap;
import java.util.Map;
/** /**
* 同步事项申请条件等 * 同步事项申请条件等
...@@ -82,253 +78,130 @@ public class RequestMatterController { ...@@ -82,253 +78,130 @@ public class RequestMatterController {
public ApiRespPdu question(@RequestBody ApiReqPdu<RequestTaskReq> req) { public ApiRespPdu question(@RequestBody ApiReqPdu<RequestTaskReq> req) {
ApiRespPdu<String> respPdu = new ApiRespPdu<>(); ApiRespPdu<String> respPdu = new ApiRespPdu<>();
BiMap<String, String> materialPropertyInverseMap = HashBiMap.create( paramService.getParamByFirstOrganize(Constant.Param_materialProperty)).inverse();
BiMap<String, String> materialTypeInverseMap = HashBiMap.create( paramService.getParamByFirstOrganize(Constant.Param_materialType)).inverse();
BiMap<String, String> electronicgsInverseMap = HashBiMap.create( paramService.getParamByFirstOrganize(Constant.Param_electronicgs)).inverse();
BiMap<String, String> materialSourceInverseMap = HashBiMap.create( paramService.getParamByFirstOrganize(Constant.Param_materialSource)).inverse();
BiMap<String, String> paperGgInverseMap = HashBiMap.create( paramService.getParamByFirstOrganize(Constant.Param_paperGg)).inverse();
BiMap<String, String> jianmMsInverseMap = HashBiMap.create( paramService.getParamByFirstOrganize(Constant.Param_jianmMs)).inverse();
BiMap<String, String> sealWayInverseMap = HashBiMap.create( paramService.getParamByFirstOrganize(Constant.Param_sealWay)).inverse();
BiMap<String, String> isMustInverseMap = HashBiMap.create( paramService.getParamByFirstOrganize(Constant.Param_isMust)).inverse();
BiMap<String, String> iszzsbInverseMap = HashBiMap.create( YesNoEnum.getEnumMap()).inverse();
BiMap<String, String> yesOrNoInverseMap = HashBiMap.create( YesNoEnum.getEnumMap()).inverse();
//String value = inverse.getOrDefault(m.getValue().toString(), "0");
try { try {
//拆分材料库数据 //拆分材料库数据
matterDetailService.find(new MatterDetailQuery()).stream().peek(item -> { matterDetailService.find(new MatterDetailQuery()).stream().peek(item -> {
String json = item.getMaterialsSqcl(); //String json = item.getMaterialsSqcl();
String json = item.getQuestionCjwt();
//log.info("receive json:"+json); //log.info("receive json:"+json);
if(ObjectUtils.isEmpty(json)||"{}".equals(json)){ if (ObjectUtils.isEmpty(json) || "{}".equals(json)) {
log.info("json:"+json); log.info("json:" + json);
return; return;
} }
JSONObject root =null; JSONObject root = null;
try { try {
root = JSON.parseObject(json); root = JSON.parseObject(json);
}catch (Exception e){ } catch (Exception e) {
json = json.replaceAll("\\\\", "\\\\\\\\"); json = json.replaceAll("\\\\", "\\\\\\\\");
try { try {
root = JSON.parseObject(json); root = JSON.parseObject(json);
}catch (Exception e1){ } catch (Exception e1) {
log.error("error json:"+json); log.error("error json:" + json);
return; return;
} }
} }
if(root.isEmpty()){ if (root.isEmpty()) {
log.info("root is null"); log.info("root is null");
return; return;
} }
JSONArray jsonArray =null; JSONArray jsonArray = null;
try { try {
jsonArray=root.getJSONArray("申请材料"); jsonArray = root.getJSONArray("常见问题");
}catch (Exception e){ } catch (Exception e) {
log.error("error 无申请材料"); log.error("error 无常见问题");
} }
if(ObjectUtils.isEmpty(jsonArray)){ if (ObjectUtils.isEmpty(jsonArray)) {
log.info("申请材料 is null"); log.info("常见问题 is null");
return; return;
} }
for (int i = 0; i < jsonArray.size(); i++) { for (int i = 0; i < jsonArray.size(); i++) {
JSONObject secondJsonObject = jsonArray.getJSONObject(i); JSONObject jsonObject = jsonArray.getJSONObject(i);
MatterDatumEntity datumEntity = new MatterDatumEntity();
datumEntity.setMatterId(item.getMatterId());
datumEntity.setSource(0);
datumEntity.setCreateTime(new Date());
datumEntity.setCreateUser("system");
//材料详情
JSONArray jsonArrayThree = secondJsonObject.getJSONArray("材料详情");
if (!ObjectUtils.isEmpty(jsonArrayThree)) {
for (int j = 0; j < jsonArrayThree.size(); j++) {
jsonArrayThree.getJSONObject(j).entrySet().stream().peek(m -> {
Boolean bool=false;
if ("材料名称".equals(m.getKey().trim())) {
datumEntity.setMaterialName(m.getValue().toString());
bool=true;
}
if ("材料形式".equals(m.getKey().trim())) {
//materialPropertyInverseMap
String value = materialPropertyInverseMap.getOrDefault(m.getValue().toString(), "0");
datumEntity.setMaterialProperty(Integer.parseInt(value));
bool=true;
checkKeyValue(materialPropertyInverseMap, m, value);
}
if ("材料必要性".equals(m.getKey().trim())) {
//isMustInverseMap
String value = isMustInverseMap.getOrDefault(m.getValue().toString(), "0");
datumEntity.setIsMust(Integer.parseInt(value));
bool=true;
checkKeyValue(isMustInverseMap, m, value);
}
if ("材料类型".equals(m.getKey().trim())) {
//materialTypeInverseMap
String value = materialTypeInverseMap.getOrDefault(m.getValue().toString(), "0");
datumEntity.setMaterialType(Integer.parseInt(value));
bool=true;
checkKeyValue(materialTypeInverseMap, m, value);
}
if ("电子材料格式".equals(m.getKey().trim())) {
//electronicgsInverseMap
String value = electronicgsInverseMap.getOrDefault(m.getValue().toString(), "0");
datumEntity.setElectronicgs(Integer.parseInt(value));
bool=true;
checkKeyValue(electronicgsInverseMap, m, value);
}
if ("来源渠道".equals(m.getKey().trim())) {
//materialSourceSmInverseMap
String value = materialSourceInverseMap.getOrDefault(m.getValue().toString(), "0");
datumEntity.setMaterialSource(Integer.parseInt(value));
bool=true;
checkKeyValue(materialSourceInverseMap, m, value);
}
if ("来源渠道说明".equals(m.getKey().trim())) {
datumEntity.setMaterialSourceSm(m.getValue().toString());
bool=true;
}
if ("纸质材料份数".equals(m.getKey().trim())) {
//materialSourceSmInverseMap
datumEntity.setPaperNum(Integer.parseInt(m.getValue().toString()));
bool=true;
}
if ("纸质材料规格".equals(m.getKey().trim())) {
//paperGgInverseMap
String value = paperGgInverseMap.getOrDefault(m.getValue().toString(), "0");
datumEntity.setPaperGg(Integer.parseInt(value));
bool=true;
checkKeyValue(paperGgInverseMap, m, value);
datumEntity.setPaperGgText(m.getValue().toString());
}
if ("盖章或盖手印方式".equals(m.getKey().trim())) {
//sealWayInverseMap
String value = sealWayInverseMap.getOrDefault(m.getValue().toString(), "0");
datumEntity.setSealWay(Integer.parseInt(value));
bool=true;
checkKeyValue(sealWayInverseMap, m, value);
datumEntity.setSealWayText(m.getValue().toString());
}
if ("是否容缺".equals(m.getKey().trim())) {
//yesOrNoInverseMap
String value = yesOrNoInverseMap.getOrDefault(m.getValue().toString(), "0");
datumEntity.setIsLack(Integer.parseInt(value));
bool=true;
checkKeyValue(yesOrNoInverseMap, m, value);
}
if ("是否减免".equals(m.getKey().trim())) {
//yesOrNoInverseMap
String value = yesOrNoInverseMap.getOrDefault(m.getValue().toString(), "0");
datumEntity.setIsjianm(Integer.parseInt(value));
bool=true;
checkKeyValue(yesOrNoInverseMap, m, value);
}
if ("减免模式".equals(m.getKey().trim())) {
//jianmMsInverseMap
if("".equals(m.getValue().toString())){
m.setValue("无");
}
String value = jianmMsInverseMap.getOrDefault(m.getValue().toString(), "0");
datumEntity.setJianmMs(Integer.parseInt(value));
bool=true;
checkKeyValue(jianmMsInverseMap, m, value);
}
if ("填报须知".equals(m.getKey().trim())) {
datumEntity.setRemarkSub(m.getValue().toString());
bool=true;
}
if ("受理标准".equals(m.getKey().trim())) {
datumEntity.setSummary(m.getValue().toString());
bool=true;
}
if ("要求提供材料的依据".equals(m.getKey().trim())) {
datumEntity.setClauseContent(m.getValue().toString());
bool=true;
}
if ("备注".equals(m.getKey().trim())) {
datumEntity.setRemark(m.getValue().toString());
bool=true;
}
if(!bool){
System.out.println("name:" + m.getKey());
System.out.print(" value:" + m.getValue());
}
}).count();
}
}
matterDatumService.save(datumEntity); List<MatterQuestionEntity> questionEntityList = jsonObject.entrySet().stream().map(question -> {
//示例样表 MatterQuestionEntity questionEntity = new MatterQuestionEntity();
JSONArray jsonArrayone = secondJsonObject.getJSONArray("示例样表"); questionEntity.setTitle(question.getKey());
if (!ObjectUtils.isEmpty(jsonArrayone)) { questionEntity.setContent(question.getValue().toString());
ArrayList<MatterDatumFileEntity> fileArrayList = new ArrayList<>(); questionEntity.setMatterId(item.getMatterId());
for (int j = 0; j < jsonArrayone.size(); j++) { questionEntity.setSource(0);
MatterDatumFileEntity fileEntity = new MatterDatumFileEntity(); questionEntity.setCreateTime(new Date());
fileEntity.setCreateTime(new Date()); questionEntity.setCreateUser("system");
fileEntity.setCreateUser("system"); return questionEntity;
fileEntity.setDatumid(datumEntity.getId()); }).collect(Collectors.toList());
fileEntity.setSource(0);
fileEntity.setFiletype(1);
jsonArrayone.getJSONObject(j).entrySet().stream().peek(m -> {
fileEntity.setFileName(m.getKey());
fileEntity.setFileUrl(m.getValue().toString());
}).count();
fileArrayList.add(fileEntity);
}
matterDatumFileService.save(fileArrayList);
matterQuestionService.save(questionEntityList);
}
}).count();
} catch (Exception e) {
log.error("error", e);
}
return respPdu;
}
/**
* 同步解析受理条件
*
* @param req
* @return
*/
@PostMapping("/accept")
public ApiRespPdu accept(@RequestBody ApiReqPdu<RequestTaskReq> req) {
ApiRespPdu<String> respPdu = new ApiRespPdu<>();
try {
//拆分材料库数据
matterDetailService.find(new MatterDetailQuery()).stream().peek(item -> {
String json = item.getConditionsSltj();
//log.info("receive json:"+json);
if (ObjectUtils.isEmpty(json) || "{}".equals(json)) {
log.info("json:" + json);
return;
}
JSONObject root = null;
try {
root = JSON.parseObject(json);
} catch (Exception e) {
json = json.replaceAll("\\\\", "\\\\\\\\");
try {
root = JSON.parseObject(json);
} catch (Exception e1) {
log.error("error json:" + json);
return;
} }
//空白表格
JSONArray jsonArraytwo = secondJsonObject.getJSONArray("空白表格"); }
if (!ObjectUtils.isEmpty(jsonArraytwo)) {
ArrayList<MatterDatumFileEntity> fileArrayList = new ArrayList<>(); if (root.isEmpty()) {
for (int j = 0; j < jsonArraytwo.size(); j++) { log.info("root is null");
MatterDatumFileEntity fileEntity = new MatterDatumFileEntity(); return;
fileEntity.setCreateTime(new Date()); }
fileEntity.setCreateUser("system"); String value = null;
fileEntity.setDatumid(datumEntity.getId()); try {
fileEntity.setSource(0); value = root.getString("受理条件");
fileEntity.setFiletype(2);
jsonArraytwo.getJSONObject(j).entrySet().stream().peek(m -> { } catch (Exception e) {
fileEntity.setFileName(m.getKey()); log.error("error 受理条件",e);
fileEntity.setFileUrl(m.getValue().toString()); }
}).count();
fileArrayList.add(fileEntity); if (ObjectUtils.isEmpty(json)) {
} log.info("受理条件 is null");
matterDatumFileService.save(fileArrayList); return;
}
} }
}).count(); }).count();
...@@ -338,13 +211,119 @@ public class RequestMatterController { ...@@ -338,13 +211,119 @@ public class RequestMatterController {
return respPdu; return respPdu;
} }
/**
* 同步解析办理流程
*
* @param req
* @return
*/
@PostMapping("/flow")
public ApiRespPdu flow(@RequestBody ApiReqPdu<RequestTaskReq> req) {
ApiRespPdu<String> respPdu = new ApiRespPdu<>();
try {
//拆分材料库数据
matterDetailService.find(new MatterDetailQuery()).stream().peek(item -> {
String json = item.getProcessBllc();
//log.info("receive json:"+json);
if (ObjectUtils.isEmpty(json) || "{}".equals(json)) {
log.info("json:" + json);
return;
}
JSONObject root = null;
try {
root = JSON.parseObject(json);
} catch (Exception e) {
json = json.replaceAll("\\\\", "\\\\\\\\");
try {
root = JSON.parseObject(json);
} catch (Exception e1) {
log.error("error json:" + json);
return;
}
}
JSONArray jsonArray = null;
try {
jsonArray = root.getJSONArray("办理流程");
} catch (Exception e) {
log.error("error 无办理流程");
}
if (ObjectUtils.isEmpty(jsonArray)) {
log.info("办理流程 is null");
return;
}
List<MatterFlowlimitEntity> flowlimitEntityArrayList = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
MatterFlowlimitEntity matterFlowlimitEntity = new MatterFlowlimitEntity();
matterFlowlimitEntity.setMatterId(item.getMatterId());
matterFlowlimitEntity.setSource(0);
matterFlowlimitEntity.setCreateTime(new Date());
matterFlowlimitEntity.setCreateUser("system");
JSONArray innerJsonArray = jsonArray.getJSONArray(i);
for (int j = 0; j < innerJsonArray.size(); j++) {
innerJsonArray.getJSONObject(j).entrySet().stream().peek(m -> {
Boolean bool=false;
if ("办理流程".equals(m.getKey().trim())) {
matterFlowlimitEntity.setFlowName(m.getValue().toString());
bool=true;
}
if ("办理时长".equals(m.getKey().trim())) {
matterFlowlimitEntity.setFlowTime(m.getValue().toString());
bool=true;
}
if ("转外时限".equals(m.getKey().trim())) {
matterFlowlimitEntity.setFlowTurnOut(m.getValue().toString());
bool=true;
}
if ("办理流程说明".equals(m.getKey().trim())) {
matterFlowlimitEntity.setFlowDesc(m.getValue().toString());
bool=true;
}
if(!bool){
System.out.println("name:" + m.getKey());
System.out.print(" value:" + m.getValue());
}
}).count();
}
flowlimitEntityArrayList.add(matterFlowlimitEntity);
}
matterFlowlimitService.save(flowlimitEntityArrayList);
}).count();
} catch (Exception e) {
log.error("error", e);
}
return respPdu;
}
private void checkKeyValue(BiMap<String, String> map, Map.Entry<String, Object> m, String value) { private void checkKeyValue(BiMap<String, String> map, Map.Entry<String, Object> m, String value) {
if("0".equals(value)){ if ("0".equals(value)) {
//查看是否为空 //查看是否为空
String temp = map.get(m.getValue().toString()); String temp = map.get(m.getValue().toString());
if(ObjectUtils.isEmpty(temp)){ if (ObjectUtils.isEmpty(temp)) {
//打印枚举类型值 //打印枚举类型值
System.out.println("uncheck name:"+ m.getKey()+" value:"+ m.getValue()); System.out.println("uncheck name:" + m.getKey() + " value:" + m.getValue());
} }
} }
} }
......
government-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterFlowlimitEntity.java
View file @ 731df811
...@@ -5,26 +5,36 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -5,26 +5,36 @@ import com.mortals.framework.model.BaseEntityLong;
/** /**
* *
* Description:MatterFlowlimit * Description:MatterFlowlimit
* date: 2021-9-17 15:55:12 * date: 2021-9-23 13:21:04
*/ */
public class MatterFlowlimitEntity extends BaseEntityLong{ public class MatterFlowlimitEntity extends BaseEntityLong{
private static final long serialVersionUID = 1631865312190L; private static final long serialVersionUID = 1632374464316L;
/** /**
* 事项基础表matter id * 事项matter id
*/ */
private Long matterId; private Long matterId;
/** /**
* 模板标题 * 办理流程
*/ */
private String title; private String flowName;
/** /**
* 办理流程 * 办理时长
*/
private String flowTime;
/**
* 转外时限
*/
private String flowTurnOut;
/**
* 办理流程说明
*/ */
private String content; private String flowDesc;
/** /**
* 事项来源，0：政务网，1：自定义，默认0 * 事项来源，0：政务网，1：自定义，默认0
...@@ -55,46 +65,74 @@ public class MatterFlowlimitEntity extends BaseEntityLong{ ...@@ -55,46 +65,74 @@ public class MatterFlowlimitEntity extends BaseEntityLong{
} }
/** /**
* 获取 事项基础表matter id * 获取 事项matter id
* @return matterId * @return matterId
*/ */
public Long getMatterId() { public Long getMatterId() {
return this.matterId; return this.matterId;
} }
/** /**
* 设置 事项基础表matter id * 设置 事项matter id
* @param matterId * @param matterId
*/ */
public void setMatterId(Long matterId) { public void setMatterId(Long matterId) {
this.matterId = matterId; this.matterId = matterId;
} }
/** /**
* 获取 模板标题 * 获取 办理流程
* @return title * @return flowName
*/ */
public String getTitle() { public String getFlowName() {
return this.title; return this.flowName;
} }
/** /**
* 设置 模板标题 * 设置 办理流程
* @param title * @param flowName
*/ */
public void setTitle(String title) { public void setFlowName(String flowName) {
this.title = title; this.flowName = flowName;
} }
/** /**
* 获取 办理流程 * 获取 办理时长
* @return content * @return flowTime
*/ */
public String getContent() { public String getFlowTime() {
return this.content; return this.flowTime;
} }
/** /**
* 设置 办理流程 * 设置 办理时长
* @param content * @param flowTime
*/
public void setFlowTime(String flowTime) {
this.flowTime = flowTime;
}
/**
* 获取 转外时限
* @return flowTurnOut
*/
public String getFlowTurnOut() {
return this.flowTurnOut;
}
/**
* 设置 转外时限
* @param flowTurnOut
*/
public void setFlowTurnOut(String flowTurnOut) {
this.flowTurnOut = flowTurnOut;
}
/**
* 获取 办理流程说明
* @return flowDesc
*/
public String getFlowDesc() {
return this.flowDesc;
}
/**
* 设置 办理流程说明
* @param flowDesc
*/ */
public void setContent(String content) { public void setFlowDesc(String flowDesc) {
this.content = content; this.flowDesc = flowDesc;
} }
/** /**
* 获取 事项来源，0：政务网，1：自定义，默认0 * 获取 事项来源，0：政务网，1：自定义，默认0
...@@ -189,8 +227,10 @@ public class MatterFlowlimitEntity extends BaseEntityLong{ ...@@ -189,8 +227,10 @@ public class MatterFlowlimitEntity extends BaseEntityLong{
sb sb
.append(",id:").append(getId()) .append(",id:").append(getId())
.append(",matterId:").append(getMatterId()) .append(",matterId:").append(getMatterId())
.append(",title:").append(getTitle()) .append(",flowName:").append(getFlowName())
.append(",content:").append(getContent()) .append(",flowTime:").append(getFlowTime())
.append(",flowTurnOut:").append(getFlowTurnOut())
.append(",flowDesc:").append(getFlowDesc())
.append(",source:").append(getSource()) .append(",source:").append(getSource())
.append(",updateTime:").append(getUpdateTime()) .append(",updateTime:").append(getUpdateTime())
.append(",updateUser:").append(getUpdateUser()) .append(",updateUser:").append(getUpdateUser())
...@@ -202,8 +242,10 @@ public class MatterFlowlimitEntity extends BaseEntityLong{ ...@@ -202,8 +242,10 @@ public class MatterFlowlimitEntity extends BaseEntityLong{
public void initAttrValue(){ public void initAttrValue(){
this.matterId = null; this.matterId = null;
this.title = null; this.flowName = null;
this.content = null; this.flowTime = null;
this.flowTurnOut = null;
this.flowDesc = null;
this.source = null; this.source = null;
this.updateTime = null; this.updateTime = null;
this.updateUser = null; this.updateUser = null;
......
government-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterFlowlimitQuery.java
View file @ 731df811
...@@ -6,10 +6,10 @@ import java.util.Date; ...@@ -6,10 +6,10 @@ import java.util.Date;
/** /**
* *
* Description:MatterFlowlimit * Description:MatterFlowlimit
* date: 2021-9-17 15:55:12 * date: 2021-9-23 13:21:04
*/ */
public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
private static final long serialVersionUID = 1631865312191L; private static final long serialVersionUID = 1632374464325L;
/** 开始 主键，自增长 */ /** 开始 主键，自增长 */
private Long idStart; private Long idStart;
...@@ -22,24 +22,30 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -22,24 +22,30 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
/** 主键，自增长 */ /** 主键，自增长 */
private List <Long> idList; private List <Long> idList;
/** 开始 事项基础表matter id */ /** 开始 事项matter id */
private Long matterIdStart; private Long matterIdStart;
/** 结束 事项基础表matter id */ /** 结束 事项matter id */
private Long matterIdEnd; private Long matterIdEnd;
/** 增加 事项基础表matter id */ /** 增加 事项matter id */
private Long matterIdIncrement; private Long matterIdIncrement;
/** 事项基础表matter id */ /** 事项matter id */
private List <Long> matterIdList; private List <Long> matterIdList;
/** 模板标题 */
private List<String> titleList;
/** 办理流程 */ /** 办理流程 */
private List<String> contentList; private List<String> flowNameList;
/** 办理时长 */
private List<String> flowTimeList;
/** 转外时限 */
private List<String> flowTurnOutList;
/** 办理流程说明 */
private List<String> flowDescList;
/** 开始 事项来源，0：政务网，1：自定义，默认0 */ /** 开始 事项来源，0：政务网，1：自定义，默认0 */
private Integer sourceStart; private Integer sourceStart;
...@@ -143,7 +149,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -143,7 +149,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 开始 事项基础表matter id * 获取 开始 事项matter id
* @return matterIdStart * @return matterIdStart
*/ */
public Long getMatterIdStart(){ public Long getMatterIdStart(){
...@@ -151,7 +157,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -151,7 +157,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
} }
/** /**
* 设置 开始 事项基础表matter id * 设置 开始 事项matter id
* @param matterIdStart * @param matterIdStart
*/ */
public void setMatterIdStart(Long matterIdStart){ public void setMatterIdStart(Long matterIdStart){
...@@ -159,7 +165,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -159,7 +165,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
} }
/** /**
* 获取 结束 事项基础表matter id * 获取 结束 事项matter id
* @return matterIdEnd * @return matterIdEnd
*/ */
public Long getMatterIdEnd(){ public Long getMatterIdEnd(){
...@@ -167,7 +173,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -167,7 +173,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
} }
/** /**
* 设置 结束 事项基础表matter id * 设置 结束 事项matter id
* @param matterIdEnd * @param matterIdEnd
*/ */
public void setMatterIdEnd(Long matterIdEnd){ public void setMatterIdEnd(Long matterIdEnd){
...@@ -175,7 +181,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -175,7 +181,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
} }
/** /**
* 获取 增加 事项基础表matter id * 获取 增加 事项matter id
* @return matterIdIncrement * @return matterIdIncrement
*/ */
public Long getMatterIdIncrement(){ public Long getMatterIdIncrement(){
...@@ -183,7 +189,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -183,7 +189,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
} }
/** /**
* 设置 增加 事项基础表matter id * 设置 增加 事项matter id
* @param matterIdIncrement * @param matterIdIncrement
*/ */
public void setMatterIdIncrement(Long matterIdIncrement){ public void setMatterIdIncrement(Long matterIdIncrement){
...@@ -191,7 +197,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -191,7 +197,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
} }
/** /**
* 获取 事项基础表matter id * 获取 事项matter id
* @return matterIdList * @return matterIdList
*/ */
public List<Long> getMatterIdList(){ public List<Long> getMatterIdList(){
...@@ -199,41 +205,71 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -199,41 +205,71 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
} }
/** /**
* 设置 事项基础表matter id * 设置 事项matter id
* @param matterIdList * @param matterIdList
*/ */
public void setMatterIdList(List<Long> matterIdList){ public void setMatterIdList(List<Long> matterIdList){
this.matterIdList = matterIdList; this.matterIdList = matterIdList;
} }
/** /**
* 获取 模板标题 * 获取 办理流程
* @return titleList * @return flowNameList
*/ */
public List<String> getTitleList(){ public List<String> getFlowNameList(){
return this.titleList; return this.flowNameList;
} }
/** /**
* 设置 模板标题 * 设置 办理流程
* @param titleList * @param flowNameList
*/ */
public void setTitleList(List<String> titleList){ public void setFlowNameList(List<String> flowNameList){
this.titleList = titleList; this.flowNameList = flowNameList;
} }
/** /**
* 获取 办理流程 * 获取 办理时长
* @return contentList * @return flowTimeList
*/ */
public List<String> getContentList(){ public List<String> getFlowTimeList(){
return this.contentList; return this.flowTimeList;
} }
/** /**
* 设置 办理流程 * 设置 办理时长
* @param contentList * @param flowTimeList
*/
public void setFlowTimeList(List<String> flowTimeList){
this.flowTimeList = flowTimeList;
}
/**
* 获取 转外时限
* @return flowTurnOutList
*/ */
public void setContentList(List<String> contentList){ public List<String> getFlowTurnOutList(){
this.contentList = contentList; return this.flowTurnOutList;
}
/**
* 设置 转外时限
* @param flowTurnOutList
*/
public void setFlowTurnOutList(List<String> flowTurnOutList){
this.flowTurnOutList = flowTurnOutList;
}
/**
* 获取 办理流程说明
* @return flowDescList
*/
public List<String> getFlowDescList(){
return this.flowDescList;
}
/**
* 设置 办理流程说明
* @param flowDescList
*/
public void setFlowDescList(List<String> flowDescList){
this.flowDescList = flowDescList;
} }
/** /**
* 获取 开始 事项来源，0：政务网，1：自定义，默认0 * 获取 开始 事项来源，0：政务网，1：自定义，默认0
...@@ -438,7 +474,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -438,7 +474,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
} }
/** /**
* 设置 事项基础表matter id * 设置 事项matter id
* @param matterId * @param matterId
*/ */
public MatterFlowlimitQuery matterId(Long matterId){ public MatterFlowlimitQuery matterId(Long matterId){
...@@ -447,7 +483,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -447,7 +483,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
} }
/** /**
* 设置 开始 事项基础表matter id * 设置 开始 事项matter id
* @param matterIdStart * @param matterIdStart
*/ */
public MatterFlowlimitQuery matterIdStart(Long matterIdStart){ public MatterFlowlimitQuery matterIdStart(Long matterIdStart){
...@@ -456,7 +492,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -456,7 +492,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
} }
/** /**
* 设置 结束 事项基础表matter id * 设置 结束 事项matter id
* @param matterIdEnd * @param matterIdEnd
*/ */
public MatterFlowlimitQuery matterIdEnd(Long matterIdEnd){ public MatterFlowlimitQuery matterIdEnd(Long matterIdEnd){
...@@ -465,7 +501,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -465,7 +501,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
} }
/** /**
* 设置 增加 事项基础表matter id * 设置 增加 事项matter id
* @param matterIdIncrement * @param matterIdIncrement
*/ */
public MatterFlowlimitQuery matterIdIncrement(Long matterIdIncrement){ public MatterFlowlimitQuery matterIdIncrement(Long matterIdIncrement){
...@@ -474,7 +510,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -474,7 +510,7 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
} }
/** /**
* 设置 事项基础表matter id * 设置 事项matter id
* @param matterIdList * @param matterIdList
*/ */
public MatterFlowlimitQuery matterIdList(List<Long> matterIdList){ public MatterFlowlimitQuery matterIdList(List<Long> matterIdList){
...@@ -482,39 +518,75 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{ ...@@ -482,39 +518,75 @@ public class MatterFlowlimitQuery extends MatterFlowlimitEntity{
return this; return this;
} }
/** /**
* 设置 模板标题 * 设置 办理流程
* @param title * @param flowName
*/
public MatterFlowlimitQuery flowName(String flowName){
setFlowName(flowName);
return this;
}
/**
* 设置 办理流程
* @param flowNameList
*/
public MatterFlowlimitQuery flowNameList(List<String> flowNameList){
this.flowNameList = flowNameList;
return this;
}
/**
* 设置 办理时长
* @param flowTime
*/ */
public MatterFlowlimitQuery title(String title){ public MatterFlowlimitQuery flowTime(String flowTime){
setTitle(title); setFlowTime(flowTime);
return this; return this;
} }
/** /**
* 设置 模板标题 * 设置 办理时长
* @param titleList * @param flowTimeList
*/ */
public MatterFlowlimitQuery titleList(List<String> titleList){ public MatterFlowlimitQuery flowTimeList(List<String> flowTimeList){
this.titleList = titleList; this.flowTimeList = flowTimeList;
return this; return this;
} }
/** /**
* 设置 办理流程 * 设置 转外时限
* @param content * @param flowTurnOut
*/ */
public MatterFlowlimitQuery content(String content){ public MatterFlowlimitQuery flowTurnOut(String flowTurnOut){
setContent(content); setFlowTurnOut(flowTurnOut);
return this; return this;
} }
/** /**
* 设置 办理流程 * 设置 转外时限
* @param contentList * @param flowTurnOutList
*/
public MatterFlowlimitQuery flowTurnOutList(List<String> flowTurnOutList){
this.flowTurnOutList = flowTurnOutList;
return this;
}
/**
* 设置 办理流程说明
* @param flowDesc
*/
public MatterFlowlimitQuery flowDesc(String flowDesc){
setFlowDesc(flowDesc);
return this;
}
/**
* 设置 办理流程说明
* @param flowDescList
*/ */
public MatterFlowlimitQuery contentList(List<String> contentList){ public MatterFlowlimitQuery flowDescList(List<String> flowDescList){
this.contentList = contentList; this.flowDescList = flowDescList;
return this; return this;
} }
......
government-manager/src/main/java/com/mortals/xhx/module/one/service/OneClassifyTopicalService.java
View file @ 731df811
...@@ -2,6 +2,8 @@ package com.mortals.xhx.module.one.service; ...@@ -2,6 +2,8 @@ package com.mortals.xhx.module.one.service;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo; import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo;
import com.mortals.xhx.busiz.question.AnswerReq;
import com.mortals.xhx.busiz.question.QuestionInfo;
import com.mortals.xhx.module.one.model.OneClassifyTopicalEntity; import com.mortals.xhx.module.one.model.OneClassifyTopicalEntity;
import java.util.HashMap; import java.util.HashMap;
...@@ -29,4 +31,7 @@ public interface OneClassifyTopicalService extends ICRUDService<OneClassifyTopic ...@@ -29,4 +31,7 @@ public interface OneClassifyTopicalService extends ICRUDService<OneClassifyTopic
*/ */
OneProblemInfo findAllQuestion(Long id); OneProblemInfo findAllQuestion(Long id);
QuestionInfo getMattersByAnswers(AnswerReq req);
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/one/service/impl/OneClassifyTopicalServiceImpl.java
View file @ 731df811
...@@ -3,10 +3,17 @@ package com.mortals.xhx.module.one.service.impl; ...@@ -3,10 +3,17 @@ package com.mortals.xhx.module.one.service.impl;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo; import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo;
import com.mortals.xhx.busiz.question.*;
import com.mortals.xhx.common.code.YesNoEnum; import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.matter.model.*;
import com.mortals.xhx.module.matter.service.*;
import com.mortals.xhx.module.one.model.*; import com.mortals.xhx.module.one.model.*;
import com.mortals.xhx.module.one.service.OneClassifyService; import com.mortals.xhx.module.one.service.OneClassifyService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
...@@ -15,7 +22,6 @@ import com.mortals.xhx.module.one.service.OneClassifyTopicalService; ...@@ -15,7 +22,6 @@ import com.mortals.xhx.module.one.service.OneClassifyTopicalService;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -32,6 +38,20 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl ...@@ -32,6 +38,20 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
@Autowired @Autowired
private OneClassifyService oneClassifyService; private OneClassifyService oneClassifyService;
@Autowired
private MatterService matterService;
@Autowired
private MatterDatumService matterDatumService;
@Autowired
private ParamService paramService;
@Autowired
private MatterDatumFileService matterDatumFileService;
@Autowired
private MatterFlowlimitService matterFlowlimitService;
@Autowired
private MatterQuestionService matterQuestionService;
@Autowired
private MatterAcceptService matterAcceptService;
@Override @Override
...@@ -111,16 +131,11 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl ...@@ -111,16 +131,11 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
info.setParentId(rootClassify.getParentId()); info.setParentId(rootClassify.getParentId());
info.setRemark(rootClassify.getSortRemarks()); info.setRemark(rootClassify.getSortRemarks());
info.setIsAns(rootClassify.getIsAns()); info.setIsAns(rootClassify.getIsAns());
List<OneProblemInfo> collect = getOneClassifyEntities(rootClassify); List<OneProblemInfo> collect = getOneClassifyEntities(rootClassify);
if (!ObjectUtils.isEmpty(collect)) {
if(!ObjectUtils.isEmpty(collect)){
info.setChildren(collect); info.setChildren(collect);
} }
} }
return info; return info;
} }
...@@ -140,12 +155,103 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl ...@@ -140,12 +155,103 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
List<OneProblemInfo> oneClassifyEntities = this.getOneClassifyEntities(item); List<OneProblemInfo> oneClassifyEntities = this.getOneClassifyEntities(item);
if(!ObjectUtils.isEmpty(oneClassifyEntities)){ if (!ObjectUtils.isEmpty(oneClassifyEntities)) {
info.setChildren(oneClassifyEntities); info.setChildren(oneClassifyEntities);
} }
return info; return info;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
return collect; return collect;
} }
@Override
public QuestionInfo getMattersByAnswers(AnswerReq req) {
QuestionInfo questionInfo = new QuestionInfo();
Map<String, String> materialPropertyMap = paramService.getParamByFirstOrganize(Constant.Param_materialProperty);
Map<String, String> materialTypeMap = paramService.getParamByFirstOrganize(Constant.Param_materialType);
Map<String, String> electronicgsMap = paramService.getParamByFirstOrganize(Constant.Param_electronicgs);
Map<String, String> materialSourceMap = paramService.getParamByFirstOrganize(Constant.Param_materialSource);
//Map<String, String> paperGgMap = paramService.getParamByFirstOrganize(Constant.Param_paperGg);
Map<String, String> jianmMsMap = paramService.getParamByFirstOrganize(Constant.Param_jianmMs);
//Map<String, String> sealWayMap = paramService.getParamByFirstOrganize(Constant.Param_sealWay);
Map<String, String> isMustMap = paramService.getParamByFirstOrganize(Constant.Param_isMust);
//获取关联的所有事项
List<Long> matterIdsList = oneClassifyService.find(new OneClassifyQuery().idList(req.getOptionIds()))
.stream().flatMap(item ->
Arrays.asList(item.getMatterIds().split(",")).stream()
).map(Long::valueOf).distinct().collect(Collectors.toList());
//根据事项获取所有材料
List<MatterEntity> matterList = matterService.find(new MatterQuery().idList(matterIdsList));
List<MatterInfo> matterEntityList = matterList.stream().map(item -> {
MatterInfo matterinfo = new MatterInfo();
matterinfo.setId(item.getId());
matterinfo.setMatterName(item.getMatterName());
return matterinfo;
}).collect(Collectors.toList());
questionInfo.setMatterInfoList(matterEntityList);
List<DatumInfo> datumInfoList = matterDatumService.find(new MatterDatumQuery().matterIdList(matterIdsList))
.stream().distinct().map(item -> {
DatumInfo datumInfo = new DatumInfo();
BeanUtils.copyProperties(item, datumInfo, BeanUtil.getNullPropertyNames(item));
datumInfo.setId(item.getId());
datumInfo.setJianmMs(jianmMsMap.getOrDefault(item.getJianmMs().toString(), ""));
datumInfo.setIsMust(isMustMap.getOrDefault(item.getIsMust().toString(), ""));
datumInfo.setMaterialProperty(materialPropertyMap.getOrDefault(item.getMaterialProperty().toString(), ""));
datumInfo.setMaterialSource(materialSourceMap.getOrDefault(item.getMaterialSource().toString(), ""));
datumInfo.setMaterialSourceSm(item.getMaterialSourceSm());
datumInfo.setElectronicgs(electronicgsMap.getOrDefault(item.getElectronicgs().toString(), ""));
datumInfo.setMaterialType(materialTypeMap.getOrDefault(item.getMaterialType().toString(), ""));
datumInfo.setIsLack(YesNoEnum.getByValue(item.getIsLack()).getDesc());
datumInfo.setIsjianm(YesNoEnum.getByValue(item.getIsjianm()).getDesc());
datumInfo.setSealWay(item.getSealWayText());
datumInfo.setPaperGg(item.getPaperGgText());
List<DatumDownloadInfo> downloadInfoList = matterDatumFileService.find(new MatterDatumFileQuery().datumid(item.getId())).stream().map(file -> {
DatumDownloadInfo datumDownloadInfo = new DatumDownloadInfo();
BeanUtils.copyProperties(file, datumDownloadInfo, BeanUtil.getNullPropertyNames(file));
return datumDownloadInfo;
}).collect(Collectors.toList());
datumInfo.setAttachList(downloadInfoList);
return datumInfo;
}).collect(Collectors.toList());
questionInfo.setDatumInfoList(datumInfoList);
//根据事项获取所有申请条件
List<AcceptInfo> acceptInfoList = matterAcceptService.find(new MatterAcceptQuery().matterIdList(matterIdsList)).stream().map(item -> {
AcceptInfo acceptInfo = new AcceptInfo();
acceptInfo.setTitle(item.getTitle());
acceptInfo.setContent(item.getContent());
acceptInfo.setMatterId(item.getMatterId());
return acceptInfo;
}).collect(Collectors.toList());
questionInfo.setAcceptInfoList(acceptInfoList);
//根据事项获取所有办理流程
List<FlowLimitInfo> flowLimitInfoList = matterFlowlimitService.find(new MatterFlowlimitQuery().matterIdList(matterIdsList)).stream().map(item -> {
FlowLimitInfo flowLimitInfo = new FlowLimitInfo();
BeanUtils.copyProperties(item, flowLimitInfo, BeanUtil.getNullPropertyNames(item));
return flowLimitInfo;
}).collect(Collectors.toList());
questionInfo.setFlowLimitInfoList(flowLimitInfoList);
//根据事项获取所有常见问题
List<QAndAInfo> qAndAInfoList = matterQuestionService.find(new MatterQuestionQuery().matterIdList(matterIdsList)).stream().map(item -> {
QAndAInfo info = new QAndAInfo();
info.setQuestion(item.getTitle());
info.setAnswer(item.getContent());
info.setMatterId(item.getMatterId());
return info;
}).collect(Collectors.toList());
questionInfo.setQAndAInfoList(qAndAInfoList);
return questionInfo;
}
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/YthOnethingDetailDao.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.module.yth.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.yth.model.YthOnethingDetailEntity;
/**
* <p>Title: 一件事提交详细表</p>
* <p>Description: YthOnethingDetailDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface YthOnethingDetailDao extends ICRUDDao<YthOnethingDetailEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/ibatis/YthOnethingDetailDaoImpl.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.module.yth.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.yth.dao.YthOnethingDetailDao;
import com.mortals.xhx.module.yth.model.YthOnethingDetailEntity;
/**
* <p>Title: 一件事提交详细表</p>
* <p>Description: YthOnethingDetailDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("ythOnethingDetailDao")
public class YthOnethingDetailDaoImpl extends BaseCRUDDaoMybatis<YthOnethingDetailEntity,Long> implements YthOnethingDetailDao {
}
government-manager/src/main/java/com/mortals/xhx/module/yth/model/BusinessInfo.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.module.yth.model;
import lombok.Data;
/**
* 业务数据
*
* @author: zxfei
* @date: 2021/9/6 14:05
* @description:
**/
@Data
public class BusinessInfo {
/**
* 事项名称
*/
private String oneThingName;
/**
* 事项描述
*/
private String oneThingDesc;
}
government-manager/src/main/java/com/mortals/xhx/module/yth/model/YthOnethingDetailEntity.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.module.yth.model;
import java.util.Date;
import com.mortals.framework.model.BaseEntityLong;
/**
*
* Description:YthOnethingDetail
* date: 2021-9-23 16:22:50
*/
public class YthOnethingDetailEntity extends BaseEntityLong{
private static final long serialVersionUID = 1632385370714L;
/**
* 材料提交id
*/
private Long oneThingId;
/**
* 事项id
*/
private Long matterId;
/**
* 材料id
*/
private Long datumId;
/**
* 附件名称
*/
private String fileName;
/**
* 附件地址
*/
private String filepath;
/**
* 变更时间
*/
private Date updateTime;
/**
* 变更用户loginName
*/
private String updateUser;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建用户loginName
*/
private String createUser;
public YthOnethingDetailEntity(){
}
/**
* 获取 材料提交id
* @return oneThingId
*/
public Long getOneThingId() {
return this.oneThingId;
}
/**
* 设置 材料提交id
* @param oneThingId
*/
public void setOneThingId(Long oneThingId) {
this.oneThingId = oneThingId;
}
/**
* 获取 事项id
* @return matterId
*/
public Long getMatterId() {
return this.matterId;
}
/**
* 设置 事项id
* @param matterId
*/
public void setMatterId(Long matterId) {
this.matterId = matterId;
}
/**
* 获取 材料id
* @return datumId
*/
public Long getDatumId() {
return this.datumId;
}
/**
* 设置 材料id
* @param datumId
*/
public void setDatumId(Long datumId) {
this.datumId = datumId;
}
/**
* 获取 附件名称
* @return fileName
*/
public String getFileName() {
return this.fileName;
}
/**
* 设置 附件名称
* @param fileName
*/
public void setFileName(String fileName) {
this.fileName = fileName;
}
/**
* 获取 附件地址
* @return filepath
*/
public String getFilepath() {
return this.filepath;
}
/**
* 设置 附件地址
* @param filepath
*/
public void setFilepath(String filepath) {
this.filepath = filepath;
}
/**
* 获取 变更时间
* @return updateTime
*/
public Date getUpdateTime() {
return this.updateTime;
}
/**
* 设置 变更时间
* @param updateTime
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* 获取 变更用户loginName
* @return updateUser
*/
public String getUpdateUser() {
return this.updateUser;
}
/**
* 设置 变更用户loginName
* @param updateUser
*/
public void setUpdateUser(String updateUser) {
this.updateUser = updateUser;
}
/**
* 获取 创建时间
* @return createTime
*/
public Date getCreateTime() {
return this.createTime;
}
/**
* 设置 创建时间
* @param createTime
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* 获取 创建用户loginName
* @return createUser
*/
public String getCreateUser() {
return this.createUser;
}
/**
* 设置 创建用户loginName
* @param createUser
*/
public void setCreateUser(String createUser) {
this.createUser = createUser;
}
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null)
return false;
if (obj instanceof YthOnethingDetailEntity) {
YthOnethingDetailEntity tmp = (YthOnethingDetailEntity) 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(",oneThingId:").append(getOneThingId())
.append(",matterId:").append(getMatterId())
.append(",datumId:").append(getDatumId())
.append(",fileName:").append(getFileName())
.append(",filepath:").append(getFilepath())
.append(",updateTime:").append(getUpdateTime())
.append(",updateUser:").append(getUpdateUser())
.append(",createTime:").append(getCreateTime())
.append(",createUser:").append(getCreateUser())
;
return sb.toString();
}
public void initAttrValue(){
this.oneThingId = null;
this.matterId = null;
this.datumId = null;
this.fileName = null;
this.filepath = null;
this.updateTime = null;
this.updateUser = null;
this.createTime = null;
this.createUser = null;
}
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/model/YthOnethingDetailQuery.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.module.yth.model;
import java.util.List;
import java.util.Date;
/**
*
* Description:YthOnethingDetail
* date: 2021-9-23 16:22:50
*/
public class YthOnethingDetailQuery extends YthOnethingDetailEntity{
private static final long serialVersionUID = 1632385370718L;
/** 开始 主键，自增长 */
private Long idStart;
/** 结束 主键，自增长 */
private Long idEnd;
/** 增加 主键，自增长 */
private Long idIncrement;
/** 主键，自增长 */
private List <Long> idList;
/** 开始 材料提交id */
private Long oneThingIdStart;
/** 结束 材料提交id */
private Long oneThingIdEnd;
/** 增加 材料提交id */
private Long oneThingIdIncrement;
/** 材料提交id */
private List <Long> oneThingIdList;
/** 开始 事项id */
private Long matterIdStart;
/** 结束 事项id */
private Long matterIdEnd;
/** 增加 事项id */
private Long matterIdIncrement;
/** 事项id */
private List <Long> matterIdList;
/** 开始 材料id */
private Long datumIdStart;
/** 结束 材料id */
private Long datumIdEnd;
/** 增加 材料id */
private Long datumIdIncrement;
/** 材料id */
private List <Long> datumIdList;
/** 附件名称 */
private List<String> fileNameList;
/** 附件地址 */
private List<String> filepathList;
/** 开始 变更时间 */
private String updateTimeStart;
/** 结束 变更时间 */
private String updateTimeEnd;
/** 变更用户loginName */
private List<String> updateUserList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 创建用户loginName */
private List<String> createUserList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<YthOnethingDetailQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<YthOnethingDetailQuery> andConditionList;
public YthOnethingDetailQuery(){
}
/**
* 获取 开始 主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 主键，自增长
* @return idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 主键，自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 开始 材料提交id
* @return oneThingIdStart
*/
public Long getOneThingIdStart(){
return this.oneThingIdStart;
}
/**
* 设置 开始 材料提交id
* @param oneThingIdStart
*/
public void setOneThingIdStart(Long oneThingIdStart){
this.oneThingIdStart = oneThingIdStart;
}
/**
* 获取 结束 材料提交id
* @return oneThingIdEnd
*/
public Long getOneThingIdEnd(){
return this.oneThingIdEnd;
}
/**
* 设置 结束 材料提交id
* @param oneThingIdEnd
*/
public void setOneThingIdEnd(Long oneThingIdEnd){
this.oneThingIdEnd = oneThingIdEnd;
}
/**
* 获取 增加 材料提交id
* @return oneThingIdIncrement
*/
public Long getOneThingIdIncrement(){
return this.oneThingIdIncrement;
}
/**
* 设置 增加 材料提交id
* @param oneThingIdIncrement
*/
public void setOneThingIdIncrement(Long oneThingIdIncrement){
this.oneThingIdIncrement = oneThingIdIncrement;
}
/**
* 获取 材料提交id
* @return oneThingIdList
*/
public List<Long> getOneThingIdList(){
return this.oneThingIdList;
}
/**
* 设置 材料提交id
* @param oneThingIdList
*/
public void setOneThingIdList(List<Long> oneThingIdList){
this.oneThingIdList = oneThingIdList;
}
/**
* 获取 开始 事项id
* @return matterIdStart
*/
public Long getMatterIdStart(){
return this.matterIdStart;
}
/**
* 设置 开始 事项id
* @param matterIdStart
*/
public void setMatterIdStart(Long matterIdStart){
this.matterIdStart = matterIdStart;
}
/**
* 获取 结束 事项id
* @return matterIdEnd
*/
public Long getMatterIdEnd(){
return this.matterIdEnd;
}
/**
* 设置 结束 事项id
* @param matterIdEnd
*/
public void setMatterIdEnd(Long matterIdEnd){
this.matterIdEnd = matterIdEnd;
}
/**
* 获取 增加 事项id
* @return matterIdIncrement
*/
public Long getMatterIdIncrement(){
return this.matterIdIncrement;
}
/**
* 设置 增加 事项id
* @param matterIdIncrement
*/
public void setMatterIdIncrement(Long matterIdIncrement){
this.matterIdIncrement = matterIdIncrement;
}
/**
* 获取 事项id
* @return matterIdList
*/
public List<Long> getMatterIdList(){
return this.matterIdList;
}
/**
* 设置 事项id
* @param matterIdList
*/
public void setMatterIdList(List<Long> matterIdList){
this.matterIdList = matterIdList;
}
/**
* 获取 开始 材料id
* @return datumIdStart
*/
public Long getDatumIdStart(){
return this.datumIdStart;
}
/**
* 设置 开始 材料id
* @param datumIdStart
*/
public void setDatumIdStart(Long datumIdStart){
this.datumIdStart = datumIdStart;
}
/**
* 获取 结束 材料id
* @return datumIdEnd
*/
public Long getDatumIdEnd(){
return this.datumIdEnd;
}
/**
* 设置 结束 材料id
* @param datumIdEnd
*/
public void setDatumIdEnd(Long datumIdEnd){
this.datumIdEnd = datumIdEnd;
}
/**
* 获取 增加 材料id
* @return datumIdIncrement
*/
public Long getDatumIdIncrement(){
return this.datumIdIncrement;
}
/**
* 设置 增加 材料id
* @param datumIdIncrement
*/
public void setDatumIdIncrement(Long datumIdIncrement){
this.datumIdIncrement = datumIdIncrement;
}
/**
* 获取 材料id
* @return datumIdList
*/
public List<Long> getDatumIdList(){
return this.datumIdList;
}
/**
* 设置 材料id
* @param datumIdList
*/
public void setDatumIdList(List<Long> datumIdList){
this.datumIdList = datumIdList;
}
/**
* 获取 附件名称
* @return fileNameList
*/
public List<String> getFileNameList(){
return this.fileNameList;
}
/**
* 设置 附件名称
* @param fileNameList
*/
public void setFileNameList(List<String> fileNameList){
this.fileNameList = fileNameList;
}
/**
* 获取 附件地址
* @return filepathList
*/
public List<String> getFilepathList(){
return this.filepathList;
}
/**
* 设置 附件地址
* @param filepathList
*/
public void setFilepathList(List<String> filepathList){
this.filepathList = filepathList;
}
/**
* 获取 开始 变更时间
* @return updateTimeStart
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
* 设置 开始 变更时间
* @param updateTimeStart
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
* 获取 结束 变更时间
* @return updateTimeEnd
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
* 设置 结束 变更时间
* @param updateTimeEnd
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 变更用户loginName
* @return updateUserList
*/
public List<String> getUpdateUserList(){
return this.updateUserList;
}
/**
* 设置 变更用户loginName
* @param updateUserList
*/
public void setUpdateUserList(List<String> updateUserList){
this.updateUserList = updateUserList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 创建用户loginName
* @return createUserList
*/
public List<String> getCreateUserList(){
return this.createUserList;
}
/**
* 设置 创建用户loginName
* @param createUserList
*/
public void setCreateUserList(List<String> createUserList){
this.createUserList = createUserList;
}
/**
* 设置 主键，自增长
* @param id
*/
public YthOnethingDetailQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 主键，自增长
* @param idStart
*/
public YthOnethingDetailQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 主键，自增长
* @param idEnd
*/
public YthOnethingDetailQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 主键，自增长
* @param idIncrement
*/
public YthOnethingDetailQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 主键，自增长
* @param idList
*/
public YthOnethingDetailQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 材料提交id
* @param oneThingId
*/
public YthOnethingDetailQuery oneThingId(Long oneThingId){
setOneThingId(oneThingId);
return this;
}
/**
* 设置 开始 材料提交id
* @param oneThingIdStart
*/
public YthOnethingDetailQuery oneThingIdStart(Long oneThingIdStart){
this.oneThingIdStart = oneThingIdStart;
return this;
}
/**
* 设置 结束 材料提交id
* @param oneThingIdEnd
*/
public YthOnethingDetailQuery oneThingIdEnd(Long oneThingIdEnd){
this.oneThingIdEnd = oneThingIdEnd;
return this;
}
/**
* 设置 增加 材料提交id
* @param oneThingIdIncrement
*/
public YthOnethingDetailQuery oneThingIdIncrement(Long oneThingIdIncrement){
this.oneThingIdIncrement = oneThingIdIncrement;
return this;
}
/**
* 设置 材料提交id
* @param oneThingIdList
*/
public YthOnethingDetailQuery oneThingIdList(List<Long> oneThingIdList){
this.oneThingIdList = oneThingIdList;
return this;
}
/**
* 设置 事项id
* @param matterId
*/
public YthOnethingDetailQuery matterId(Long matterId){
setMatterId(matterId);
return this;
}
/**
* 设置 开始 事项id
* @param matterIdStart
*/
public YthOnethingDetailQuery matterIdStart(Long matterIdStart){
this.matterIdStart = matterIdStart;
return this;
}
/**
* 设置 结束 事项id
* @param matterIdEnd
*/
public YthOnethingDetailQuery matterIdEnd(Long matterIdEnd){
this.matterIdEnd = matterIdEnd;
return this;
}
/**
* 设置 增加 事项id
* @param matterIdIncrement
*/
public YthOnethingDetailQuery matterIdIncrement(Long matterIdIncrement){
this.matterIdIncrement = matterIdIncrement;
return this;
}
/**
* 设置 事项id
* @param matterIdList
*/
public YthOnethingDetailQuery matterIdList(List<Long> matterIdList){
this.matterIdList = matterIdList;
return this;
}
/**
* 设置 材料id
* @param datumId
*/
public YthOnethingDetailQuery datumId(Long datumId){
setDatumId(datumId);
return this;
}
/**
* 设置 开始 材料id
* @param datumIdStart
*/
public YthOnethingDetailQuery datumIdStart(Long datumIdStart){
this.datumIdStart = datumIdStart;
return this;
}
/**
* 设置 结束 材料id
* @param datumIdEnd
*/
public YthOnethingDetailQuery datumIdEnd(Long datumIdEnd){
this.datumIdEnd = datumIdEnd;
return this;
}
/**
* 设置 增加 材料id
* @param datumIdIncrement
*/
public YthOnethingDetailQuery datumIdIncrement(Long datumIdIncrement){
this.datumIdIncrement = datumIdIncrement;
return this;
}
/**
* 设置 材料id
* @param datumIdList
*/
public YthOnethingDetailQuery datumIdList(List<Long> datumIdList){
this.datumIdList = datumIdList;
return this;
}
/**
* 设置 附件名称
* @param fileName
*/
public YthOnethingDetailQuery fileName(String fileName){
setFileName(fileName);
return this;
}
/**
* 设置 附件名称
* @param fileNameList
*/
public YthOnethingDetailQuery fileNameList(List<String> fileNameList){
this.fileNameList = fileNameList;
return this;
}
/**
* 设置 附件地址
* @param filepath
*/
public YthOnethingDetailQuery filepath(String filepath){
setFilepath(filepath);
return this;
}
/**
* 设置 附件地址
* @param filepathList
*/
public YthOnethingDetailQuery filepathList(List<String> filepathList){
this.filepathList = filepathList;
return this;
}
/**
* 设置 开始 变更时间
* @param updateTimeStart
*/
public YthOnethingDetailQuery updateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
return this;
}
/**
* 设置 结束 变更时间
* @param updateTimeEnd
*/
public YthOnethingDetailQuery updateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
return this;
}
/**
* 设置 变更用户loginName
* @param updateUser
*/
public YthOnethingDetailQuery updateUser(String updateUser){
setUpdateUser(updateUser);
return this;
}
/**
* 设置 变更用户loginName
* @param updateUserList
*/
public YthOnethingDetailQuery updateUserList(List<String> updateUserList){
this.updateUserList = updateUserList;
return this;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public YthOnethingDetailQuery createTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
return this;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public YthOnethingDetailQuery createTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
return this;
}
/**
* 设置 创建用户loginName
* @param createUser
*/
public YthOnethingDetailQuery createUser(String createUser){
setCreateUser(createUser);
return this;
}
/**
* 设置 创建用户loginName
* @param createUserList
*/
public YthOnethingDetailQuery createUserList(List<String> createUserList){
this.createUserList = createUserList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<YthOnethingDetailQuery> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<YthOnethingDetailQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<YthOnethingDetailQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<YthOnethingDetailQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/model/YthOnethingEntity.java
View file @ 731df811
...@@ -5,10 +5,10 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -5,10 +5,10 @@ import com.mortals.framework.model.BaseEntityLong;
/** /**
* *
* Description:YthOnething * Description:YthOnething
* date: 2021-9-8 9:18:50 * date: 2021-9-23 16:00:52
*/ */
public class YthOnethingEntity extends BaseEntityLong{ public class YthOnethingEntity extends BaseEntityLong{
private static final long serialVersionUID = 1631063930777L; private static final long serialVersionUID = 1632384052549L;
/** /**
...@@ -27,24 +27,14 @@ public class YthOnethingEntity extends BaseEntityLong{ ...@@ -27,24 +27,14 @@ public class YthOnethingEntity extends BaseEntityLong{
private Long memberId; private Long memberId;
/** /**
* 微信openId * 微信OPENID
*/ */
private String openId; private String openId;
/** /**
* 事项ID * 申请主题包id
*/ */
private Long matterid; private Long classifyTopicId;
/**
* 上传时间
*/
private Integer uploadtime;
/**
* 1资料上传 2确认提交
*/
private Integer type;
/** /**
* 邮寄地址 * 邮寄地址
...@@ -61,11 +51,6 @@ public class YthOnethingEntity extends BaseEntityLong{ ...@@ -61,11 +51,6 @@ public class YthOnethingEntity extends BaseEntityLong{
*/ */
private Integer phone; private Integer phone;
/**
* 0本人办理 1代办
*/
private Integer isAgent;
/** /**
* 取件方式 0自主取件 1邮寄 * 取件方式 0自主取件 1邮寄
*/ */
...@@ -82,9 +67,9 @@ public class YthOnethingEntity extends BaseEntityLong{ ...@@ -82,9 +67,9 @@ public class YthOnethingEntity extends BaseEntityLong{
private String number; private String number;
/** /**
* 问答内容 * 是否代办 0是本人办理 1他人代办
*/ */
private String optionContent; private Integer isAgent;
/** /**
* 0是否撤销 1撤销 * 0是否撤销 1撤销
...@@ -167,60 +152,32 @@ public class YthOnethingEntity extends BaseEntityLong{ ...@@ -167,60 +152,32 @@ public class YthOnethingEntity extends BaseEntityLong{
this.memberId = memberId; this.memberId = memberId;
} }
/** /**
* 获取 微信openId * 获取 微信OPENID
* @return openId * @return openId
*/ */
public String getOpenId() { public String getOpenId() {
return this.openId; return this.openId;
} }
/** /**
* 设置 微信openId * 设置 微信OPENID
* @param openId * @param openId
*/ */
public void setOpenId(String openId) { public void setOpenId(String openId) {
this.openId = openId; this.openId = openId;
} }
/** /**
* 获取 事项ID * 获取 申请主题包id
* @return matterid * @return classifyTopicId
*/
public Long getMatterid() {
return this.matterid;
}
/**
* 设置 事项ID
* @param matterid
*/
public void setMatterid(Long matterid) {
this.matterid = matterid;
}
/**
* 获取 上传时间
* @return uploadtime
*/ */
public Integer getUploadtime() { public Long getClassifyTopicId() {
return this.uploadtime; return this.classifyTopicId;
} }
/** /**
* 设置 上传时间 * 设置 申请主题包id
* @param uploadtime * @param classifyTopicId
*/ */
public void setUploadtime(Integer uploadtime) { public void setClassifyTopicId(Long classifyTopicId) {
this.uploadtime = uploadtime; this.classifyTopicId = classifyTopicId;
}
/**
* 获取 1资料上传 2确认提交
* @return type
*/
public Integer getType() {
return this.type;
}
/**
* 设置 1资料上传 2确认提交
* @param type
*/
public void setType(Integer type) {
this.type = type;
} }
/** /**
* 获取 邮寄地址 * 获取 邮寄地址
...@@ -265,20 +222,6 @@ public class YthOnethingEntity extends BaseEntityLong{ ...@@ -265,20 +222,6 @@ public class YthOnethingEntity extends BaseEntityLong{
this.phone = phone; this.phone = phone;
} }
/** /**
* 获取 0本人办理 1代办
* @return isAgent
*/
public Integer getIsAgent() {
return this.isAgent;
}
/**
* 设置 0本人办理 1代办
* @param isAgent
*/
public void setIsAgent(Integer isAgent) {
this.isAgent = isAgent;
}
/**
* 获取 取件方式 0自主取件 1邮寄 * 获取 取件方式 0自主取件 1邮寄
* @return manner * @return manner
*/ */
...@@ -321,18 +264,18 @@ public class YthOnethingEntity extends BaseEntityLong{ ...@@ -321,18 +264,18 @@ public class YthOnethingEntity extends BaseEntityLong{
this.number = number; this.number = number;
} }
/** /**
* 获取 问答内容 * 获取 是否代办 0是本人办理 1他人代办
* @return optionContent * @return isAgent
*/ */
public String getOptionContent() { public Integer getIsAgent() {
return this.optionContent; return this.isAgent;
} }
/** /**
* 设置 问答内容 * 设置 是否代办 0是本人办理 1他人代办
* @param optionContent * @param isAgent
*/ */
public void setOptionContent(String optionContent) { public void setIsAgent(Integer isAgent) {
this.optionContent = optionContent; this.isAgent = isAgent;
} }
/** /**
* 获取 0是否撤销 1撤销 * 获取 0是否撤销 1撤销
...@@ -458,17 +401,14 @@ public class YthOnethingEntity extends BaseEntityLong{ ...@@ -458,17 +401,14 @@ public class YthOnethingEntity extends BaseEntityLong{
.append(",processInstanceId:").append(getProcessInstanceId()) .append(",processInstanceId:").append(getProcessInstanceId())
.append(",memberId:").append(getMemberId()) .append(",memberId:").append(getMemberId())
.append(",openId:").append(getOpenId()) .append(",openId:").append(getOpenId())
.append(",matterid:").append(getMatterid()) .append(",classifyTopicId:").append(getClassifyTopicId())
.append(",uploadtime:").append(getUploadtime())
.append(",type:").append(getType())
.append(",address:").append(getAddress()) .append(",address:").append(getAddress())
.append(",linkman:").append(getLinkman()) .append(",linkman:").append(getLinkman())
.append(",phone:").append(getPhone()) .append(",phone:").append(getPhone())
.append(",isAgent:").append(getIsAgent())
.append(",manner:").append(getManner()) .append(",manner:").append(getManner())
.append(",getnum:").append(getGetnum()) .append(",getnum:").append(getGetnum())
.append(",number:").append(getNumber()) .append(",number:").append(getNumber())
.append(",optionContent:").append(getOptionContent()) .append(",isAgent:").append(getIsAgent())
.append(",isRevoke:").append(getIsRevoke()) .append(",isRevoke:").append(getIsRevoke())
.append(",siteid:").append(getSiteid()) .append(",siteid:").append(getSiteid())
.append(",status:").append(getStatus()) .append(",status:").append(getStatus())
...@@ -482,48 +422,23 @@ public class YthOnethingEntity extends BaseEntityLong{ ...@@ -482,48 +422,23 @@ public class YthOnethingEntity extends BaseEntityLong{
public void initAttrValue(){ public void initAttrValue(){
this.taskId = null; this.taskId = null;
this.processInstanceId = null; this.processInstanceId = null;
this.memberId = null; this.memberId = null;
this.openId = null; this.openId = null;
this.classifyTopicId = null;
this.matterid = null;
this.uploadtime = null;
this.type = null;
this.address = null; this.address = null;
this.linkman = null; this.linkman = null;
this.phone = null; this.phone = null;
this.isAgent = null;
this.manner = null; this.manner = null;
this.getnum = null; this.getnum = null;
this.number = null; this.number = null;
this.isAgent = null;
this.optionContent = null;
this.isRevoke = null; this.isRevoke = null;
this.siteid = null; this.siteid = null;
this.status = null; this.status = null;
this.updateTime = null; this.updateTime = null;
this.updateUser = null; this.updateUser = null;
this.createTime = null; this.createTime = null;
this.createUser = null; this.createUser = null;
} }
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/model/YthOnethingQuery.java
View file @ 731df811
...@@ -6,10 +6,10 @@ import java.util.Date; ...@@ -6,10 +6,10 @@ import java.util.Date;
/** /**
* *
* Description:YthOnething * Description:YthOnething
* date: 2021-9-8 9:18:50 * date: 2021-9-23 16:00:52
*/ */
public class YthOnethingQuery extends YthOnethingEntity{ public class YthOnethingQuery extends YthOnethingEntity{
private static final long serialVersionUID = 1631063930792L; private static final long serialVersionUID = 1632384052551L;
/** 开始 主键，自增长 */ /** 开始 主键，自增长 */
private Long idStart; private Long idStart;
...@@ -41,45 +41,21 @@ public class YthOnethingQuery extends YthOnethingEntity{ ...@@ -41,45 +41,21 @@ public class YthOnethingQuery extends YthOnethingEntity{
private List <Long> memberIdList; private List <Long> memberIdList;
/** 微信openId */ /** 微信OPENID */
private List<String> openIdList; private List<String> openIdList;
/** 开始 事项ID */ /** 开始 申请主题包id */
private Long matteridStart; private Long classifyTopicIdStart;
/** 结束 事项ID */ /** 结束 申请主题包id */
private Long matteridEnd; private Long classifyTopicIdEnd;
/** 增加 事项ID */ /** 增加 申请主题包id */
private Long matteridIncrement; private Long classifyTopicIdIncrement;
/** 事项ID */ /** 申请主题包id */
private List <Long> matteridList; private List <Long> classifyTopicIdList;
/** 开始 上传时间 */
private Integer uploadtimeStart;
/** 结束 上传时间 */
private Integer uploadtimeEnd;
/** 增加 上传时间 */
private Integer uploadtimeIncrement;
/** 上传时间 */
private List <Integer> uploadtimeList;
/** 开始 1资料上传 2确认提交 */
private Integer typeStart;
/** 结束 1资料上传 2确认提交 */
private Integer typeEnd;
/** 增加 1资料上传 2确认提交 */
private Integer typeIncrement;
/** 1资料上传 2确认提交 */
private List <Integer> typeList;
/** 邮寄地址 */ /** 邮寄地址 */
private List<String> addressList; private List<String> addressList;
...@@ -98,18 +74,6 @@ public class YthOnethingQuery extends YthOnethingEntity{ ...@@ -98,18 +74,6 @@ public class YthOnethingQuery extends YthOnethingEntity{
/** 联系电话 */ /** 联系电话 */
private List <Integer> phoneList; private List <Integer> phoneList;
/** 开始 0本人办理 1代办 */
private Integer isAgentStart;
/** 结束 0本人办理 1代办 */
private Integer isAgentEnd;
/** 增加 0本人办理 1代办 */
private Integer isAgentIncrement;
/** 0本人办理 1代办 */
private List <Integer> isAgentList;
/** 开始 取件方式 0自主取件 1邮寄 */ /** 开始 取件方式 0自主取件 1邮寄 */
private Integer mannerStart; private Integer mannerStart;
...@@ -128,8 +92,17 @@ public class YthOnethingQuery extends YthOnethingEntity{ ...@@ -128,8 +92,17 @@ public class YthOnethingQuery extends YthOnethingEntity{
/** 快递单号 */ /** 快递单号 */
private List<String> numberList; private List<String> numberList;
/** 问答内容 */ /** 开始 是否代办 0是本人办理 1他人代办 */
private List<String> optionContentList; private Integer isAgentStart;
/** 结束 是否代办 0是本人办理 1他人代办 */
private Integer isAgentEnd;
/** 增加 是否代办 0是本人办理 1他人代办 */
private Integer isAgentIncrement;
/** 是否代办 0是本人办理 1他人代办 */
private List <Integer> isAgentList;
/** 开始 0是否撤销 1撤销 */ /** 开始 0是否撤销 1撤销 */
private Integer isRevokeStart; private Integer isRevokeStart;
...@@ -350,7 +323,7 @@ public class YthOnethingQuery extends YthOnethingEntity{ ...@@ -350,7 +323,7 @@ public class YthOnethingQuery extends YthOnethingEntity{
this.memberIdList = memberIdList; this.memberIdList = memberIdList;
} }
/** /**
* 获取 微信openId * 获取 微信OPENID
* @return openIdList * @return openIdList
*/ */
public List<String> getOpenIdList(){ public List<String> getOpenIdList(){
...@@ -358,202 +331,76 @@ public class YthOnethingQuery extends YthOnethingEntity{ ...@@ -358,202 +331,76 @@ public class YthOnethingQuery extends YthOnethingEntity{
} }
/** /**
* 设置 微信openId * 设置 微信OPENID
* @param openIdList * @param openIdList
*/ */
public void setOpenIdList(List<String> openIdList){ public void setOpenIdList(List<String> openIdList){
this.openIdList = openIdList; this.openIdList = openIdList;
} }
/** /**
* 获取 开始 事项ID * 获取 开始 申请主题包id
* @return matteridStart * @return classifyTopicIdStart
*/ */
public Long getMatteridStart(){ public Long getClassifyTopicIdStart(){
return this.matteridStart; return this.classifyTopicIdStart;
} }
/** /**
* 设置 开始 事项ID * 设置 开始 申请主题包id
* @param matteridStart * @param classifyTopicIdStart
*/ */
public void setMatteridStart(Long matteridStart){ public void setClassifyTopicIdStart(Long classifyTopicIdStart){
this.matteridStart = matteridStart; this.classifyTopicIdStart = classifyTopicIdStart;
} }
/** /**
* 获取 结束 事项ID * 获取 结束 申请主题包id
* @return matteridEnd * @return classifyTopicIdEnd
*/ */
public Long getMatteridEnd(){ public Long getClassifyTopicIdEnd(){
return this.matteridEnd; return this.classifyTopicIdEnd;
} }
/** /**
* 设置 结束 事项ID * 设置 结束 申请主题包id
* @param matteridEnd * @param classifyTopicIdEnd
*/ */
public void setMatteridEnd(Long matteridEnd){ public void setClassifyTopicIdEnd(Long classifyTopicIdEnd){
this.matteridEnd = matteridEnd; this.classifyTopicIdEnd = classifyTopicIdEnd;
} }
/** /**
* 获取 增加 事项ID * 获取 增加 申请主题包id
* @return matteridIncrement * @return classifyTopicIdIncrement
*/ */
public Long getMatteridIncrement(){ public Long getClassifyTopicIdIncrement(){
return this.matteridIncrement; return this.classifyTopicIdIncrement;
} }
/** /**
* 设置 增加 事项ID * 设置 增加 申请主题包id
* @param matteridIncrement * @param classifyTopicIdIncrement
*/ */
public void setMatteridIncrement(Long matteridIncrement){ public void setClassifyTopicIdIncrement(Long classifyTopicIdIncrement){
this.matteridIncrement = matteridIncrement; this.classifyTopicIdIncrement = classifyTopicIdIncrement;
} }
/** /**
* 获取 事项ID * 获取 申请主题包id
* @return matteridList * @return classifyTopicIdList
*/ */
public List<Long> getMatteridList(){ public List<Long> getClassifyTopicIdList(){
return this.matteridList; return this.classifyTopicIdList;
} }
/** /**
* 设置 事项ID * 设置 申请主题包id
* @param matteridList * @param classifyTopicIdList
*/ */
public void setMatteridList(List<Long> matteridList){ public void setClassifyTopicIdList(List<Long> classifyTopicIdList){
this.matteridList = matteridList; this.classifyTopicIdList = classifyTopicIdList;
} }
/** /**
* 获取 开始 上传时间
* @return uploadtimeStart
*/
public Integer getUploadtimeStart(){
return this.uploadtimeStart;
}
/**
* 设置 开始 上传时间
* @param uploadtimeStart
*/
public void setUploadtimeStart(Integer uploadtimeStart){
this.uploadtimeStart = uploadtimeStart;
}
/**
* 获取 结束 上传时间
* @return uploadtimeEnd
*/
public Integer getUploadtimeEnd(){
return this.uploadtimeEnd;
}
/**
* 设置 结束 上传时间
* @param uploadtimeEnd
*/
public void setUploadtimeEnd(Integer uploadtimeEnd){
this.uploadtimeEnd = uploadtimeEnd;
}
/**
* 获取 增加 上传时间
* @return uploadtimeIncrement
*/
public Integer getUploadtimeIncrement(){
return this.uploadtimeIncrement;
}
/**
* 设置 增加 上传时间
* @param uploadtimeIncrement
*/
public void setUploadtimeIncrement(Integer uploadtimeIncrement){
this.uploadtimeIncrement = uploadtimeIncrement;
}
/**
* 获取 上传时间
* @return uploadtimeList
*/
public List<Integer> getUploadtimeList(){
return this.uploadtimeList;
}
/**
* 设置 上传时间
* @param uploadtimeList
*/
public void setUploadtimeList(List<Integer> uploadtimeList){
this.uploadtimeList = uploadtimeList;
}
/**
* 获取 开始 1资料上传 2确认提交
* @return typeStart
*/
public Integer getTypeStart(){
return this.typeStart;
}
/**
* 设置 开始 1资料上传 2确认提交
* @param typeStart
*/
public void setTypeStart(Integer typeStart){
this.typeStart = typeStart;
}
/**
* 获取 结束 1资料上传 2确认提交
* @return typeEnd
*/
public Integer getTypeEnd(){
return this.typeEnd;
}
/**
* 设置 结束 1资料上传 2确认提交
* @param typeEnd
*/
public void setTypeEnd(Integer typeEnd){
this.typeEnd = typeEnd;
}
/**
* 获取 增加 1资料上传 2确认提交
* @return typeIncrement
*/
public Integer getTypeIncrement(){
return this.typeIncrement;
}
/**
* 设置 增加 1资料上传 2确认提交
* @param typeIncrement
*/
public void setTypeIncrement(Integer typeIncrement){
this.typeIncrement = typeIncrement;
}
/**
* 获取 1资料上传 2确认提交
* @return typeList
*/
public List<Integer> getTypeList(){
return this.typeList;
}
/**
* 设置 1资料上传 2确认提交
* @param typeList
*/
public void setTypeList(List<Integer> typeList){
this.typeList = typeList;
}
/**
* 获取 邮寄地址 * 获取 邮寄地址
* @return addressList * @return addressList
*/ */
...@@ -647,69 +494,6 @@ public class YthOnethingQuery extends YthOnethingEntity{ ...@@ -647,69 +494,6 @@ public class YthOnethingQuery extends YthOnethingEntity{
this.phoneList = phoneList; this.phoneList = phoneList;
} }
/** /**
* 获取 开始 0本人办理 1代办
* @return isAgentStart
*/
public Integer getIsAgentStart(){
return this.isAgentStart;
}
/**
* 设置 开始 0本人办理 1代办
* @param isAgentStart
*/
public void setIsAgentStart(Integer isAgentStart){
this.isAgentStart = isAgentStart;
}
/**
* 获取 结束 0本人办理 1代办
* @return isAgentEnd
*/
public Integer getIsAgentEnd(){
return this.isAgentEnd;
}
/**
* 设置 结束 0本人办理 1代办
* @param isAgentEnd
*/
public void setIsAgentEnd(Integer isAgentEnd){
this.isAgentEnd = isAgentEnd;
}
/**
* 获取 增加 0本人办理 1代办
* @return isAgentIncrement
*/
public Integer getIsAgentIncrement(){
return this.isAgentIncrement;
}
/**
* 设置 增加 0本人办理 1代办
* @param isAgentIncrement
*/
public void setIsAgentIncrement(Integer isAgentIncrement){
this.isAgentIncrement = isAgentIncrement;
}
/**
* 获取 0本人办理 1代办
* @return isAgentList
*/
public List<Integer> getIsAgentList(){
return this.isAgentList;
}
/**
* 设置 0本人办理 1代办
* @param isAgentList
*/
public void setIsAgentList(List<Integer> isAgentList){
this.isAgentList = isAgentList;
}
/**
* 获取 开始 取件方式 0自主取件 1邮寄 * 获取 开始 取件方式 0自主取件 1邮寄
* @return mannerStart * @return mannerStart
*/ */
...@@ -803,19 +587,67 @@ public class YthOnethingQuery extends YthOnethingEntity{ ...@@ -803,19 +587,67 @@ public class YthOnethingQuery extends YthOnethingEntity{
this.numberList = numberList; this.numberList = numberList;
} }
/** /**
* 获取 问答内容 * 获取 开始 是否代办 0是本人办理 1他人代办
* @return optionContentList * @return isAgentStart
*/
public Integer getIsAgentStart(){
return this.isAgentStart;
}
/**
* 设置 开始 是否代办 0是本人办理 1他人代办
* @param isAgentStart
*/
public void setIsAgentStart(Integer isAgentStart){
this.isAgentStart = isAgentStart;
}
/**
* 获取 结束 是否代办 0是本人办理 1他人代办
* @return isAgentEnd
*/
public Integer getIsAgentEnd(){
return this.isAgentEnd;
}
/**
* 设置 结束 是否代办 0是本人办理 1他人代办
* @param isAgentEnd
*/
public void setIsAgentEnd(Integer isAgentEnd){
this.isAgentEnd = isAgentEnd;
}
/**
* 获取 增加 是否代办 0是本人办理 1他人代办
* @return isAgentIncrement
*/
public Integer getIsAgentIncrement(){
return this.isAgentIncrement;
}
/**
* 设置 增加 是否代办 0是本人办理 1他人代办
* @param isAgentIncrement
*/
public void setIsAgentIncrement(Integer isAgentIncrement){
this.isAgentIncrement = isAgentIncrement;
}
/**
* 获取 是否代办 0是本人办理 1他人代办
* @return isAgentList
*/ */
public List<String> getOptionContentList(){ public List<Integer> getIsAgentList(){
return this.optionContentList; return this.isAgentList;
} }
/** /**
* 设置 问答内容 * 设置 是否代办 0是本人办理 1他人代办
* @param optionContentList * @param isAgentList
*/ */
public void setOptionContentList(List<String> optionContentList){ public void setIsAgentList(List<Integer> isAgentList){
this.optionContentList = optionContentList; this.isAgentList = isAgentList;
} }
/** /**
* 获取 开始 0是否撤销 1撤销 * 获取 开始 0是否撤销 1撤销
...@@ -1226,7 +1058,7 @@ public class YthOnethingQuery extends YthOnethingEntity{ ...@@ -1226,7 +1058,7 @@ public class YthOnethingQuery extends YthOnethingEntity{
return this; return this;
} }
/** /**
* 设置 微信openId * 设置 微信OPENID
* @param openId * @param openId
*/ */
public YthOnethingQuery openId(String openId){ public YthOnethingQuery openId(String openId){
...@@ -1236,7 +1068,7 @@ public class YthOnethingQuery extends YthOnethingEntity{ ...@@ -1236,7 +1068,7 @@ public class YthOnethingQuery extends YthOnethingEntity{
/** /**
* 设置 微信openId * 设置 微信OPENID
* @param openIdList * @param openIdList
*/ */
public YthOnethingQuery openIdList(List<String> openIdList){ public YthOnethingQuery openIdList(List<String> openIdList){
...@@ -1245,145 +1077,49 @@ public class YthOnethingQuery extends YthOnethingEntity{ ...@@ -1245,145 +1077,49 @@ public class YthOnethingQuery extends YthOnethingEntity{
} }
/** /**
* 设置 事项ID * 设置 申请主题包id
* @param matterid * @param classifyTopicId
*/ */
public YthOnethingQuery matterid(Long matterid){ public YthOnethingQuery classifyTopicId(Long classifyTopicId){
setMatterid(matterid); setClassifyTopicId(classifyTopicId);
return this; return this;
} }
/** /**
* 设置 开始 事项ID * 设置 开始 申请主题包id
* @param matteridStart * @param classifyTopicIdStart
*/ */
public YthOnethingQuery matteridStart(Long matteridStart){ public YthOnethingQuery classifyTopicIdStart(Long classifyTopicIdStart){
this.matteridStart = matteridStart; this.classifyTopicIdStart = classifyTopicIdStart;
return this; return this;
} }
/** /**
* 设置 结束 事项ID * 设置 结束 申请主题包id
* @param matteridEnd * @param classifyTopicIdEnd
*/ */
public YthOnethingQuery matteridEnd(Long matteridEnd){ public YthOnethingQuery classifyTopicIdEnd(Long classifyTopicIdEnd){
this.matteridEnd = matteridEnd; this.classifyTopicIdEnd = classifyTopicIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 事项ID * 设置 增加 申请主题包id
* @param matteridIncrement * @param classifyTopicIdIncrement
*/ */
public YthOnethingQuery matteridIncrement(Long matteridIncrement){ public YthOnethingQuery classifyTopicIdIncrement(Long classifyTopicIdIncrement){
this.matteridIncrement = matteridIncrement; this.classifyTopicIdIncrement = classifyTopicIdIncrement;
return this; return this;
} }
/** /**
* 设置 事项ID * 设置 申请主题包id
* @param matteridList * @param classifyTopicIdList
*/ */
public YthOnethingQuery matteridList(List<Long> matteridList){ public YthOnethingQuery classifyTopicIdList(List<Long> classifyTopicIdList){
this.matteridList = matteridList; this.classifyTopicIdList = classifyTopicIdList;
return this; return this;
} }
/**
* 设置 上传时间
* @param uploadtime
*/
public YthOnethingQuery uploadtime(Integer uploadtime){
setUploadtime(uploadtime);
return this;
}
/**
* 设置 开始 上传时间
* @param uploadtimeStart
*/
public YthOnethingQuery uploadtimeStart(Integer uploadtimeStart){
this.uploadtimeStart = uploadtimeStart;
return this;
}
/**
* 设置 结束 上传时间
* @param uploadtimeEnd
*/
public YthOnethingQuery uploadtimeEnd(Integer uploadtimeEnd){
this.uploadtimeEnd = uploadtimeEnd;
return this;
}
/**
* 设置 增加 上传时间
* @param uploadtimeIncrement
*/
public YthOnethingQuery uploadtimeIncrement(Integer uploadtimeIncrement){
this.uploadtimeIncrement = uploadtimeIncrement;
return this;
}
/**
* 设置 上传时间
* @param uploadtimeList
*/
public YthOnethingQuery uploadtimeList(List<Integer> uploadtimeList){
this.uploadtimeList = uploadtimeList;
return this;
}
/**
* 设置 1资料上传 2确认提交
* @param type
*/
public YthOnethingQuery type(Integer type){
setType(type);
return this;
}
/**
* 设置 开始 1资料上传 2确认提交
* @param typeStart
*/
public YthOnethingQuery typeStart(Integer typeStart){
this.typeStart = typeStart;
return this;
}
/**
* 设置 结束 1资料上传 2确认提交
* @param typeEnd
*/
public YthOnethingQuery typeEnd(Integer typeEnd){
this.typeEnd = typeEnd;
return this;
}
/**
* 设置 增加 1资料上传 2确认提交
* @param typeIncrement
*/
public YthOnethingQuery typeIncrement(Integer typeIncrement){
this.typeIncrement = typeIncrement;
return this;
}
/**
* 设置 1资料上传 2确认提交
* @param typeList
*/
public YthOnethingQuery typeList(List<Integer> typeList){
this.typeList = typeList;
return this;
}
/** /**
* 设置 邮寄地址 * 设置 邮寄地址
* @param address * @param address
...@@ -1469,54 +1205,6 @@ public class YthOnethingQuery extends YthOnethingEntity{ ...@@ -1469,54 +1205,6 @@ public class YthOnethingQuery extends YthOnethingEntity{
return this; return this;
} }
/**
* 设置 0本人办理 1代办
* @param isAgent
*/
public YthOnethingQuery isAgent(Integer isAgent){
setIsAgent(isAgent);
return this;
}
/**
* 设置 开始 0本人办理 1代办
* @param isAgentStart
*/
public YthOnethingQuery isAgentStart(Integer isAgentStart){
this.isAgentStart = isAgentStart;
return this;
}
/**
* 设置 结束 0本人办理 1代办
* @param isAgentEnd
*/
public YthOnethingQuery isAgentEnd(Integer isAgentEnd){
this.isAgentEnd = isAgentEnd;
return this;
}
/**
* 设置 增加 0本人办理 1代办
* @param isAgentIncrement
*/
public YthOnethingQuery isAgentIncrement(Integer isAgentIncrement){
this.isAgentIncrement = isAgentIncrement;
return this;
}
/**
* 设置 0本人办理 1代办
* @param isAgentList
*/
public YthOnethingQuery isAgentList(List<Integer> isAgentList){
this.isAgentList = isAgentList;
return this;
}
/** /**
* 设置 取件方式 0自主取件 1邮寄 * 设置 取件方式 0自主取件 1邮寄
* @param manner * @param manner
...@@ -1600,22 +1288,52 @@ public class YthOnethingQuery extends YthOnethingEntity{ ...@@ -1600,22 +1288,52 @@ public class YthOnethingQuery extends YthOnethingEntity{
this.numberList = numberList; this.numberList = numberList;
return this; return this;
} }
/** /**
* 设置 问答内容 * 设置 是否代办 0是本人办理 1他人代办
* @param optionContent * @param isAgent
*/
public YthOnethingQuery isAgent(Integer isAgent){
setIsAgent(isAgent);
return this;
}
/**
* 设置 开始 是否代办 0是本人办理 1他人代办
* @param isAgentStart
*/
public YthOnethingQuery isAgentStart(Integer isAgentStart){
this.isAgentStart = isAgentStart;
return this;
}
/**
* 设置 结束 是否代办 0是本人办理 1他人代办
* @param isAgentEnd
*/
public YthOnethingQuery isAgentEnd(Integer isAgentEnd){
this.isAgentEnd = isAgentEnd;
return this;
}
/**
* 设置 增加 是否代办 0是本人办理 1他人代办
* @param isAgentIncrement
*/ */
public YthOnethingQuery optionContent(String optionContent){ public YthOnethingQuery isAgentIncrement(Integer isAgentIncrement){
setOptionContent(optionContent); this.isAgentIncrement = isAgentIncrement;
return this; return this;
} }
/** /**
* 设置 问答内容 * 设置 是否代办 0是本人办理 1他人代办
* @param optionContentList * @param isAgentList
*/ */
public YthOnethingQuery optionContentList(List<String> optionContentList){ public YthOnethingQuery isAgentList(List<Integer> isAgentList){
this.optionContentList = optionContentList; this.isAgentList = isAgentList;
return this; return this;
} }
......
government-manager/src/main/java/com/mortals/xhx/module/yth/service/YthOnethingDetailService.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.module.yth.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.yth.model.YthOnethingDetailEntity;
/**
* <p>Title: 一件事提交详细表</p>
* <p>Description: YthOnethingDetailService service接口 </p>
* <p>Copyright: Copyright &reg; </p>
* @version 1.0.0
*/
public interface YthOnethingDetailService extends ICRUDService<YthOnethingDetailEntity,Long>{
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/service/YthOnethingService.java
View file @ 731df811
...@@ -2,7 +2,7 @@ package com.mortals.xhx.module.yth.service; ...@@ -2,7 +2,7 @@ package com.mortals.xhx.module.yth.service;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.busiz.uploadfile.UploadDatumReq; import com.mortals.xhx.busiz.uploadfile.SubmitDatumReq;
import com.mortals.xhx.module.yth.model.YthOnethingEntity; import com.mortals.xhx.module.yth.model.YthOnethingEntity;
/** /**
...@@ -17,5 +17,8 @@ public interface YthOnethingService extends ICRUDService<YthOnethingEntity,Long> ...@@ -17,5 +17,8 @@ public interface YthOnethingService extends ICRUDService<YthOnethingEntity,Long>
* 用户提交资料并发起审核流程 * 用户提交资料并发起审核流程
* @param req * @param req
*/ */
void datumUploadAndStartFlow(UploadDatumReq req) throws AppException; void datumUploadAndStartFlow(SubmitDatumReq req) throws AppException;
void getBusinessDetail(String proInsId);
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/service/impl/YthOnethingDetailServiceImpl.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.module.yth.service.impl;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.yth.dao.YthOnethingDetailDao;
import com.mortals.xhx.module.yth.model.YthOnethingDetailEntity;
import com.mortals.xhx.module.yth.service.YthOnethingDetailService;
/**
* <p>Title: 一件事提交详细表</p>
* <p>Description: YthOnethingDetailService service接口 </p>
* <p>Copyright: Copyright &reg; </p>
* @version 1.0.0
*/
@Service("ythOnethingDetailService")
public class YthOnethingDetailServiceImpl extends AbstractCRUDServiceImpl<YthOnethingDetailDao, YthOnethingDetailEntity, Long> implements YthOnethingDetailService {
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/service/impl/YthOnethingServiceImpl.java
View file @ 731df811
package com.mortals.xhx.module.yth.service.impl; package com.mortals.xhx.module.yth.service.impl;
import cn.hutool.core.util.PhoneUtil;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.javafaker.Faker; import com.github.javafaker.Faker;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.base.framework.config.InterceptorConfig; import com.mortals.xhx.base.framework.config.InterceptorConfig;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.busiz.uploadfile.UploadDatumReq; import com.mortals.xhx.busiz.uploadfile.MatterReq;
import com.mortals.xhx.busiz.uploadfile.SubmitDatumReq;
import com.mortals.xhx.common.code.ApproveStateEnum; import com.mortals.xhx.common.code.ApproveStateEnum;
import com.mortals.xhx.common.code.MannerEnum; import com.mortals.xhx.common.code.MannerEnum;
import com.mortals.xhx.common.code.OneThingTypeEnum; import com.mortals.xhx.common.code.OneThingTypeEnum;
...@@ -16,18 +16,25 @@ import com.mortals.xhx.common.keys.BusizParams; ...@@ -16,18 +16,25 @@ import com.mortals.xhx.common.keys.BusizParams;
import com.mortals.xhx.feign.flowable.IApiFlowInstanceFeign; import com.mortals.xhx.feign.flowable.IApiFlowInstanceFeign;
import com.mortals.xhx.feign.rsp.ApiResp; import com.mortals.xhx.feign.rsp.ApiResp;
import com.mortals.xhx.feign.runtime.StartProcessInstanceReq; import com.mortals.xhx.feign.runtime.StartProcessInstanceReq;
import com.mortals.xhx.module.member.model.MemberEntity;
import com.mortals.xhx.module.member.model.MemberQuery; import com.mortals.xhx.module.member.model.MemberQuery;
import com.mortals.xhx.module.member.service.MemberService; import com.mortals.xhx.module.member.service.MemberService;
import com.mortals.xhx.module.one.model.OneClassifyEntity;
import com.mortals.xhx.module.one.model.OneClassifyTopicalEntity;
import com.mortals.xhx.module.one.service.OneClassifyService;
import com.mortals.xhx.module.one.service.OneClassifyTopicalService;
import com.mortals.xhx.module.yth.dao.YthOnethingDao; import com.mortals.xhx.module.yth.dao.YthOnethingDao;
import com.mortals.xhx.module.yth.model.YthOnethingDetailEntity;
import com.mortals.xhx.module.yth.model.YthOnethingDetailQuery;
import com.mortals.xhx.module.yth.model.YthOnethingEntity; import com.mortals.xhx.module.yth.model.YthOnethingEntity;
import com.mortals.xhx.module.yth.model.YthOnethingQuery;
import com.mortals.xhx.module.yth.service.YthOnethingDetailService;
import com.mortals.xhx.module.yth.service.YthOnethingService; import com.mortals.xhx.module.yth.service.YthOnethingService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.Date; import java.util.*;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -49,21 +56,30 @@ public class YthOnethingServiceImpl extends AbstractCRUDServiceImpl<YthOnethingD ...@@ -49,21 +56,30 @@ public class YthOnethingServiceImpl extends AbstractCRUDServiceImpl<YthOnethingD
@Autowired @Autowired
private InterceptorConfig config; private InterceptorConfig config;
@Autowired @Autowired
private YthOnethingDetailService ythOnethingDetailService;
@Autowired
private IApiFlowInstanceFeign apiFlowInstanceFeign; private IApiFlowInstanceFeign apiFlowInstanceFeign;
@Autowired
private OneClassifyTopicalService oneClassifyTopicalService;
@Autowired
private OneClassifyService oneClassifyService;
@Override @Override
public void datumUploadAndStartFlow(UploadDatumReq req) { public void datumUploadAndStartFlow(SubmitDatumReq req) {
try { try {
//保存一件事 //保存一件事
YthOnethingEntity entity = new YthOnethingEntity(); YthOnethingEntity entity = new YthOnethingEntity();
entity.setMemberId(memberService.selectOne(new MemberQuery().openId(req.getOpen_id()), null).getId()); MemberEntity memberEntity = memberService.selectOne(new MemberQuery().openId(req.getOpenId()));
entity.setOpenId(req.getOpen_id()); if(ObjectUtils.isEmpty(memberEntity)){
entity.setMatterid(req.getMatterid()); throw new AppException(String.format("未找到当前openId:%s 对应的用户", req.getOpenId()));
entity.setOptionContent(req.getOption_content()); }
entity.setMemberId(memberEntity.getId());
entity.setOpenId(req.getOpenId());
entity.setManner(MannerEnum.SELF.getValue()); entity.setManner(MannerEnum.SELF.getValue());
entity.setSiteid(req.getSiteid().intValue()); entity.setSiteid(req.getSiteId().intValue());
entity.setIsAgent(req.getIs_agent()); entity.setIsAgent(req.getIsAgent());
entity.setIsRevoke(YesNoEnum.NO.getValue()); entity.setIsRevoke(YesNoEnum.NO.getValue());
entity.setClassifyTopicId(req.getClassifyTopicId());
Faker faker = new Faker(Locale.CHINESE); Faker faker = new Faker(Locale.CHINESE);
...@@ -72,27 +88,30 @@ public class YthOnethingServiceImpl extends AbstractCRUDServiceImpl<YthOnethingD ...@@ -72,27 +88,30 @@ public class YthOnethingServiceImpl extends AbstractCRUDServiceImpl<YthOnethingD
entity.setPhone(138); entity.setPhone(138);
entity.setGetnum(faker.number().digits(12)); entity.setGetnum(faker.number().digits(12));
entity.setNumber(faker.idNumber().validSvSeSsn()); entity.setNumber(faker.idNumber().validSvSeSsn());
entity.setUploadtime(123);
entity.setType(OneThingTypeEnum.UNSUBMIT.getValue());
entity.setStatus(ApproveStateEnum.UN_AUDIT.getValue()); entity.setStatus(ApproveStateEnum.UN_AUDIT.getValue());
entity.setCreateUser("admin"); entity.setCreateUser("system");
entity.setCreateTime(new Date()); entity.setCreateTime(new Date());
YthOnethingEntity save = this.save(entity); YthOnethingEntity save = this.save(entity);
//保存材料附件 List<YthOnethingDetailEntity> detailList = req.getMatterReqList().stream().flatMap(item -> {
// List<DatumFileEntity> fileList = req.getFile_arr().stream().map(item -> { return item.getAttachmentList().stream().map(m1 -> {
// DatumFileEntity datumFileEntity = new DatumFileEntity(); YthOnethingDetailEntity detailEntity = new YthOnethingDetailEntity();
// datumFileEntity.setTid(save.getId()); detailEntity.setMatterId(item.getMatterid());
// datumFileEntity.setDatumid(item.getDatumid()); detailEntity.setOneThingId(save.getId());
// datumFileEntity.setFile(item.getFile()); detailEntity.setDatumId(m1.getDatumId());
// datumFileEntity.setUploadtime(new Date()); detailEntity.setFileName(m1.getFileName());
// datumFileEntity.setCreateTime(new Date()); detailEntity.setFilepath(m1.getFilepath());
// datumFileEntity.setCreateUser("admin"); detailEntity.setCreateTime(new Date());
// return datumFileEntity; detailEntity.setCreateUser("system");
// }).collect(Collectors.toList());
// datumFileService.save(fileList); return detailEntity;
});
}).collect(Collectors.toList());
ythOnethingDetailService.save(detailList);
//获取流程定义key 发起流程 当前通过param参数固定获取 //获取流程定义key 发起流程 当前通过param参数固定获取
String oneThingKey = paramService.getValueByKey(BusizParams.SYS_PARAM_FLOW_KEY); String oneThingKey = paramService.getValueByKey(BusizParams.SYS_PARAM_FLOW_KEY);
...@@ -111,7 +130,6 @@ public class YthOnethingServiceImpl extends AbstractCRUDServiceImpl<YthOnethingD ...@@ -111,7 +130,6 @@ public class YthOnethingServiceImpl extends AbstractCRUDServiceImpl<YthOnethingD
ApiResp<String> resp = apiFlowInstanceFeign.processStart(startProcessInstanceReq); ApiResp<String> resp = apiFlowInstanceFeign.processStart(startProcessInstanceReq);
entity.setProcessInstanceId(resp.getData()); entity.setProcessInstanceId(resp.getData());
entity.setType(OneThingTypeEnum.SUBMIT.getValue());
entity.setStatus(ApproveStateEnum.AUDITING.getValue()); entity.setStatus(ApproveStateEnum.AUDITING.getValue());
this.update(entity); this.update(entity);
...@@ -120,5 +138,27 @@ public class YthOnethingServiceImpl extends AbstractCRUDServiceImpl<YthOnethingD ...@@ -120,5 +138,27 @@ public class YthOnethingServiceImpl extends AbstractCRUDServiceImpl<YthOnethingD
} }
}
@Override
public void getBusinessDetail(String proInsId) {
YthOnethingEntity ythOnethingEntity = this.selectOne(new YthOnethingQuery().processInstanceId(proInsId));
if(ObjectUtils.isEmpty(ythOnethingEntity)){
throw new AppException("未找到相关业务！");
}
OneClassifyTopicalEntity classifyTopicalEntity = oneClassifyTopicalService.get(ythOnethingEntity.getClassifyTopicId());
OneClassifyEntity oneClassifyEntity = oneClassifyService.get(classifyTopicalEntity.getClassifyId());
//查询提交的附件信息及事项名称
YthOnethingDetailQuery query = new YthOnethingDetailQuery().oneThingId(ythOnethingEntity.getId());
query.setGroupList(Arrays.asList("matterId"));
List<YthOnethingDetailEntity> detailEntityList = ythOnethingDetailService.find(query);
} }
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/web/YthOnethingController.java
View file @ 731df811
package com.mortals.xhx.module.yth.web; package com.mortals.xhx.module.yth.web;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.xhx.common.code.*; import com.mortals.xhx.common.code.*;
import com.mortals.xhx.common.pdu.flow.FlowViewerPdu;
import io.swagger.annotations.ApiParam;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.mortals.framework.web.BaseCRUDJsonMappingController; import com.mortals.framework.web.BaseCRUDJsonMappingController;
import com.mortals.xhx.module.yth.model.YthOnethingEntity; import com.mortals.xhx.module.yth.model.YthOnethingEntity;
...@@ -13,6 +19,8 @@ import com.mortals.xhx.module.yth.service.YthOnethingService; ...@@ -13,6 +19,8 @@ import com.mortals.xhx.module.yth.service.YthOnethingService;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -54,4 +62,26 @@ public class YthOnethingController extends BaseCRUDJsonMappingController<YthOnet ...@@ -54,4 +62,26 @@ public class YthOnethingController extends BaseCRUDJsonMappingController<YthOnet
} }
/**
* 获取业务详细信息
*/
@PostMapping(value = "getBusinessDetail")
public String getBusinessById(@ApiParam(value = "流程Id") @RequestParam(value = "proInsId") String proInsId) {
log.info("receive getBusinessDetail,proInsId:" + proInsId);
JSONObject ret = new JSONObject();
try {
//ret.put(KEY_RESULT_DATA, flowViewers);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
} catch (Exception e) {
log.error("读取流程图片异常", e);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, super.convertException(e));
}
return ret.toJSONString();
}
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/web/YthOnethingDetailController.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.module.yth.web;
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.yth.model.YthOnethingDetailEntity;
import com.mortals.xhx.module.yth.service.YthOnethingDetailService;
/**
* <p>Title: 一件事提交详细表</p>
* <p>Description: YthOnethingDetailController </p>
* <p>Copyright: Copyright &reg; </p>
* <p>Company: </p>
* @author zxfei
* @version 1.0.0
*/
@RestController
@RequestMapping("yth/onething/detail")
public class YthOnethingDetailController extends BaseCRUDJsonMappingController<YthOnethingDetailService,YthOnethingDetailForm,YthOnethingDetailEntity,Long> {
public YthOnethingDetailController(){
super.setFormClass(YthOnethingDetailForm.class);
super.setModuleDesc("一件事提交详细表");
}
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/web/YthOnethingDetailForm.java 0 → 100644
View file @ 731df811
package com.mortals.xhx.module.yth.web;
import com.mortals.framework.web.BaseCRUDFormLong;
import com.mortals.xhx.module.yth.model.YthOnethingDetailEntity;
import com.mortals.xhx.module.yth.model.YthOnethingDetailQuery;
/**
* <p>Title: 一件事提交详细表</p>
* <p>Description: YthOnethingDetailForm </p>
* @author
* @version 1.0.0
*/
public class YthOnethingDetailForm extends BaseCRUDFormLong<YthOnethingDetailEntity> {
private YthOnethingDetailEntity entity = new YthOnethingDetailEntity();
private YthOnethingDetailQuery query = new YthOnethingDetailQuery();
public YthOnethingDetailForm(){
}
@Override
public YthOnethingDetailEntity getEntity() {
return entity;
}
public void setYthOnethingDetail(YthOnethingDetailEntity entity) {
this.entity = entity;
}
@Override
public YthOnethingDetailQuery getQuery() {
return query;
}
public void setQuery(YthOnethingDetailQuery query) {
this.query = query;
}
}
\ No newline at end of file
government-manager/src/main/resources/sqlmap/module/matter/matterFlowlimit.xml
View file @ 731df811
...@@ -7,8 +7,10 @@ ...@@ -7,8 +7,10 @@
<resultMap type="MatterFlowlimitEntity" id="MatterFlowlimitEntity-Map"> <resultMap type="MatterFlowlimitEntity" id="MatterFlowlimitEntity-Map">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="matterId" column="matterId" /> <result property="matterId" column="matterId" />
<result property="title" column="title" /> <result property="flowName" column="flowName" />
<result property="content" column="content" /> <result property="flowTime" column="flowTime" />
<result property="flowTurnOut" column="flowTurnOut" />
<result property="flowDesc" column="flowDesc" />
<result property="source" column="source" /> <result property="source" column="source" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="updateUser" column="updateUser" /> <result property="updateUser" column="updateUser" />
...@@ -25,11 +27,17 @@ ...@@ -25,11 +27,17 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterId') or colPickMode == 1 and data.containsKey('matterId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
a.matterId as matterId, a.matterId as matterId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('title') or colPickMode == 1 and data.containsKey('title')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('flowName') or colPickMode == 1 and data.containsKey('flowName')))">
a.title as title, a.flowName as flowName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('flowTime') or colPickMode == 1 and data.containsKey('flowTime')))">
a.content as content, a.flowTime as flowTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('flowTurnOut') or colPickMode == 1 and data.containsKey('flowTurnOut')))">
a.flowTurnOut as flowTurnOut,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('flowDesc') or colPickMode == 1 and data.containsKey('flowDesc')))">
a.flowDesc as flowDesc,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
a.source as source, a.source as source,
...@@ -51,18 +59,18 @@ ...@@ -51,18 +59,18 @@
<!-- 新增 --> <!-- 新增 -->
<insert id="insert" parameterType="MatterFlowlimitEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="MatterFlowlimitEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_matter_flowlimit insert into mortals_xhx_matter_flowlimit
(matterId,title,content,source,updateTime,updateUser,createTime,createUser) (matterId,flowName,flowTime,flowTurnOut,flowDesc,source,updateTime,updateUser,createTime,createUser)
VALUES VALUES
(#{matterId},#{title},#{content},#{source},#{updateTime},#{updateUser},#{createTime},#{createUser}) (#{matterId},#{flowName},#{flowTime},#{flowTurnOut},#{flowDesc},#{source},#{updateTime},#{updateUser},#{createTime},#{createUser})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_matter_flowlimit insert into mortals_xhx_matter_flowlimit
(matterId,title,content,source,updateTime,updateUser,createTime,createUser) (matterId,flowName,flowTime,flowTurnOut,flowDesc,source,updateTime,updateUser,createTime,createUser)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.matterId},#{item.title},#{item.content},#{item.source},#{item.updateTime},#{item.updateUser},#{item.createTime},#{item.createUser}) (#{item.matterId},#{item.flowName},#{item.flowTime},#{item.flowTurnOut},#{item.flowDesc},#{item.source},#{item.updateTime},#{item.updateUser},#{item.createTime},#{item.createUser})
</foreach> </foreach>
</insert> </insert>
<!-- 根据ParamDto更新 --> <!-- 根据ParamDto更新 -->
...@@ -76,11 +84,17 @@ ...@@ -76,11 +84,17 @@
<if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))">
a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement}, a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('title')) or (colPickMode==1 and !data.containsKey('title'))"> <if test="(colPickMode==0 and data.containsKey('flowName')) or (colPickMode==1 and !data.containsKey('flowName'))">
a.title=#{data.title}, a.flowName=#{data.flowName},
</if>
<if test="(colPickMode==0 and data.containsKey('flowTime')) or (colPickMode==1 and !data.containsKey('flowTime'))">
a.flowTime=#{data.flowTime},
</if>
<if test="(colPickMode==0 and data.containsKey('flowTurnOut')) or (colPickMode==1 and !data.containsKey('flowTurnOut'))">
a.flowTurnOut=#{data.flowTurnOut},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('content')) or (colPickMode==1 and !data.containsKey('content'))"> <if test="(colPickMode==0 and data.containsKey('flowDesc')) or (colPickMode==1 and !data.containsKey('flowDesc'))">
a.content=#{data.content}, a.flowDesc=#{data.flowDesc},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))"> <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
a.source=#{data.source}, a.source=#{data.source},
...@@ -127,18 +141,34 @@ ...@@ -127,18 +141,34 @@
</foreach> </foreach>
</trim> </trim>
<trim prefix="title=(case" suffix="ELSE title end),"> <trim prefix="flowName=(case" suffix="ELSE flowName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('flowName')) or (colPickMode==1 and !item.containsKey('flowName'))">
when a.id=#{item.id} then #{item.flowName}
</if>
</foreach>
</trim>
<trim prefix="flowTime=(case" suffix="ELSE flowTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('flowTime')) or (colPickMode==1 and !item.containsKey('flowTime'))">
when a.id=#{item.id} then #{item.flowTime}
</if>
</foreach>
</trim>
<trim prefix="flowTurnOut=(case" suffix="ELSE flowTurnOut end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('title')) or (colPickMode==1 and !item.containsKey('title'))"> <if test="(colPickMode==0 and item.containsKey('flowTurnOut')) or (colPickMode==1 and !item.containsKey('flowTurnOut'))">
when a.id=#{item.id} then #{item.title} when a.id=#{item.id} then #{item.flowTurnOut}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="content=(case" suffix="ELSE content end),"> <trim prefix="flowDesc=(case" suffix="ELSE flowDesc end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))"> <if test="(colPickMode==0 and item.containsKey('flowDesc')) or (colPickMode==1 and !item.containsKey('flowDesc'))">
when a.id=#{item.id} then #{item.content} when a.id=#{item.id} then #{item.flowDesc}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -329,32 +359,62 @@ ...@@ -329,32 +359,62 @@
</if> </if>
<if test="conditionParamRef.containsKey('title')"> <if test="conditionParamRef.containsKey('flowName')">
<if test="conditionParamRef.title != null and conditionParamRef.title != ''"> <if test="conditionParamRef.flowName != null and conditionParamRef.flowName != ''">
${_conditionType_} a.title like #{${_conditionParam_}.title} ${_conditionType_} a.flowName like #{${_conditionParam_}.flowName}
</if>
<if test="conditionParamRef.flowName == null">
${_conditionType_} a.flowName is null
</if>
</if>
<if test="conditionParamRef.containsKey('flowNameList')">
${_conditionType_} a.flowName in
<foreach collection="conditionParamRef.flowNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('flowTime')">
<if test="conditionParamRef.flowTime != null and conditionParamRef.flowTime != ''">
${_conditionType_} a.flowTime like #{${_conditionParam_}.flowTime}
</if>
<if test="conditionParamRef.flowTime == null">
${_conditionType_} a.flowTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('flowTimeList')">
${_conditionType_} a.flowTime in
<foreach collection="conditionParamRef.flowTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('flowTurnOut')">
<if test="conditionParamRef.flowTurnOut != null and conditionParamRef.flowTurnOut != ''">
${_conditionType_} a.flowTurnOut like #{${_conditionParam_}.flowTurnOut}
</if> </if>
<if test="conditionParamRef.title == null"> <if test="conditionParamRef.flowTurnOut == null">
${_conditionType_} a.title is null ${_conditionType_} a.flowTurnOut is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('titleList')"> <if test="conditionParamRef.containsKey('flowTurnOutList')">
${_conditionType_} a.title in ${_conditionType_} a.flowTurnOut in
<foreach collection="conditionParamRef.titleList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.flowTurnOutList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('content')"> <if test="conditionParamRef.containsKey('flowDesc')">
<if test="conditionParamRef.content != null and conditionParamRef.content != ''"> <if test="conditionParamRef.flowDesc != null and conditionParamRef.flowDesc != ''">
${_conditionType_} a.content like #{${_conditionParam_}.content} ${_conditionType_} a.flowDesc like #{${_conditionParam_}.flowDesc}
</if> </if>
<if test="conditionParamRef.content == null"> <if test="conditionParamRef.flowDesc == null">
${_conditionType_} a.content is null ${_conditionType_} a.flowDesc is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('contentList')"> <if test="conditionParamRef.containsKey('flowDescList')">
${_conditionType_} a.content in ${_conditionType_} a.flowDesc in
<foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.flowDescList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -462,14 +522,24 @@ ...@@ -462,14 +522,24 @@
<if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if> <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('title')"> <if test="orderCol.containsKey('flowName')">
a.title a.flowName
<if test='orderCol.title != null and "DESC".equalsIgnoreCase(orderCol.title)'>DESC</if> <if test='orderCol.flowName != null and "DESC".equalsIgnoreCase(orderCol.flowName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('flowTime')">
a.flowTime
<if test='orderCol.flowTime != null and "DESC".equalsIgnoreCase(orderCol.flowTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('flowTurnOut')">
a.flowTurnOut
<if test='orderCol.flowTurnOut != null and "DESC".equalsIgnoreCase(orderCol.flowTurnOut)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('content')"> <if test="orderCol.containsKey('flowDesc')">
a.content a.flowDesc
<if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if> <if test='orderCol.flowDesc != null and "DESC".equalsIgnoreCase(orderCol.flowDesc)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('source')"> <if test="orderCol.containsKey('source')">
......
government-manager/src/main/resources/sqlmap/module/yth/ythOnething.xml
View file @ 731df811
...@@ -10,17 +10,14 @@ ...@@ -10,17 +10,14 @@
<result property="processInstanceId" column="processInstanceId" /> <result property="processInstanceId" column="processInstanceId" />
<result property="memberId" column="memberId" /> <result property="memberId" column="memberId" />
<result property="openId" column="openId" /> <result property="openId" column="openId" />
<result property="matterid" column="matterid" /> <result property="classifyTopicId" column="classifyTopicId" />
<result property="uploadtime" column="uploadtime" />
<result property="type" column="type" />
<result property="address" column="address" /> <result property="address" column="address" />
<result property="linkman" column="linkman" /> <result property="linkman" column="linkman" />
<result property="phone" column="phone" /> <result property="phone" column="phone" />
<result property="isAgent" column="isAgent" />
<result property="manner" column="manner" /> <result property="manner" column="manner" />
<result property="getnum" column="getnum" /> <result property="getnum" column="getnum" />
<result property="number" column="number" /> <result property="number" column="number" />
<result property="optionContent" column="optionContent" /> <result property="isAgent" column="isAgent" />
<result property="isRevoke" column="isRevoke" /> <result property="isRevoke" column="isRevoke" />
<result property="siteid" column="siteid" /> <result property="siteid" column="siteid" />
<result property="status" column="status" /> <result property="status" column="status" />
...@@ -48,14 +45,8 @@ ...@@ -48,14 +45,8 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('openId') or colPickMode == 1 and data.containsKey('openId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('openId') or colPickMode == 1 and data.containsKey('openId')))">
a.openId as openId, a.openId as openId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterid') or colPickMode == 1 and data.containsKey('matterid')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('classifyTopicId') or colPickMode == 1 and data.containsKey('classifyTopicId')))">
a.matterid as matterid, a.classifyTopicId as classifyTopicId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('uploadtime') or colPickMode == 1 and data.containsKey('uploadtime')))">
a.uploadtime as uploadtime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('type') or colPickMode == 1 and data.containsKey('type')))">
a.type as type,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('address') or colPickMode == 1 and data.containsKey('address')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('address') or colPickMode == 1 and data.containsKey('address')))">
a.address as address, a.address as address,
...@@ -66,9 +57,6 @@ ...@@ -66,9 +57,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('phone') or colPickMode == 1 and data.containsKey('phone')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('phone') or colPickMode == 1 and data.containsKey('phone')))">
a.phone as phone, a.phone as phone,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isAgent') or colPickMode == 1 and data.containsKey('isAgent')))">
a.isAgent as isAgent,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('manner') or colPickMode == 1 and data.containsKey('manner')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('manner') or colPickMode == 1 and data.containsKey('manner')))">
a.manner as manner, a.manner as manner,
</if> </if>
...@@ -78,8 +66,8 @@ ...@@ -78,8 +66,8 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('number') or colPickMode == 1 and data.containsKey('number')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('number') or colPickMode == 1 and data.containsKey('number')))">
a.number as number, a.number as number,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('optionContent') or colPickMode == 1 and data.containsKey('optionContent')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isAgent') or colPickMode == 1 and data.containsKey('isAgent')))">
a.optionContent as optionContent, a.isAgent as isAgent,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isRevoke') or colPickMode == 1 and data.containsKey('isRevoke')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isRevoke') or colPickMode == 1 and data.containsKey('isRevoke')))">
a.isRevoke as isRevoke, a.isRevoke as isRevoke,
...@@ -107,18 +95,18 @@ ...@@ -107,18 +95,18 @@
<!-- 新增 --> <!-- 新增 -->
<insert id="insert" parameterType="YthOnethingEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="YthOnethingEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_yth_onething insert into mortals_xhx_yth_onething
(taskId,processInstanceId,memberId,openId,matterid,uploadtime,type,address,linkman,phone,isAgent,manner,getnum,number,optionContent,isRevoke,siteid,status,updateTime,updateUser,createTime,createUser) (taskId,processInstanceId,memberId,openId,classifyTopicId,address,linkman,phone,manner,getnum,number,isAgent,isRevoke,siteid,status,updateTime,updateUser,createTime,createUser)
VALUES VALUES
(#{taskId},#{processInstanceId},#{memberId},#{openId},#{matterid},#{uploadtime},#{type},#{address},#{linkman},#{phone},#{isAgent},#{manner},#{getnum},#{number},#{optionContent},#{isRevoke},#{siteid},#{status},#{updateTime},#{updateUser},#{createTime},#{createUser}) (#{taskId},#{processInstanceId},#{memberId},#{openId},#{classifyTopicId},#{address},#{linkman},#{phone},#{manner},#{getnum},#{number},#{isAgent},#{isRevoke},#{siteid},#{status},#{updateTime},#{updateUser},#{createTime},#{createUser})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_yth_onething insert into mortals_xhx_yth_onething
(taskId,processInstanceId,memberId,openId,matterid,uploadtime,type,address,linkman,phone,isAgent,manner,getnum,number,optionContent,isRevoke,siteid,status,updateTime,updateUser,createTime,createUser) (taskId,processInstanceId,memberId,openId,classifyTopicId,address,linkman,phone,manner,getnum,number,isAgent,isRevoke,siteid,status,updateTime,updateUser,createTime,createUser)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.taskId},#{item.processInstanceId},#{item.memberId},#{item.openId},#{item.matterid},#{item.uploadtime},#{item.type},#{item.address},#{item.linkman},#{item.phone},#{item.isAgent},#{item.manner},#{item.getnum},#{item.number},#{item.optionContent},#{item.isRevoke},#{item.siteid},#{item.status},#{item.updateTime},#{item.updateUser},#{item.createTime},#{item.createUser}) (#{item.taskId},#{item.processInstanceId},#{item.memberId},#{item.openId},#{item.classifyTopicId},#{item.address},#{item.linkman},#{item.phone},#{item.manner},#{item.getnum},#{item.number},#{item.isAgent},#{item.isRevoke},#{item.siteid},#{item.status},#{item.updateTime},#{item.updateUser},#{item.createTime},#{item.createUser})
</foreach> </foreach>
</insert> </insert>
<!-- 根据ParamDto更新 --> <!-- 根据ParamDto更新 -->
...@@ -141,23 +129,11 @@ ...@@ -141,23 +129,11 @@
<if test="(colPickMode==0 and data.containsKey('openId')) or (colPickMode==1 and !data.containsKey('openId'))"> <if test="(colPickMode==0 and data.containsKey('openId')) or (colPickMode==1 and !data.containsKey('openId'))">
a.openId=#{data.openId}, a.openId=#{data.openId},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('matterid')) or (colPickMode==1 and !data.containsKey('matterid'))"> <if test="(colPickMode==0 and data.containsKey('classifyTopicId')) or (colPickMode==1 and !data.containsKey('classifyTopicId'))">
a.matterid=#{data.matterid}, a.classifyTopicId=#{data.classifyTopicId},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('matteridIncrement')) or (colPickMode==1 and !data.containsKey('matteridIncrement'))"> <if test="(colPickMode==0 and data.containsKey('classifyTopicIdIncrement')) or (colPickMode==1 and !data.containsKey('classifyTopicIdIncrement'))">
a.matterid=ifnull(a.matterid,0) + #{data.matteridIncrement}, a.classifyTopicId=ifnull(a.classifyTopicId,0) + #{data.classifyTopicIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('uploadtime')) or (colPickMode==1 and !data.containsKey('uploadtime'))">
a.uploadtime=#{data.uploadtime},
</if>
<if test="(colPickMode==0 and data.containsKey('uploadtimeIncrement')) or (colPickMode==1 and !data.containsKey('uploadtimeIncrement'))">
a.uploadtime=ifnull(a.uploadtime,0) + #{data.uploadtimeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('type')) or (colPickMode==1 and !data.containsKey('type'))">
a.type=#{data.type},
</if>
<if test="(colPickMode==0 and data.containsKey('typeIncrement')) or (colPickMode==1 and !data.containsKey('typeIncrement'))">
a.type=ifnull(a.type,0) + #{data.typeIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('address')) or (colPickMode==1 and !data.containsKey('address'))"> <if test="(colPickMode==0 and data.containsKey('address')) or (colPickMode==1 and !data.containsKey('address'))">
a.address=#{data.address}, a.address=#{data.address},
...@@ -171,12 +147,6 @@ ...@@ -171,12 +147,6 @@
<if test="(colPickMode==0 and data.containsKey('phoneIncrement')) or (colPickMode==1 and !data.containsKey('phoneIncrement'))"> <if test="(colPickMode==0 and data.containsKey('phoneIncrement')) or (colPickMode==1 and !data.containsKey('phoneIncrement'))">
a.phone=ifnull(a.phone,0) + #{data.phoneIncrement}, a.phone=ifnull(a.phone,0) + #{data.phoneIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('isAgent')) or (colPickMode==1 and !data.containsKey('isAgent'))">
a.isAgent=#{data.isAgent},
</if>
<if test="(colPickMode==0 and data.containsKey('isAgentIncrement')) or (colPickMode==1 and !data.containsKey('isAgentIncrement'))">
a.isAgent=ifnull(a.isAgent,0) + #{data.isAgentIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('manner')) or (colPickMode==1 and !data.containsKey('manner'))"> <if test="(colPickMode==0 and data.containsKey('manner')) or (colPickMode==1 and !data.containsKey('manner'))">
a.manner=#{data.manner}, a.manner=#{data.manner},
</if> </if>
...@@ -189,8 +159,11 @@ ...@@ -189,8 +159,11 @@
<if test="(colPickMode==0 and data.containsKey('number')) or (colPickMode==1 and !data.containsKey('number'))"> <if test="(colPickMode==0 and data.containsKey('number')) or (colPickMode==1 and !data.containsKey('number'))">
a.number=#{data.number}, a.number=#{data.number},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('optionContent')) or (colPickMode==1 and !data.containsKey('optionContent'))"> <if test="(colPickMode==0 and data.containsKey('isAgent')) or (colPickMode==1 and !data.containsKey('isAgent'))">
a.optionContent=#{data.optionContent}, a.isAgent=#{data.isAgent},
</if>
<if test="(colPickMode==0 and data.containsKey('isAgentIncrement')) or (colPickMode==1 and !data.containsKey('isAgentIncrement'))">
a.isAgent=ifnull(a.isAgent,0) + #{data.isAgentIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('isRevoke')) or (colPickMode==1 and !data.containsKey('isRevoke'))"> <if test="(colPickMode==0 and data.containsKey('isRevoke')) or (colPickMode==1 and !data.containsKey('isRevoke'))">
a.isRevoke=#{data.isRevoke}, a.isRevoke=#{data.isRevoke},
...@@ -273,40 +246,14 @@ ...@@ -273,40 +246,14 @@
</foreach> </foreach>
</trim> </trim>
<trim prefix="matterid=(case" suffix="ELSE matterid end),"> <trim prefix="classifyTopicId=(case" suffix="ELSE classifyTopicId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('matterid')) or (colPickMode==1 and !item.containsKey('matterid'))">
when a.id=#{item.id} then #{item.matterid}
</when>
<when test="(colPickMode==0 and item.containsKey('matteridIncrement')) or (colPickMode==1 and !item.containsKey('matteridIncrement'))">
when a.id=#{item.id} then ifnull(a.matterid,0) + #{item.matteridIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="uploadtime=(case" suffix="ELSE uploadtime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('uploadtime')) or (colPickMode==1 and !item.containsKey('uploadtime'))">
when a.id=#{item.id} then #{item.uploadtime}
</when>
<when test="(colPickMode==0 and item.containsKey('uploadtimeIncrement')) or (colPickMode==1 and !item.containsKey('uploadtimeIncrement'))">
when a.id=#{item.id} then ifnull(a.uploadtime,0) + #{item.uploadtimeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="type=(case" suffix="ELSE type end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('type')) or (colPickMode==1 and !item.containsKey('type'))"> <when test="(colPickMode==0 and item.containsKey('classifyTopicId')) or (colPickMode==1 and !item.containsKey('classifyTopicId'))">
when a.id=#{item.id} then #{item.type} when a.id=#{item.id} then #{item.classifyTopicId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('typeIncrement')) or (colPickMode==1 and !item.containsKey('typeIncrement'))"> <when test="(colPickMode==0 and item.containsKey('classifyTopicIdIncrement')) or (colPickMode==1 and !item.containsKey('classifyTopicIdIncrement'))">
when a.id=#{item.id} then ifnull(a.type,0) + #{item.typeIncrement} when a.id=#{item.id} then ifnull(a.classifyTopicId,0) + #{item.classifyTopicIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
...@@ -341,19 +288,6 @@ ...@@ -341,19 +288,6 @@
</foreach> </foreach>
</trim> </trim>
<trim prefix="isAgent=(case" suffix="ELSE isAgent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('isAgent')) or (colPickMode==1 and !item.containsKey('isAgent'))">
when a.id=#{item.id} then #{item.isAgent}
</when>
<when test="(colPickMode==0 and item.containsKey('isAgentIncrement')) or (colPickMode==1 and !item.containsKey('isAgentIncrement'))">
when a.id=#{item.id} then ifnull(a.isAgent,0) + #{item.isAgentIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="manner=(case" suffix="ELSE manner end),"> <trim prefix="manner=(case" suffix="ELSE manner end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -383,13 +317,18 @@ ...@@ -383,13 +317,18 @@
</foreach> </foreach>
</trim> </trim>
<trim prefix="optionContent=(case" suffix="ELSE optionContent end),"> <trim prefix="isAgent=(case" suffix="ELSE isAgent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('optionContent')) or (colPickMode==1 and !item.containsKey('optionContent'))"> <choose>
when a.id=#{item.id} then #{item.optionContent} <when test="(colPickMode==0 and item.containsKey('isAgent')) or (colPickMode==1 and !item.containsKey('isAgent'))">
</if> when a.id=#{item.id} then #{item.isAgent}
</foreach> </when>
</trim> <when test="(colPickMode==0 and item.containsKey('isAgentIncrement')) or (colPickMode==1 and !item.containsKey('isAgentIncrement'))">
when a.id=#{item.id} then ifnull(a.isAgent,0) + #{item.isAgentIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="isRevoke=(case" suffix="ELSE isRevoke end),"> <trim prefix="isRevoke=(case" suffix="ELSE isRevoke end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
...@@ -647,67 +586,25 @@ ...@@ -647,67 +586,25 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('matterid')"> <if test="conditionParamRef.containsKey('classifyTopicId')">
<if test="conditionParamRef.matterid != null "> <if test="conditionParamRef.classifyTopicId != null ">
${_conditionType_} a.matterid = #{${_conditionParam_}.matterid} ${_conditionType_} a.classifyTopicId = #{${_conditionParam_}.classifyTopicId}
</if>
<if test="conditionParamRef.matterid == null">
${_conditionType_} a.matterid is null
</if>
</if>
<if test="conditionParamRef.containsKey('matteridList')">
${_conditionType_} a.matterid in
<foreach collection="conditionParamRef.matteridList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matteridStart') and conditionParamRef.matteridStart != null">
${_conditionType_} a.matterid <![CDATA[ >= ]]> #{${_conditionParam_}.matteridStart}
</if>
<if test="conditionParamRef.containsKey('matteridEnd') and conditionParamRef.matteridEnd != null">
${_conditionType_} a.matterid <![CDATA[ <= ]]> #{${_conditionParam_}.matteridEnd}
</if>
<if test="conditionParamRef.containsKey('uploadtime')">
<if test="conditionParamRef.uploadtime != null ">
${_conditionType_} a.uploadtime = #{${_conditionParam_}.uploadtime}
</if>
<if test="conditionParamRef.uploadtime == null">
${_conditionType_} a.uploadtime is null
</if>
</if>
<if test="conditionParamRef.containsKey('uploadtimeList')">
${_conditionType_} a.uploadtime in
<foreach collection="conditionParamRef.uploadtimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('uploadtimeStart') and conditionParamRef.uploadtimeStart != null">
${_conditionType_} a.uploadtime <![CDATA[ >= ]]> #{${_conditionParam_}.uploadtimeStart}
</if>
<if test="conditionParamRef.containsKey('uploadtimeEnd') and conditionParamRef.uploadtimeEnd != null">
${_conditionType_} a.uploadtime <![CDATA[ <= ]]> #{${_conditionParam_}.uploadtimeEnd}
</if>
<if test="conditionParamRef.containsKey('type')">
<if test="conditionParamRef.type != null ">
${_conditionType_} a.type = #{${_conditionParam_}.type}
</if> </if>
<if test="conditionParamRef.type == null"> <if test="conditionParamRef.classifyTopicId == null">
${_conditionType_} a.type is null ${_conditionType_} a.classifyTopicId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('typeList')"> <if test="conditionParamRef.containsKey('classifyTopicIdList')">
${_conditionType_} a.type in ${_conditionType_} a.classifyTopicId in
<foreach collection="conditionParamRef.typeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.classifyTopicIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('typeStart') and conditionParamRef.typeStart != null"> <if test="conditionParamRef.containsKey('classifyTopicIdStart') and conditionParamRef.classifyTopicIdStart != null">
${_conditionType_} a.type <![CDATA[ >= ]]> #{${_conditionParam_}.typeStart} ${_conditionType_} a.classifyTopicId <![CDATA[ >= ]]> #{${_conditionParam_}.classifyTopicIdStart}
</if> </if>
<if test="conditionParamRef.containsKey('typeEnd') and conditionParamRef.typeEnd != null"> <if test="conditionParamRef.containsKey('classifyTopicIdEnd') and conditionParamRef.classifyTopicIdEnd != null">
${_conditionType_} a.type <![CDATA[ <= ]]> #{${_conditionParam_}.typeEnd} ${_conditionType_} a.classifyTopicId <![CDATA[ <= ]]> #{${_conditionParam_}.classifyTopicIdEnd}
</if> </if>
...@@ -761,27 +658,6 @@ ...@@ -761,27 +658,6 @@
${_conditionType_} a.phone <![CDATA[ <= ]]> #{${_conditionParam_}.phoneEnd} ${_conditionType_} a.phone <![CDATA[ <= ]]> #{${_conditionParam_}.phoneEnd}
</if> </if>
<if test="conditionParamRef.containsKey('isAgent')">
<if test="conditionParamRef.isAgent != null ">
${_conditionType_} a.isAgent = #{${_conditionParam_}.isAgent}
</if>
<if test="conditionParamRef.isAgent == null">
${_conditionType_} a.isAgent is null
</if>
</if>
<if test="conditionParamRef.containsKey('isAgentList')">
${_conditionType_} a.isAgent in
<foreach collection="conditionParamRef.isAgentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isAgentStart') and conditionParamRef.isAgentStart != null">
${_conditionType_} a.isAgent <![CDATA[ >= ]]> #{${_conditionParam_}.isAgentStart}
</if>
<if test="conditionParamRef.containsKey('isAgentEnd') and conditionParamRef.isAgentEnd != null">
${_conditionType_} a.isAgent <![CDATA[ <= ]]> #{${_conditionParam_}.isAgentEnd}
</if>
<if test="conditionParamRef.containsKey('manner')"> <if test="conditionParamRef.containsKey('manner')">
<if test="conditionParamRef.manner != null "> <if test="conditionParamRef.manner != null ">
${_conditionType_} a.manner = #{${_conditionParam_}.manner} ${_conditionType_} a.manner = #{${_conditionParam_}.manner}
...@@ -833,21 +709,27 @@ ...@@ -833,21 +709,27 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('isAgent')">
<if test="conditionParamRef.containsKey('optionContent')"> <if test="conditionParamRef.isAgent != null ">
<if test="conditionParamRef.optionContent != null and conditionParamRef.optionContent != ''"> ${_conditionType_} a.isAgent = #{${_conditionParam_}.isAgent}
${_conditionType_} a.optionContent like #{${_conditionParam_}.optionContent}
</if> </if>
<if test="conditionParamRef.optionContent == null"> <if test="conditionParamRef.isAgent == null">
${_conditionType_} a.optionContent is null ${_conditionType_} a.isAgent is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('optionContentList')"> <if test="conditionParamRef.containsKey('isAgentList')">
${_conditionType_} a.optionContent in ${_conditionType_} a.isAgent in
<foreach collection="conditionParamRef.optionContentList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.isAgentList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('isAgentStart') and conditionParamRef.isAgentStart != null">
${_conditionType_} a.isAgent <![CDATA[ >= ]]> #{${_conditionParam_}.isAgentStart}
</if>
<if test="conditionParamRef.containsKey('isAgentEnd') and conditionParamRef.isAgentEnd != null">
${_conditionType_} a.isAgent <![CDATA[ <= ]]> #{${_conditionParam_}.isAgentEnd}
</if>
<if test="conditionParamRef.containsKey('isRevoke')"> <if test="conditionParamRef.containsKey('isRevoke')">
<if test="conditionParamRef.isRevoke != null "> <if test="conditionParamRef.isRevoke != null ">
${_conditionType_} a.isRevoke = #{${_conditionParam_}.isRevoke} ${_conditionType_} a.isRevoke = #{${_conditionParam_}.isRevoke}
...@@ -1009,19 +891,9 @@ ...@@ -1009,19 +891,9 @@
<if test='orderCol.openId != null and "DESC".equalsIgnoreCase(orderCol.openId)'>DESC</if> <if test='orderCol.openId != null and "DESC".equalsIgnoreCase(orderCol.openId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('matterid')"> <if test="orderCol.containsKey('classifyTopicId')">
a.matterid a.classifyTopicId
<if test='orderCol.matterid != null and "DESC".equalsIgnoreCase(orderCol.matterid)'>DESC</if> <if test='orderCol.classifyTopicId != null and "DESC".equalsIgnoreCase(orderCol.classifyTopicId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('uploadtime')">
a.uploadtime
<if test='orderCol.uploadtime != null and "DESC".equalsIgnoreCase(orderCol.uploadtime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('type')">
a.type
<if test='orderCol.type != null and "DESC".equalsIgnoreCase(orderCol.type)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('address')"> <if test="orderCol.containsKey('address')">
...@@ -1039,11 +911,6 @@ ...@@ -1039,11 +911,6 @@
<if test='orderCol.phone != null and "DESC".equalsIgnoreCase(orderCol.phone)'>DESC</if> <if test='orderCol.phone != null and "DESC".equalsIgnoreCase(orderCol.phone)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('isAgent')">
a.isAgent
<if test='orderCol.isAgent != null and "DESC".equalsIgnoreCase(orderCol.isAgent)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('manner')"> <if test="orderCol.containsKey('manner')">
a.manner a.manner
<if test='orderCol.manner != null and "DESC".equalsIgnoreCase(orderCol.manner)'>DESC</if> <if test='orderCol.manner != null and "DESC".equalsIgnoreCase(orderCol.manner)'>DESC</if>
...@@ -1059,9 +926,9 @@ ...@@ -1059,9 +926,9 @@
<if test='orderCol.number != null and "DESC".equalsIgnoreCase(orderCol.number)'>DESC</if> <if test='orderCol.number != null and "DESC".equalsIgnoreCase(orderCol.number)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('optionContent')"> <if test="orderCol.containsKey('isAgent')">
a.optionContent a.isAgent
<if test='orderCol.optionContent != null and "DESC".equalsIgnoreCase(orderCol.optionContent)'>DESC</if> <if test='orderCol.isAgent != null and "DESC".equalsIgnoreCase(orderCol.isAgent)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('isRevoke')"> <if test="orderCol.containsKey('isRevoke')">
......
government-manager/src/main/resources/sqlmap/module/yth/ythOnethingDetail.xml 0 → 100644
View file @ 731df811
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.yth.dao.ibatis.YthOnethingDetailDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="YthOnethingDetailEntity" id="YthOnethingDetailEntity-Map">
<result property="id" column="id" />
<result property="oneThingId" column="oneThingId" />
<result property="matterId" column="matterId" />
<result property="datumId" column="datumId" />
<result property="fileName" column="fileName" />
<result property="filepath" column="filepath" />
<result property="updateTime" column="updateTime" />
<result property="updateUser" column="updateUser" />
<result property="createTime" column="createTime" />
<result property="createUser" column="createUser" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id as id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('oneThingId') or colPickMode == 1 and data.containsKey('oneThingId')))">
a.oneThingId as oneThingId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
a.matterId as matterId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('datumId') or colPickMode == 1 and data.containsKey('datumId')))">
a.datumId as datumId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileName') or colPickMode == 1 and data.containsKey('fileName')))">
a.fileName as fileName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filepath') or colPickMode == 1 and data.containsKey('filepath')))">
a.filepath as filepath,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime as updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUser') or colPickMode == 1 and data.containsKey('updateUser')))">
a.updateUser as updateUser,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime as createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUser') or colPickMode == 1 and data.containsKey('createUser')))">
a.createUser as createUser,
</if>
</trim>
</sql>
<!-- 新增 -->
<insert id="insert" parameterType="YthOnethingDetailEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_yth_onething_detail
(oneThingId,matterId,datumId,fileName,filepath,updateTime,updateUser,createTime,createUser)
VALUES
(#{oneThingId},#{matterId},#{datumId},#{fileName},#{filepath},#{updateTime},#{updateUser},#{createTime},#{createUser})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_yth_onething_detail
(oneThingId,matterId,datumId,fileName,filepath,updateTime,updateUser,createTime,createUser)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.oneThingId},#{item.matterId},#{item.datumId},#{item.fileName},#{item.filepath},#{item.updateTime},#{item.updateUser},#{item.createTime},#{item.createUser})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update mortals_xhx_yth_onething_detail as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('oneThingId')) or (colPickMode==1 and !data.containsKey('oneThingId'))">
a.oneThingId=#{data.oneThingId},
</if>
<if test="(colPickMode==0 and data.containsKey('oneThingIdIncrement')) or (colPickMode==1 and !data.containsKey('oneThingIdIncrement'))">
a.oneThingId=ifnull(a.oneThingId,0) + #{data.oneThingIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
a.matterId=#{data.matterId},
</if>
<if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))">
a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('datumId')) or (colPickMode==1 and !data.containsKey('datumId'))">
a.datumId=#{data.datumId},
</if>
<if test="(colPickMode==0 and data.containsKey('datumIdIncrement')) or (colPickMode==1 and !data.containsKey('datumIdIncrement'))">
a.datumId=ifnull(a.datumId,0) + #{data.datumIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('fileName')) or (colPickMode==1 and !data.containsKey('fileName'))">
a.fileName=#{data.fileName},
</if>
<if test="(colPickMode==0 and data.containsKey('filepath')) or (colPickMode==1 and !data.containsKey('filepath'))">
a.filepath=#{data.filepath},
</if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUser')) or (colPickMode==1 and !data.containsKey('updateUser'))">
a.updateUser=#{data.updateUser},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('createUser')) or (colPickMode==1 and !data.containsKey('createUser'))">
a.createUser=#{data.createUser},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</update>
<!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_yth_onething_detail as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="oneThingId=(case" suffix="ELSE oneThingId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('oneThingId')) or (colPickMode==1 and !item.containsKey('oneThingId'))">
when a.id=#{item.id} then #{item.oneThingId}
</when>
<when test="(colPickMode==0 and item.containsKey('oneThingIdIncrement')) or (colPickMode==1 and !item.containsKey('oneThingIdIncrement'))">
when a.id=#{item.id} then ifnull(a.oneThingId,0) + #{item.oneThingIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="matterId=(case" suffix="ELSE matterId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
when a.id=#{item.id} then #{item.matterId}
</when>
<when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="datumId=(case" suffix="ELSE datumId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('datumId')) or (colPickMode==1 and !item.containsKey('datumId'))">
when a.id=#{item.id} then #{item.datumId}
</when>
<when test="(colPickMode==0 and item.containsKey('datumIdIncrement')) or (colPickMode==1 and !item.containsKey('datumIdIncrement'))">
when a.id=#{item.id} then ifnull(a.datumId,0) + #{item.datumIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="fileName=(case" suffix="ELSE fileName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileName')) or (colPickMode==1 and !item.containsKey('fileName'))">
when a.id=#{item.id} then #{item.fileName}
</if>
</foreach>
</trim>
<trim prefix="filepath=(case" suffix="ELSE filepath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filepath')) or (colPickMode==1 and !item.containsKey('filepath'))">
when a.id=#{item.id} then #{item.filepath}
</if>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
<trim prefix="updateUser=(case" suffix="ELSE updateUser end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateUser')) or (colPickMode==1 and !item.containsKey('updateUser'))">
when a.id=#{item.id} then #{item.updateUser}
</if>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="createUser=(case" suffix="ELSE createUser end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createUser')) or (colPickMode==1 and !item.containsKey('createUser'))">
when a.id=#{item.id} then #{item.createUser}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="YthOnethingDetailEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_yth_onething_detail as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_yth_onething_detail as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys">
delete from mortals_xhx_yth_onething_detail where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_yth_onething_detail as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</delete>
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="YthOnethingDetailEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_yth_onething_detail as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
select count(1)
from mortals_xhx_yth_onething_detail as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</select>
<!-- 条件映射 -->
<sql id="_condition_">
<if test="condition != null and !condition.isEmpty()">
<!-- 条件映射-普通条件 -->
<include refid="_condition_param_">
<property name="_conditionParam_" value="condition"/>
<property name="_conditionType_" value="and"/>
</include>
<!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
<if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
and
<foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
<trim prefixOverrides="or" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="andCondition"/>
<property name="_conditionType_" value="or"/>
</include>
</trim>
</foreach>
</if>
<!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
<if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
and
<foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
<trim prefixOverrides="and" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="orCondition"/>
<property name="_conditionType_" value="and"/>
</include>
</trim>
</foreach>
</if>
</if>
</sql>
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('oneThingId')">
<if test="conditionParamRef.oneThingId != null ">
${_conditionType_} a.oneThingId = #{${_conditionParam_}.oneThingId}
</if>
<if test="conditionParamRef.oneThingId == null">
${_conditionType_} a.oneThingId is null
</if>
</if>
<if test="conditionParamRef.containsKey('oneThingIdList')">
${_conditionType_} a.oneThingId in
<foreach collection="conditionParamRef.oneThingIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('oneThingIdStart') and conditionParamRef.oneThingIdStart != null">
${_conditionType_} a.oneThingId <![CDATA[ >= ]]> #{${_conditionParam_}.oneThingIdStart}
</if>
<if test="conditionParamRef.containsKey('oneThingIdEnd') and conditionParamRef.oneThingIdEnd != null">
${_conditionType_} a.oneThingId <![CDATA[ <= ]]> #{${_conditionParam_}.oneThingIdEnd}
</if>
<if test="conditionParamRef.containsKey('matterId')">
<if test="conditionParamRef.matterId != null ">
${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
</if>
<if test="conditionParamRef.matterId == null">
${_conditionType_} a.matterId is null
</if>
</if>
<if test="conditionParamRef.containsKey('matterIdList')">
${_conditionType_} a.matterId in
<foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
</if>
<if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
</if>
<if test="conditionParamRef.containsKey('datumId')">
<if test="conditionParamRef.datumId != null ">
${_conditionType_} a.datumId = #{${_conditionParam_}.datumId}
</if>
<if test="conditionParamRef.datumId == null">
${_conditionType_} a.datumId is null
</if>
</if>
<if test="conditionParamRef.containsKey('datumIdList')">
${_conditionType_} a.datumId in
<foreach collection="conditionParamRef.datumIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('datumIdStart') and conditionParamRef.datumIdStart != null">
${_conditionType_} a.datumId <![CDATA[ >= ]]> #{${_conditionParam_}.datumIdStart}
</if>
<if test="conditionParamRef.containsKey('datumIdEnd') and conditionParamRef.datumIdEnd != null">
${_conditionType_} a.datumId <![CDATA[ <= ]]> #{${_conditionParam_}.datumIdEnd}
</if>
<if test="conditionParamRef.containsKey('fileName')">
<if test="conditionParamRef.fileName != null and conditionParamRef.fileName != ''">
${_conditionType_} a.fileName like #{${_conditionParam_}.fileName}
</if>
<if test="conditionParamRef.fileName == null">
${_conditionType_} a.fileName is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNameList')">
${_conditionType_} a.fileName in
<foreach collection="conditionParamRef.fileNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filepath')">
<if test="conditionParamRef.filepath != null and conditionParamRef.filepath != ''">
${_conditionType_} a.filepath like #{${_conditionParam_}.filepath}
</if>
<if test="conditionParamRef.filepath == null">
${_conditionType_} a.filepath is null
</if>
</if>
<if test="conditionParamRef.containsKey('filepathList')">
${_conditionType_} a.filepath in
<foreach collection="conditionParamRef.filepathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUser')">
<if test="conditionParamRef.updateUser != null and conditionParamRef.updateUser != ''">
${_conditionType_} a.updateUser like #{${_conditionParam_}.updateUser}
</if>
<if test="conditionParamRef.updateUser == null">
${_conditionType_} a.updateUser is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserList')">
${_conditionType_} a.updateUser in
<foreach collection="conditionParamRef.updateUserList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUser')">
<if test="conditionParamRef.createUser != null and conditionParamRef.createUser != ''">
${_conditionType_} a.createUser like #{${_conditionParam_}.createUser}
</if>
<if test="conditionParamRef.createUser == null">
${_conditionType_} a.createUser is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserList')">
${_conditionType_} a.createUser in
<foreach collection="conditionParamRef.createUserList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('oneThingId')">
a.oneThingId
<if test='orderCol.oneThingId != null and "DESC".equalsIgnoreCase(orderCol.oneThingId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('matterId')">
a.matterId
<if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('datumId')">
a.datumId
<if test='orderCol.datumId != null and "DESC".equalsIgnoreCase(orderCol.datumId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('fileName')">
a.fileName
<if test='orderCol.fileName != null and "DESC".equalsIgnoreCase(orderCol.fileName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filepath')">
a.filepath
<if test='orderCol.filepath != null and "DESC".equalsIgnoreCase(orderCol.filepath)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateUser')">
a.updateUser
<if test='orderCol.updateUser != null and "DESC".equalsIgnoreCase(orderCol.updateUser)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUser')">
a.createUser
<if test='orderCol.createUser != null and "DESC".equalsIgnoreCase(orderCol.createUser)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
GROUP BY
<trim suffixOverrides="," suffix="">
<foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item}
</foreach>
</trim>
</if>
</sql>
</mapper>
\ No newline at end of file
government-manager/src/main/resources/static/doc/AllInOne.md.md
View file @ 731df811
Version | Update Time | Status | Author | Description Version | Update Time | Status | Author | Description
---|---|---|---|--- ---|---|---|---|---
v2021-09-08 09:08:17|2021-09-08 09:08:17|auto|@finegirl|Created by smart-doc v2021-09-23 15:07:28|2021-09-23 15:07:28|auto|@finegirl|Created by smart-doc
## 一件事微信对外服务接口 ## 一件事微信对外服务接口
### 一件事列表 ### 一件事主题列表(包含主题包)
**URL:** http://localhost:28080/zwfw/proced/thing/one_list **URL:** http://localhost:28080/zwfw/proced/thing/oneTopiclist
**Type:** POST **Type:** POST
**Content-Type:** application/x-www-form-urlencoded;charset=utf-8 **Content-Type:** application/x-www-form-urlencoded;charset=utf-8
**Description:** 一件事列表 **Description:** 一件事主题列表(包含主题包)
**Query-parameters:** **Query-parameters:**
Parameter | Type|Description|Required|Since Parameter | Type|Description|Required|Since
---|---|---|---|--- ---|---|---|---|---
open_id|string|微信开放id|false|- openId|string|微信开放id|false|-
type|int32|主题包类型（1：个人服务，2：企业服务）|false|-
page|int32|当前请求页数|false|- page|int32|当前请求页数|false|-
limit|int32|每页记录数|false|- limit|int32|每页记录数|false|-
keywords|string|搜索关键词|false|- keywords|string|搜索关键词|false|-
**Request-example:** **Request-example:**
``` ```
curl -X POST -i http://localhost:28080/zwfw/proced/thing/one_list --data 'limit=10&page=1&open_id=87&keywords=rvxed1' curl -X POST -i http://localhost:28080/zwfw/proced/thing/oneTopiclist --data 'limit=10&type=459&page=1&keywords=c11wki&openId=94'
``` ```
**Response-fields:** **Response-fields:**
...@@ -35,195 +36,44 @@ Field | Type|Description|Since ...@@ -35,195 +36,44 @@ Field | Type|Description|Since
code|int32|No comments found.|- code|int32|No comments found.|-
msg|string|No comments found.|- msg|string|No comments found.|-
data|array|No comments found.|- data|array|No comments found.|-
└─id|int64|id|- └─any object|object|any object.|-
└─tname|string|名称|-
└─matter_ids|string|事项关联id|-
└─valid|int32|是否删除（ 0正常 1删除）|-
└─create_time|int64|创建时间|-
**Response-example:** **Response-example:**
``` ```
{ {
"code": 805, "code": 818,
"msg": "f5h6lm", "msg": "bsqmz3",
"data": [ "data": [
{ {
"id": 482, "mapKey": {
"tname": "正豪.丁", "waring": "You may use java.util.Object for Map value; smart-doc can't be handle."
"matter_ids": "v98bhx", }
"valid": 361,
"create_time": 1631063301501
}
]
}
```
### 问答数据列表
**URL:** http://localhost:28080/zwfw/proced/thing/one_problem
**Type:** POST
**Content-Type:** application/x-www-form-urlencoded;charset=utf-8
**Description:** 问答数据列表
**Query-parameters:**
Parameter | Type|Description|Required|Since
---|---|---|---|---
open_id|string|微信开放id|false|-
basics_id|int64|选中一件事ID|false|-
**Request-example:**
```
curl -X POST -i http://localhost:28080/zwfw/proced/thing/one_problem --data 'open_id=87&basics_id=675'
```
**Response-fields:**
Field | Type|Description|Since
---|---|---|---
code|int32|No comments found.|-
msg|string|No comments found.|-
data|array|No comments found.|-
└─id|int64|No comments found.|-
└─basics_id|string|No comments found.|-
└─name|string|No comments found.|-
└─type|int32|No comments found.|-
└─ismust|int32|No comments found.|-
└─level|int32|No comments found.|-
└─option_ids|string|No comments found.|-
└─create_time|int64|No comments found.|-
└─option|array|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─classify_id|string|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─classify_next_id|string|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─name|string|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isend|int32|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─basicsinfo_id|int64|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─accept_id|string|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowlimit_id|string|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matter_id|string|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─datum_id|string|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─summary_type|int32|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─summary|string|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─create_time|int64|No comments found.|-
**Response-example:**
```
{
"code": 188,
"msg": "qtw83h",
"data": [
{
"id": 453,
"basics_id": "87",
"name": "正豪.丁",
"type": 320,
"ismust": 817,
"level": 922,
"option_ids": "590o35",
"create_time": 1631063301501,
"option": [
{
"id": 655,
"classify_id": "87",
"classify_next_id": "87",
"name": "正豪.丁",
"isend": 584,
"basicsinfo_id": 174,
"accept_id": "87",
"flowlimit_id": "87",
"matter_id": "87",
"datum_id": "87",
"summary_type": 572,
"summary": "9y4pe0",
"create_time": 1631063301501
}
]
} }
] ]
} }
``` ```
### 事项详细 ### 问答答案提交后返回的详细结果
**URL:** http://localhost:28080/zwfw/proced/thing/oneBasicsInfo **URL:** http://localhost:28080/zwfw/proced/thing/ansResults
**Type:** POST **Type:** POST
**Content-Type:** application/x-www-form-urlencoded;charset=utf-8 **Content-Type:** application/x-www-form-urlencoded;charset=utf-8
**Description:** 事项详细 **Description:** 问答答案提交后返回的详细结果
**Query-parameters:** **Query-parameters:**
Parameter | Type|Description|Required|Since Parameter | Type|Description|Required|Since
---|---|---|---|--- ---|---|---|---|---
open_id|string|微信开放id|false|- openId|string|微信开放id|false|-
id|int64|一件事基础表id|false|- optionIds|array|问答最后答案选项ID（多问题线）|false|-
**Request-example:**
```
curl -X POST -i http://localhost:28080/zwfw/proced/thing/oneBasicsInfo --data 'id=933&open_id=87'
```
**Response-fields:**
Field | Type|Description|Since
---|---|---|---
code|int32|No comments found.|-
msg|string|No comments found.|-
data|object|No comments found.|-
└─id|int64|No comments found.|-
└─datum_ids|string|材料ids|-
└─matter_ids|string|事项关联|-
└─qrcode|string|二维码（文件存储地址）|-
└─iszzsb|int32|是否自主申报 0否 1是 默认0|-
└─tname|string|'一件事标题|-
└─sort|int32|排序|-
└─valid|int32|是否删除|-
└─create_time|string|创建时间|-
**Response-example:**
```
{
"code": 365,
"msg": "t603mv",
"data": {
"id": 832,
"datum_ids": "muu8yk",
"matter_ids": "7mfwws",
"qrcode": "82730",
"iszzsb": 153,
"tname": "正豪.丁",
"sort": 43,
"valid": 921,
"create_time": "2021-09-08 09:08:21"
}
}
```
### 问答基础信息
**URL:** http://localhost:28080/zwfw/proced/thing/condition
**Type:** POST
**Content-Type:** application/x-www-form-urlencoded;charset=utf-8
**Description:** 问答基础信息
**Query-parameters:**
Parameter | Type|Description|Required|Since
---|---|---|---|---
open_id|string|微信开放id|false|-
option_id|int64|问答最后最后选项ID|false|-
key|string|问题路线id?|false|- key|string|问题路线id?|false|-
**Request-example:** **Request-example:**
``` ```
curl -X POST -i http://localhost:28080/zwfw/proced/thing/condition --data 'key=11zjca&option_id=9&open_id=87' curl -X POST -i http://localhost:28080/zwfw/proced/thing/ansResults --data 'key=5n57or&openId=94'
``` ```
**Response-fields:** **Response-fields:**
...@@ -232,127 +82,115 @@ Field | Type|Description|Since ...@@ -232,127 +82,115 @@ Field | Type|Description|Since
code|int32|No comments found.|- code|int32|No comments found.|-
msg|string|No comments found.|- msg|string|No comments found.|-
data|object|No comments found.|- data|object|No comments found.|-
└─basicsInfo|object|No comments found.|- └─matterInfoList|array|事项列表列表|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|No comments found.|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|事项id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─title|string|模板标题|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterName|string|事项名称|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─basics_id|int64|一件事基础表id|- └─acceptInfoList|array|受理条件列表|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─jointInfoShow|string|办理机构|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterId|int64|事项id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─legalTimeLimitShow|string|法定时限|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─title|string|受理条件|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─promiseTimeLimitShow|string|承诺时限|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─content|string|受理条件|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isChargesShow|int32|是否收费,0,否，1是 默认0|- └─flowLimitInfoList|array|办理流程列表|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─Charges|string|收费金额|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterId|int64|事项matter id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─handleTimeShow|string|办公时间|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowName|string|办理流程|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─handlePlaceShow|string|办公地址|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowTime|string|办理时长|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─cousultingTelephoneShow|string|咨询电话|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowTurnOut|string|转外时限|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─supervisoryTelephoneShow|string|投诉电话|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowDesc|string|办理流程说明|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─resultInfo|string|结果信息|- └─datumInfoList|array|事项材料列表|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─qa|string|常见问题|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|材料id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─create_time|int64|No comments found.|-
└─accept|array|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─title|string|模板标题|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─content|string|申请条件|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─basics_id|int64|基础表one_basics id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─create_time|int64|创建时间|-
└─flowlimit|array|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─title|string|模板标题|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─content|string|办理流程|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─basics_id|int64|基础表one_basics id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─create_time|int64|创建时间|-
└─datum|array|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialName|string|材料名|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialName|string|材料名|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─basics_id|int64|基础表one_basics id|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterId|int64|事项Id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterid|int64|事项表yth_matter id 表示从一体化获取的材料|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialProperty|string|材料形式|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─datum_id|int64|材料表yth_datum id 表示从一体化获取的材料|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isMust|string|是否必交，0 否 1 是 默认0|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialProperty|int32|材料形式|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialType|string|材料类型|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isMust|int32|是否必交，0 否 1 是 默认0|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─electronicgs|string|电子材料格式|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialType|int32|材料类型|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialSource|string|材料来源渠道|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─electronicgs|int32|电子材料格式|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialSource|int32|材料来源渠道|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─paperNum|int32|纸质材料份数|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─paperNum|int32|纸质材料份数|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─paperGg|int32|纸质材料规格|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─paperGg|string|纸质材料规格|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─jianmMs|int32|减免模式|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─jianmMs|string|减免模式|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─sealWay|int32|盖章方式|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─sealWay|string|盖章方式|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isjianm|int32|是否减免|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isjianm|string|是否减免|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isLack|int32|材料是否容缺|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isLack|string|材料是否容缺|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─yb_url|string|材料地址|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialSourceSm|string|来源渠道说明|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialSourceSm|string|来源渠道说明|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─remarkSub|string|填报须知|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─remarkSub|string|填报须知|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─remark|string|受理标准|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─remark|string|受理标准|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─clauseContent|string|要求提供材料的依据|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─clauseContent|string|要求提供材料的依据|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─summary|string|备注|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─summary|string|备注|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─valid|int32|0正常 1删除|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─createTime|string|材料创建时间|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─create_time|int64|No comments found.|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─attachList|array|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─datumid|int64|材料id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─fileName|string|附件名称|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─fileUrl|string|附件下载地址|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─filetype|int32|附件类型 1 示例样表 2空白表格 默认1|-
└─qAndAInfoList|array|常见问题列表|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterId|int64|事项id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─question|string|问题|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─answer|string|回答|-
**Response-example:** **Response-example:**
``` ```
{ {
"code": 128, "code": 861,
"msg": "jzfnhp", "msg": "i9y1jg",
"data": { "data": {
"basicsInfo": { "matterInfoList": [
"id": 79,
"title": "sfko0r",
"basics_id": 992,
"jointInfoShow": "rkc6t2",
"legalTimeLimitShow": "34o5gf",
"promiseTimeLimitShow": "a65igi",
"isChargesShow": 231,
"Charges": "8kezlr",
"handleTimeShow": "s29f71",
"handlePlaceShow": "czag0t",
"cousultingTelephoneShow": "u2otba",
"supervisoryTelephoneShow": "9sporc",
"resultInfo": "wdlfhb",
"qa": "6kc719",
"create_time": 1631063301501
},
"accept": [
{ {
"id": 546, "id": 804,
"title": "qsrmnp", "matterName": "文昊.范"
"content": "lmvmju",
"basics_id": 873,
"create_time": 1631063301501
} }
], ],
"flowlimit": [ "acceptInfoList": [
{ {
"id": 849, "matterId": 326,
"title": "7p32xx", "title": "dlzcph",
"content": "o3x24y", "content": "dca3gj"
"basics_id": 597,
"create_time": 1631063301501
} }
], ],
"datum": [ "flowLimitInfoList": [
{ {
"id": 330, "matterId": 981,
"materialName": "正豪.丁", "flowName": "文昊.范",
"basics_id": 400, "flowTime": "2021-09-23 15:07:33",
"matterid": 873, "flowTurnOut": "n79mew",
"datum_id": 408, "flowDesc": "vkhlwm"
"materialProperty": 541, }
"isMust": 254, ],
"materialType": 426, "datumInfoList": [
"electronicgs": 617, {
"materialSource": 544, "id": 957,
"paperNum": 659, "materialName": "文昊.范",
"paperGg": 311, "matterId": 134,
"jianmMs": 62, "materialProperty": "lmhtbw",
"sealWay": 31, "isMust": "dessh0",
"isjianm": 590, "materialType": "01upvx",
"isLack": 195, "electronicgs": "tuun5d",
"yb_url": "www.xn---xn--4l5a-455q4919c.com", "materialSource": "mv060c",
"materialSourceSm": "hwo1jl", "paperNum": 718,
"remarkSub": "e8ol9f", "paperGg": "ba4uav",
"remark": "g9mut8", "jianmMs": "x5fzrw",
"clauseContent": "mmnhdt", "sealWay": "eyofow",
"summary": "ez55wv", "isjianm": "zk29i4",
"valid": 222, "isLack": "g7j47x",
"create_time": 1631063301501 "materialSourceSm": "1ttuds",
"remarkSub": "u37bsq",
"remark": "b2wuc9",
"clauseContent": "8474qb",
"summary": "b1f061",
"createTime": "2021-09-23 15:07:34",
"attachList": [
{
"datumid": 772,
"fileName": "文昊.范",
"fileUrl": "www.xn---xn--btv-815q681d.net",
"filetype": 254
}
]
}
],
"qAndAInfoList": [
{
"matterId": 215,
"question": "u088pb",
"answer": "o8dz8a"
} }
] ]
} }
...@@ -378,7 +216,7 @@ open_id|string|No comments found.|false|- ...@@ -378,7 +216,7 @@ open_id|string|No comments found.|false|-
**Request-example:** **Request-example:**
``` ```
curl -X POST -i http://localhost:28080/zwfw/proced/thing/datum_data --data 'key=izvap1&open_id=87' curl -X POST -i http://localhost:28080/zwfw/proced/thing/datum_data --data 'open_id=94&key=ein1q9'
``` ```
**Response-fields:** **Response-fields:**
...@@ -387,127 +225,115 @@ Field | Type|Description|Since ...@@ -387,127 +225,115 @@ Field | Type|Description|Since
code|int32|No comments found.|- code|int32|No comments found.|-
msg|string|No comments found.|- msg|string|No comments found.|-
data|object|No comments found.|- data|object|No comments found.|-
└─basicsInfo|object|No comments found.|- └─matterInfoList|array|事项列表列表|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|No comments found.|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|事项id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─title|string|模板标题|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterName|string|事项名称|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─basics_id|int64|一件事基础表id|- └─acceptInfoList|array|受理条件列表|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─jointInfoShow|string|办理机构|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterId|int64|事项id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─legalTimeLimitShow|string|法定时限|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─title|string|受理条件|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─promiseTimeLimitShow|string|承诺时限|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─content|string|受理条件|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isChargesShow|int32|是否收费,0,否，1是 默认0|- └─flowLimitInfoList|array|办理流程列表|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─Charges|string|收费金额|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterId|int64|事项matter id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─handleTimeShow|string|办公时间|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowName|string|办理流程|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─handlePlaceShow|string|办公地址|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowTime|string|办理时长|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─cousultingTelephoneShow|string|咨询电话|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowTurnOut|string|转外时限|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─supervisoryTelephoneShow|string|投诉电话|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─flowDesc|string|办理流程说明|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─resultInfo|string|结果信息|- └─datumInfoList|array|事项材料列表|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─qa|string|常见问题|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|材料id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─create_time|int64|No comments found.|-
└─accept|array|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─title|string|模板标题|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─content|string|申请条件|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─basics_id|int64|基础表one_basics id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─create_time|int64|创建时间|-
└─flowlimit|array|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─title|string|模板标题|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─content|string|办理流程|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─basics_id|int64|基础表one_basics id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─create_time|int64|创建时间|-
└─datum|array|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─id|int64|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialName|string|材料名|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialName|string|材料名|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─basics_id|int64|基础表one_basics id|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterId|int64|事项Id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterid|int64|事项表yth_matter id 表示从一体化获取的材料|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialProperty|string|材料形式|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─datum_id|int64|材料表yth_datum id 表示从一体化获取的材料|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isMust|string|是否必交，0 否 1 是 默认0|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialProperty|int32|材料形式|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialType|string|材料类型|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isMust|int32|是否必交，0 否 1 是 默认0|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─electronicgs|string|电子材料格式|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialType|int32|材料类型|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialSource|string|材料来源渠道|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─electronicgs|int32|电子材料格式|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialSource|int32|材料来源渠道|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─paperNum|int32|纸质材料份数|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─paperNum|int32|纸质材料份数|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─paperGg|int32|纸质材料规格|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─paperGg|string|纸质材料规格|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─jianmMs|int32|减免模式|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─jianmMs|string|减免模式|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─sealWay|int32|盖章方式|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─sealWay|string|盖章方式|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isjianm|int32|是否减免|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isjianm|string|是否减免|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isLack|int32|材料是否容缺|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─isLack|string|材料是否容缺|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─yb_url|string|材料地址|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialSourceSm|string|来源渠道说明|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─materialSourceSm|string|来源渠道说明|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─remarkSub|string|填报须知|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─remarkSub|string|填报须知|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─remark|string|受理标准|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─remark|string|受理标准|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─clauseContent|string|要求提供材料的依据|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─clauseContent|string|要求提供材料的依据|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─summary|string|备注|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─summary|string|备注|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─valid|int32|0正常 1删除|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─createTime|string|材料创建时间|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─create_time|int64|No comments found.|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─attachList|array|No comments found.|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─datumid|int64|材料id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─fileName|string|附件名称|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─fileUrl|string|附件下载地址|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─filetype|int32|附件类型 1 示例样表 2空白表格 默认1|-
└─qAndAInfoList|array|常见问题列表|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─matterId|int64|事项id|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─question|string|问题|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─answer|string|回答|-
**Response-example:** **Response-example:**
``` ```
{ {
"code": 963, "code": 801,
"msg": "6bbvs8", "msg": "5180nj",
"data": { "data": {
"basicsInfo": { "matterInfoList": [
"id": 596, {
"title": "rtcx8t", "id": 480,
"basics_id": 304, "matterName": "文昊.范"
"jointInfoShow": "emb7gn", }
"legalTimeLimitShow": "3ofsb9", ],
"promiseTimeLimitShow": "aiagro", "acceptInfoList": [
"isChargesShow": 732, {
"Charges": "eym2h0", "matterId": 608,
"handleTimeShow": "go7nc8", "title": "mxe208",
"handlePlaceShow": "7mx8ux", "content": "n4axbi"
"cousultingTelephoneShow": "lgtv83", }
"supervisoryTelephoneShow": "eu9h1q", ],
"resultInfo": "k5ert3", "flowLimitInfoList": [
"qa": "8j3qga",
"create_time": 1631063301501
},
"accept": [
{ {
"id": 828, "matterId": 123,
"title": "8swwuv", "flowName": "文昊.范",
"content": "67nvj4", "flowTime": "2021-09-23 15:07:33",
"basics_id": 856, "flowTurnOut": "g45v3w",
"create_time": 1631063301501 "flowDesc": "a4x90b"
} }
], ],
"flowlimit": [ "datumInfoList": [
{ {
"id": 421, "id": 99,
"title": "63ovlj", "materialName": "文昊.范",
"content": "0y0p9i", "matterId": 938,
"basics_id": 266, "materialProperty": "4uhixx",
"create_time": 1631063301501 "isMust": "5k4jy1",
"materialType": "h2zw4i",
"electronicgs": "7ka0nn",
"materialSource": "31b25g",
"paperNum": 411,
"paperGg": "38ereq",
"jianmMs": "lj26g0",
"sealWay": "oom7xr",
"isjianm": "1khwsj",
"isLack": "xqxves",
"materialSourceSm": "pj4jt0",
"remarkSub": "dhmr4f",
"remark": "hnau93",
"clauseContent": "4bam7o",
"summary": "nookwm",
"createTime": "2021-09-23 15:07:34",
"attachList": [
{
"datumid": 22,
"fileName": "文昊.范",
"fileUrl": "www.xn---xn--btv-815q681d.net",
"filetype": 232
}
]
} }
], ],
"datum": [ "qAndAInfoList": [
{ {
"id": 115, "matterId": 948,
"materialName": "正豪.丁", "question": "5s5hcj",
"basics_id": 976, "answer": "lzgxpj"
"matterid": 772,
"datum_id": 625,
"materialProperty": 591,
"isMust": 179,
"materialType": 579,
"electronicgs": 442,
"materialSource": 337,
"paperNum": 125,
"paperGg": 169,
"jianmMs": 356,
"sealWay": 52,
"isjianm": 107,
"isLack": 164,
"yb_url": "www.xn---xn--4l5a-455q4919c.com",
"materialSourceSm": "i137iw",
"remarkSub": "lzokfi",
"remark": "zl7fqe",
"clauseContent": "rpnusp",
"summary": "kq5ow0",
"valid": 311,
"create_time": 1631063301501
} }
] ]
} }
...@@ -515,7 +341,7 @@ data|object|No comments found.|- ...@@ -515,7 +341,7 @@ data|object|No comments found.|-
``` ```
### 上传附件 ### 上传附件
**URL:** http://localhost:28080/zwfw/proced/thing/upload_file **URL:** http://localhost:28080/zwfw/proced/thing/uploadFile
**Type:** POST **Type:** POST
...@@ -532,7 +358,7 @@ file|file|No comments found.|true|- ...@@ -532,7 +358,7 @@ file|file|No comments found.|true|-
**Request-example:** **Request-example:**
``` ```
curl -X POST -H 'Content-Type: multipart/form-data' -i http://localhost:28080/zwfw/proced/thing/upload_file curl -X POST -H 'Content-Type: multipart/form-data' -i http://localhost:28080/zwfw/proced/thing/uploadFile
``` ```
**Response-fields:** **Response-fields:**
...@@ -545,17 +371,17 @@ data|object|No comments found.|- ...@@ -545,17 +371,17 @@ data|object|No comments found.|-
**Response-example:** **Response-example:**
``` ```
{ {
"code": 323, "code": 725,
"msg": "ui6kz8", "msg": "t35r6e",
"data": { "data": {
"mapKey1": "r6u0ar", "mapKey1": "znrt8v",
"mapKey2": "nay3dy" "mapKey2": "slmaxd"
} }
} }
``` ```
### 删除附件 ### 删除附件
**URL:** http://localhost:28080/zwfw/proced/thing/del_file **URL:** http://localhost:28080/zwfw/proced/thing/delFile
**Type:** POST **Type:** POST
...@@ -568,12 +394,12 @@ data|object|No comments found.|- ...@@ -568,12 +394,12 @@ data|object|No comments found.|-
Parameter | Type|Description|Required|Since Parameter | Type|Description|Required|Since
---|---|---|---|--- ---|---|---|---|---
open_id|string|微信开放id|false|- openId|string|微信开放id|false|-
file_path|string|文件路径|false|- filePath|string|文件路径|false|-
**Request-example:** **Request-example:**
``` ```
curl -X POST -i http://localhost:28080/zwfw/proced/thing/del_file --data 'open_id=87&file_path=u0w4qs' curl -X POST -i http://localhost:28080/zwfw/proced/thing/delFile --data 'openId=94&filePath=uj8x5k'
``` ```
**Response-fields:** **Response-fields:**
...@@ -586,14 +412,14 @@ data|object|No comments found.|- ...@@ -586,14 +412,14 @@ data|object|No comments found.|-
**Response-example:** **Response-example:**
``` ```
{ {
"code": 48, "code": 520,
"msg": "32nwtj", "msg": "wszuy9",
"data": "4kfktu" "data": "pnyluj"
} }
``` ```
### 查询用户信息 ### 查询用户信息
**URL:** http://localhost:28080/zwfw/proced/thing/is_phone **URL:** http://localhost:28080/zwfw/proced/thing/searchMember
**Type:** POST **Type:** POST
...@@ -606,11 +432,11 @@ data|object|No comments found.|- ...@@ -606,11 +432,11 @@ data|object|No comments found.|-
Parameter | Type|Description|Required|Since Parameter | Type|Description|Required|Since
---|---|---|---|--- ---|---|---|---|---
open_id|string|微信开放id|false|- openId|string|微信开放id|false|-
**Request-example:** **Request-example:**
``` ```
curl -X POST -i http://localhost:28080/zwfw/proced/thing/is_phone --data 'open_id=87' curl -X POST -i http://localhost:28080/zwfw/proced/thing/searchMember --data 'openId=94'
``` ```
**Response-fields:** **Response-fields:**
...@@ -623,6 +449,7 @@ data|object|No comments found.|- ...@@ -623,6 +449,7 @@ data|object|No comments found.|-
└─createTime|string|创建时间|- └─createTime|string|创建时间|-
└─createUser|string|创建用户|- └─createUser|string|创建用户|-
└─createUserId|int64|No comments found.|- └─createUserId|int64|No comments found.|-
└─deleted|int32|No comments found.|-
└─createUserName|string|创建用户名称|- └─createUserName|string|创建用户名称|-
└─createUserDeptId|int64|No comments found.|- └─createUserDeptId|int64|No comments found.|-
└─createUserDeptName|string|No comments found.|- └─createUserDeptName|string|No comments found.|-
...@@ -661,82 +488,83 @@ data|object|No comments found.|- ...@@ -661,82 +488,83 @@ data|object|No comments found.|-
**Response-example:** **Response-example:**
``` ```
{ {
"code": 823, "code": 686,
"msg": "0gwn4w", "msg": "692v76",
"data": { "data": {
"id": "k6hp33", "id": "nc71t3",
"createTime": "2021-09-08 09:08:22", "createTime": "2021-09-23 15:07:34",
"createUser": "3xvwt3", "createUser": "gw3ig0",
"createUserId": 302, "createUserId": 600,
"createUserName": "正豪.丁", "deleted": 308,
"createUserDeptId": 983, "createUserName": "文昊.范",
"createUserDeptName": "正豪.丁", "createUserDeptId": 720,
"updateTime": "2021-09-08 09:08:22", "createUserDeptName": "文昊.范",
"updateUser": "3w97bl", "updateTime": "2021-09-23 15:07:34",
"updateUserId": 792, "updateUser": "kv5wmb",
"updateUserName": "正豪.丁", "updateUserId": 996,
"updateUserDeptId": 232, "updateUserName": "文昊.范",
"updateUserDeptName": "正豪.丁", "updateUserDeptId": 388,
"idcardName": "正豪.丁", "updateUserDeptName": "文昊.范",
"idcardSex": "cpzrrs", "idcardName": "文昊.范",
"idcardNation": "efcopo", "idcardSex": "xsuvf0",
"idcardBorn": "dvwi2e", "idcardNation": "ed9ban",
"idcardAddress": "任旁96号， 宝鸡， 琼 030389", "idcardBorn": "5ek2of",
"idcardIDCardNo": "10b175", "idcardAddress": "郭巷28号， 三门峡， 藏 153623",
"idcardGrantDept": "vg86va", "idcardIDCardNo": "ao6bnt",
"idcardUserLifeBegin": "bwcxj3", "idcardGrantDept": "fywhcn",
"idcardUserLifeEnd": "zou5d5", "idcardUserLifeBegin": "wwrvwk",
"idcardDataPhotoFileName": "正豪.丁", "idcardUserLifeEnd": "w61kit",
"phone": "15719864910", "idcardDataPhotoFileName": "文昊.范",
"unionid": "87", "phone": "15978345833",
"openId": "87", "unionid": "94",
"picImage": "sd356b", "openId": "94",
"nickname": "ahmad.jenkins", "picImage": "ammqvv",
"realName": "正豪.丁", "nickname": "elden.white",
"gender": "0dhmun", "realName": "文昊.范",
"icon": "s9n8bb", "gender": "iz9stl",
"zImg": "sqs5hh", "icon": "px75zf",
"bImg": "ki86q4", "zImg": "h8k6z1",
"siteid": 831, "bImg": "pbyp5x",
"username": "正豪.丁", "siteid": 687,
"lasttime": "2021-09-08 09:08:22", "username": "文昊.范",
"remark": "bnu7r2", "lasttime": "2021-09-23 15:07:34",
"status": 640 "remark": "757762",
"status": 417
} }
} }
``` ```
### 文件资料上传 ### 一件事办理资料提交
**URL:** http://localhost:28080/zwfw/proced/thing/upload_datum **URL:** http://localhost:28080/zwfw/proced/thing/submitDatum
**Type:** POST **Type:** POST
**Content-Type:** application/x-www-form-urlencoded;charset=utf-8 **Content-Type:** application/x-www-form-urlencoded;charset=utf-8
**Description:** 文件资料上传 **Description:** 一件事办理资料提交
**Query-parameters:** **Query-parameters:**
Parameter | Type|Description|Required|Since Parameter | Type|Description|Required|Since
---|---|---|---|--- ---|---|---|---|---
open_id|string|微信开放id|false|- openId|string|微信开放id|false|-
matterid|int64|事项ID|false|- siteId|int64|站点ID|false|-
siteid|int64|siteid|false|-
option_content|string|问答内容|false|-
name|string|申请人姓名|false|- name|string|申请人姓名|false|-
phone|string|电话|false|- phone|string|电话|false|-
idcard|string|身份证|false|- idcard|string|身份证|false|-
is_agent|int32|0本人办理 1代办|false|- isAgent|int32|0本人办理 1代办|false|-
manner|int32|0自主取件 1代办领取 (取件方式)|false|- manner|int32|0自主取件 1代办领取 (取件方式)|false|-
region_id|int64|村ID|false|- matterReqList|array|申请事项列表|false|-
file_arr|array|申请材料附件列表|false|- └─matterid|int64|事项ID|false|-
└─datumid|int64|No comments found.|false|- └─attachmentList|array|申请材料列表|false|-
└─file|string|No comments found.|false|- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─datumId|int64|材料id|false|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─fileName|string|附件名称|false|-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;└─filepath|string|附件存储地址|false|-
**Request-example:** **Request-example:**
``` ```
curl -X POST -i http://localhost:28080/zwfw/proced/thing/upload_datum --data 'is_agent=928&open_id=87&file_arr[0].file=3sh8vt&manner=227&matterid=441&region_id=441&option_content=v1ia4x&phone=15719864910&name=正豪.丁&siteid=501&file_arr[0].datumid=507&idcard=231206199112313277' curl -X POST -i http://localhost:28080/zwfw/proced/thing/submitDatum --data 'siteId=305&openId=94&isAgent=813&idcard=361620199707288337&matterReqList[0].attachmentList[0].filepath=hrear5&name=文昊.范&matterReqList[0].matterid=258&phone=15978345833&matterReqList[0].attachmentList[0].fileName=文昊.范&manner=336&matterReqList[0].attachmentList[0].datumId=815'
``` ```
**Response-fields:** **Response-fields:**
...@@ -749,14 +577,14 @@ data|object|No comments found.|- ...@@ -749,14 +577,14 @@ data|object|No comments found.|-
**Response-example:** **Response-example:**
``` ```
{ {
"code": 663, "code": 671,
"msg": "xqf83e", "msg": "y446io",
"data": "v19tc0" "data": "hgv6cm"
} }
``` ```
### 我的办理 ### 我的办理
**URL:** http://localhost:28080/zwfw/proced/thing/my_handle **URL:** http://localhost:28080/zwfw/proced/thing/myHandle
**Type:** POST **Type:** POST
...@@ -769,11 +597,11 @@ data|object|No comments found.|- ...@@ -769,11 +597,11 @@ data|object|No comments found.|-
Parameter | Type|Description|Required|Since Parameter | Type|Description|Required|Since
---|---|---|---|--- ---|---|---|---|---
open_id|string|微信开放id|false|- openId|string|微信开放id|false|-
**Request-example:** **Request-example:**
``` ```
curl -X POST -i http://localhost:28080/zwfw/proced/thing/my_handle --data 'open_id=87' curl -X POST -i http://localhost:28080/zwfw/proced/thing/myHandle --data 'openId=94'
``` ```
**Response-fields:** **Response-fields:**
...@@ -782,62 +610,78 @@ Field | Type|Description|Since ...@@ -782,62 +610,78 @@ Field | Type|Description|Since
code|int32|No comments found.|- code|int32|No comments found.|-
msg|string|No comments found.|- msg|string|No comments found.|-
data|array|No comments found.|- data|array|No comments found.|-
└─id|int64|id|- └─id|object|No comments found.|-
└─matterid|string|名称|- └─createTime|string|创建时间|-
└─userid|int64|userid|- └─createUser|string|创建用户loginName|-
└─type|int32|No comments found.|- └─createUserId|int64|No comments found.|-
└─status|int32|No comments found.|- └─deleted|int32|No comments found.|-
└─summary|int32|No comments found.|- └─createUserName|string|No comments found.|-
└─address|string|No comments found.|- └─createUserDeptId|int64|No comments found.|-
└─linkman|string|No comments found.|- └─createUserDeptName|string|No comments found.|-
└─phone|string|No comments found.|- └─updateTime|string|变更时间|-
└─manner|int32|No comments found.|- └─updateUser|string|变更用户loginName|-
└─createtime|string|No comments found.|- └─updateUserId|int64|No comments found.|-
└─uptime|string|No comments found.|- └─updateUserName|string|No comments found.|-
└─getnum|string|No comments found.|- └─updateUserDeptId|int64|No comments found.|-
└─txmap|string|No comments found.|- └─updateUserDeptName|string|No comments found.|-
└─number|string|No comments found.|- └─taskId|string|流程任务id|-
└─sign|string|No comments found.|- └─processInstanceId|string|流程实例id|-
└─tix|string|No comments found.|- └─memberId|int64|微信用户ID|-
└─sign_file|string|No comments found.|- └─openId|string|微信openId|-
└─level_status|string|No comments found.|- └─matterid|int64|事项ID|-
└─decision_summary|string|No comments found.|- └─uploadtime|int32|上传时间|-
└─option_content|string|No comments found.|- └─type|int32|1资料上传 2确认提交|-
└─uptime_descison|string|No comments found.|- └─address|string|邮寄地址|-
└─basics_name|string|No comments found.|- └─linkman|string|联系人|-
└─create_time|int64|创建时间|- └─phone|int32|联系电话|-
└─isAgent|int32|0本人办理 1代办|-
└─manner|int32|取件方式 0自主取件 1邮寄|-
└─getnum|string|取件码|-
└─number|string|快递单号|-
└─optionContent|string|问答内容|-
└─isRevoke|int32|0是否撤销 1撤销|-
└─siteid|int32|站点ID|-
└─status|int32|审批状态 0未审核 1 审核中 2 审核成功|-
**Response-example:** **Response-example:**
``` ```
{ {
"code": 538, "code": 746,
"msg": "3gezvt", "msg": "weicad",
"data": [ "data": [
{ {
"id": 142, "id": "d4ii4u",
"matterid": "87", "createTime": "2021-09-23 15:07:34",
"userid": 550, "createUser": "ry2rsp",
"type": 82, "createUserId": 966,
"status": 303, "deleted": 70,
"summary": 170, "createUserName": "文昊.范",
"address": "任旁96号， 宝鸡， 琼 030389", "createUserDeptId": 348,
"linkman": "b09usw", "createUserDeptName": "文昊.范",
"phone": "15719864910", "updateTime": "2021-09-23 15:07:34",
"manner": 438, "updateUser": "sbhcf4",
"createtime": "2021-09-08 09:08:21", "updateUserId": 973,
"uptime": "2021-09-08 09:08:21", "updateUserName": "文昊.范",
"getnum": "6ggw86", "updateUserDeptId": 778,
"txmap": "wd2y4p", "updateUserDeptName": "文昊.范",
"number": "d4gy2a", "taskId": "94",
"sign": "8dkhv4", "processInstanceId": "94",
"tix": "s37jqj", "memberId": 269,
"sign_file": "qe8813", "openId": "94",
"level_status": "2btn8l", "matterid": 394,
"decision_summary": "igve3v", "uploadtime": 414,
"option_content": "m01fto", "type": 973,
"uptime_descison": "ubpeqv", "address": "郭巷28号， 三门峡， 藏 153623",
"basics_name": "正豪.丁", "linkman": "rd68q2",
"create_time": 1631063301501 "phone": 254,
"isAgent": 536,
"manner": 671,
"getnum": "vh9zcr",
"number": "q30zft",
"optionContent": "79zesa",
"isRevoke": 952,
"siteid": 755,
"status": 903
} }
] ]
} }
......
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