Skip to content

C
chuanshan_gov_platform
Commit f93d989d authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

辅助事项增加字段

parent a7276f5a
Show whitespace changes
Inline Side-by-side
Showing with 1644 additions and 1692 deletions
knowledge-base/doc/api.md
View file @ f93d989d
......@@ -212,280 +212,6 @@ Content-Type: multipart/form-data
```
## 纠错管理
### 查询纠错管理列表
**请求URL:** error/recovery/list
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 查询纠错管理
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
page|Integer|否|当前页
size|Integer|否|每页条数，值为-1，查询所有记录
errorTitle|String|否|纠错标题,字段前后添加%%模糊查询
matterSite|String|否|事件位置,字段前后添加%%模糊查询
substance|String|否|具体内容,字段前后添加%%模糊查询
formalReply|String|否|建议答复,字段前后添加%%模糊查询
status|Integer|否|处理状态，0：未处理，1：已处理
**请求样例:**
```
{
"errorTitle":"cii47p",
"matterSite":"rtjip2",
"substance":"i3gkc1",
"formalReply":"u1daw8",
"status":2551,
"page":1,
"size":10
}
```
**响应参数:**
参数名称|参数类型|描述
:---|:---|:------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 per_page|Integer|每页条数
 total|Integer|总条数
 last_page|Integer|总页数
 current_page|Integer|当前页
 data|array|结果集列表|数组
  id|Long|序号，主键，自增长
  siteId|Long|站点id
  errorTitle|String|纠错标题
  matterSite|String|事件位置
  substance|String|具体内容
  annexUrl|String|附件地址
  formalReply|String|建议答复
  submitUserId|Long|纠错用户id
  submitUserName|String|纠错用户名称
  submitDate|Date|提交时间
  status|Integer|处理状态，0：未处理，1：已处理
  answerUserId|Long|处理用户id
  answerUserName|String|处理用户名称
  answerDate|Date|处理时间
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
dict|object|字典对象
**响应消息样例:**
```
{
"code":1,
"data":{
}
}
```
### 查看纠错管理
**请求URL:** error/recovery/info
**请求方式:** GET
**内容类型:** application/json;charset=utf-8
**简要描述:** 查看纠错管理，返回实例详细信息
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
id|Long|是|ID
**请求样例:**
```
http://localhost/error/recovery/info?id=549
```
**响应参数:**
参数名称 |参数类型|描述
:---|:---|:-------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|序号，主键，自增长
 siteId|Long|站点id
 errorTitle|String|纠错标题
 matterSite|String|事件位置
 substance|String|具体内容
 annexUrl|String|附件地址
 formalReply|String|建议答复
 submitUserId|Long|纠错用户id
 submitUserName|String|纠错用户名称
 submitDate|Date|提交时间
 status|Integer|处理状态，0：未处理，1：已处理
 answerUserId|Long|处理用户id
 answerUserName|String|处理用户名称
 answerDate|Date|处理时间
 createUserId|Long|创建用户
 createTime|Date|创建时间
 updateUserId|Long|更新用户
 updateTime|Date|更新时间
dict|object|字典对象
**响应消息样例:**
```
{
"code": 1,
"data": {
"id":9318,
"siteId":4343,
"errorTitle":"pylmf6",
"matterSite":"acw4al",
"substance":"uiu7ih",
"annexUrl":"rg3gjq",
"formalReply":"7p7ayo",
"submitUserId":7570,
"submitUserName":"dhfw7k",
"submitDate":"2023-03-01",
"status":2746,
"answerUserId":6143,
"answerUserName":"cqq1yi",
"answerDate":"2023-03-01",
"createUserId":3636,
"createTime":"2023-03-01",
"updateUserId":3711,
"updateTime":"2023-03-01"
}
}
```
### 保存更新纠错管理
**请求URL:** error/recovery/save
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 保存或更新纠错管理：id为空时为新增保存，否则为更新提交
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:-------
siteId|Long|否|站点id
errorTitle|String|是|纠错标题
matterSite|String|否|事件位置
substance|String|否|具体内容
annexUrl|String|否|附件地址
formalReply|String|否|建议答复
submitUserId|Long|否|纠错用户id
submitUserName|String|否|纠错用户名称
submitDate|Date|是|提交时间
status|Integer|否|处理状态，0：未处理，1：已处理
answerUserId|Long|否|处理用户id
answerUserName|String|否|处理用户名称
answerDate|Date|否|处理时间
**请求样例:**
```
{
"siteId":8374,
"errorTitle":"1su3ib",
"matterSite":"dmw0z7",
"substance":"raxxk4",
"annexUrl":"nkcq39",
"formalReply":"ejs96r",
"submitUserId":4570,
"submitUserName":"9cv9lf",
"submitDate":"2023-03-01",
"status":1004,
"answerUserId":4754,
"answerUserName":"b87e4m",
"answerDate":"2023-03-01",
}
```
**响应参数:**
参数名称 |参数类型|描述
:---|:---|:------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
  id|Long|序号，主键，自增长
  siteId|Long|站点id
  errorTitle|String|纠错标题
  matterSite|String|事件位置
  substance|String|具体内容
  annexUrl|String|附件地址
  formalReply|String|建议答复
  submitUserId|Long|纠错用户id
  submitUserName|String|纠错用户名称
  submitDate|Date|提交时间
  status|Integer|处理状态，0：未处理，1：已处理
  answerUserId|Long|处理用户id
  answerUserName|String|处理用户名称
  answerDate|Date|处理时间
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
**响应消息样例:**
```
{
"msg":"新增模块成功",
"code":1,
"data":{}
}
}
```
### 删除纠错管理
**请求URL:** error/recovery/delete
**请求方式:** GET
**内容类型:** application/json;charset=utf-8
**简要描述:** 删除纠错管理
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
id|String|是|数组
**请求样例:**
```
http://localhost:8080/error/recovery/delete?id=1&id=2'
```
**响应参数:**
参数名称 |参数类型|备注|其它
---|---|---|---
code|Integer|结果码（-1.失败，1.成功）|-
msg|String|消息|-
**响应消息样例:**
```
{
"code":1,
"msg":"成功"
}
```
## 纠错管理
### 查询纠错管理列表
......
knowledge-base/src/main/java/com/mortals/xhx/module/site/model/SiteMatterAssistEntity.java
View file @ f93d989d
......@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.site.model.vo.SiteMatterAssistVo;
/**
* 辅助接件事项实体对象
*
* @author zxfei
* @date 2023-03-17
*/
* 辅助接件事项实体对象
*
* @author zxfei
* @date 2023-03-21
*/
public class SiteMatterAssistEntity extends SiteMatterAssistVo {
private static final long serialVersionUID = 1L;
......@@ -64,6 +64,10 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo {
* 政务网地址
*/
private String govUrl;
/**
* 事项来源
*/
private Integer source;
......@@ -236,6 +240,20 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo {
public void setGovUrl(String govUrl){
this.govUrl = govUrl;
}
/**
* 获取 事项来源
* @return Integer
*/
public Integer getSource(){
return source;
}
/**
* 设置 事项来源
* @param source
*/
public void setSource(Integer source){
this.source = source;
}
......@@ -270,6 +288,7 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo {
sb.append(",dutyer:").append(getDutyer());
sb.append(",telephone:").append(getTelephone());
sb.append(",govUrl:").append(getGovUrl());
sb.append(",source:").append(getSource());
return sb.toString();
}
......@@ -298,5 +317,7 @@ public class SiteMatterAssistEntity extends SiteMatterAssistVo {
this.telephone = "";
this.govUrl = "";
this.source = null;
}
}
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/site/model/SiteMatterAssistQuery.java
View file @ f93d989d
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.site.model;
import java.util.List;
import com.mortals.xhx.module.site.model.SiteMatterAssistEntity;
/**
* 辅助接件事项查询对象
*
* @author zxfei
* @date 2023-03-17
*/
* 辅助接件事项查询对象
*
* @author zxfei
* @date 2023-03-21
*/
public class SiteMatterAssistQuery extends SiteMatterAssistEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -166,6 +166,21 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 开始 事项来源 */
private Integer sourceStart;
/** 结束 事项来源 */
private Integer sourceEnd;
/** 增加 事项来源 */
private Integer sourceIncrement;
/** 事项来源列表 */
private List <Integer> sourceList;
/** 事项来源排除列表 */
private List <Integer> sourceNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<SiteMatterAssistQuery> orConditionList;
......@@ -1061,6 +1076,87 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 开始 事项来源
* @return sourceStart
*/
public Integer getSourceStart(){
return this.sourceStart;
}
/**
* 设置 开始 事项来源
* @param sourceStart
*/
public void setSourceStart(Integer sourceStart){
this.sourceStart = sourceStart;
}
/**
* 获取 结束 事项来源
* @return $sourceEnd
*/
public Integer getSourceEnd(){
return this.sourceEnd;
}
/**
* 设置 结束 事项来源
* @param sourceEnd
*/
public void setSourceEnd(Integer sourceEnd){
this.sourceEnd = sourceEnd;
}
/**
* 获取 增加 事项来源
* @return sourceIncrement
*/
public Integer getSourceIncrement(){
return this.sourceIncrement;
}
/**
* 设置 增加 事项来源
* @param sourceIncrement
*/
public void setSourceIncrement(Integer sourceIncrement){
this.sourceIncrement = sourceIncrement;
}
/**
* 获取 事项来源
* @return sourceList
*/
public List<Integer> getSourceList(){
return this.sourceList;
}
/**
* 设置 事项来源
* @param sourceList
*/
public void setSourceList(List<Integer> sourceList){
this.sourceList = sourceList;
}
/**
* 获取 事项来源
* @return sourceNotList
*/
public List<Integer> getSourceNotList(){
return this.sourceNotList;
}
/**
* 设置 事项来源
* @param sourceNotList
*/
public void setSourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -1593,6 +1689,60 @@ public class SiteMatterAssistQuery extends SiteMatterAssistEntity {
}
/**
* 设置 事项来源
* @param source
*/
public SiteMatterAssistQuery source(Integer source){
setSource(source);
return this;
}
/**
* 设置 开始 事项来源
* @param sourceStart
*/
public SiteMatterAssistQuery sourceStart(Integer sourceStart){
this.sourceStart = sourceStart;
return this;
}
/**
* 设置 结束 事项来源
* @param sourceEnd
*/
public SiteMatterAssistQuery sourceEnd(Integer sourceEnd){
this.sourceEnd = sourceEnd;
return this;
}
/**
* 设置 增加 事项来源
* @param sourceIncrement
*/
public SiteMatterAssistQuery sourceIncrement(Integer sourceIncrement){
this.sourceIncrement = sourceIncrement;
return this;
}
/**
* 设置 事项来源
* @param sourceList
*/
public SiteMatterAssistQuery sourceList(List<Integer> sourceList){
this.sourceList = sourceList;
return this;
}
/**
* 设置 事项来源
* @param sourceNotList
*/
public SiteMatterAssistQuery sourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
knowledge-base/src/main/java/com/mortals/xhx/module/site/web/SiteMatterAssistController.java
View file @ f93d989d
......@@ -42,6 +42,7 @@ public class SiteMatterAssistController extends BaseCRUDJsonBodyMappingControlle
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "source", paramService.getParamBySecondOrganize("SiteMatter","source"));
super.init(model, context);
}
......
knowledge-base/src/main/resources/sqlmap/module/site/SiteMatterAssistMapper.xml
View file @ f93d989d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.site.dao.ibatis.SiteMatterAssistDaoImpl">
<!-- 字段和属性映射 -->
......@@ -22,6 +22,7 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="source" column="source" />
</resultMap>
......@@ -80,23 +81,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
a.source,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SiteMatterAssistEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_site_matter_assist
(siteMatterId,matterId,matterName,matterCode,deptId,deptName,deptCode,officeId,officeName,dutyer,telephone,govUrl,createUserId,createTime,updateUserId,updateTime)
(siteMatterId,matterId,matterName,matterCode,deptId,deptName,deptCode,officeId,officeName,dutyer,telephone,govUrl,createUserId,createTime,updateUserId,updateTime,source)
VALUES
(#{siteMatterId},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{deptCode},#{officeId},#{officeName},#{dutyer},#{telephone},#{govUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
(#{siteMatterId},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{deptCode},#{officeId},#{officeName},#{dutyer},#{telephone},#{govUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{source})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site_matter_assist
(siteMatterId,matterId,matterName,matterCode,deptId,deptName,deptCode,officeId,officeName,dutyer,telephone,govUrl,createUserId,createTime,updateUserId,updateTime)
(siteMatterId,matterId,matterName,matterCode,deptId,deptName,deptCode,officeId,officeName,dutyer,telephone,govUrl,createUserId,createTime,updateUserId,updateTime,source)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteMatterId},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.deptCode},#{item.officeId},#{item.officeName},#{item.dutyer},#{item.telephone},#{item.govUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
(#{item.siteMatterId},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.deptCode},#{item.officeId},#{item.officeName},#{item.dutyer},#{item.telephone},#{item.govUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.source})
</foreach>
</insert>
......@@ -172,6 +176,12 @@
<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('source')) or (colPickMode==1 and !data.containsKey('source'))">
a.source=#{data.source},
</if>
<if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
a.source=ifnull(a.source,0) + #{data.sourceIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -326,6 +336,18 @@
</if>
</foreach>
</trim>
<trim prefix="source=(case" suffix="ELSE source end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
when a.id=#{item.id} then #{item.source}
</when>
<when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -829,6 +851,33 @@
<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('source')">
<if test="conditionParamRef.source != null ">
${_conditionType_} a.source = #{${_conditionParam_}.source}
</if>
<if test="conditionParamRef.source == null">
${_conditionType_} a.source is null
</if>
</if>
<if test="conditionParamRef.containsKey('sourceList')">
${_conditionType_} a.source in
<foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sourceNotList')">
${_conditionType_} a.source not in
<foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
</if>
<if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -927,6 +976,11 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('source')">
a.source
<if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
single-matter/src/main/java/com/mortals/xhx/module/single/web/SingleMatterController.java
View file @ f93d989d
......@@ -44,7 +44,7 @@ public class SingleMatterController extends BaseCRUDJsonBodyMappingController<Si
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "source", paramService.getParamBySecondOrganize("SingleMatter","source"));
this.addDict(model, "source", paramService.getParamBySecondOrganize("SiteMatter","source"));
this.addDict(model, "isConvert", paramService.getParamBySecondOrganize("SingleMatter","isConvert"));
super.init(model, context);
}
......
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