Skip to content

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

一件事统一办

parent fc53b550
Expand all Show whitespace changes
Inline Side-by-side
Showing with 25434 additions and 1316 deletions
common-lib/src/main/java/com/mortals/xhx/feign/rsp/ApiResp.java
View file @ a37864d9
package com.mortals.xhx.feign.rsp; package com.mortals.xhx.feign.rsp;
import com.mortals.xhx.common.code.YesNoEnum;
import lombok.Data; import lombok.Data;
/** /**
...@@ -21,10 +20,10 @@ public class ApiResp<T> { ...@@ -21,10 +20,10 @@ public class ApiResp<T> {
*/ */
private T data; private T data;
public boolean isSuccess() { // public boolean isSuccess() {
if (YesNoEnum.YES.getValue() == code) { // if (YesNoEnum.YES.getValue() == code) {
return true; // return true;
} // }
return false; // return false;
} // }
} }
db/government-platform.sql
View file @ a37864d9
...@@ -336,17 +336,4 @@ CREATE TABLE `mortals_xhx_valid_code` ( ...@@ -336,17 +336,4 @@ CREATE TABLE `mortals_xhx_valid_code` (
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;
-- ----------------------------
-- Table structure for mortals_xhx_demo
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_demo`;
CREATE TABLE `mortals_xhx_demo` (
`id` bigint(20) NOT NULL,
`fieldOne` varchar(255) DEFAULT NULL,
`fieldTwo` bigint(20) DEFAULT NULL,
`updateTime` datetime DEFAULT NULL,
`updateUser` varchar(255) DEFAULT NULL,
`createTime` datetime DEFAULT NULL,
`createUser` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
\ No newline at end of file
government-manager/pom.xml
View file @ a37864d9
...@@ -53,6 +53,8 @@ ...@@ -53,6 +53,8 @@
</dependency> </dependency>
<!--集成EasyExcel --> <!--集成EasyExcel -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
...@@ -83,7 +85,12 @@ ...@@ -83,7 +85,12 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>1.4.2.Final</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
......
government-manager/src/main/java/com/mortals/xhx/base/framework/config/InterceptorConfig.java
View file @ a37864d9
...@@ -39,6 +39,13 @@ public class InterceptorConfig { ...@@ -39,6 +39,13 @@ public class InterceptorConfig {
@Getter @Getter
private String tenantId; private String tenantId;
@Value("${upload.prepath}")
@Getter
private String prepath;
private Set<String> uncheckLoginUrls = new HashSet<>(); private Set<String> uncheckLoginUrls = new HashSet<>();
private Set<String> uncheckAuthUrls = new HashSet<>(); private Set<String> uncheckAuthUrls = new HashSet<>();
......
government-manager/src/main/java/com/mortals/xhx/busiz/BaseMapper.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz;
import com.mortals.framework.util.DateUtils;
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.module.basics.model.BasicsEntity;
import com.mortals.xhx.module.classify.model.ClassifyEntity;
import com.mortals.xhx.module.classify.model.ClassifyOptionEntity;
import com.mortals.xhx.module.member.model.MemberEntity;
import com.mortals.xhx.module.yth.model.YthOnethingEntity;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
/**
* java bean 映射类
*
* @author: zxfei
* @date: 2021/9/6 14:17
* @description:
**/
@Mapper
public interface BaseMapper {
BaseMapper INSTANCE = Mappers.getMapper( BaseMapper.class );
@Mapping(source = "matterIds", target = "matter_ids")
@Mapping(source = "createTime", target = "create_time",dateFormat = "yyyy-MM-dd HH:mm:ss")
BaseInfoDetail basicsEntity2Detail(BasicsEntity entity);
@Mapping(source = "openid", target = "openId")
@Mapping(source = "idcard", target = "idcardIDCardNo")
@Mapping(source = "tel", target = "phone")
@Mapping(source = "name", target = "idcardName")
@Mapping(source = "file", target = "idcardDataPhotoFileName")
@Mapping(source = "z_img", target = "ZImg")
@Mapping(source = "b_img", target = "BImg")
MemberEntity weChat2Entity(WechatBaseReq req);
@Mapping(source = "open_id", target = "openId")
YthOnethingEntity uploadDatumReq2OneThingEntity(UploadDatumReq req);
}
government-manager/src/main/java/com/mortals/xhx/busiz/BaseReq.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz;
import lombok.Data;
/**
* @author: zxfei
* @date: 2021/9/6 9:27
* @description:
**/
@Data
public class BaseReq {
/**
* 微信开放id
*/
private String open_id;
}
government-manager/src/main/java/com/mortals/xhx/busiz/WxOneThingController.http
View file @ a37864d9
###列表查询
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/one_problem
Content-Type: application/x-www-form-urlencoded
basics_id= 1
###事项详细数据
POST {{baseUrl}}/m/zwfw/proced/thing/oneBasicsInfo
Content-Type: application/x-www-form-urlencoded
id= 1
###根据openid 查询用户
POST {{baseUrl}}/m/zwfw/proced/thing/is_phone
Content-Type: application/x-www-form-urlencoded
open_id= dafdadfasfdaf
###问答基础数据
POST {{baseUrl}}/m/zwfw/proced/thing/condition
Content-Type: application/x-www-form-urlencoded
option_id= 59&key= (1&2&3)
###微信用户校验创建更新
POST {{baseUrl}}/m/zwfw/wechatinter/base/checkCard
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
###测试文件上传
POST {{baseUrl}}/m/zwfw/proced/thing/upload_file
Content-Type: multipart/form-data; boundary=WebAppBoundary
--WebAppBoundary
Content-Disposition: form-data; name="file"; filename="test.xlsx"
Content-Type: multipart/form-data
< ./test.xlsx
--WebAppBoundary--
###材料创建 ###材料创建
POST {{baseUrl}}/m//api/one/thing/create POST {{baseUrl}}/m//api/one/thing/create
Content-Type: application/json Content-Type: application/x-www-form-urlencoded
memberId= 1&matterid= 41&uploadtime= 683&address= 黎桥8号， 江阴， 沪 949973&linkman= fon85y&phone= 802&updateTime= 12255555&manner= 0&getnum= aumqil&number= l6xlee&optionContent= ep6etx&isRevoke= 1&siteid= 143
{
"memberId": 1,
"matterid": 41,
"uploadtime": 683,
"address": "黎桥8号， 江阴， 沪 949973",
"linkman": "fon85y",
"phone": 802,
"updateTime":12255555,
"manner": 0,
"getnum": "aumqil",
"number": "l6xlee",
"optionContent": "ep6etx",
"isRevoke": 1,
"siteid": 143
}
###发起审批 ###发起审批
POST {{baseUrl}}/m//api/one/thing/start POST {{baseUrl}}/m//api/one/thing/start
Content-Type: application/json Content-Type: application/x-www-form-urlencoded
{ oneThingId= 2
"oneThingId": 2
}
###发起审批
POST {{baseUrl}}/m/zwfw/proced/thing/upload_datum
Content-Type: application/x-www-form-urlencoded
is_agent=0&open_id=aldadfijakdjkdknnciemdmdiadkkdmakd&manner=0&matterid=1&region_id=1&option_content=v1ia4x&phone=15719864910&name=正豪.丁&siteid=501&file_arr[0].datumid=507&file_arr[0].file=3sh8vt&idcard=510106198907211830
government-manager/src/main/java/com/mortals/xhx/busiz/WxWechatApiController.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.base.framework.config.InterceptorConfig;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.busiz.baseinfo.BaseInfoDetail;
import com.mortals.xhx.busiz.baseinfo.BaseInfoReq;
import com.mortals.xhx.busiz.login.DatumDataReq;
import com.mortals.xhx.busiz.matters.MattersInfo;
import com.mortals.xhx.busiz.matters.MyMattersReq;
import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo;
import com.mortals.xhx.busiz.oneProblemlist.OneProblemReq;
import com.mortals.xhx.busiz.onethinglist.OneThineInfo;
import com.mortals.xhx.busiz.onethinglist.OneThingReq;
import com.mortals.xhx.busiz.question.QuestionInfo;
import com.mortals.xhx.busiz.question.QuestionReq;
import com.mortals.xhx.busiz.uploadfile.DeleteFileReq;
import com.mortals.xhx.busiz.uploadfile.UploadDatumReq;
import com.mortals.xhx.busiz.wechat.WechatBaseReq;
import com.mortals.xhx.common.code.ApiRespCodeEnum;
import com.mortals.xhx.common.code.ApproveStateEnum;
import com.mortals.xhx.common.code.OneThingRespCodeEnum;
import com.mortals.xhx.common.code.OneThingTypeEnum;
import com.mortals.xhx.common.keys.BusizParams;
import com.mortals.xhx.feign.flowable.IApiFlowInstanceFeign;
import com.mortals.xhx.feign.rsp.ApiResp;
import com.mortals.xhx.feign.runtime.StartProcessInstanceReq;
import com.mortals.xhx.module.basics.model.BasicsDatumEntity;
import com.mortals.xhx.module.basics.model.BasicsDatumQuery;
import com.mortals.xhx.module.basics.model.BasicsEntity;
import com.mortals.xhx.module.basics.model.BasicsQuery;
import com.mortals.xhx.module.basics.service.BasicsDatumService;
import com.mortals.xhx.module.basics.service.BasicsService;
import com.mortals.xhx.module.classify.service.ClassifyOptionService;
import com.mortals.xhx.module.classify.service.ClassifyService;
import com.mortals.xhx.module.datum.service.DatumFileService;
import com.mortals.xhx.module.member.model.MemberEntity;
import com.mortals.xhx.module.member.model.MemberQuery;
import com.mortals.xhx.module.member.service.MemberService;
import com.mortals.xhx.module.yth.service.YthOnethingService;
import lombok.extern.apachecommons.CommonsLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 微信认证
*
* @author: zxfei
* @date: 2021/8/24 20:28
*/
@RestController
@CommonsLog
@RequestMapping("/zwfw/wechatinter/")
public class WxWechatApiController {
@Autowired
private MemberService memberService;
@Autowired
private InterceptorConfig config;
@Autowired
private UploadService uploadService;
@Autowired
private DatumFileService datumFileService;
/**
* 微信注册认证
*
* @param req
* @return
*/
@PostMapping("base/checkCard")
public ApiResp<String> wxCheckCard(WechatBaseReq req) {
ApiResp<String> rsp = new ApiResp<>();
rsp.setMsg(OneThingRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(OneThingRespCodeEnum.SUCCESS.getValue());
try {
//校验部分参数
if (!PhoneUtil.isPhone(req.getTel())) {
rsp.setMsg("电话号码不正确！");
rsp.setCode(OneThingRespCodeEnum.FAILED.getValue());
return rsp;
}
if (!IdcardUtil.isValidCard(req.getIdcard())) {
rsp.setMsg("身份证号码不正确！");
rsp.setCode(OneThingRespCodeEnum.FAILED.getValue());
return rsp;
}
memberService.checkMember(req);
} catch (Exception e) {
log.error("微信注册认证失败", e);
rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
rsp.setMsg(e.getMessage());
return rsp;
}
log.info("响应【微信注册认证】【响应体】--> " + JSONObject.toJSONString(rsp));
return rsp;
}
}
government-manager/src/main/java/com/mortals/xhx/busiz/baseinfo/BaseInfoDetail.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.baseinfo;
import lombok.Data;
/**
* @author: zxfei
* @date: 2021/9/6 11:58
* @description:
**/
@Data
public class BaseInfoDetail {
private Long id;
/**
* 材料ids
*/
private String datum_ids;
/**
* 事项关联
*/
private String matter_ids;
/**
* 二维码（文件存储地址）
*/
private String qrcode;
/**
* 是否自主申报 0否 1是 默认0
*/
private Integer iszzsb;
/**
* '一件事标题
*/
private String tname;
/**
* 排序
*/
private Integer sort;
/**
* 是否删除
*/
private Integer valid;
/**
* 创建时间
*/
private String create_time;
}
government-manager/src/main/java/com/mortals/xhx/busiz/baseinfo/BaseInfoReq.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.baseinfo;
import com.mortals.xhx.busiz.BaseReq;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 一件事基础详细
*
* @author: zxfei
* @date: 2021/9/6 9:26
*/
@Data
@ApiModel(value = "BaseInfoReq", description = "请求参数")
public class BaseInfoReq extends BaseReq implements Serializable {
/**
* 一件事基础表id
*/
@ApiModelProperty(value = "一件事基础表id")
private Long id;
}
government-manager/src/main/java/com/mortals/xhx/busiz/login/DatumDataReq.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.login;
import lombok.Data;
/**
* @author: zxfei
* @date: 2021/9/6 17:10
* @description:
**/
@Data
public class DatumDataReq {
private String key;
private String open_id;
}
government-manager/src/main/java/com/mortals/xhx/busiz/matters/MattersInfo.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.matters;
import lombok.Data;
/**
* @author: zxfei
* @date: 2021/9/6 9:32
* @description:
**/
@Data
public class MattersInfo {
/**
* id
*/
private Long id;
/**
* 名称
*/
private String matterid;
/**
* userid
*/
private Long userid;
/**
*
*/
private Integer type;
/**
*
*/
private Integer status;
/**
*
*/
private Integer summary;
/**
*
*/
private String address;
/**
*
*/
private String linkman;
/**
*
*/
private String phone;
/**
*
*/
private Integer manner;
/**
*
*/
private String createtime;
/**
*
*/
private String uptime;
/**
*
*/
private String getnum;
/**
*
*/
private String txmap;
/**
*
*/
private String number;
/**
*
*/
private String sign;
/**
*
*/
private String tix;
/**
*
*/
private String sign_file;
/**
*
*/
private String level_status;
/**
*
*/
private String decision_summary;
/**
*
*/
private String option_content;
/**
*
*/
private String uptime_descison;
/**
*
*/
private String basics_name;
/**
* 创建时间
*/
private Long create_time;
}
government-manager/src/main/java/com/mortals/xhx/busiz/matters/MyMattersReq.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.matters;
import com.mortals.xhx.busiz.BaseReq;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 我的事项
*
* @author: zxfei
* @date: 2021/9/6 9:26
*/
@Data
@ApiModel(value = "MyMattersReq", description = "请求参数")
public class MyMattersReq extends BaseReq implements Serializable {
}
government-manager/src/main/java/com/mortals/xhx/busiz/oneProblemlist/OneProblemInfo.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.oneProblemlist;
import lombok.Data;
import java.util.List;
/**
* 基本问题库
*
* @author: zxfei
* @date: 2021/9/6 10:29
* @description:
**/
@Data
public class OneProblemInfo {
private Long id;
private String basics_id;
private String name;
private Integer type;
private Integer ismust;
private Integer level;
private String option_ids;
private Long create_time;
private List<OptionDetailInfo> option;
}
government-manager/src/main/java/com/mortals/xhx/busiz/oneProblemlist/OneProblemReq.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.oneProblemlist;
import com.mortals.xhx.busiz.BaseReq;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 问答数据请求
*
* @author: zxfei
* @date: 2021/9/6 9:26
*/
@Data
@ApiModel(value = "OneProblemReq", description = "列表请求参数")
public class OneProblemReq extends BaseReq implements Serializable {
/**
* 选中一件事ID
*/
@ApiModelProperty(value = "选中一件事ID")
private Long basics_id;
}
government-manager/src/main/java/com/mortals/xhx/busiz/oneProblemlist/OptionDetailInfo.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.oneProblemlist;
import lombok.Data;
/**
* @author: zxfei
* @date: 2021/9/6 11:58
* @description:
**/
@Data
public class OptionDetailInfo {
private Long id;
private String classify_id;
private String classify_next_id;
private String name;
private Integer isend;
private Long basicsinfo_id;
private String accept_id;
private String flowlimit_id;
private String matter_id;
private String datum_id;
private Integer summary_type;
private String summary;
private Long create_time;
}
government-manager/src/main/java/com/mortals/xhx/busiz/oneProblemlist/mapper/ProblemMapper.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.oneProblemlist.mapper;
import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo;
import com.mortals.xhx.busiz.oneProblemlist.OptionDetailInfo;
import com.mortals.xhx.busiz.question.AcceptInfo;
import com.mortals.xhx.busiz.question.BasicsInfo;
import com.mortals.xhx.busiz.question.DatumInfo;
import com.mortals.xhx.busiz.question.FlowLimitinfo;
import com.mortals.xhx.module.accept.model.AcceptEntity;
import com.mortals.xhx.module.basics.model.BasicsInfoEntity;
import com.mortals.xhx.module.classify.model.ClassifyEntity;
import com.mortals.xhx.module.classify.model.ClassifyOptionEntity;
import com.mortals.xhx.module.classify.model.ClassifyOptionQuery;
import com.mortals.xhx.module.datum.model.DatumEntity;
import com.mortals.xhx.module.flowlimit.model.FlowlimitEntity;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
/**
* java bean 映射类
*
* @author: zxfei
* @date: 2021/9/6 14:17
* @description:
**/
@Mapper
public interface ProblemMapper {
ProblemMapper INSTANCE = Mappers.getMapper( ProblemMapper.class );
@Mapping(source = "basicsId", target = "basics_id")
OneProblemInfo classifyEntity2Info(ClassifyEntity entity);
@Mapping(source = "classifyId", target = "classify_id")
@Mapping(source = "classifyNextId", target = "classify_next_id")
@Mapping(source = "basicsinfoId", target = "basicsinfo_id")
@Mapping(source = "acceptId", target = "accept_id")
@Mapping(source = "flowlimitId", target = "flowlimit_id")
@Mapping(source = "matterId", target = "matter_id")
@Mapping(source = "datumId", target = "datum_id")
@Mapping(source = "summaryType", target = "summary_type")
OptionDetailInfo classifyOptionEntity2DetailInfo(ClassifyOptionEntity entity);
}
government-manager/src/main/java/com/mortals/xhx/busiz/onethinglist/OneThineInfo.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.onethinglist;
import lombok.Data;
/**
* @author: zxfei
* @date: 2021/9/6 9:32
* @description:
**/
@Data
public class OneThineInfo {
/**
* id
*/
private Long id;
/**
* 名称
*/
private String tname;
/**
* 事项关联id
*/
private String matter_ids;
/**
* 是否删除（ 0正常 1删除）
*/
private Integer valid;
/**
* 创建时间
*/
private Long create_time;
}
government-manager/src/main/java/com/mortals/xhx/busiz/onethinglist/OneThingReq.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.onethinglist;
import com.mortals.xhx.busiz.BaseReq;
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 = "OneThingReq", description = "列表请求参数")
public class OneThingReq extends BaseReq implements Serializable {
/**
* 当前请求页数
*/
@ApiModelProperty(value = "当前请求页数")
private int page;
/**
* 每页记录数
*/
@ApiModelProperty(value = "每页记录数")
private int limit;
/**
* 搜索关键词
*/
@ApiModelProperty(value = "搜索关键词")
private String keywords;
}
government-manager/src/main/java/com/mortals/xhx/busiz/question/AcceptInfo.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.question;
import lombok.Data;
import java.util.Date;
/**
* @author: zxfei
* @date: 2021/9/6 13:59
* @description:
**/
@Data
public class AcceptInfo {
private Long id;
/**
* 模板标题
*/
private String title;
/**
* 申请条件
*/
private String content;
/**
* 基础表one_basics id
*/
private Long basics_id;
/**
* 创建时间
*/
private Long create_time;
}
government-manager/src/main/java/com/mortals/xhx/busiz/question/BasicsInfo.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.question;
import lombok.Data;
/**
* @author: zxfei
* @date: 2021/9/6 13:54
* @description:
**/
@Data
public class BasicsInfo {
private Long id;
/**
* 模板标题
*/
private String title;
/**
* 一件事基础表id
*/
private Long basics_id;
/**
* 办理机构
*/
private String jointInfoShow;
/**
* 法定时限
*/
private String legalTimeLimitShow;
/**
* 承诺时限
*/
private String promiseTimeLimitShow;
/**
* 是否收费,0,否，1是 默认0
*/
private Integer isChargesShow;
/**
* 收费金额
*/
private String Charges;
/**
* 办公时间
*/
private String handleTimeShow;
/**
* 办公地址
*/
private String handlePlaceShow;
/**
* 咨询电话
*/
private String cousultingTelephoneShow;
/**
* 投诉电话
*/
private String supervisoryTelephoneShow;
/**
* 结果信息
*/
private String resultInfo;
/**
* 常见问题
*/
private String qa;
private Long create_time;
}
government-manager/src/main/java/com/mortals/xhx/busiz/question/DatumInfo.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.question;
import lombok.Data;
/**
* @author: zxfei
* @date: 2021/9/6 14:06
* @description:
**/
@Data
public class DatumInfo {
private Long id;
/**
* 材料名
*/
private String materialName;
/**
* 基础表one_basics id
*/
private Long basics_id;
/**
* 事项表yth_matter id 表示从一体化获取的材料
*/
private Long matterid;
/**
* 材料表yth_datum id 表示从一体化获取的材料
*/
private Long datum_id;
/**
* 材料形式
*/
private Integer materialProperty;
/**
* 是否必交，0 否 1 是 默认0
*/
private Integer isMust;
/**
* 材料类型
*/
private Integer materialType;
/**
* 电子材料格式
*/
private Integer electronicgs;
/**
* 材料来源渠道
*/
private Integer materialSource;
/**
* 纸质材料份数
*/
private Integer paperNum;
/**
* 纸质材料规格
*/
private Integer paperGg;
/**
* 减免模式
*/
private Integer jianmMs;
/**
* 盖章方式
*/
private Integer sealWay;
/**
* 是否减免
*/
private Integer isjianm;
/**
* 材料是否容缺
*/
private Integer isLack;
/**
* 材料地址
*/
private String yb_url;
/**
* 来源渠道说明
*/
private String materialSourceSm;
/**
* 填报须知
*/
private String remarkSub;
/**
* 受理标准
*/
private String remark;
/**
* 要求提供材料的依据
*/
private String clauseContent;
/**
* 备注
*/
private String summary;
/**
* 0正常 1删除
*/
private Integer valid;
private Long create_time;
}
government-manager/src/main/java/com/mortals/xhx/busiz/question/FlowLimitinfo.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.question;
import lombok.Data;
/**
* @author: zxfei
* @date: 2021/9/6 14:05
* @description:
**/
@Data
public class FlowLimitinfo {
private Long id;
/**
* 模板标题
*/
private String title;
/**
* 办理流程
*/
private String content;
/**
* 基础表one_basics id
*/
private Long basics_id;
/**
* 创建时间
*/
private Long create_time;
}
government-manager/src/main/java/com/mortals/xhx/busiz/question/QuestionInfo.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.question;
import lombok.Data;
import java.util.List;
/**
* @author: zxfei
* @date: 2021/9/6 13:58
* @description:
**/
@Data
public class QuestionInfo {
private BasicsInfo basicsInfo;
private List<AcceptInfo> accept;
private List<FlowLimitinfo> flowlimit;
private List<DatumInfo> datum;
}
government-manager/src/main/java/com/mortals/xhx/busiz/question/QuestionReq.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.question;
import com.mortals.xhx.busiz.BaseReq;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 问答问题
*
* @author: zxfei
* @date: 2021/9/6 9:26
*/
@Data
@ApiModel(value = "QuestionReq", description = "回答问题请求参数")
public class QuestionReq extends BaseReq implements Serializable {
/**
* 问答最后最后选项ID
*/
@ApiModelProperty(value = "问答最后最后选项ID")
private Long option_id;
/**
* 问题路线id?
*/
@ApiModelProperty(value = "问题路线id")
private String key;
}
government-manager/src/main/java/com/mortals/xhx/busiz/question/mapper/QuestionMapper.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.question.mapper;
import com.mortals.xhx.busiz.question.AcceptInfo;
import com.mortals.xhx.busiz.question.BasicsInfo;
import com.mortals.xhx.busiz.question.DatumInfo;
import com.mortals.xhx.busiz.question.FlowLimitinfo;
import com.mortals.xhx.module.accept.model.AcceptEntity;
import com.mortals.xhx.module.basics.model.BasicsInfoEntity;
import com.mortals.xhx.module.datum.model.DatumEntity;
import com.mortals.xhx.module.flowlimit.model.FlowlimitEntity;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
/**
* java bean 映射类
*
* @author: zxfei
* @date: 2021/9/6 14:17
* @description:
**/
@Mapper
public interface QuestionMapper {
QuestionMapper INSTANCE = Mappers.getMapper( QuestionMapper.class );
@Mapping(source = "basicsId", target = "basics_id")
BasicsInfo basicsEntity2Info(BasicsInfoEntity basicsInfoEntity);
@Mapping(source = "basicsId", target = "basics_id")
AcceptInfo acceptEntity2Info(AcceptEntity acceptEntity);
@Mapping(source = "basicsId", target = "basics_id")
FlowLimitinfo flowLimitEntity2Info(FlowlimitEntity flowlimitEntity);
@Mapping(source = "basicsId", target = "basics_id")
@Mapping(source = "datumId", target = "datum_id")
@Mapping(source = "ybUrl", target = "yb_url")
DatumInfo datumEntity2Info(DatumEntity datumEntity);
}
government-manager/src/main/java/com/mortals/xhx/busiz/uploadfile/DeleteFileReq.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.uploadfile;
import com.mortals.xhx.busiz.BaseReq;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 删除文件
*
* @author: zxfei
* @date: 2021/9/6 9:26
*/
@Data
@ApiModel(value = "DeleteFileReq", description = "请求参数")
public class DeleteFileReq extends BaseReq implements Serializable {
/**
* 文件路径
*/
@ApiModelProperty(value = "文件路径")
private String file_path;
}
government-manager/src/main/java/com/mortals/xhx/busiz/uploadfile/UploadDatumReq.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.uploadfile;
import com.mortals.xhx.busiz.BaseReq;
import com.mortals.xhx.module.datum.model.DatumFileEntity;
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 = "UploadDatumReq", description = "请求参数")
public class UploadDatumReq extends BaseReq implements Serializable {
/**
* 事项ID
*/
@ApiModelProperty(value = "事项ID")
private Long matterid;
/**
* siteid
*/
@ApiModelProperty(value = "村数据下的站点id")
private Long siteid;
/**
* 问答内容
*/
@ApiModelProperty(value = "问答内容")
private String option_content;
/**
* 申请人姓名
*/
@ApiModelProperty(value = "申请人姓名")
private String name;
/**
* 电话
*/
@ApiModelProperty(value = "电话")
private String phone;
/**
* 身份证
*/
@ApiModelProperty(value = "身份证")
private String idcard;
/**
* 0本人办理 1代办
*/
@ApiModelProperty(value = "0本人办理 1代办")
private Integer is_agent;
/**
* 0自主取件 1代办领取 (取件方式)
*/
@ApiModelProperty(value = "0 自主取件 1 代办领取 (取件方式)")
private Integer manner;
/**
* 村ID
*/
@ApiModelProperty(value = "村ID")
private Long region_id;
/**
* 申请材料附件列表
*
*/
@ApiModelProperty(value = "申请材料附件列表")
private List<UploadFileInfo> file_arr;
}
government-manager/src/main/java/com/mortals/xhx/busiz/uploadfile/UploadFileInfo.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.uploadfile;
import lombok.Data;
/**
* @author: zxfei
* @date: 2021/9/7 15:04
* @description:
**/
@Data
public class UploadFileInfo {
private Long datumid;
private String file;
}
government-manager/src/main/java/com/mortals/xhx/busiz/wechat/WechatBaseReq.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.busiz.wechat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 微信注册认证
*
* @author: zxfei
* @date: 2021/9/6 9:26
*/
@Data
@ApiModel(value = "WechatBaseReq", description = "微信认证请求参数")
public class WechatBaseReq implements Serializable {
/**
* 站点编号
*/
@ApiModelProperty(value = "站点编号")
private String sitenum;
/**
* 微信openid
*/
@ApiModelProperty(value = "微信openid")
private String openid;
/**
* 身份证
*/
@ApiModelProperty(value = "身份证")
private String idcard;
/**
* 电话
*/
@ApiModelProperty(value = "电话")
private String tel;
/**
* 姓名
*/
@ApiModelProperty(value = "姓名")
private String name;
/**
* 人脸照片地址
*/
@ApiModelProperty(value = "人脸照片地址")
private String file;
/**
* 身份证正面照片地址
*/
@ApiModelProperty(value = "身份证正面照片地址")
private String z_img;
/**
* 身份证反面照片地址
*/
@ApiModelProperty(value = "身份证反面照片地址")
private String b_img;
/**
* 站点id (对站点进行绑定)
*/
@ApiModelProperty(value = "站点id (对站点进行绑定)")
private Long siteid;
}
government-manager/src/main/java/com/mortals/xhx/common/code/MannerEnum.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* @author: finegirl
* @date: 2021/7/16 11:50
* @description: //TODO 请完善注释信息
**/
public enum MannerEnum {
SELF(0, "自主取件"),
EXPRESS(1, "邮寄");
private int value;
private String desc;
private MannerEnum(int value, String desc) {
this.value = value;
this.desc = desc;
}
public int getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static MannerEnum getByValue(int value) {
MannerEnum[] var1 = values();
int var2 = var1.length;
for(int var3 = 0; var3 < var2; ++var3) {
MannerEnum examStatus = var1[var3];
if (examStatus.getValue() == value) {
return examStatus;
}
}
return null;
}
public static Map<String, String> getEnumMap(int... eItem) {
Map<String, String> resultMap = new LinkedHashMap();
MannerEnum[] var2 = values();
int var3 = var2.length;
for(int var4 = 0; var4 < var3; ++var4) {
MannerEnum item = var2[var4];
try {
boolean hasE = false;
int[] var7 = eItem;
int var8 = eItem.length;
for(int var9 = 0; var9 < var8; ++var9) {
int e = var7[var9];
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception var11) {
}
}
return resultMap;
}
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/common/code/OneThingRespCodeEnum.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.common.code;
/**
* @author karlhoo
*/
public enum OneThingRespCodeEnum {
/** 接收成功 */
SUCCESS(200, "成功"),
/** 执行失败 */
FAILED(400,"执行失败"),
;
private final Integer value;
private final String label;
OneThingRespCodeEnum(Integer value, String label) {
this.value = value;
this.label = label;
}
public int getValue() {
return this.value;
}
public String getLabel() {
return this.label;
}
}
government-manager/src/main/java/com/mortals/xhx/module/accept/model/AcceptEntity.java
View file @ a37864d9
...@@ -5,10 +5,10 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -5,10 +5,10 @@ import com.mortals.framework.model.BaseEntityLong;
/** /**
* *
* Description:Accept * Description:Accept
* date: 2021-8-18 14:24:46 * date: 2021-9-6 14:40:57
*/ */
public class AcceptEntity extends BaseEntityLong{ public class AcceptEntity extends BaseEntityLong{
private static final long serialVersionUID = 1629267886313L; private static final long serialVersionUID = 1630910457462L;
/** /**
......
government-manager/src/main/java/com/mortals/xhx/module/accept/model/AcceptQuery.java
View file @ a37864d9
...@@ -6,10 +6,10 @@ import java.util.Date; ...@@ -6,10 +6,10 @@ import java.util.Date;
/** /**
* *
* Description:Accept * Description:Accept
* date: 2021-8-18 14:24:46 * date: 2021-9-6 14:40:57
*/ */
public class AcceptQuery extends AcceptEntity{ public class AcceptQuery extends AcceptEntity{
private static final long serialVersionUID = 1629267886315L; private static final long serialVersionUID = 1630910457463L;
/** 开始 主键，自增长 */ /** 开始 主键，自增长 */
private Long idStart; private Long idStart;
...@@ -316,6 +316,208 @@ public class AcceptQuery extends AcceptEntity{ ...@@ -316,6 +316,208 @@ public class AcceptQuery extends AcceptEntity{
this.createUserList = createUserList; this.createUserList = createUserList;
} }
/**
* 设置 主键，自增长
* @param id
*/
public AcceptQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 主键，自增长
* @param idStart
*/
public AcceptQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 主键，自增长
* @param idEnd
*/
public AcceptQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 主键，自增长
* @param idIncrement
*/
public AcceptQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 主键，自增长
* @param idList
*/
public AcceptQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 模板标题
* @param title
*/
public AcceptQuery title(String title){
setTitle(title);
return this;
}
/**
* 设置 模板标题
* @param titleList
*/
public AcceptQuery titleList(List<String> titleList){
this.titleList = titleList;
return this;
}
/**
* 设置 申请条件
* @param content
*/
public AcceptQuery content(String content){
setContent(content);
return this;
}
/**
* 设置 申请条件
* @param contentList
*/
public AcceptQuery contentList(List<String> contentList){
this.contentList = contentList;
return this;
}
/**
* 设置 基础表one_basics id
* @param basicsId
*/
public AcceptQuery basicsId(Long basicsId){
setBasicsId(basicsId);
return this;
}
/**
* 设置 开始 基础表one_basics id
* @param basicsIdStart
*/
public AcceptQuery basicsIdStart(Long basicsIdStart){
this.basicsIdStart = basicsIdStart;
return this;
}
/**
* 设置 结束 基础表one_basics id
* @param basicsIdEnd
*/
public AcceptQuery basicsIdEnd(Long basicsIdEnd){
this.basicsIdEnd = basicsIdEnd;
return this;
}
/**
* 设置 增加 基础表one_basics id
* @param basicsIdIncrement
*/
public AcceptQuery basicsIdIncrement(Long basicsIdIncrement){
this.basicsIdIncrement = basicsIdIncrement;
return this;
}
/**
* 设置 基础表one_basics id
* @param basicsIdList
*/
public AcceptQuery basicsIdList(List<Long> basicsIdList){
this.basicsIdList = basicsIdList;
return this;
}
/**
* 设置 开始 变更时间
* @param updateTimeStart
*/
public AcceptQuery updateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
return this;
}
/**
* 设置 结束 变更时间
* @param updateTimeEnd
*/
public AcceptQuery updateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
return this;
}
/**
* 设置 变更用户loginName
* @param updateUser
*/
public AcceptQuery updateUser(String updateUser){
setUpdateUser(updateUser);
return this;
}
/**
* 设置 变更用户loginName
* @param updateUserList
*/
public AcceptQuery updateUserList(List<String> updateUserList){
this.updateUserList = updateUserList;
return this;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public AcceptQuery createTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
return this;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public AcceptQuery createTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
return this;
}
/**
* 设置 创建用户loginName
* @param createUser
*/
public AcceptQuery createUser(String createUser){
setCreateUser(createUser);
return this;
}
/**
* 设置 创建用户loginName
* @param createUserList
*/
public AcceptQuery 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) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
government-manager/src/main/java/com/mortals/xhx/module/classify/model/ClassifyOptionEntity.java
View file @ a37864d9
...@@ -5,10 +5,10 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -5,10 +5,10 @@ import com.mortals.framework.model.BaseEntityLong;
/** /**
* *
* Description:ClassifyOption * Description:ClassifyOption
* date: 2021-8-19 23:28:22 * date: 2021-9-6 14:40:56
*/ */
public class ClassifyOptionEntity extends BaseEntityLong{ public class ClassifyOptionEntity extends BaseEntityLong{
private static final long serialVersionUID = 1629386902204L; private static final long serialVersionUID = 1630910456935L;
/** /**
...@@ -39,22 +39,22 @@ public class ClassifyOptionEntity extends BaseEntityLong{ ...@@ -39,22 +39,22 @@ public class ClassifyOptionEntity extends BaseEntityLong{
/** /**
* 申请条件id * 申请条件id
*/ */
private Long acceptId; private String acceptId;
/** /**
* 办理流程id * 办理流程id
*/ */
private Long flowlimitId; private String flowlimitId;
/** /**
* 事项关联id * 事项关联id
*/ */
private Long matterId; private String matterId;
/** /**
* 材料id * 材料id
*/ */
private Long datumId; private String datumId;
/** /**
* 备注类型 1常规备注 2终结备注 * 备注类型 1常规备注 2终结备注
...@@ -163,56 +163,56 @@ public class ClassifyOptionEntity extends BaseEntityLong{ ...@@ -163,56 +163,56 @@ public class ClassifyOptionEntity extends BaseEntityLong{
* 获取 申请条件id * 获取 申请条件id
* @return acceptId * @return acceptId
*/ */
public Long getAcceptId() { public String getAcceptId() {
return this.acceptId; return this.acceptId;
} }
/** /**
* 设置 申请条件id * 设置 申请条件id
* @param acceptId * @param acceptId
*/ */
public void setAcceptId(Long acceptId) { public void setAcceptId(String acceptId) {
this.acceptId = acceptId; this.acceptId = acceptId;
} }
/** /**
* 获取 办理流程id * 获取 办理流程id
* @return flowlimitId * @return flowlimitId
*/ */
public Long getFlowlimitId() { public String getFlowlimitId() {
return this.flowlimitId; return this.flowlimitId;
} }
/** /**
* 设置 办理流程id * 设置 办理流程id
* @param flowlimitId * @param flowlimitId
*/ */
public void setFlowlimitId(Long flowlimitId) { public void setFlowlimitId(String flowlimitId) {
this.flowlimitId = flowlimitId; this.flowlimitId = flowlimitId;
} }
/** /**
* 获取 事项关联id * 获取 事项关联id
* @return matterId * @return matterId
*/ */
public Long getMatterId() { public String getMatterId() {
return this.matterId; return this.matterId;
} }
/** /**
* 设置 事项关联id * 设置 事项关联id
* @param matterId * @param matterId
*/ */
public void setMatterId(Long matterId) { public void setMatterId(String matterId) {
this.matterId = matterId; this.matterId = matterId;
} }
/** /**
* 获取 材料id * 获取 材料id
* @return datumId * @return datumId
*/ */
public Long getDatumId() { public String getDatumId() {
return this.datumId; return this.datumId;
} }
/** /**
* 设置 材料id * 设置 材料id
* @param datumId * @param datumId
*/ */
public void setDatumId(Long datumId) { public void setDatumId(String datumId) {
this.datumId = datumId; this.datumId = datumId;
} }
/** /**
......
government-manager/src/main/java/com/mortals/xhx/module/classify/model/ClassifyVo.java
View file @ a37864d9
...@@ -30,15 +30,15 @@ public class ClassifyVo { ...@@ -30,15 +30,15 @@ public class ClassifyVo {
public static void main(String[] args) { public static void main(String[] args) {
ClassifyVo classifyVo = new ClassifyVo(); // ClassifyVo classifyVo = new ClassifyVo();
classifyVo.getEntity().setBasicsId(111L); // classifyVo.getEntity().setBasicsId(111L);
//
ClassifyOptionEntity classifyOptionEntity = new ClassifyOptionEntity(); // ClassifyOptionEntity classifyOptionEntity = new ClassifyOptionEntity();
classifyOptionEntity.setDatumId(22222L); // classifyOptionEntity.setDatumId(22222L);
classifyVo.getList().add(classifyOptionEntity); // classifyVo.getList().add(classifyOptionEntity);
//
//
System.out.println(JSON.toJSONString(classifyVo)); // System.out.println(JSON.toJSONString(classifyVo));
} }
......
government-manager/src/main/java/com/mortals/xhx/module/classify/service/ClassifyOptionService.java
View file @ a37864d9
package com.mortals.xhx.module.classify.service; package com.mortals.xhx.module.classify.service;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.busiz.question.QuestionInfo;
import com.mortals.xhx.module.classify.model.ClassifyOptionEntity; import com.mortals.xhx.module.classify.model.ClassifyOptionEntity;
import java.util.List; import java.util.List;
/** /**
* <p>Title: 一件事问题选项表</p> * <p>Title: 一件事问题选项表</p>
* <p>Description: ClassifyOptionService service接口 </p> * <p>Description: ClassifyOptionService service接口 </p>
* <p>Copyright: Copyright &reg; </p> * <p>Copyright: Copyright &reg; </p>
* @version 1.0.0 *
*/ * @version 1.0.0
*/
public interface ClassifyOptionService extends ICRUDService<ClassifyOptionEntity,Long>{ public interface ClassifyOptionService extends ICRUDService<ClassifyOptionEntity, Long> {
/**
* 问题答案
* @param optionId
* @param key
* @return
*/
QuestionInfo conditionQuestion(Long optionId, String key);
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/classify/service/ClassifyService.java
View file @ a37864d9
...@@ -2,9 +2,12 @@ package com.mortals.xhx.module.classify.service; ...@@ -2,9 +2,12 @@ package com.mortals.xhx.module.classify.service;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo;
import com.mortals.xhx.module.classify.model.ClassifyEntity; import com.mortals.xhx.module.classify.model.ClassifyEntity;
import com.mortals.xhx.module.classify.model.ClassifyVo; import com.mortals.xhx.module.classify.model.ClassifyVo;
import java.util.List;
/** /**
* <p>Title: 一件事问题分类</p> * <p>Title: 一件事问题分类</p>
* <p>Description: ClassifyService service接口 </p> * <p>Description: ClassifyService service接口 </p>
...@@ -19,4 +22,7 @@ public interface ClassifyService extends ICRUDService<ClassifyEntity,Long>{ ...@@ -19,4 +22,7 @@ public interface ClassifyService extends ICRUDService<ClassifyEntity,Long>{
int removeQueston(Long basicsId, Context context); int removeQueston(Long basicsId, Context context);
List<OneProblemInfo> oneProblemList(Long basicsId);
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/classify/service/impl/ClassifyOptionServiceImpl.java
View file @ a37864d9
package com.mortals.xhx.module.classify.service.impl; package com.mortals.xhx.module.classify.service.impl;
import com.mortals.framework.exception.AppException;
import com.mortals.xhx.busiz.question.*;
import com.mortals.xhx.busiz.question.mapper.QuestionMapper;
import com.mortals.xhx.module.accept.model.AcceptQuery;
import com.mortals.xhx.module.accept.service.AcceptService;
import com.mortals.xhx.module.basics.model.BasicsInfoEntity;
import com.mortals.xhx.module.basics.service.BasicsInfoService;
import com.mortals.xhx.module.datum.model.DatumQuery;
import com.mortals.xhx.module.datum.service.DatumService;
import com.mortals.xhx.module.flowlimit.model.FlowlimitEntity;
import com.mortals.xhx.module.flowlimit.model.FlowlimitQuery;
import com.mortals.xhx.module.flowlimit.service.FlowlimitService;
import org.mapstruct.factory.Mappers;
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;
import com.mortals.xhx.module.classify.dao.ClassifyOptionDao; import com.mortals.xhx.module.classify.dao.ClassifyOptionDao;
import com.mortals.xhx.module.classify.model.ClassifyOptionEntity; import com.mortals.xhx.module.classify.model.ClassifyOptionEntity;
import com.mortals.xhx.module.classify.service.ClassifyOptionService; import com.mortals.xhx.module.classify.service.ClassifyOptionService;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* <p>Title: 一件事问题选项表</p> * <p>Title: 一件事问题选项表</p>
* <p>Description: ClassifyOptionService service接口 </p> * <p>Description: ClassifyOptionService service接口 </p>
* <p>Copyright: Copyright &reg; </p> * <p>Copyright: Copyright &reg; </p>
* @version 1.0.0 *
*/ * @version 1.0.0
*/
@Service("classifyOptionService") @Service("classifyOptionService")
public class ClassifyOptionServiceImpl extends AbstractCRUDServiceImpl<ClassifyOptionDao, ClassifyOptionEntity, Long> implements ClassifyOptionService { public class ClassifyOptionServiceImpl extends AbstractCRUDServiceImpl<ClassifyOptionDao, ClassifyOptionEntity, Long> implements ClassifyOptionService {
@Autowired
private BasicsInfoService basicsInfoService;
@Autowired
private FlowlimitService flowlimitService;
@Autowired
private AcceptService acceptService;
@Autowired
private DatumService datumService;
@Override
public QuestionInfo conditionQuestion(Long optionId, String key) {
QuestionInfo questionInfo = new QuestionInfo();
try {
ClassifyOptionEntity optionEntity = this.get(optionId);
BasicsInfoEntity basicsInfoEntity = basicsInfoService.get(optionEntity.getBasicsinfoId());
BasicsInfo basicsInfo = QuestionMapper.INSTANCE.basicsEntity2Info(basicsInfoEntity);
basicsInfo.setCreate_time(basicsInfoEntity.getCreateTime().getTime());
questionInfo.setBasicsInfo(basicsInfo);
List<Long> idAcciptList = Stream.of(optionEntity.getAcceptId().split(",")).map(Long::valueOf).collect(Collectors.toList());
List<AcceptInfo> acceptInfoList = acceptService.find(new AcceptQuery().idList(idAcciptList)).stream().map(item -> {
AcceptInfo acceptInfo = QuestionMapper.INSTANCE.acceptEntity2Info(item);
acceptInfo.setCreate_time(item.getCreateTime().getTime());
return acceptInfo;
}).collect(Collectors.toList());
questionInfo.setAccept(acceptInfoList);
List<Long> idFlowList = Stream.of(optionEntity.getFlowlimitId().split(",")).map(Long::valueOf).collect(Collectors.toList());
List<FlowLimitinfo> flowLimitinfos = flowlimitService.find(new FlowlimitQuery().idList(idFlowList)).stream().map(item -> {
FlowLimitinfo flowLimitinfo = QuestionMapper.INSTANCE.flowLimitEntity2Info(item);
flowLimitinfo.setCreate_time(item.getCreateTime().getTime());
return flowLimitinfo;
}).collect(Collectors.toList());
questionInfo.setFlowlimit(flowLimitinfos);
List<Long> idDatumList = Stream.of(optionEntity.getDatumId().split(",")).map(Long::valueOf).collect(Collectors.toList());
List<DatumInfo> datumInfoList = datumService.find(new DatumQuery().idList(idDatumList)).stream().map(item -> {
DatumInfo datumInfo = QuestionMapper.INSTANCE.datumEntity2Info(item);
datumInfo.setCreate_time(item.getCreateTime().getTime());
return datumInfo;
}).collect(Collectors.toList());
questionInfo.setDatum(datumInfoList);
} catch (AppException e) {
throw new AppException("异常:" + e.getMessage());
}
return questionInfo;
}
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/classify/service/impl/ClassifyServiceImpl.java
View file @ a37864d9
package com.mortals.xhx.module.classify.service.impl; package com.mortals.xhx.module.classify.service.impl;
import com.mortals.framework.model.Context;; import com.mortals.framework.model.Context;;
import com.mortals.xhx.module.basics.model.BasicsDatumEntity; import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo;
import com.mortals.xhx.busiz.oneProblemlist.OptionDetailInfo;
import com.mortals.xhx.busiz.oneProblemlist.mapper.ProblemMapper;
import com.mortals.xhx.module.classify.model.*; import com.mortals.xhx.module.classify.model.*;
import com.mortals.xhx.module.classify.service.ClassifyOptionService; import com.mortals.xhx.module.classify.service.ClassifyOptionService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -11,7 +13,6 @@ import com.mortals.xhx.module.classify.dao.ClassifyDao; ...@@ -11,7 +13,6 @@ import com.mortals.xhx.module.classify.dao.ClassifyDao;
import com.mortals.xhx.module.classify.service.ClassifyService; import com.mortals.xhx.module.classify.service.ClassifyService;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -89,7 +90,31 @@ public class ClassifyServiceImpl extends AbstractCRUDServiceImpl<ClassifyDao, Cl ...@@ -89,7 +90,31 @@ public class ClassifyServiceImpl extends AbstractCRUDServiceImpl<ClassifyDao, Cl
//级联删除 //级联删除
int remove = this.remove(ids, context); int remove = this.remove(ids, context);
int remove1 = classifyOptionService.remove(optionIds, context); int remove1 = classifyOptionService.remove(optionIds, context);
return remove+remove1; return remove + remove1;
}
@Override
public List<OneProblemInfo> oneProblemList(Long basicsId) {
return this.find(new ClassifyQuery().basicsId(basicsId)).stream().map(item -> {
OneProblemInfo oneProblemInfo = ProblemMapper.INSTANCE.classifyEntity2Info(item);
oneProblemInfo.setCreate_time(item.getCreateTime().getTime());
List<OptionDetailInfo> list = classifyOptionService.find(new ClassifyOptionQuery().classifyId(item.getId())).stream().map(option -> {
OptionDetailInfo optionDetailInfo = ProblemMapper.INSTANCE.classifyOptionEntity2DetailInfo(option);
optionDetailInfo.setCreate_time(option.getCreateTime().getTime());
return optionDetailInfo;
}).collect(Collectors.toList());
oneProblemInfo.setOption(list);
ClassifyOptionEntity temp = classifyOptionService.selectOne(new ClassifyOptionQuery().classifyNextId(item.getId()), null);
if(!ObjectUtils.isEmpty(temp)){
//option_ids 为父问题
oneProblemInfo.setOption_ids(temp.getId().toString());
}
return oneProblemInfo;
}).collect(Collectors.toList());
} }
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/datum/model/DatumFileEntity.java
View file @ a37864d9
...@@ -5,10 +5,10 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -5,10 +5,10 @@ import com.mortals.framework.model.BaseEntityLong;
/** /**
* *
* Description:DatumFile * Description:DatumFile
* date: 2021-8-18 14:24:46 * date: 2021-9-6 14:40:57
*/ */
public class DatumFileEntity extends BaseEntityLong{ public class DatumFileEntity extends BaseEntityLong{
private static final long serialVersionUID = 1629267886325L; private static final long serialVersionUID = 1630910457470L;
/** /**
......
government-manager/src/main/java/com/mortals/xhx/module/datum/model/DatumFileQuery.java
View file @ a37864d9
...@@ -6,10 +6,10 @@ import java.util.Date; ...@@ -6,10 +6,10 @@ import java.util.Date;
/** /**
* *
* Description:DatumFile * Description:DatumFile
* date: 2021-8-18 14:24:46 * date: 2021-9-6 14:40:57
*/ */
public class DatumFileQuery extends DatumFileEntity{ public class DatumFileQuery extends DatumFileEntity{
private static final long serialVersionUID = 1629267886327L; private static final long serialVersionUID = 1630910457472L;
/** 开始 主键，自增长 */ /** 开始 主键，自增长 */
private Long idStart; private Long idStart;
...@@ -652,6 +652,416 @@ public class DatumFileQuery extends DatumFileEntity{ ...@@ -652,6 +652,416 @@ public class DatumFileQuery extends DatumFileEntity{
this.createUserList = createUserList; this.createUserList = createUserList;
} }
/**
* 设置 主键，自增长
* @param id
*/
public DatumFileQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 主键，自增长
* @param idStart
*/
public DatumFileQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 主键，自增长
* @param idEnd
*/
public DatumFileQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 主键，自增长
* @param idIncrement
*/
public DatumFileQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 主键，自增长
* @param idList
*/
public DatumFileQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 附件ID
* @param tid
*/
public DatumFileQuery tid(Long tid){
setTid(tid);
return this;
}
/**
* 设置 开始 附件ID
* @param tidStart
*/
public DatumFileQuery tidStart(Long tidStart){
this.tidStart = tidStart;
return this;
}
/**
* 设置 结束 附件ID
* @param tidEnd
*/
public DatumFileQuery tidEnd(Long tidEnd){
this.tidEnd = tidEnd;
return this;
}
/**
* 设置 增加 附件ID
* @param tidIncrement
*/
public DatumFileQuery tidIncrement(Long tidIncrement){
this.tidIncrement = tidIncrement;
return this;
}
/**
* 设置 附件ID
* @param tidList
*/
public DatumFileQuery tidList(List<Long> tidList){
this.tidList = tidList;
return this;
}
/**
* 设置 材料id 政务网
* @param datumid
*/
public DatumFileQuery datumid(Long datumid){
setDatumid(datumid);
return this;
}
/**
* 设置 开始 材料id 政务网
* @param datumidStart
*/
public DatumFileQuery datumidStart(Long datumidStart){
this.datumidStart = datumidStart;
return this;
}
/**
* 设置 结束 材料id 政务网
* @param datumidEnd
*/
public DatumFileQuery datumidEnd(Long datumidEnd){
this.datumidEnd = datumidEnd;
return this;
}
/**
* 设置 增加 材料id 政务网
* @param datumidIncrement
*/
public DatumFileQuery datumidIncrement(Long datumidIncrement){
this.datumidIncrement = datumidIncrement;
return this;
}
/**
* 设置 材料id 政务网
* @param datumidList
*/
public DatumFileQuery datumidList(List<Long> datumidList){
this.datumidList = datumidList;
return this;
}
/**
* 设置 用户事项id(gra_matterdatum的id)
* @param fdatumid
*/
public DatumFileQuery fdatumid(Integer fdatumid){
setFdatumid(fdatumid);
return this;
}
/**
* 设置 开始 用户事项id(gra_matterdatum的id)
* @param fdatumidStart
*/
public DatumFileQuery fdatumidStart(Integer fdatumidStart){
this.fdatumidStart = fdatumidStart;
return this;
}
/**
* 设置 结束 用户事项id(gra_matterdatum的id)
* @param fdatumidEnd
*/
public DatumFileQuery fdatumidEnd(Integer fdatumidEnd){
this.fdatumidEnd = fdatumidEnd;
return this;
}
/**
* 设置 增加 用户事项id(gra_matterdatum的id)
* @param fdatumidIncrement
*/
public DatumFileQuery fdatumidIncrement(Integer fdatumidIncrement){
this.fdatumidIncrement = fdatumidIncrement;
return this;
}
/**
* 设置 用户事项id(gra_matterdatum的id)
* @param fdatumidList
*/
public DatumFileQuery fdatumidList(List<Integer> fdatumidList){
this.fdatumidList = fdatumidList;
return this;
}
/**
* 设置 上传资料地址
* @param file
*/
public DatumFileQuery file(String file){
setFile(file);
return this;
}
/**
* 设置 上传资料地址
* @param fileList
*/
public DatumFileQuery fileList(List<String> fileList){
this.fileList = fileList;
return this;
}
/**
* 设置 开始 上传时间
* @param uploadtimeStart
*/
public DatumFileQuery uploadtimeStart(String uploadtimeStart){
this.uploadtimeStart = uploadtimeStart;
return this;
}
/**
* 设置 结束 上传时间
* @param uploadtimeEnd
*/
public DatumFileQuery uploadtimeEnd(String uploadtimeEnd){
this.uploadtimeEnd = uploadtimeEnd;
return this;
}
/**
* 设置 状态 1资料上传 2确认提交
* @param type
*/
public DatumFileQuery type(Integer type){
setType(type);
return this;
}
/**
* 设置 开始 状态 1资料上传 2确认提交
* @param typeStart
*/
public DatumFileQuery typeStart(Integer typeStart){
this.typeStart = typeStart;
return this;
}
/**
* 设置 结束 状态 1资料上传 2确认提交
* @param typeEnd
*/
public DatumFileQuery typeEnd(Integer typeEnd){
this.typeEnd = typeEnd;
return this;
}
/**
* 设置 增加 状态 1资料上传 2确认提交
* @param typeIncrement
*/
public DatumFileQuery typeIncrement(Integer typeIncrement){
this.typeIncrement = typeIncrement;
return this;
}
/**
* 设置 状态 1资料上传 2确认提交
* @param typeList
*/
public DatumFileQuery typeList(List<Integer> typeList){
this.typeList = typeList;
return this;
}
/**
* 设置 审核是否不通过 0待审核 1不通过 2通过
* @param examine
*/
public DatumFileQuery examine(Integer examine){
setExamine(examine);
return this;
}
/**
* 设置 开始 审核是否不通过 0待审核 1不通过 2通过
* @param examineStart
*/
public DatumFileQuery examineStart(Integer examineStart){
this.examineStart = examineStart;
return this;
}
/**
* 设置 结束 审核是否不通过 0待审核 1不通过 2通过
* @param examineEnd
*/
public DatumFileQuery examineEnd(Integer examineEnd){
this.examineEnd = examineEnd;
return this;
}
/**
* 设置 增加 审核是否不通过 0待审核 1不通过 2通过
* @param examineIncrement
*/
public DatumFileQuery examineIncrement(Integer examineIncrement){
this.examineIncrement = examineIncrement;
return this;
}
/**
* 设置 审核是否不通过 0待审核 1不通过 2通过
* @param examineList
*/
public DatumFileQuery examineList(List<Integer> examineList){
this.examineList = examineList;
return this;
}
/**
* 设置 不通过原因
* @param summary
*/
public DatumFileQuery summary(String summary){
setSummary(summary);
return this;
}
/**
* 设置 不通过原因
* @param summaryList
*/
public DatumFileQuery summaryList(List<String> summaryList){
this.summaryList = summaryList;
return this;
}
/**
* 设置 开始 变更时间
* @param updateTimeStart
*/
public DatumFileQuery updateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
return this;
}
/**
* 设置 结束 变更时间
* @param updateTimeEnd
*/
public DatumFileQuery updateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
return this;
}
/**
* 设置 变更用户loginName
* @param updateUser
*/
public DatumFileQuery updateUser(String updateUser){
setUpdateUser(updateUser);
return this;
}
/**
* 设置 变更用户loginName
* @param updateUserList
*/
public DatumFileQuery updateUserList(List<String> updateUserList){
this.updateUserList = updateUserList;
return this;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public DatumFileQuery createTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
return this;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public DatumFileQuery createTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
return this;
}
/**
* 设置 创建用户loginName
* @param createUser
*/
public DatumFileQuery createUser(String createUser){
setCreateUser(createUser);
return this;
}
/**
* 设置 创建用户loginName
* @param createUserList
*/
public DatumFileQuery 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) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
government-manager/src/main/java/com/mortals/xhx/module/flowlimit/model/FlowlimitEntity.java
View file @ a37864d9
...@@ -5,10 +5,10 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -5,10 +5,10 @@ import com.mortals.framework.model.BaseEntityLong;
/** /**
* *
* Description:Flowlimit * Description:Flowlimit
* date: 2021-8-18 14:24:46 * date: 2021-9-3 10:12:09
*/ */
public class FlowlimitEntity extends BaseEntityLong{ public class FlowlimitEntity extends BaseEntityLong{
private static final long serialVersionUID = 1629267886336L; private static final long serialVersionUID = 1630635129023L;
/** /**
......
government-manager/src/main/java/com/mortals/xhx/module/flowlimit/model/FlowlimitQuery.java
View file @ a37864d9
...@@ -6,10 +6,10 @@ import java.util.Date; ...@@ -6,10 +6,10 @@ import java.util.Date;
/** /**
* *
* Description:Flowlimit * Description:Flowlimit
* date: 2021-8-18 14:24:46 * date: 2021-9-3 10:12:09
*/ */
public class FlowlimitQuery extends FlowlimitEntity{ public class FlowlimitQuery extends FlowlimitEntity{
private static final long serialVersionUID = 1629267886337L; private static final long serialVersionUID = 1630635129024L;
/** 开始 主键，自增长 */ /** 开始 主键，自增长 */
private Long idStart; private Long idStart;
...@@ -316,6 +316,208 @@ public class FlowlimitQuery extends FlowlimitEntity{ ...@@ -316,6 +316,208 @@ public class FlowlimitQuery extends FlowlimitEntity{
this.createUserList = createUserList; this.createUserList = createUserList;
} }
/**
* 设置 主键，自增长
* @param id
*/
public FlowlimitQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 主键，自增长
* @param idStart
*/
public FlowlimitQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 主键，自增长
* @param idEnd
*/
public FlowlimitQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 主键，自增长
* @param idIncrement
*/
public FlowlimitQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 主键，自增长
* @param idList
*/
public FlowlimitQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 模板标题
* @param title
*/
public FlowlimitQuery title(String title){
setTitle(title);
return this;
}
/**
* 设置 模板标题
* @param titleList
*/
public FlowlimitQuery titleList(List<String> titleList){
this.titleList = titleList;
return this;
}
/**
* 设置 办理流程
* @param content
*/
public FlowlimitQuery content(String content){
setContent(content);
return this;
}
/**
* 设置 办理流程
* @param contentList
*/
public FlowlimitQuery contentList(List<String> contentList){
this.contentList = contentList;
return this;
}
/**
* 设置 基础表one_basics id
* @param basicsId
*/
public FlowlimitQuery basicsId(Long basicsId){
setBasicsId(basicsId);
return this;
}
/**
* 设置 开始 基础表one_basics id
* @param basicsIdStart
*/
public FlowlimitQuery basicsIdStart(Long basicsIdStart){
this.basicsIdStart = basicsIdStart;
return this;
}
/**
* 设置 结束 基础表one_basics id
* @param basicsIdEnd
*/
public FlowlimitQuery basicsIdEnd(Long basicsIdEnd){
this.basicsIdEnd = basicsIdEnd;
return this;
}
/**
* 设置 增加 基础表one_basics id
* @param basicsIdIncrement
*/
public FlowlimitQuery basicsIdIncrement(Long basicsIdIncrement){
this.basicsIdIncrement = basicsIdIncrement;
return this;
}
/**
* 设置 基础表one_basics id
* @param basicsIdList
*/
public FlowlimitQuery basicsIdList(List<Long> basicsIdList){
this.basicsIdList = basicsIdList;
return this;
}
/**
* 设置 开始 变更时间
* @param updateTimeStart
*/
public FlowlimitQuery updateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
return this;
}
/**
* 设置 结束 变更时间
* @param updateTimeEnd
*/
public FlowlimitQuery updateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
return this;
}
/**
* 设置 变更用户loginName
* @param updateUser
*/
public FlowlimitQuery updateUser(String updateUser){
setUpdateUser(updateUser);
return this;
}
/**
* 设置 变更用户loginName
* @param updateUserList
*/
public FlowlimitQuery updateUserList(List<String> updateUserList){
this.updateUserList = updateUserList;
return this;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public FlowlimitQuery createTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
return this;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public FlowlimitQuery createTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
return this;
}
/**
* 设置 创建用户loginName
* @param createUser
*/
public FlowlimitQuery createUser(String createUser){
setCreateUser(createUser);
return this;
}
/**
* 设置 创建用户loginName
* @param createUserList
*/
public FlowlimitQuery 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) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
government-manager/src/main/java/com/mortals/xhx/module/member/service/MemberService.java
View file @ a37864d9
package com.mortals.xhx.module.member.service; package com.mortals.xhx.module.member.service;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.busiz.wechat.WechatBaseReq;
import com.mortals.xhx.module.member.model.MemberEntity; import com.mortals.xhx.module.member.model.MemberEntity;
/** /**
...@@ -12,4 +13,7 @@ import com.mortals.xhx.module.member.model.MemberEntity; ...@@ -12,4 +13,7 @@ import com.mortals.xhx.module.member.model.MemberEntity;
public interface MemberService extends ICRUDService<MemberEntity,Long>{ public interface MemberService extends ICRUDService<MemberEntity,Long>{
void checkMember(WechatBaseReq req);
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/member/service/impl/MemberServiceImpl.java
View file @ a37864d9
package com.mortals.xhx.module.member.service.impl; package com.mortals.xhx.module.member.service.impl;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.xhx.busiz.BaseMapper;
import com.mortals.xhx.common.code.YesNoEnum; import com.mortals.xhx.busiz.wechat.WechatBaseReq;
import com.mortals.xhx.common.code.OneThingRespCodeEnum;
import com.mortals.xhx.module.member.model.MemberQuery;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.member.dao.MemberDao; import com.mortals.xhx.module.member.dao.MemberDao;
import com.mortals.xhx.module.member.model.MemberEntity; import com.mortals.xhx.module.member.model.MemberEntity;
import com.mortals.xhx.module.member.service.MemberService; import com.mortals.xhx.module.member.service.MemberService;
import org.springframework.util.ObjectUtils;
import java.util.Date;
/** /**
* <p>Title: 微信会员基本信息</p> * <p>Title: 微信会员基本信息</p>
...@@ -18,12 +23,20 @@ import com.mortals.xhx.module.member.service.MemberService; ...@@ -18,12 +23,20 @@ import com.mortals.xhx.module.member.service.MemberService;
@Service("memberService") @Service("memberService")
public class MemberServiceImpl extends AbstractCRUDServiceImpl<MemberDao, MemberEntity, Long> implements MemberService { public class MemberServiceImpl extends AbstractCRUDServiceImpl<MemberDao, MemberEntity, Long> implements MemberService {
@Override @Override
protected void saveBefore(MemberEntity entity, Context context) throws AppException { public void checkMember(WechatBaseReq req) {
//校验已经存在
MemberEntity memberEntity = this.selectOne(new MemberQuery().openId(req.getOpenid()), null);
if (!ObjectUtils.isEmpty(memberEntity)) {
throw new AppException("已认证登记身份信息");
}
//todo 请求外部身份证识别
entity.setStatus(YesNoEnum.YES.getValue()); MemberEntity entity = BaseMapper.INSTANCE.weChat2Entity(req);
entity.setGender("男"); entity.setCreateTime(new Date());
super.saveBefore(entity, context); entity.setCreateUser("admin");
this.save(entity);
} }
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/member/web/MemberController.java
View file @ a37864d9
package com.mortals.xhx.module.member.web; package com.mortals.xhx.module.member.web;
import com.mortals.framework.model.Context;
import com.mortals.xhx.common.code.UserStatus;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.module.basics.web.BasicsInfoForm;
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 com.mortals.framework.web.BaseCRUDJsonMappingController; import com.mortals.framework.web.BaseCRUDJsonMappingController;
import com.mortals.xhx.module.member.model.MemberEntity; import com.mortals.xhx.module.member.model.MemberEntity;
import com.mortals.xhx.module.member.service.MemberService; import com.mortals.xhx.module.member.service.MemberService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/** /**
* <p>Title: 微信会员基本信息</p> * <p>Title: 微信会员基本信息</p>
...@@ -32,9 +24,4 @@ public class MemberController extends BaseCRUDJsonMappingController<MemberServic ...@@ -32,9 +24,4 @@ public class MemberController extends BaseCRUDJsonMappingController<MemberServic
super.setModuleDesc("微信会员基本信息"); super.setModuleDesc("微信会员基本信息");
} }
@Override
protected void init(HttpServletRequest request, HttpServletResponse response, MemberForm form, Map<String, Object> model, Context context) {
this.addDict(model, "status", UserStatus.getEnumMap());
}
} }
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/onething/service/impl/OnethingServiceImpl.java deleted 100644 → 0
View file @ fc53b550
package com.mortals.xhx.module.onething.service.impl;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.onething.dao.OnethingDao;
import com.mortals.xhx.module.onething.model.OnethingEntity;
import com.mortals.xhx.module.onething.service.OnethingService;
/**
* <p>Title: 一件事提交基础表</p>
* <p>Description: OnethingService service接口 </p>
* <p>Copyright: Copyright &reg; </p>
* @version 1.0.0
*/
@Service("onethingService")
public class OnethingServiceImpl extends AbstractCRUDServiceImpl<OnethingDao, OnethingEntity, Long> implements OnethingService {
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/onething/web/OnethingController.java deleted 100644 → 0
View file @ fc53b550
package com.mortals.xhx.module.onething.web;
import com.mortals.framework.model.Context;
import com.mortals.xhx.common.code.ApproveStateEnum;
import com.mortals.xhx.common.code.UserStatus;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.module.member.web.MemberForm;
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.onething.model.OnethingEntity;
import com.mortals.xhx.module.onething.service.OnethingService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* <p>Title: 一件事提交基础表</p>
* <p>Description: OnethingController </p>
* <p>Copyright: Copyright &reg; </p>
* <p>Company: </p>
* @author zxfei
* @version 1.0.0
*/
@RestController
@RequestMapping("onething")
public class OnethingController extends BaseCRUDJsonMappingController<OnethingService,OnethingForm,OnethingEntity,Long> {
public OnethingController(){
super.setFormClass(OnethingForm.class);
super.setModuleDesc("一件事提交基础表");
}
@Override
protected void init(HttpServletRequest request, HttpServletResponse response, OnethingForm form, Map<String, Object> model, Context context) {
this.addDict(model, "status", ApproveStateEnum.getEnumMap());
this.addDict(model, "isRevoke", YesNoEnum.getEnumMap());
}
}
\ No newline at end of file
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/YthAcceptDao.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.module.yth.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.yth.model.YthAcceptEntity;
/**
* <p>Title: 受理标准表</p>
* <p>Description: YthAcceptDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface YthAcceptDao extends ICRUDDao<YthAcceptEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/YthDatumDao.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.module.yth.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.yth.model.YthDatumEntity;
/**
* <p>Title: 材料表</p>
* <p>Description: YthDatumDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface YthDatumDao extends ICRUDDao<YthDatumEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/YthFlowlimitDao.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.module.yth.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.yth.model.YthFlowlimitEntity;
/**
* <p>Title: 办理流程表</p>
* <p>Description: YthFlowlimitDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface YthFlowlimitDao extends ICRUDDao<YthFlowlimitEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/YthMatterDao.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.module.yth.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.yth.model.YthMatterEntity;
/**
* <p>Title: 事项表</p>
* <p>Description: YthMatterDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface YthMatterDao extends ICRUDDao<YthMatterEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/onething/dao/OnethingDao.java → government-manager/src/main/java/com/mortals/xhx/module/yth/dao/YthOnethingDao.java
View file @ a37864d9
package com.mortals.xhx.module.onething.dao; package com.mortals.xhx.module.yth.dao;
import com.mortals.framework.dao.ICRUDDao; import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.onething.model.OnethingEntity; import com.mortals.xhx.module.yth.model.YthOnethingEntity;
/** /**
* <p>Title: 一件事提交基础表</p> * <p>Title: 一件事提交基础表</p>
* <p>Description: OnethingDao DAO接口 </p> * <p>Description: YthOnethingDao DAO接口 </p>
* @author * @author
* @version 1.0.0 * @version 1.0.0
*/ */
public interface OnethingDao extends ICRUDDao<OnethingEntity,Long>{ public interface YthOnethingDao extends ICRUDDao<YthOnethingEntity,Long>{
} }
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/YthWarrntsetDao.java 0 → 100644
View file @ a37864d9
package com.mortals.xhx.module.yth.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.yth.model.YthWarrntsetEntity;
/**
* <p>Title: 设定依据表</p>
* <p>Description: YthWarrntsetDao DAO接口 </p>
* @author
* @version 1.0.0
*/
public interface YthWarrntsetDao extends ICRUDDao<YthWarrntsetEntity,Long>{
}
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/ibatis/YthAcceptDaoImpl.java 0 → 100644
View file @ a37864d9
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.YthAcceptDao;
import com.mortals.xhx.module.yth.model.YthAcceptEntity;
/**
* <p>Title: 受理标准表</p>
* <p>Description: YthAcceptDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("ythAcceptDao")
public class YthAcceptDaoImpl extends BaseCRUDDaoMybatis<YthAcceptEntity,Long> implements YthAcceptDao {
}
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/ibatis/YthDatumDaoImpl.java 0 → 100644
View file @ a37864d9
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.YthDatumDao;
import com.mortals.xhx.module.yth.model.YthDatumEntity;
/**
* <p>Title: 材料表</p>
* <p>Description: YthDatumDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("ythDatumDao")
public class YthDatumDaoImpl extends BaseCRUDDaoMybatis<YthDatumEntity,Long> implements YthDatumDao {
}
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/ibatis/YthFlowlimitDaoImpl.java 0 → 100644
View file @ a37864d9
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.YthFlowlimitDao;
import com.mortals.xhx.module.yth.model.YthFlowlimitEntity;
/**
* <p>Title: 办理流程表</p>
* <p>Description: YthFlowlimitDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("ythFlowlimitDao")
public class YthFlowlimitDaoImpl extends BaseCRUDDaoMybatis<YthFlowlimitEntity,Long> implements YthFlowlimitDao {
}
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/ibatis/YthMatterDaoImpl.java 0 → 100644
View file @ a37864d9
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.YthMatterDao;
import com.mortals.xhx.module.yth.model.YthMatterEntity;
/**
* <p>Title: 事项表</p>
* <p>Description: YthMatterDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("ythMatterDao")
public class YthMatterDaoImpl extends BaseCRUDDaoMybatis<YthMatterEntity,Long> implements YthMatterDao {
}
government-manager/src/main/java/com/mortals/xhx/module/onething/dao/ibatis/OnethingDaoImpl.java → government-manager/src/main/java/com/mortals/xhx/module/yth/dao/ibatis/YthOnethingDaoImpl.java
View file @ a37864d9
package com.mortals.xhx.module.onething.dao.ibatis; package com.mortals.xhx.module.yth.dao.ibatis;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis; import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.onething.dao.OnethingDao; import com.mortals.xhx.module.yth.dao.YthOnethingDao;
import com.mortals.xhx.module.onething.model.OnethingEntity; import com.mortals.xhx.module.yth.model.YthOnethingEntity;
/** /**
* <p>Title: 一件事提交基础表</p> * <p>Title: 一件事提交基础表</p>
* <p>Description: OnethingDaoImpl DAO接口 </p> * <p>Description: YthOnethingDaoImpl DAO接口 </p>
* @author * @author
* @version 1.0.0 * @version 1.0.0
*/ */
@Repository("onethingDao") @Repository("ythOnethingDao")
public class OnethingDaoImpl extends BaseCRUDDaoMybatis<OnethingEntity,Long> implements OnethingDao { public class YthOnethingDaoImpl extends BaseCRUDDaoMybatis<YthOnethingEntity,Long> implements YthOnethingDao {
} }
government-manager/src/main/java/com/mortals/xhx/module/yth/dao/ibatis/YthWarrntsetDaoImpl.java 0 → 100644
View file @ a37864d9
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.YthWarrntsetDao;
import com.mortals.xhx.module.yth.model.YthWarrntsetEntity;
/**
* <p>Title: 设定依据表</p>
* <p>Description: YthWarrntsetDaoImpl DAO接口 </p>
* @author
* @version 1.0.0
*/
@Repository("ythWarrntsetDao")
public class YthWarrntsetDaoImpl extends BaseCRUDDaoMybatis<YthWarrntsetEntity,Long> implements YthWarrntsetDao {
}
pom.xml
View file @ a37864d9
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment