Skip to content

S
self-service
Commit a54ce107 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

修改事项材料，用户事项申请，增加用户事项申请审批

parent ef4f6d3a
Show whitespace changes
Inline Side-by-side
Showing with 6782 additions and 1474 deletions
sst-manager/db/add_db.sql
View file @ a54ce107
...@@ -49,7 +49,7 @@ PRIMARY KEY (`id`) ...@@ -49,7 +49,7 @@ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='申报事项'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='申报事项';
-- ---------------------------- -- ----------------------------
-- 事项申请材料表 -- 事项材料表
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `mortals_sys_matter_datum`; DROP TABLE IF EXISTS `mortals_sys_matter_datum`;
CREATE TABLE mortals_sys_matter_datum( CREATE TABLE mortals_sys_matter_datum(
...@@ -59,8 +59,11 @@ CREATE TABLE mortals_sys_matter_datum( ...@@ -59,8 +59,11 @@ CREATE TABLE mortals_sys_matter_datum(
`matterId` bigint(20) COMMENT '事项id', `matterId` bigint(20) COMMENT '事项id',
`matterCode` varchar(512) COMMENT '事项编码', `matterCode` varchar(512) COMMENT '事项编码',
`shortName` varchar(512) COMMENT '材料简称', `shortName` varchar(512) COMMENT '材料简称',
`fullName` varchar(512) NOT NULL COMMENT '材料全称', `fullName` varchar(512) COMMENT '材料全称',
`uselType` tinyint(2) NOT NULL DEFAULT '1' COMMENT '使用方式（1.拍照上传，2.在线填写)', `needType` tinyint(2) DEFAULT '0' COMMENT '是否必要0不选1必要2非必要',
`datumType` tinyint(2) DEFAULT '0' COMMENT '材料形式0不选1纸质2电子3纸质-电子',
`needOriginal` tinyint(2) DEFAULT '0' COMMENT '提交原件0不需要1需要',
`uselType` tinyint(2) DEFAULT '1' COMMENT '使用方式（1.拍照上传，2.在线填写)',
`suggest` tinyint(2) DEFAULT '0' COMMENT '是否推荐（0否1是）', `suggest` tinyint(2) DEFAULT '0' COMMENT '是否推荐（0否1是）',
`fillSum` int(8) DEFAULT '1' COMMENT '填写次数', `fillSum` int(8) DEFAULT '1' COMMENT '填写次数',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
...@@ -68,7 +71,7 @@ CREATE TABLE mortals_sys_matter_datum( ...@@ -68,7 +71,7 @@ CREATE TABLE mortals_sys_matter_datum(
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '修改时间', `updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项材料';
...@@ -95,7 +98,6 @@ PRIMARY KEY (`id`) ...@@ -95,7 +98,6 @@ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='材料附件'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='材料附件';
-- ---------------------------- -- ----------------------------
-- 站点材料公共库表 -- 站点材料公共库表
-- ---------------------------- -- ----------------------------
...@@ -106,8 +108,13 @@ CREATE TABLE mortals_sys_datum_library( ...@@ -106,8 +108,13 @@ CREATE TABLE mortals_sys_datum_library(
`siteName` varchar(255) COMMENT '站点名称', `siteName` varchar(255) COMMENT '站点名称',
`datumId` bigint(20) COMMENT '材料id', `datumId` bigint(20) COMMENT '材料id',
`shortName` varchar(512) COMMENT '材料简称', `shortName` varchar(512) COMMENT '材料简称',
`fullName` varchar(512) NOT NULL COMMENT '材料全称', `fullName` varchar(512) COMMENT '材料全称',
`uselType` tinyint(2) NOT NULL DEFAULT '1' COMMENT '使用方式（1.拍照上传，2.在线填写)', `needType` tinyint(2) DEFAULT '0' COMMENT '是否必要0不选1必要2非必要',
`datumType` tinyint(2) DEFAULT '0' COMMENT '材料形式0不选1纸质2电子3纸质-电子',
`needOriginal` tinyint(2) DEFAULT '0' COMMENT '提交原件0不需要1需要',
`uselType` tinyint(2) DEFAULT '1' COMMENT '使用方式（1.拍照上传，2.在线填写)',
`suggest` tinyint(2) DEFAULT '0' COMMENT '是否推荐（0否1是）',
`fillSum` int(8) DEFAULT '1' COMMENT '填写次数',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
...@@ -115,6 +122,7 @@ CREATE TABLE mortals_sys_datum_library( ...@@ -115,6 +122,7 @@ CREATE TABLE mortals_sys_datum_library(
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='站点材料公共库'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='站点材料公共库';
-- ---------------------------- -- ----------------------------
-- 用户申报信息表 -- 用户申报信息表
-- ---------------------------- -- ----------------------------
...@@ -126,9 +134,18 @@ CREATE TABLE mortals_xhx_user_matter_apply( ...@@ -126,9 +134,18 @@ CREATE TABLE mortals_xhx_user_matter_apply(
`matterName` varchar(1024) COMMENT '事项名称', `matterName` varchar(1024) COMMENT '事项名称',
`matterCode` varchar(512) COMMENT '事项编码', `matterCode` varchar(512) COMMENT '事项编码',
`applyCode` varchar(512) COMMENT '申报编号', `applyCode` varchar(512) COMMENT '申报编号',
`applyAddr` varchar(512) COMMENT '申报地址名称', `applyAddr` varchar(512) COMMENT '申报地址',
`deviceName` varchar(512) COMMENT '申报设备名称', `deviceName` varchar(512) COMMENT '申报设备名称',
`applyPerson` varchar(512) COMMENT '申请人姓名', `applyPerson` varchar(512) COMMENT '申请人姓名',
`phoneNum` varchar(128) COMMENT '联系电话',
`idCard` varchar(128) COMMENT '证件号码',
`deptName` varchar(128) COMMENT '事项所属部门',
`applyDate` datetime COMMENT '申报时间',
`status` tinyint(2) DEFAULT '0' COMMENT '受理状态0未受理1已受理',
`applyWay` varchar(128) COMMENT '申报方式',
`storeDevice` varchar(128) COMMENT '存储设备',
`boxNum` varchar(128) COMMENT '箱体编号',
`storeDate` datetime COMMENT '存件时间',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
...@@ -160,3 +177,20 @@ CREATE TABLE mortals_xhx_user_matter_details( ...@@ -160,3 +177,20 @@ CREATE TABLE mortals_xhx_user_matter_details(
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户申报明细'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户申报明细';
-- ----------------------------
-- 用户申报事项审批表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_user_matter_examine`;
CREATE TABLE mortals_xhx_user_matter_examine(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`applyrId` bigint(20) NOT NULL COMMENT '用户申报id',
`acceptPerson` varchar(64) COMMENT '受理人员',
`acceptResult` tinyint(2) COMMENT '受理结果1通过2拒绝',
`acceptOpinion` varchar(512) COMMENT '受理意见',
`acceptDate` datetime COMMENT '受理时间',
`createUserId` bigint(20) COMMENT '创建用户',
`createTime` datetime COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户申报事项审批';
\ No newline at end of file
sst-manager/db/init_data.sql 0 → 100644
View file @ a54ce107
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('事项来源', 'MatterApply', 'source', '0', '政务网', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('事项来源', 'MatterApply', 'source', '1', '自定义', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('是否必要', 'MatterDatum', 'needType', '0', '不选', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('是否必要', 'MatterDatum', 'needType', '1', '必要', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('是否必要', 'MatterDatum', 'needType', '2', '非必要', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('材料形式', 'MatterDatum', 'datumType', '0', '不选', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('材料形式', 'MatterDatum', 'datumType', '1', '纸质', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('材料形式', 'MatterDatum', 'datumType', '2', '电子', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('材料形式', 'MatterDatum', 'datumType', '3', '纸质-电子', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('提交原件', 'MatterDatum', 'needOriginal', '0', '不需要', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('提交原件', 'MatterDatum', 'needOriginal', '1', '需要', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('使用方式', 'MatterDatum', 'uselType', '1', '拍照上传', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('使用方式', 'MatterDatum', 'uselType', '2', '在线填写', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('是否推荐', 'MatterDatum', 'suggest', '0', '否', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('是否推荐', 'MatterDatum', 'suggest', '1', '是', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('附件类型', 'MatterDatumFile', 'filetype', '1', '示例样表', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('附件类型', 'MatterDatumFile', 'filetype', '2', '空白表格', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('受理状态', 'UserMatterApply', 'status', '0', '未受理', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('受理状态', 'UserMatterApply', 'status', '1', '已受理', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('受理结果', 'UserMatterExamine', 'acceptResult', '1', '通过', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('受理结果', 'UserMatterExamine', 'acceptResult', '0', '拒绝', '1', '4', '0', NULL, NULL, NULL, NULL);
\ No newline at end of file
sst-manager/doc/api.md
View file @ a54ce107
...@@ -2545,9 +2545,9 @@ msg|String|消息|- ...@@ -2545,9 +2545,9 @@ msg|String|消息|-
``` ```
## 事项申请材料 ## 事项材料
### 查询事项申请材料列表 ### 查询事项材料列表
**请求URL:** matter/datum/list **请求URL:** matter/datum/list
...@@ -2555,7 +2555,7 @@ msg|String|消息|- ...@@ -2555,7 +2555,7 @@ msg|String|消息|-
**内容类型:** application/json;charset=utf-8 **内容类型:** application/json;charset=utf-8
**简要描述:** 查询事项申请材料 **简要描述:** 查询事项材料
**请求参数:** **请求参数:**
...@@ -2568,7 +2568,7 @@ siteName|String|否|站点名称,字段前后添加%%模糊查询 ...@@ -2568,7 +2568,7 @@ siteName|String|否|站点名称,字段前后添加%%模糊查询
**请求样例:** **请求样例:**
``` ```
{ {
"siteName":"m34pm4", "siteName":"z4lyit",
"page":1, "page":1,
"size":10 "size":10
} }
...@@ -2593,6 +2593,9 @@ data|object|数据对象 ...@@ -2593,6 +2593,9 @@ data|object|数据对象
  matterCode|String|事项编码   matterCode|String|事项编码
  shortName|String|材料简称   shortName|String|材料简称
  fullName|String|材料全称   fullName|String|材料全称
  needType|Integer|是否必要0不选1必要2非必要
  datumType|Integer|材料形式0不选1纸质2电子3纸质-电子
  needOriginal|Integer|提交原件0不需要1需要
  uselType|Integer|使用方式（1.拍照上传，2.在线填写)   uselType|Integer|使用方式（1.拍照上传，2.在线填写)
  suggest|Integer|是否推荐（0否1是）   suggest|Integer|是否推荐（0否1是）
  fillSum|Integer|填写次数   fillSum|Integer|填写次数
...@@ -2600,7 +2603,6 @@ data|object|数据对象 ...@@ -2600,7 +2603,6 @@ data|object|数据对象
  createUserId|Long|创建用户   createUserId|Long|创建用户
  updateUserId|Long|更新用户   updateUserId|Long|更新用户
  updateTime|Date|修改时间   updateTime|Date|修改时间
  matterDatumFileList|array|材料附件明细
dict|object|字典对象 dict|object|字典对象
**响应消息样例:** **响应消息样例:**
...@@ -2612,7 +2614,7 @@ dict|object|字典对象 ...@@ -2612,7 +2614,7 @@ dict|object|字典对象
} }
``` ```
### 查看事项申请材料 ### 查看事项材料
**请求URL:** matter/datum/info **请求URL:** matter/datum/info
...@@ -2620,7 +2622,7 @@ dict|object|字典对象 ...@@ -2620,7 +2622,7 @@ dict|object|字典对象
**内容类型:** application/json;charset=utf-8 **内容类型:** application/json;charset=utf-8
**简要描述:** 查看事项申请材料，返回实例详细信息 **简要描述:** 查看事项材料，返回实例详细信息
**请求参数:** **请求参数:**
...@@ -2646,6 +2648,9 @@ data|object|数据对象 ...@@ -2646,6 +2648,9 @@ data|object|数据对象
 matterCode|String|事项编码  matterCode|String|事项编码
 shortName|String|材料简称  shortName|String|材料简称
 fullName|String|材料全称  fullName|String|材料全称
 needType|Integer|是否必要0不选1必要2非必要
 datumType|Integer|材料形式0不选1纸质2电子3纸质-电子
 needOriginal|Integer|提交原件0不需要1需要
 uselType|Integer|使用方式（1.拍照上传，2.在线填写)  uselType|Integer|使用方式（1.拍照上传，2.在线填写)
 suggest|Integer|是否推荐（0否1是）  suggest|Integer|是否推荐（0否1是）
 fillSum|Integer|填写次数  fillSum|Integer|填写次数
...@@ -2660,25 +2665,28 @@ dict|object|字典对象 ...@@ -2660,25 +2665,28 @@ dict|object|字典对象
{ {
"code": 1, "code": 1,
"data": { "data": {
"id":4219, "id":1034,
"siteId":9262, "siteId":5049,
"siteName":"9fv8qa", "siteName":"78e27l",
"matterId":8899, "matterId":876,
"matterCode":"bb5rm4", "matterCode":"puddcq",
"shortName":"7d109k", "shortName":"lwj8es",
"fullName":"598eip", "fullName":"rhkwcn",
"uselType":71, "needType":1594,
"suggest":1735, "datumType":275,
"fillSum":1898, "needOriginal":6361,
"createTime":"2023-04-10", "uselType":4798,
"createUserId":5729, "suggest":2483,
"updateUserId":5373, "fillSum":4289,
"updateTime":"2023-04-10" "createTime":"2023-04-11",
"createUserId":61,
"updateUserId":5173,
"updateTime":"2023-04-11"
} }
} }
``` ```
### 保存更新事项申请材料 ### 保存更新事项材料
**请求URL:** matter/datum/save **请求URL:** matter/datum/save
...@@ -2686,7 +2694,7 @@ dict|object|字典对象 ...@@ -2686,7 +2694,7 @@ dict|object|字典对象
**内容类型:** application/json;charset=utf-8 **内容类型:** application/json;charset=utf-8
**简要描述:** 保存或更新事项申请材料：id为空时为新增保存，否则为更新提交 **简要描述:** 保存或更新事项材料：id为空时为新增保存，否则为更新提交
**请求参数:** **请求参数:**
...@@ -2697,23 +2705,29 @@ siteName|String|否|站点名称 ...@@ -2697,23 +2705,29 @@ siteName|String|否|站点名称
matterId|Long|否|事项id matterId|Long|否|事项id
matterCode|String|否|事项编码 matterCode|String|否|事项编码
shortName|String|否|材料简称 shortName|String|否|材料简称
fullName|String|是|材料全称 fullName|String|否|材料全称
uselType|Integer|是|使用方式（1.拍照上传，2.在线填写) needType|Integer|否|是否必要0不选1必要2非必要
datumType|Integer|否|材料形式0不选1纸质2电子3纸质-电子
needOriginal|Integer|否|提交原件0不需要1需要
uselType|Integer|否|使用方式（1.拍照上传，2.在线填写)
suggest|Integer|否|是否推荐（0否1是） suggest|Integer|否|是否推荐（0否1是）
fillSum|Integer|否|填写次数 fillSum|Integer|否|填写次数
**请求样例:** **请求样例:**
``` ```
{ {
"siteId":4366, "siteId":3083,
"siteName":"bkwyfn", "siteName":"4wdjkm",
"matterId":1201, "matterId":2112,
"matterCode":"8mq5rx", "matterCode":"8glwdt",
"shortName":"qabitv", "shortName":"v7219x",
"fullName":"h668av", "fullName":"xvw9rc",
"uselType":3502, "needType":8710,
"suggest":7872, "datumType":5552,
"fillSum":9306, "needOriginal":9411,
"uselType":8911,
"suggest":8551,
"fillSum":4211,
} }
``` ```
...@@ -2733,6 +2747,9 @@ data|object|数据对象 ...@@ -2733,6 +2747,9 @@ data|object|数据对象
  matterCode|String|事项编码   matterCode|String|事项编码
  shortName|String|材料简称   shortName|String|材料简称
  fullName|String|材料全称   fullName|String|材料全称
  needType|Integer|是否必要0不选1必要2非必要
  datumType|Integer|材料形式0不选1纸质2电子3纸质-电子
  needOriginal|Integer|提交原件0不需要1需要
  uselType|Integer|使用方式（1.拍照上传，2.在线填写)   uselType|Integer|使用方式（1.拍照上传，2.在线填写)
  suggest|Integer|是否推荐（0否1是）   suggest|Integer|是否推荐（0否1是）
  fillSum|Integer|填写次数   fillSum|Integer|填写次数
...@@ -2752,7 +2769,7 @@ data|object|数据对象 ...@@ -2752,7 +2769,7 @@ data|object|数据对象
``` ```
### 删除事项申请材料 ### 删除事项材料
**请求URL:** matter/datum/delete **请求URL:** matter/datum/delete
...@@ -2760,7 +2777,7 @@ data|object|数据对象 ...@@ -2760,7 +2777,7 @@ data|object|数据对象
**内容类型:** application/json;charset=utf-8 **内容类型:** application/json;charset=utf-8
**简要描述:** 删除事项申请材料 **简要描述:** 删除事项材料
**请求参数:** **请求参数:**
...@@ -2787,6 +2804,7 @@ msg|String|消息|- ...@@ -2787,6 +2804,7 @@ msg|String|消息|-
} }
``` ```
## 材料附件 ## 材料附件
### 查询材料附件列表 ### 查询材料附件列表
...@@ -3047,12 +3065,10 @@ msg|String|消息|- ...@@ -3047,12 +3065,10 @@ msg|String|消息|-
:---|:---|:---|:------ :---|:---|:---|:------
page|Integer|否|当前页 page|Integer|否|当前页
size|Integer|否|每页条数，值为-1，查询所有记录 size|Integer|否|每页条数，值为-1，查询所有记录
siteName|String|否|站点名称,字段前后添加%%模糊查询
**请求样例:** **请求样例:**
``` ```
{ {
"siteName":"hctshv",
"page":1, "page":1,
"size":10 "size":10
} }
...@@ -3076,12 +3092,16 @@ data|object|数据对象 ...@@ -3076,12 +3092,16 @@ data|object|数据对象
  datumId|Long|材料id   datumId|Long|材料id
  shortName|String|材料简称   shortName|String|材料简称
  fullName|String|材料全称   fullName|String|材料全称
  needType|Integer|是否必要0不选1必要2非必要
  datumType|Integer|材料形式0不选1纸质2电子3纸质-电子
  needOriginal|Integer|提交原件0不需要1需要
  uselType|Integer|使用方式（1.拍照上传，2.在线填写)   uselType|Integer|使用方式（1.拍照上传，2.在线填写)
  suggest|Integer|是否推荐（0否1是）
  fillSum|Integer|填写次数
  createTime|Date|创建时间   createTime|Date|创建时间
  createUserId|Long|创建用户   createUserId|Long|创建用户
  updateUserId|Long|更新用户   updateUserId|Long|更新用户
  updateTime|Date|修改时间   updateTime|Date|修改时间
  matterDatumFileList|array|材料附件明细
dict|object|字典对象 dict|object|字典对象
**响应消息样例:** **响应消息样例:**
...@@ -3126,7 +3146,12 @@ data|object|数据对象 ...@@ -3126,7 +3146,12 @@ data|object|数据对象
 datumId|Long|材料id  datumId|Long|材料id
 shortName|String|材料简称  shortName|String|材料简称
 fullName|String|材料全称  fullName|String|材料全称
 needType|Integer|是否必要0不选1必要2非必要
 datumType|Integer|材料形式0不选1纸质2电子3纸质-电子
 needOriginal|Integer|提交原件0不需要1需要
 uselType|Integer|使用方式（1.拍照上传，2.在线填写)  uselType|Integer|使用方式（1.拍照上传，2.在线填写)
 suggest|Integer|是否推荐（0否1是）
 fillSum|Integer|填写次数
 createTime|Date|创建时间  createTime|Date|创建时间
 createUserId|Long|创建用户  createUserId|Long|创建用户
 updateUserId|Long|更新用户  updateUserId|Long|更新用户
...@@ -3138,17 +3163,22 @@ dict|object|字典对象 ...@@ -3138,17 +3163,22 @@ dict|object|字典对象
{ {
"code": 1, "code": 1,
"data": { "data": {
"id":2780, "id":3175,
"siteId":2461, "siteId":4889,
"siteName":"iys7a9", "siteName":"la20m6",
"datumId":8699, "datumId":3050,
"shortName":"8aspjs", "shortName":"7nxqs1",
"fullName":"ad2itr", "fullName":"jf6dd5",
"uselType":2923, "needType":5350,
"createTime":"2023-04-10", "datumType":6343,
"createUserId":8167, "needOriginal":1434,
"updateUserId":4070, "uselType":3073,
"updateTime":"2023-04-10" "suggest":9561,
"fillSum":9766,
"createTime":"2023-04-11",
"createUserId":4333,
"updateUserId":6241,
"updateTime":"2023-04-11"
} }
} }
``` ```
...@@ -3171,18 +3201,28 @@ siteId|Long|否|站点id ...@@ -3171,18 +3201,28 @@ siteId|Long|否|站点id
siteName|String|否|站点名称 siteName|String|否|站点名称
datumId|Long|否|材料id datumId|Long|否|材料id
shortName|String|否|材料简称 shortName|String|否|材料简称
fullName|String|是|材料全称 fullName|String|否|材料全称
uselType|Integer|是|使用方式（1.拍照上传，2.在线填写) needType|Integer|否|是否必要0不选1必要2非必要
datumType|Integer|否|材料形式0不选1纸质2电子3纸质-电子
needOriginal|Integer|否|提交原件0不需要1需要
uselType|Integer|否|使用方式（1.拍照上传，2.在线填写)
suggest|Integer|否|是否推荐（0否1是）
fillSum|Integer|否|填写次数
**请求样例:** **请求样例:**
``` ```
{ {
"siteId":3119, "siteId":1506,
"siteName":"m53o8n", "siteName":"gplmnp",
"datumId":7452, "datumId":8509,
"shortName":"o5154r", "shortName":"ygzkkw",
"fullName":"ydj15s", "fullName":"kof081",
"uselType":3292, "needType":7773,
"datumType":3055,
"needOriginal":5030,
"uselType":729,
"suggest":2092,
"fillSum":3435,
} }
``` ```
...@@ -3201,7 +3241,12 @@ data|object|数据对象 ...@@ -3201,7 +3241,12 @@ data|object|数据对象
  datumId|Long|材料id   datumId|Long|材料id
  shortName|String|材料简称   shortName|String|材料简称
  fullName|String|材料全称   fullName|String|材料全称
  needType|Integer|是否必要0不选1必要2非必要
  datumType|Integer|材料形式0不选1纸质2电子3纸质-电子
  needOriginal|Integer|提交原件0不需要1需要
  uselType|Integer|使用方式（1.拍照上传，2.在线填写)   uselType|Integer|使用方式（1.拍照上传，2.在线填写)
  suggest|Integer|是否推荐（0否1是）
  fillSum|Integer|填写次数
  createTime|Date|创建时间   createTime|Date|创建时间
  createUserId|Long|创建用户   createUserId|Long|创建用户
  updateUserId|Long|更新用户   updateUserId|Long|更新用户
...@@ -3299,30 +3344,22 @@ data|object|数据对象 ...@@ -3299,30 +3344,22 @@ data|object|数据对象
  matterName|String|事项名称   matterName|String|事项名称
  matterCode|String|事项编码   matterCode|String|事项编码
  applyCode|String|申报编号   applyCode|String|申报编号
  applyAddr|String|申报地址名称   applyAddr|String|申报地址
  deviceName|String|申报设备名称   deviceName|String|申报设备名称
  applyPerson|String|申请人姓名   applyPerson|String|申请人姓名
  phoneNum|String|联系电话
  idCard|String|证件号码
  deptName|String|事项所属部门
  applyDate|Date|申报时间
  status|Integer|受理状态0未受理1已受理
  applyWay|String|申报方式
  storeDevice|String|存储设备
  boxNum|String|箱体编号
  storeDate|Date|存件时间
  createUserId|Long|创建用户   createUserId|Long|创建用户
  createTime|Date|创建时间   createTime|Date|创建时间
  updateUserId|Long|更新用户   updateUserId|Long|更新用户
  updateTime|Date|更新时间   updateTime|Date|更新时间
  userMatterDetails|array|材料明细
   id|Long|序号，主键，自增长
   applyrId|Long|用户申报id
   datumId|Long|材料id
   matterId|Long|事项id
   matterCode|String|事项编码
   shortName|String|材料简称
   fullName|String|材料全称
   fileName|String|附件名称
   previewUrl|String|文件预览地址
   formContent|String|填单表单内容
   formTemplate|String|填单表单模板
   templateUrl|String|模板文件地址
   createUserId|Long|创建用户
   createTime|Date|创建时间
   updateUserId|Long|更新用户
   updateTime|Date|更新时间
dict|object|字典对象 dict|object|字典对象
**响应消息样例:** **响应消息样例:**
...@@ -3367,9 +3404,18 @@ data|object|数据对象 ...@@ -3367,9 +3404,18 @@ data|object|数据对象
 matterName|String|事项名称  matterName|String|事项名称
 matterCode|String|事项编码  matterCode|String|事项编码
 applyCode|String|申报编号  applyCode|String|申报编号
 applyAddr|String|申报地址名称  applyAddr|String|申报地址
 deviceName|String|申报设备名称  deviceName|String|申报设备名称
 applyPerson|String|申请人姓名  applyPerson|String|申请人姓名
 phoneNum|String|联系电话
 idCard|String|证件号码
 deptName|String|事项所属部门
 applyDate|Date|申报时间
 status|Integer|受理状态0未受理1已受理
 applyWay|String|申报方式
 storeDevice|String|存储设备
 boxNum|String|箱体编号
 storeDate|Date|存件时间
 createUserId|Long|创建用户  createUserId|Long|创建用户
 createTime|Date|创建时间  createTime|Date|创建时间
 updateUserId|Long|更新用户  updateUserId|Long|更新用户
...@@ -3381,19 +3427,28 @@ dict|object|字典对象 ...@@ -3381,19 +3427,28 @@ dict|object|字典对象
{ {
"code": 1, "code": 1,
"data": { "data": {
"id":9711, "id":2263,
"userId":1053, "userId":7687,
"matterId":2056, "matterId":7114,
"matterName":"plj9h8", "matterName":"58mipp",
"matterCode":"x3et1b", "matterCode":"gmw6ka",
"applyCode":"a84mrv", "applyCode":"wkhsr5",
"applyAddr":"f070se", "applyAddr":"d30l1s",
"deviceName":"hppzfz", "deviceName":"perpkm",
"applyPerson":"9gl58o", "applyPerson":"dzkj24",
"createUserId":6995, "phoneNum":"zi2nls",
"createTime":"2023-04-10", "idCard":"x2pyzz",
"updateUserId":6534, "deptName":"65i4x0",
"updateTime":"2023-04-10" "applyDate":"2023-04-11",
"status":4792,
"applyWay":"8npkh9",
"storeDevice":"zfspfm",
"boxNum":"9ix0no",
"storeDate":"2023-04-11",
"createUserId":3118,
"createTime":"2023-04-11",
"updateUserId":9581,
"updateTime":"2023-04-11"
} }
} }
``` ```
...@@ -3417,21 +3472,39 @@ matterId|Long|否|事项ID ...@@ -3417,21 +3472,39 @@ matterId|Long|否|事项ID
matterName|String|否|事项名称 matterName|String|否|事项名称
matterCode|String|否|事项编码 matterCode|String|否|事项编码
applyCode|String|否|申报编号 applyCode|String|否|申报编号
applyAddr|String|否|申报地址名称 applyAddr|String|否|申报地址
deviceName|String|否|申报设备名称 deviceName|String|否|申报设备名称
applyPerson|String|否|申请人姓名 applyPerson|String|否|申请人姓名
phoneNum|String|否|联系电话
idCard|String|否|证件号码
deptName|String|否|事项所属部门
applyDate|Date|否|申报时间
status|Integer|否|受理状态0未受理1已受理
applyWay|String|否|申报方式
storeDevice|String|否|存储设备
boxNum|String|否|箱体编号
storeDate|Date|否|存件时间
**请求样例:** **请求样例:**
``` ```
{ {
"userId":7930, "userId":6803,
"matterId":7302, "matterId":6080,
"matterName":"osr8cl", "matterName":"gebqic",
"matterCode":"l1rwz5", "matterCode":"yhusso",
"applyCode":"6olyr8", "applyCode":"qntfvq",
"applyAddr":"tl22h7", "applyAddr":"hnnbjs",
"deviceName":"ujyn3i", "deviceName":"qec3o8",
"applyPerson":"fqs7mh", "applyPerson":"p2xs4h",
"phoneNum":"kzjbyb",
"idCard":"c13rjj",
"deptName":"7m9ftr",
"applyDate":"2023-04-11",
"status":1,
"applyWay":"sh8gbj",
"storeDevice":"07tytx",
"boxNum":"b8ns8a",
"storeDate":"2023-04-11",
} }
``` ```
...@@ -3450,9 +3523,18 @@ data|object|数据对象 ...@@ -3450,9 +3523,18 @@ data|object|数据对象
  matterName|String|事项名称   matterName|String|事项名称
  matterCode|String|事项编码   matterCode|String|事项编码
  applyCode|String|申报编号   applyCode|String|申报编号
  applyAddr|String|申报地址名称   applyAddr|String|申报地址
  deviceName|String|申报设备名称   deviceName|String|申报设备名称
  applyPerson|String|申请人姓名   applyPerson|String|申请人姓名
  phoneNum|String|联系电话
  idCard|String|证件号码
  deptName|String|事项所属部门
  applyDate|Date|申报时间
  status|Integer|受理状态0未受理1已受理
  applyWay|String|申报方式
  storeDevice|String|存储设备
  boxNum|String|箱体编号
  storeDate|Date|存件时间
  createUserId|Long|创建用户   createUserId|Long|创建用户
  createTime|Date|创建时间   createTime|Date|创建时间
  updateUserId|Long|更新用户   updateUserId|Long|更新用户
...@@ -3620,22 +3702,22 @@ dict|object|字典对象 ...@@ -3620,22 +3702,22 @@ dict|object|字典对象
{ {
"code": 1, "code": 1,
"data": { "data": {
"id":901, "id":714,
"applyrId":1472, "applyrId":2741,
"datumId":9256, "datumId":1350,
"matterId":2739, "matterId":3178,
"matterCode":"nyf3zn", "matterCode":"1q6bwq",
"shortName":"gke6ol", "shortName":"v5nf8d",
"fullName":"64yi4t", "fullName":"5u2x2w",
"fileName":"lt2ab4", "fileName":"quorc5",
"previewUrl":"qu6vkq", "previewUrl":"q86nvt",
"formContent":"yokglr", "formContent":"mwlk21",
"formTemplate":"9fe4at", "formTemplate":"4b561b",
"templateUrl":"d7jfoa", "templateUrl":"z25ve9",
"createUserId":22, "createUserId":4948,
"createTime":"2023-04-10", "createTime":"2023-04-11",
"updateUserId":6697, "updateUserId":2095,
"updateTime":"2023-04-10" "updateTime":"2023-04-11"
} }
} }
``` ```
...@@ -3655,7 +3737,7 @@ dict|object|字典对象 ...@@ -3655,7 +3737,7 @@ dict|object|字典对象
参数名称|类型|必填|描述 参数名称|类型|必填|描述
:---|:---|:---|:------- :---|:---|:---|:-------
applyrId|Long|是|用户申报id applyrId|Long|是|用户申报id
datumId|Long|是|材料id datumId|Long|否|材料id
matterId|Long|否|事项id matterId|Long|否|事项id
matterCode|String|否|事项编码 matterCode|String|否|事项编码
shortName|String|否|材料简称 shortName|String|否|材料简称
...@@ -3669,17 +3751,17 @@ templateUrl|String|否|模板文件地址 ...@@ -3669,17 +3751,17 @@ templateUrl|String|否|模板文件地址
**请求样例:** **请求样例:**
``` ```
{ {
"applyrId":4974, "applyrId":5027,
"datumId":2773, "datumId":3055,
"matterId":5635, "matterId":2757,
"matterCode":"1j4jg8", "matterCode":"hvk5nf",
"shortName":"po7yzh", "shortName":"ij5s3p",
"fullName":"9fb1yu", "fullName":"iquqkv",
"fileName":"50qoaz", "fileName":"39kd3v",
"previewUrl":"gb1nai", "previewUrl":"ch8d31",
"formContent":"wxall2", "formContent":"zmxd2a",
"formTemplate":"9rusbh", "formTemplate":"h9fj6l",
"templateUrl":"rc6nqn", "templateUrl":"wskxj8",
} }
``` ```
...@@ -3754,6 +3836,221 @@ msg|String|消息|- ...@@ -3754,6 +3836,221 @@ msg|String|消息|-
"msg":"成功" "msg":"成功"
} }
```
## 用户申报事项审批
### 查询用户申报事项审批列表
**请求URL:** user/matter/examine/list
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 查询用户申报事项审批
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
page|Integer|否|当前页
size|Integer|否|每页条数，值为-1，查询所有记录
**请求样例:**
```
{
"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|序号，主键，自增长
  applyrId|Long|用户申报id
  acceptPerson|String|受理人员
  acceptResult|Integer|受理结果1通过2拒绝
  acceptOpinion|String|受理意见
  acceptDate|Date|受理时间
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
dict|object|字典对象
**响应消息样例:**
```
{
"code":1,
"data":{
}
}
```
### 查看用户申报事项审批
**请求URL:** user/matter/examine/info
**请求方式:** GET
**内容类型:** application/json;charset=utf-8
**简要描述:** 查看用户申报事项审批，返回实例详细信息
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
id|Long|是|ID
**请求样例:**
```
http://localhost/user/matter/examine/info?id=549
```
**响应参数:**
参数名称 |参数类型|描述
:---|:---|:-------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|序号，主键，自增长
 applyrId|Long|用户申报id
 acceptPerson|String|受理人员
 acceptResult|Integer|受理结果1通过2拒绝
 acceptOpinion|String|受理意见
 acceptDate|Date|受理时间
 createUserId|Long|创建用户
 createTime|Date|创建时间
 updateUserId|Long|更新用户
 updateTime|Date|更新时间
dict|object|字典对象
**响应消息样例:**
```
{
"code": 1,
"data": {
"id":2937,
"applyrId":3567,
"acceptPerson":"9ymdvj",
"acceptResult":3388,
"acceptOpinion":"zv0som",
"acceptDate":"2023-04-11",
"createUserId":4068,
"createTime":"2023-04-11",
"updateUserId":8642,
"updateTime":"2023-04-11"
}
}
```
### 保存更新用户申报事项审批
**请求URL:** user/matter/examine/save
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 保存或更新用户申报事项审批：id为空时为新增保存，否则为更新提交
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:-------
applyrId|Long|是|用户申报id
acceptPerson|String|否|受理人员
acceptResult|Integer|否|受理结果1通过2拒绝
acceptOpinion|String|否|受理意见
acceptDate|Date|否|受理时间
**请求样例:**
```
{
"applyrId":8057,
"acceptPerson":"n5f2mq",
"acceptResult":4657,
"acceptOpinion":"l4k3r6",
"acceptDate":"2023-04-11",
}
```
**响应参数:**
参数名称 |参数类型|描述
:---|:---|:------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
  id|Long|序号，主键，自增长
  applyrId|Long|用户申报id
  acceptPerson|String|受理人员
  acceptResult|Integer|受理结果1通过2拒绝
  acceptOpinion|String|受理意见
  acceptDate|Date|受理时间
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
**响应消息样例:**
```
{
"msg":"新增模块成功",
"code":1,
"data":{}
}
}
```
### 删除用户申报事项审批
**请求URL:** user/matter/examine/delete
**请求方式:** GET
**内容类型:** application/json;charset=utf-8
**简要描述:** 删除用户申报事项审批
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
id|String|是|数组
**请求样例:**
```
http://localhost:8080/user/matter/examine/delete?id=1&id=2'
```
**响应参数:**
参数名称 |参数类型|备注|其它
---|---|---|---
code|Integer|结果码（-1.失败，1.成功）|-
msg|String|消息|-
**响应消息样例:**
```
{
"code":1,
"msg":"成功"
}
``` ```
## 后台管理接口 ## 后台管理接口
...@@ -4269,6 +4566,9 @@ matterCode|String|否|事项编码 ...@@ -4269,6 +4566,9 @@ matterCode|String|否|事项编码
shortName|String|否|材料简称 shortName|String|否|材料简称
fullName|String|是|材料全称 fullName|String|是|材料全称
uselType|Integer|是|使用方式（1.拍照上传，2.在线填写) uselType|Integer|是|使用方式（1.拍照上传，2.在线填写)
needType|Integer|否|是否必要0不选1必要2非必要
datumType|Integer|否|材料形式0不选1纸质2电子3纸质-电子
needOriginal|Integer|否|提交原件0不需要1需要
matterDatumFileList|array|是|材料附件 matterDatumFileList|array|是|材料附件
 fileName|String|附件名称  fileName|String|附件名称
 templatePath|String|模板地址  templatePath|String|模板地址
...@@ -4284,6 +4584,9 @@ matterDatumFileList|array|是|材料附件 ...@@ -4284,6 +4584,9 @@ matterDatumFileList|array|是|材料附件
"matterCode":"511Z75017001-511500000000-000-11511200731635085N-1-00", "matterCode":"511Z75017001-511500000000-000-11511200731635085N-1-00",
"shortName":"测试材料2", "shortName":"测试材料2",
"fullName":"测试材料2", "fullName":"测试材料2",
"needType":1,
"datumType":1,
"needOriginal":1,
"uselType":2, "uselType":2,
"matterDatumFileList":[ "matterDatumFileList":[
{ {
...@@ -4349,8 +4652,15 @@ matterId|Long|否|事项ID ...@@ -4349,8 +4652,15 @@ matterId|Long|否|事项ID
applyAddr|String|否|申报地址名称 applyAddr|String|否|申报地址名称
deviceName|String|否|申报设备名称 deviceName|String|否|申报设备名称
applyPerson|String|否|申请人姓名 applyPerson|String|否|申请人姓名
phoneNum|String|否|联系电话
idCard|String|否|证件号码
applyWay|String|否|申报方式
storeDevice|String|否|存储设备
boxNum|String|否|箱体编号
userMatterDetails|array|是|材料明细 userMatterDetails|array|是|材料明细
 datumId|Long|附件材料ID  datumId|Long|附件材料ID
 previewUrl|String|文件地址
 formContent|String|填单表单内容
**请求样例:** **请求样例:**
...@@ -4361,9 +4671,16 @@ userMatterDetails|array|是|材料明细 ...@@ -4361,9 +4671,16 @@ userMatterDetails|array|是|材料明细
"applyAddr":"宜宾市民中心", "applyAddr":"宜宾市民中心",
"deviceName":"一楼自助服务终端", "deviceName":"一楼自助服务终端",
"applyPerson":"刘德华", "applyPerson":"刘德华",
"phoneNum":"13880214439",
"idCard":"511112198203090711",
"applyWay":"自助服务终端申报",
"storeDevice":"一楼自助存储柜",
"boxNum":"06",
"userMatterDetails":[ "userMatterDetails":[
{ {
"datumId":2 "datumId":2,
"previewUrl":"q86nvt",
"formContent":"mwlk21"
} }
] ]
} }
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/dao/UserMatterExamineDao.java 0 → 100644
View file @ a54ce107
package com.mortals.xhx.module.matter.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.matter.model.UserMatterExamineEntity;
import java.util.List;
/**
* 用户申报事项审批Dao
* 用户申报事项审批 DAO接口
*
* @author zxfei
* @date 2023-04-11
*/
public interface UserMatterExamineDao extends ICRUDDao<UserMatterExamineEntity,Long>{
}
sst-manager/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/UserMatterExamineDaoImpl.java 0 → 100644
View file @ a54ce107
package com.mortals.xhx.module.matter.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.matter.dao.UserMatterExamineDao;
import com.mortals.xhx.module.matter.model.UserMatterExamineEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 用户申报事项审批DaoImpl DAO接口
*
* @author zxfei
* @date 2023-04-11
*/
@Repository("userMatterExamineDao")
public class UserMatterExamineDaoImpl extends BaseCRUDDaoMybatis<UserMatterExamineEntity,Long> implements UserMatterExamineDao {
}
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/DatumLibraryEntity.java
View file @ a54ce107
...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.DatumLibraryVo; ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.DatumLibraryVo;
* 站点材料公共库实体对象 * 站点材料公共库实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-10 * @date 2023-04-11
*/ */
public class DatumLibraryEntity extends DatumLibraryVo { public class DatumLibraryEntity extends DatumLibraryVo {
...@@ -36,10 +36,30 @@ public class DatumLibraryEntity extends DatumLibraryVo { ...@@ -36,10 +36,30 @@ public class DatumLibraryEntity extends DatumLibraryVo {
* 材料全称 * 材料全称
*/ */
private String fullName; private String fullName;
/**
* 是否必要0不选1必要2非必要
*/
private Integer needType;
/**
* 材料形式0不选1纸质2电子3纸质-电子
*/
private Integer datumType;
/**
* 提交原件0不需要1需要
*/
private Integer needOriginal;
/** /**
* 使用方式（1.拍照上传，2.在线填写) * 使用方式（1.拍照上传，2.在线填写)
*/ */
private Integer uselType; private Integer uselType;
/**
* 是否推荐（0否1是）
*/
private Integer suggest;
/**
* 填写次数
*/
private Integer fillSum;
...@@ -114,6 +134,48 @@ public class DatumLibraryEntity extends DatumLibraryVo { ...@@ -114,6 +134,48 @@ public class DatumLibraryEntity extends DatumLibraryVo {
public void setFullName(String fullName){ public void setFullName(String fullName){
this.fullName = fullName; this.fullName = fullName;
} }
/**
* 获取 是否必要0不选1必要2非必要
* @return Integer
*/
public Integer getNeedType(){
return needType;
}
/**
* 设置 是否必要0不选1必要2非必要
* @param needType
*/
public void setNeedType(Integer needType){
this.needType = needType;
}
/**
* 获取 材料形式0不选1纸质2电子3纸质-电子
* @return Integer
*/
public Integer getDatumType(){
return datumType;
}
/**
* 设置 材料形式0不选1纸质2电子3纸质-电子
* @param datumType
*/
public void setDatumType(Integer datumType){
this.datumType = datumType;
}
/**
* 获取 提交原件0不需要1需要
* @return Integer
*/
public Integer getNeedOriginal(){
return needOriginal;
}
/**
* 设置 提交原件0不需要1需要
* @param needOriginal
*/
public void setNeedOriginal(Integer needOriginal){
this.needOriginal = needOriginal;
}
/** /**
* 获取 使用方式（1.拍照上传，2.在线填写) * 获取 使用方式（1.拍照上传，2.在线填写)
* @return Integer * @return Integer
...@@ -128,6 +190,34 @@ public class DatumLibraryEntity extends DatumLibraryVo { ...@@ -128,6 +190,34 @@ public class DatumLibraryEntity extends DatumLibraryVo {
public void setUselType(Integer uselType){ public void setUselType(Integer uselType){
this.uselType = uselType; this.uselType = uselType;
} }
/**
* 获取 是否推荐（0否1是）
* @return Integer
*/
public Integer getSuggest(){
return suggest;
}
/**
* 设置 是否推荐（0否1是）
* @param suggest
*/
public void setSuggest(Integer suggest){
this.suggest = suggest;
}
/**
* 获取 填写次数
* @return Integer
*/
public Integer getFillSum(){
return fillSum;
}
/**
* 设置 填写次数
* @param fillSum
*/
public void setFillSum(Integer fillSum){
this.fillSum = fillSum;
}
...@@ -155,7 +245,12 @@ public class DatumLibraryEntity extends DatumLibraryVo { ...@@ -155,7 +245,12 @@ public class DatumLibraryEntity extends DatumLibraryVo {
sb.append(",datumId:").append(getDatumId()); sb.append(",datumId:").append(getDatumId());
sb.append(",shortName:").append(getShortName()); sb.append(",shortName:").append(getShortName());
sb.append(",fullName:").append(getFullName()); sb.append(",fullName:").append(getFullName());
sb.append(",needType:").append(getNeedType());
sb.append(",datumType:").append(getDatumType());
sb.append(",needOriginal:").append(getNeedOriginal());
sb.append(",uselType:").append(getUselType()); sb.append(",uselType:").append(getUselType());
sb.append(",suggest:").append(getSuggest());
sb.append(",fillSum:").append(getFillSum());
return sb.toString(); return sb.toString();
} }
...@@ -171,6 +266,16 @@ public class DatumLibraryEntity extends DatumLibraryVo { ...@@ -171,6 +266,16 @@ public class DatumLibraryEntity extends DatumLibraryVo {
this.fullName = ""; this.fullName = "";
this.needType = 0;
this.datumType = 0;
this.needOriginal = 0;
this.uselType = 1; this.uselType = 1;
this.suggest = 0;
this.fillSum = 1;
} }
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/DatumLibraryQuery.java
View file @ a54ce107
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.DatumLibraryEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.DatumLibraryEntity;
* 站点材料公共库查询对象 * 站点材料公共库查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-10 * @date 2023-04-11
*/ */
public class DatumLibraryQuery extends DatumLibraryEntity { public class DatumLibraryQuery extends DatumLibraryEntity {
/** 开始 主键，自增长 */ /** 开始 主键，自增长 */
...@@ -69,6 +69,51 @@ public class DatumLibraryQuery extends DatumLibraryEntity { ...@@ -69,6 +69,51 @@ public class DatumLibraryQuery extends DatumLibraryEntity {
/** 材料全称排除列表 */ /** 材料全称排除列表 */
private List <String> fullNameNotList; private List <String> fullNameNotList;
/** 开始 是否必要0不选1必要2非必要 */
private Integer needTypeStart;
/** 结束 是否必要0不选1必要2非必要 */
private Integer needTypeEnd;
/** 增加 是否必要0不选1必要2非必要 */
private Integer needTypeIncrement;
/** 是否必要0不选1必要2非必要列表 */
private List <Integer> needTypeList;
/** 是否必要0不选1必要2非必要排除列表 */
private List <Integer> needTypeNotList;
/** 开始 材料形式0不选1纸质2电子3纸质-电子 */
private Integer datumTypeStart;
/** 结束 材料形式0不选1纸质2电子3纸质-电子 */
private Integer datumTypeEnd;
/** 增加 材料形式0不选1纸质2电子3纸质-电子 */
private Integer datumTypeIncrement;
/** 材料形式0不选1纸质2电子3纸质-电子列表 */
private List <Integer> datumTypeList;
/** 材料形式0不选1纸质2电子3纸质-电子排除列表 */
private List <Integer> datumTypeNotList;
/** 开始 提交原件0不需要1需要 */
private Integer needOriginalStart;
/** 结束 提交原件0不需要1需要 */
private Integer needOriginalEnd;
/** 增加 提交原件0不需要1需要 */
private Integer needOriginalIncrement;
/** 提交原件0不需要1需要列表 */
private List <Integer> needOriginalList;
/** 提交原件0不需要1需要排除列表 */
private List <Integer> needOriginalNotList;
/** 开始 使用方式（1.拍照上传，2.在线填写) */ /** 开始 使用方式（1.拍照上传，2.在线填写) */
private Integer uselTypeStart; private Integer uselTypeStart;
...@@ -84,6 +129,36 @@ public class DatumLibraryQuery extends DatumLibraryEntity { ...@@ -84,6 +129,36 @@ public class DatumLibraryQuery extends DatumLibraryEntity {
/** 使用方式（1.拍照上传，2.在线填写)排除列表 */ /** 使用方式（1.拍照上传，2.在线填写)排除列表 */
private List <Integer> uselTypeNotList; private List <Integer> uselTypeNotList;
/** 开始 是否推荐（0否1是） */
private Integer suggestStart;
/** 结束 是否推荐（0否1是） */
private Integer suggestEnd;
/** 增加 是否推荐（0否1是） */
private Integer suggestIncrement;
/** 是否推荐（0否1是）列表 */
private List <Integer> suggestList;
/** 是否推荐（0否1是）排除列表 */
private List <Integer> suggestNotList;
/** 开始 填写次数 */
private Integer fillSumStart;
/** 结束 填写次数 */
private Integer fillSumEnd;
/** 增加 填写次数 */
private Integer fillSumIncrement;
/** 填写次数列表 */
private List <Integer> fillSumList;
/** 填写次数排除列表 */
private List <Integer> fillSumNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -473,6 +548,249 @@ public class DatumLibraryQuery extends DatumLibraryEntity { ...@@ -473,6 +548,249 @@ public class DatumLibraryQuery extends DatumLibraryEntity {
this.fullNameNotList = fullNameNotList; this.fullNameNotList = fullNameNotList;
} }
/**
* 获取 开始 是否必要0不选1必要2非必要
* @return needTypeStart
*/
public Integer getNeedTypeStart(){
return this.needTypeStart;
}
/**
* 设置 开始 是否必要0不选1必要2非必要
* @param needTypeStart
*/
public void setNeedTypeStart(Integer needTypeStart){
this.needTypeStart = needTypeStart;
}
/**
* 获取 结束 是否必要0不选1必要2非必要
* @return $needTypeEnd
*/
public Integer getNeedTypeEnd(){
return this.needTypeEnd;
}
/**
* 设置 结束 是否必要0不选1必要2非必要
* @param needTypeEnd
*/
public void setNeedTypeEnd(Integer needTypeEnd){
this.needTypeEnd = needTypeEnd;
}
/**
* 获取 增加 是否必要0不选1必要2非必要
* @return needTypeIncrement
*/
public Integer getNeedTypeIncrement(){
return this.needTypeIncrement;
}
/**
* 设置 增加 是否必要0不选1必要2非必要
* @param needTypeIncrement
*/
public void setNeedTypeIncrement(Integer needTypeIncrement){
this.needTypeIncrement = needTypeIncrement;
}
/**
* 获取 是否必要0不选1必要2非必要
* @return needTypeList
*/
public List<Integer> getNeedTypeList(){
return this.needTypeList;
}
/**
* 设置 是否必要0不选1必要2非必要
* @param needTypeList
*/
public void setNeedTypeList(List<Integer> needTypeList){
this.needTypeList = needTypeList;
}
/**
* 获取 是否必要0不选1必要2非必要
* @return needTypeNotList
*/
public List<Integer> getNeedTypeNotList(){
return this.needTypeNotList;
}
/**
* 设置 是否必要0不选1必要2非必要
* @param needTypeNotList
*/
public void setNeedTypeNotList(List<Integer> needTypeNotList){
this.needTypeNotList = needTypeNotList;
}
/**
* 获取 开始 材料形式0不选1纸质2电子3纸质-电子
* @return datumTypeStart
*/
public Integer getDatumTypeStart(){
return this.datumTypeStart;
}
/**
* 设置 开始 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeStart
*/
public void setDatumTypeStart(Integer datumTypeStart){
this.datumTypeStart = datumTypeStart;
}
/**
* 获取 结束 材料形式0不选1纸质2电子3纸质-电子
* @return $datumTypeEnd
*/
public Integer getDatumTypeEnd(){
return this.datumTypeEnd;
}
/**
* 设置 结束 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeEnd
*/
public void setDatumTypeEnd(Integer datumTypeEnd){
this.datumTypeEnd = datumTypeEnd;
}
/**
* 获取 增加 材料形式0不选1纸质2电子3纸质-电子
* @return datumTypeIncrement
*/
public Integer getDatumTypeIncrement(){
return this.datumTypeIncrement;
}
/**
* 设置 增加 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeIncrement
*/
public void setDatumTypeIncrement(Integer datumTypeIncrement){
this.datumTypeIncrement = datumTypeIncrement;
}
/**
* 获取 材料形式0不选1纸质2电子3纸质-电子
* @return datumTypeList
*/
public List<Integer> getDatumTypeList(){
return this.datumTypeList;
}
/**
* 设置 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeList
*/
public void setDatumTypeList(List<Integer> datumTypeList){
this.datumTypeList = datumTypeList;
}
/**
* 获取 材料形式0不选1纸质2电子3纸质-电子
* @return datumTypeNotList
*/
public List<Integer> getDatumTypeNotList(){
return this.datumTypeNotList;
}
/**
* 设置 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeNotList
*/
public void setDatumTypeNotList(List<Integer> datumTypeNotList){
this.datumTypeNotList = datumTypeNotList;
}
/**
* 获取 开始 提交原件0不需要1需要
* @return needOriginalStart
*/
public Integer getNeedOriginalStart(){
return this.needOriginalStart;
}
/**
* 设置 开始 提交原件0不需要1需要
* @param needOriginalStart
*/
public void setNeedOriginalStart(Integer needOriginalStart){
this.needOriginalStart = needOriginalStart;
}
/**
* 获取 结束 提交原件0不需要1需要
* @return $needOriginalEnd
*/
public Integer getNeedOriginalEnd(){
return this.needOriginalEnd;
}
/**
* 设置 结束 提交原件0不需要1需要
* @param needOriginalEnd
*/
public void setNeedOriginalEnd(Integer needOriginalEnd){
this.needOriginalEnd = needOriginalEnd;
}
/**
* 获取 增加 提交原件0不需要1需要
* @return needOriginalIncrement
*/
public Integer getNeedOriginalIncrement(){
return this.needOriginalIncrement;
}
/**
* 设置 增加 提交原件0不需要1需要
* @param needOriginalIncrement
*/
public void setNeedOriginalIncrement(Integer needOriginalIncrement){
this.needOriginalIncrement = needOriginalIncrement;
}
/**
* 获取 提交原件0不需要1需要
* @return needOriginalList
*/
public List<Integer> getNeedOriginalList(){
return this.needOriginalList;
}
/**
* 设置 提交原件0不需要1需要
* @param needOriginalList
*/
public void setNeedOriginalList(List<Integer> needOriginalList){
this.needOriginalList = needOriginalList;
}
/**
* 获取 提交原件0不需要1需要
* @return needOriginalNotList
*/
public List<Integer> getNeedOriginalNotList(){
return this.needOriginalNotList;
}
/**
* 设置 提交原件0不需要1需要
* @param needOriginalNotList
*/
public void setNeedOriginalNotList(List<Integer> needOriginalNotList){
this.needOriginalNotList = needOriginalNotList;
}
/** /**
* 获取 开始 使用方式（1.拍照上传，2.在线填写) * 获取 开始 使用方式（1.拍照上传，2.在线填写)
* @return uselTypeStart * @return uselTypeStart
...@@ -554,6 +872,168 @@ public class DatumLibraryQuery extends DatumLibraryEntity { ...@@ -554,6 +872,168 @@ public class DatumLibraryQuery extends DatumLibraryEntity {
} }
/**
* 获取 开始 是否推荐（0否1是）
* @return suggestStart
*/
public Integer getSuggestStart(){
return this.suggestStart;
}
/**
* 设置 开始 是否推荐（0否1是）
* @param suggestStart
*/
public void setSuggestStart(Integer suggestStart){
this.suggestStart = suggestStart;
}
/**
* 获取 结束 是否推荐（0否1是）
* @return $suggestEnd
*/
public Integer getSuggestEnd(){
return this.suggestEnd;
}
/**
* 设置 结束 是否推荐（0否1是）
* @param suggestEnd
*/
public void setSuggestEnd(Integer suggestEnd){
this.suggestEnd = suggestEnd;
}
/**
* 获取 增加 是否推荐（0否1是）
* @return suggestIncrement
*/
public Integer getSuggestIncrement(){
return this.suggestIncrement;
}
/**
* 设置 增加 是否推荐（0否1是）
* @param suggestIncrement
*/
public void setSuggestIncrement(Integer suggestIncrement){
this.suggestIncrement = suggestIncrement;
}
/**
* 获取 是否推荐（0否1是）
* @return suggestList
*/
public List<Integer> getSuggestList(){
return this.suggestList;
}
/**
* 设置 是否推荐（0否1是）
* @param suggestList
*/
public void setSuggestList(List<Integer> suggestList){
this.suggestList = suggestList;
}
/**
* 获取 是否推荐（0否1是）
* @return suggestNotList
*/
public List<Integer> getSuggestNotList(){
return this.suggestNotList;
}
/**
* 设置 是否推荐（0否1是）
* @param suggestNotList
*/
public void setSuggestNotList(List<Integer> suggestNotList){
this.suggestNotList = suggestNotList;
}
/**
* 获取 开始 填写次数
* @return fillSumStart
*/
public Integer getFillSumStart(){
return this.fillSumStart;
}
/**
* 设置 开始 填写次数
* @param fillSumStart
*/
public void setFillSumStart(Integer fillSumStart){
this.fillSumStart = fillSumStart;
}
/**
* 获取 结束 填写次数
* @return $fillSumEnd
*/
public Integer getFillSumEnd(){
return this.fillSumEnd;
}
/**
* 设置 结束 填写次数
* @param fillSumEnd
*/
public void setFillSumEnd(Integer fillSumEnd){
this.fillSumEnd = fillSumEnd;
}
/**
* 获取 增加 填写次数
* @return fillSumIncrement
*/
public Integer getFillSumIncrement(){
return this.fillSumIncrement;
}
/**
* 设置 增加 填写次数
* @param fillSumIncrement
*/
public void setFillSumIncrement(Integer fillSumIncrement){
this.fillSumIncrement = fillSumIncrement;
}
/**
* 获取 填写次数
* @return fillSumList
*/
public List<Integer> getFillSumList(){
return this.fillSumList;
}
/**
* 设置 填写次数
* @param fillSumList
*/
public void setFillSumList(List<Integer> fillSumList){
this.fillSumList = fillSumList;
}
/**
* 获取 填写次数
* @return fillSumNotList
*/
public List<Integer> getFillSumNotList(){
return this.fillSumNotList;
}
/**
* 设置 填写次数
* @param fillSumNotList
*/
public void setFillSumNotList(List<Integer> fillSumNotList){
this.fillSumNotList = fillSumNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -999,6 +1479,168 @@ public class DatumLibraryQuery extends DatumLibraryEntity { ...@@ -999,6 +1479,168 @@ public class DatumLibraryQuery extends DatumLibraryEntity {
return this; return this;
} }
/**
* 设置 是否必要0不选1必要2非必要
* @param needType
*/
public DatumLibraryQuery needType(Integer needType){
setNeedType(needType);
return this;
}
/**
* 设置 开始 是否必要0不选1必要2非必要
* @param needTypeStart
*/
public DatumLibraryQuery needTypeStart(Integer needTypeStart){
this.needTypeStart = needTypeStart;
return this;
}
/**
* 设置 结束 是否必要0不选1必要2非必要
* @param needTypeEnd
*/
public DatumLibraryQuery needTypeEnd(Integer needTypeEnd){
this.needTypeEnd = needTypeEnd;
return this;
}
/**
* 设置 增加 是否必要0不选1必要2非必要
* @param needTypeIncrement
*/
public DatumLibraryQuery needTypeIncrement(Integer needTypeIncrement){
this.needTypeIncrement = needTypeIncrement;
return this;
}
/**
* 设置 是否必要0不选1必要2非必要
* @param needTypeList
*/
public DatumLibraryQuery needTypeList(List<Integer> needTypeList){
this.needTypeList = needTypeList;
return this;
}
/**
* 设置 是否必要0不选1必要2非必要
* @param needTypeNotList
*/
public DatumLibraryQuery needTypeNotList(List<Integer> needTypeNotList){
this.needTypeNotList = needTypeNotList;
return this;
}
/**
* 设置 材料形式0不选1纸质2电子3纸质-电子
* @param datumType
*/
public DatumLibraryQuery datumType(Integer datumType){
setDatumType(datumType);
return this;
}
/**
* 设置 开始 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeStart
*/
public DatumLibraryQuery datumTypeStart(Integer datumTypeStart){
this.datumTypeStart = datumTypeStart;
return this;
}
/**
* 设置 结束 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeEnd
*/
public DatumLibraryQuery datumTypeEnd(Integer datumTypeEnd){
this.datumTypeEnd = datumTypeEnd;
return this;
}
/**
* 设置 增加 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeIncrement
*/
public DatumLibraryQuery datumTypeIncrement(Integer datumTypeIncrement){
this.datumTypeIncrement = datumTypeIncrement;
return this;
}
/**
* 设置 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeList
*/
public DatumLibraryQuery datumTypeList(List<Integer> datumTypeList){
this.datumTypeList = datumTypeList;
return this;
}
/**
* 设置 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeNotList
*/
public DatumLibraryQuery datumTypeNotList(List<Integer> datumTypeNotList){
this.datumTypeNotList = datumTypeNotList;
return this;
}
/**
* 设置 提交原件0不需要1需要
* @param needOriginal
*/
public DatumLibraryQuery needOriginal(Integer needOriginal){
setNeedOriginal(needOriginal);
return this;
}
/**
* 设置 开始 提交原件0不需要1需要
* @param needOriginalStart
*/
public DatumLibraryQuery needOriginalStart(Integer needOriginalStart){
this.needOriginalStart = needOriginalStart;
return this;
}
/**
* 设置 结束 提交原件0不需要1需要
* @param needOriginalEnd
*/
public DatumLibraryQuery needOriginalEnd(Integer needOriginalEnd){
this.needOriginalEnd = needOriginalEnd;
return this;
}
/**
* 设置 增加 提交原件0不需要1需要
* @param needOriginalIncrement
*/
public DatumLibraryQuery needOriginalIncrement(Integer needOriginalIncrement){
this.needOriginalIncrement = needOriginalIncrement;
return this;
}
/**
* 设置 提交原件0不需要1需要
* @param needOriginalList
*/
public DatumLibraryQuery needOriginalList(List<Integer> needOriginalList){
this.needOriginalList = needOriginalList;
return this;
}
/**
* 设置 提交原件0不需要1需要
* @param needOriginalNotList
*/
public DatumLibraryQuery needOriginalNotList(List<Integer> needOriginalNotList){
this.needOriginalNotList = needOriginalNotList;
return this;
}
/** /**
* 设置 使用方式（1.拍照上传，2.在线填写) * 设置 使用方式（1.拍照上传，2.在线填写)
* @param uselType * @param uselType
...@@ -1053,6 +1695,114 @@ public class DatumLibraryQuery extends DatumLibraryEntity { ...@@ -1053,6 +1695,114 @@ public class DatumLibraryQuery extends DatumLibraryEntity {
return this; return this;
} }
/**
* 设置 是否推荐（0否1是）
* @param suggest
*/
public DatumLibraryQuery suggest(Integer suggest){
setSuggest(suggest);
return this;
}
/**
* 设置 开始 是否推荐（0否1是）
* @param suggestStart
*/
public DatumLibraryQuery suggestStart(Integer suggestStart){
this.suggestStart = suggestStart;
return this;
}
/**
* 设置 结束 是否推荐（0否1是）
* @param suggestEnd
*/
public DatumLibraryQuery suggestEnd(Integer suggestEnd){
this.suggestEnd = suggestEnd;
return this;
}
/**
* 设置 增加 是否推荐（0否1是）
* @param suggestIncrement
*/
public DatumLibraryQuery suggestIncrement(Integer suggestIncrement){
this.suggestIncrement = suggestIncrement;
return this;
}
/**
* 设置 是否推荐（0否1是）
* @param suggestList
*/
public DatumLibraryQuery suggestList(List<Integer> suggestList){
this.suggestList = suggestList;
return this;
}
/**
* 设置 是否推荐（0否1是）
* @param suggestNotList
*/
public DatumLibraryQuery suggestNotList(List<Integer> suggestNotList){
this.suggestNotList = suggestNotList;
return this;
}
/**
* 设置 填写次数
* @param fillSum
*/
public DatumLibraryQuery fillSum(Integer fillSum){
setFillSum(fillSum);
return this;
}
/**
* 设置 开始 填写次数
* @param fillSumStart
*/
public DatumLibraryQuery fillSumStart(Integer fillSumStart){
this.fillSumStart = fillSumStart;
return this;
}
/**
* 设置 结束 填写次数
* @param fillSumEnd
*/
public DatumLibraryQuery fillSumEnd(Integer fillSumEnd){
this.fillSumEnd = fillSumEnd;
return this;
}
/**
* 设置 增加 填写次数
* @param fillSumIncrement
*/
public DatumLibraryQuery fillSumIncrement(Integer fillSumIncrement){
this.fillSumIncrement = fillSumIncrement;
return this;
}
/**
* 设置 填写次数
* @param fillSumList
*/
public DatumLibraryQuery fillSumList(List<Integer> fillSumList){
this.fillSumList = fillSumList;
return this;
}
/**
* 设置 填写次数
* @param fillSumNotList
*/
public DatumLibraryQuery fillSumNotList(List<Integer> fillSumNotList){
this.fillSumNotList = fillSumNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumEntity.java
View file @ a54ce107
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.matter.model.vo.MatterDatumVo; import com.mortals.xhx.module.matter.model.vo.MatterDatumVo;
/** /**
* 事项申请材料实体对象 * 事项材料实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-10 * @date 2023-04-11
*/ */
public class MatterDatumEntity extends MatterDatumVo { public class MatterDatumEntity extends MatterDatumVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -41,6 +41,18 @@ public class MatterDatumEntity extends MatterDatumVo { ...@@ -41,6 +41,18 @@ public class MatterDatumEntity extends MatterDatumVo {
*/ */
private String fullName; private String fullName;
/** /**
* 是否必要0不选1必要2非必要
*/
private Integer needType;
/**
* 材料形式0不选1纸质2电子3纸质-电子
*/
private Integer datumType;
/**
* 提交原件0不需要1需要
*/
private Integer needOriginal;
/**
* 使用方式（1.拍照上传，2.在线填写) * 使用方式（1.拍照上传，2.在线填写)
*/ */
private Integer uselType; private Integer uselType;
...@@ -141,6 +153,48 @@ public class MatterDatumEntity extends MatterDatumVo { ...@@ -141,6 +153,48 @@ public class MatterDatumEntity extends MatterDatumVo {
this.fullName = fullName; this.fullName = fullName;
} }
/** /**
* 获取 是否必要0不选1必要2非必要
* @return Integer
*/
public Integer getNeedType(){
return needType;
}
/**
* 设置 是否必要0不选1必要2非必要
* @param needType
*/
public void setNeedType(Integer needType){
this.needType = needType;
}
/**
* 获取 材料形式0不选1纸质2电子3纸质-电子
* @return Integer
*/
public Integer getDatumType(){
return datumType;
}
/**
* 设置 材料形式0不选1纸质2电子3纸质-电子
* @param datumType
*/
public void setDatumType(Integer datumType){
this.datumType = datumType;
}
/**
* 获取 提交原件0不需要1需要
* @return Integer
*/
public Integer getNeedOriginal(){
return needOriginal;
}
/**
* 设置 提交原件0不需要1需要
* @param needOriginal
*/
public void setNeedOriginal(Integer needOriginal){
this.needOriginal = needOriginal;
}
/**
* 获取 使用方式（1.拍照上传，2.在线填写) * 获取 使用方式（1.拍照上传，2.在线填写)
* @return Integer * @return Integer
*/ */
...@@ -210,6 +264,9 @@ public class MatterDatumEntity extends MatterDatumVo { ...@@ -210,6 +264,9 @@ public class MatterDatumEntity extends MatterDatumVo {
sb.append(",matterCode:").append(getMatterCode()); sb.append(",matterCode:").append(getMatterCode());
sb.append(",shortName:").append(getShortName()); sb.append(",shortName:").append(getShortName());
sb.append(",fullName:").append(getFullName()); sb.append(",fullName:").append(getFullName());
sb.append(",needType:").append(getNeedType());
sb.append(",datumType:").append(getDatumType());
sb.append(",needOriginal:").append(getNeedOriginal());
sb.append(",uselType:").append(getUselType()); sb.append(",uselType:").append(getUselType());
sb.append(",suggest:").append(getSuggest()); sb.append(",suggest:").append(getSuggest());
sb.append(",fillSum:").append(getFillSum()); sb.append(",fillSum:").append(getFillSum());
...@@ -230,6 +287,12 @@ public class MatterDatumEntity extends MatterDatumVo { ...@@ -230,6 +287,12 @@ public class MatterDatumEntity extends MatterDatumVo {
this.fullName = ""; this.fullName = "";
this.needType = 0;
this.datumType = 0;
this.needOriginal = 0;
this.uselType = 1; this.uselType = 1;
this.suggest = 0; this.suggest = 0;
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumQuery.java
View file @ a54ce107
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.matter.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.matter.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.matter.model.MatterDatumEntity; import com.mortals.xhx.module.matter.model.MatterDatumEntity;
/** /**
* 事项申请材料查询对象 * 事项材料查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-10 * @date 2023-04-11
*/ */
public class MatterDatumQuery extends MatterDatumEntity { public class MatterDatumQuery extends MatterDatumEntity {
/** 开始 主键，自增长 */ /** 开始 主键，自增长 */
private Long idStart; private Long idStart;
...@@ -74,6 +74,51 @@ public class MatterDatumQuery extends MatterDatumEntity { ...@@ -74,6 +74,51 @@ public class MatterDatumQuery extends MatterDatumEntity {
/** 材料全称排除列表 */ /** 材料全称排除列表 */
private List <String> fullNameNotList; private List <String> fullNameNotList;
/** 开始 是否必要0不选1必要2非必要 */
private Integer needTypeStart;
/** 结束 是否必要0不选1必要2非必要 */
private Integer needTypeEnd;
/** 增加 是否必要0不选1必要2非必要 */
private Integer needTypeIncrement;
/** 是否必要0不选1必要2非必要列表 */
private List <Integer> needTypeList;
/** 是否必要0不选1必要2非必要排除列表 */
private List <Integer> needTypeNotList;
/** 开始 材料形式0不选1纸质2电子3纸质-电子 */
private Integer datumTypeStart;
/** 结束 材料形式0不选1纸质2电子3纸质-电子 */
private Integer datumTypeEnd;
/** 增加 材料形式0不选1纸质2电子3纸质-电子 */
private Integer datumTypeIncrement;
/** 材料形式0不选1纸质2电子3纸质-电子列表 */
private List <Integer> datumTypeList;
/** 材料形式0不选1纸质2电子3纸质-电子排除列表 */
private List <Integer> datumTypeNotList;
/** 开始 提交原件0不需要1需要 */
private Integer needOriginalStart;
/** 结束 提交原件0不需要1需要 */
private Integer needOriginalEnd;
/** 增加 提交原件0不需要1需要 */
private Integer needOriginalIncrement;
/** 提交原件0不需要1需要列表 */
private List <Integer> needOriginalList;
/** 提交原件0不需要1需要排除列表 */
private List <Integer> needOriginalNotList;
/** 开始 使用方式（1.拍照上传，2.在线填写) */ /** 开始 使用方式（1.拍照上传，2.在线填写) */
private Integer uselTypeStart; private Integer uselTypeStart;
...@@ -540,6 +585,249 @@ public class MatterDatumQuery extends MatterDatumEntity { ...@@ -540,6 +585,249 @@ public class MatterDatumQuery extends MatterDatumEntity {
this.fullNameNotList = fullNameNotList; this.fullNameNotList = fullNameNotList;
} }
/**
* 获取 开始 是否必要0不选1必要2非必要
* @return needTypeStart
*/
public Integer getNeedTypeStart(){
return this.needTypeStart;
}
/**
* 设置 开始 是否必要0不选1必要2非必要
* @param needTypeStart
*/
public void setNeedTypeStart(Integer needTypeStart){
this.needTypeStart = needTypeStart;
}
/**
* 获取 结束 是否必要0不选1必要2非必要
* @return $needTypeEnd
*/
public Integer getNeedTypeEnd(){
return this.needTypeEnd;
}
/**
* 设置 结束 是否必要0不选1必要2非必要
* @param needTypeEnd
*/
public void setNeedTypeEnd(Integer needTypeEnd){
this.needTypeEnd = needTypeEnd;
}
/**
* 获取 增加 是否必要0不选1必要2非必要
* @return needTypeIncrement
*/
public Integer getNeedTypeIncrement(){
return this.needTypeIncrement;
}
/**
* 设置 增加 是否必要0不选1必要2非必要
* @param needTypeIncrement
*/
public void setNeedTypeIncrement(Integer needTypeIncrement){
this.needTypeIncrement = needTypeIncrement;
}
/**
* 获取 是否必要0不选1必要2非必要
* @return needTypeList
*/
public List<Integer> getNeedTypeList(){
return this.needTypeList;
}
/**
* 设置 是否必要0不选1必要2非必要
* @param needTypeList
*/
public void setNeedTypeList(List<Integer> needTypeList){
this.needTypeList = needTypeList;
}
/**
* 获取 是否必要0不选1必要2非必要
* @return needTypeNotList
*/
public List<Integer> getNeedTypeNotList(){
return this.needTypeNotList;
}
/**
* 设置 是否必要0不选1必要2非必要
* @param needTypeNotList
*/
public void setNeedTypeNotList(List<Integer> needTypeNotList){
this.needTypeNotList = needTypeNotList;
}
/**
* 获取 开始 材料形式0不选1纸质2电子3纸质-电子
* @return datumTypeStart
*/
public Integer getDatumTypeStart(){
return this.datumTypeStart;
}
/**
* 设置 开始 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeStart
*/
public void setDatumTypeStart(Integer datumTypeStart){
this.datumTypeStart = datumTypeStart;
}
/**
* 获取 结束 材料形式0不选1纸质2电子3纸质-电子
* @return $datumTypeEnd
*/
public Integer getDatumTypeEnd(){
return this.datumTypeEnd;
}
/**
* 设置 结束 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeEnd
*/
public void setDatumTypeEnd(Integer datumTypeEnd){
this.datumTypeEnd = datumTypeEnd;
}
/**
* 获取 增加 材料形式0不选1纸质2电子3纸质-电子
* @return datumTypeIncrement
*/
public Integer getDatumTypeIncrement(){
return this.datumTypeIncrement;
}
/**
* 设置 增加 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeIncrement
*/
public void setDatumTypeIncrement(Integer datumTypeIncrement){
this.datumTypeIncrement = datumTypeIncrement;
}
/**
* 获取 材料形式0不选1纸质2电子3纸质-电子
* @return datumTypeList
*/
public List<Integer> getDatumTypeList(){
return this.datumTypeList;
}
/**
* 设置 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeList
*/
public void setDatumTypeList(List<Integer> datumTypeList){
this.datumTypeList = datumTypeList;
}
/**
* 获取 材料形式0不选1纸质2电子3纸质-电子
* @return datumTypeNotList
*/
public List<Integer> getDatumTypeNotList(){
return this.datumTypeNotList;
}
/**
* 设置 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeNotList
*/
public void setDatumTypeNotList(List<Integer> datumTypeNotList){
this.datumTypeNotList = datumTypeNotList;
}
/**
* 获取 开始 提交原件0不需要1需要
* @return needOriginalStart
*/
public Integer getNeedOriginalStart(){
return this.needOriginalStart;
}
/**
* 设置 开始 提交原件0不需要1需要
* @param needOriginalStart
*/
public void setNeedOriginalStart(Integer needOriginalStart){
this.needOriginalStart = needOriginalStart;
}
/**
* 获取 结束 提交原件0不需要1需要
* @return $needOriginalEnd
*/
public Integer getNeedOriginalEnd(){
return this.needOriginalEnd;
}
/**
* 设置 结束 提交原件0不需要1需要
* @param needOriginalEnd
*/
public void setNeedOriginalEnd(Integer needOriginalEnd){
this.needOriginalEnd = needOriginalEnd;
}
/**
* 获取 增加 提交原件0不需要1需要
* @return needOriginalIncrement
*/
public Integer getNeedOriginalIncrement(){
return this.needOriginalIncrement;
}
/**
* 设置 增加 提交原件0不需要1需要
* @param needOriginalIncrement
*/
public void setNeedOriginalIncrement(Integer needOriginalIncrement){
this.needOriginalIncrement = needOriginalIncrement;
}
/**
* 获取 提交原件0不需要1需要
* @return needOriginalList
*/
public List<Integer> getNeedOriginalList(){
return this.needOriginalList;
}
/**
* 设置 提交原件0不需要1需要
* @param needOriginalList
*/
public void setNeedOriginalList(List<Integer> needOriginalList){
this.needOriginalList = needOriginalList;
}
/**
* 获取 提交原件0不需要1需要
* @return needOriginalNotList
*/
public List<Integer> getNeedOriginalNotList(){
return this.needOriginalNotList;
}
/**
* 设置 提交原件0不需要1需要
* @param needOriginalNotList
*/
public void setNeedOriginalNotList(List<Integer> needOriginalNotList){
this.needOriginalNotList = needOriginalNotList;
}
/** /**
* 获取 开始 使用方式（1.拍照上传，2.在线填写) * 获取 开始 使用方式（1.拍照上传，2.在线填写)
* @return uselTypeStart * @return uselTypeStart
...@@ -1247,6 +1535,168 @@ public class MatterDatumQuery extends MatterDatumEntity { ...@@ -1247,6 +1535,168 @@ public class MatterDatumQuery extends MatterDatumEntity {
return this; return this;
} }
/**
* 设置 是否必要0不选1必要2非必要
* @param needType
*/
public MatterDatumQuery needType(Integer needType){
setNeedType(needType);
return this;
}
/**
* 设置 开始 是否必要0不选1必要2非必要
* @param needTypeStart
*/
public MatterDatumQuery needTypeStart(Integer needTypeStart){
this.needTypeStart = needTypeStart;
return this;
}
/**
* 设置 结束 是否必要0不选1必要2非必要
* @param needTypeEnd
*/
public MatterDatumQuery needTypeEnd(Integer needTypeEnd){
this.needTypeEnd = needTypeEnd;
return this;
}
/**
* 设置 增加 是否必要0不选1必要2非必要
* @param needTypeIncrement
*/
public MatterDatumQuery needTypeIncrement(Integer needTypeIncrement){
this.needTypeIncrement = needTypeIncrement;
return this;
}
/**
* 设置 是否必要0不选1必要2非必要
* @param needTypeList
*/
public MatterDatumQuery needTypeList(List<Integer> needTypeList){
this.needTypeList = needTypeList;
return this;
}
/**
* 设置 是否必要0不选1必要2非必要
* @param needTypeNotList
*/
public MatterDatumQuery needTypeNotList(List<Integer> needTypeNotList){
this.needTypeNotList = needTypeNotList;
return this;
}
/**
* 设置 材料形式0不选1纸质2电子3纸质-电子
* @param datumType
*/
public MatterDatumQuery datumType(Integer datumType){
setDatumType(datumType);
return this;
}
/**
* 设置 开始 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeStart
*/
public MatterDatumQuery datumTypeStart(Integer datumTypeStart){
this.datumTypeStart = datumTypeStart;
return this;
}
/**
* 设置 结束 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeEnd
*/
public MatterDatumQuery datumTypeEnd(Integer datumTypeEnd){
this.datumTypeEnd = datumTypeEnd;
return this;
}
/**
* 设置 增加 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeIncrement
*/
public MatterDatumQuery datumTypeIncrement(Integer datumTypeIncrement){
this.datumTypeIncrement = datumTypeIncrement;
return this;
}
/**
* 设置 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeList
*/
public MatterDatumQuery datumTypeList(List<Integer> datumTypeList){
this.datumTypeList = datumTypeList;
return this;
}
/**
* 设置 材料形式0不选1纸质2电子3纸质-电子
* @param datumTypeNotList
*/
public MatterDatumQuery datumTypeNotList(List<Integer> datumTypeNotList){
this.datumTypeNotList = datumTypeNotList;
return this;
}
/**
* 设置 提交原件0不需要1需要
* @param needOriginal
*/
public MatterDatumQuery needOriginal(Integer needOriginal){
setNeedOriginal(needOriginal);
return this;
}
/**
* 设置 开始 提交原件0不需要1需要
* @param needOriginalStart
*/
public MatterDatumQuery needOriginalStart(Integer needOriginalStart){
this.needOriginalStart = needOriginalStart;
return this;
}
/**
* 设置 结束 提交原件0不需要1需要
* @param needOriginalEnd
*/
public MatterDatumQuery needOriginalEnd(Integer needOriginalEnd){
this.needOriginalEnd = needOriginalEnd;
return this;
}
/**
* 设置 增加 提交原件0不需要1需要
* @param needOriginalIncrement
*/
public MatterDatumQuery needOriginalIncrement(Integer needOriginalIncrement){
this.needOriginalIncrement = needOriginalIncrement;
return this;
}
/**
* 设置 提交原件0不需要1需要
* @param needOriginalList
*/
public MatterDatumQuery needOriginalList(List<Integer> needOriginalList){
this.needOriginalList = needOriginalList;
return this;
}
/**
* 设置 提交原件0不需要1需要
* @param needOriginalNotList
*/
public MatterDatumQuery needOriginalNotList(List<Integer> needOriginalNotList){
this.needOriginalNotList = needOriginalNotList;
return this;
}
/** /**
* 设置 使用方式（1.拍照上传，2.在线填写) * 设置 使用方式（1.拍照上传，2.在线填写)
* @param uselType * @param uselType
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/UserMatterApplyEntity.java
View file @ a54ce107
package com.mortals.xhx.module.matter.model; package com.mortals.xhx.module.matter.model;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
...@@ -10,7 +13,7 @@ import com.mortals.xhx.module.matter.model.vo.UserMatterApplyVo; ...@@ -10,7 +13,7 @@ import com.mortals.xhx.module.matter.model.vo.UserMatterApplyVo;
* 用户申报信息实体对象 * 用户申报信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-10 * @date 2023-04-11
*/ */
public class UserMatterApplyEntity extends UserMatterApplyVo { public class UserMatterApplyEntity extends UserMatterApplyVo {
...@@ -37,7 +40,7 @@ public class UserMatterApplyEntity extends UserMatterApplyVo { ...@@ -37,7 +40,7 @@ public class UserMatterApplyEntity extends UserMatterApplyVo {
*/ */
private String applyCode; private String applyCode;
/** /**
* 申报地址名称 * 申报地址
*/ */
private String applyAddr; private String applyAddr;
/** /**
...@@ -48,6 +51,44 @@ public class UserMatterApplyEntity extends UserMatterApplyVo { ...@@ -48,6 +51,44 @@ public class UserMatterApplyEntity extends UserMatterApplyVo {
* 申请人姓名 * 申请人姓名
*/ */
private String applyPerson; private String applyPerson;
/**
* 联系电话
*/
private String phoneNum;
/**
* 证件号码
*/
private String idCard;
/**
* 事项所属部门
*/
private String deptName;
/**
* 申报时间
*/
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date applyDate;
/**
* 受理状态0未受理1已受理
*/
private Integer status;
/**
* 申报方式
*/
private String applyWay;
/**
* 存储设备
*/
private String storeDevice;
/**
* 箱体编号
*/
private String boxNum;
/**
* 存件时间
*/
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date storeDate;
...@@ -123,14 +164,14 @@ public class UserMatterApplyEntity extends UserMatterApplyVo { ...@@ -123,14 +164,14 @@ public class UserMatterApplyEntity extends UserMatterApplyVo {
this.applyCode = applyCode; this.applyCode = applyCode;
} }
/** /**
* 获取 申报地址名称 * 获取 申报地址
* @return String * @return String
*/ */
public String getApplyAddr(){ public String getApplyAddr(){
return applyAddr; return applyAddr;
} }
/** /**
* 设置 申报地址名称 * 设置 申报地址
* @param applyAddr * @param applyAddr
*/ */
public void setApplyAddr(String applyAddr){ public void setApplyAddr(String applyAddr){
...@@ -164,6 +205,132 @@ public class UserMatterApplyEntity extends UserMatterApplyVo { ...@@ -164,6 +205,132 @@ public class UserMatterApplyEntity extends UserMatterApplyVo {
public void setApplyPerson(String applyPerson){ public void setApplyPerson(String applyPerson){
this.applyPerson = applyPerson; this.applyPerson = applyPerson;
} }
/**
* 获取 联系电话
* @return String
*/
public String getPhoneNum(){
return phoneNum;
}
/**
* 设置 联系电话
* @param phoneNum
*/
public void setPhoneNum(String phoneNum){
this.phoneNum = phoneNum;
}
/**
* 获取 证件号码
* @return String
*/
public String getIdCard(){
return idCard;
}
/**
* 设置 证件号码
* @param idCard
*/
public void setIdCard(String idCard){
this.idCard = idCard;
}
/**
* 获取 事项所属部门
* @return String
*/
public String getDeptName(){
return deptName;
}
/**
* 设置 事项所属部门
* @param deptName
*/
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 申报时间
* @return Date
*/
public Date getApplyDate(){
return applyDate;
}
/**
* 设置 申报时间
* @param applyDate
*/
public void setApplyDate(Date applyDate){
this.applyDate = applyDate;
}
/**
* 获取 受理状态0未受理1已受理
* @return Integer
*/
public Integer getStatus(){
return status;
}
/**
* 设置 受理状态0未受理1已受理
* @param status
*/
public void setStatus(Integer status){
this.status = status;
}
/**
* 获取 申报方式
* @return String
*/
public String getApplyWay(){
return applyWay;
}
/**
* 设置 申报方式
* @param applyWay
*/
public void setApplyWay(String applyWay){
this.applyWay = applyWay;
}
/**
* 获取 存储设备
* @return String
*/
public String getStoreDevice(){
return storeDevice;
}
/**
* 设置 存储设备
* @param storeDevice
*/
public void setStoreDevice(String storeDevice){
this.storeDevice = storeDevice;
}
/**
* 获取 箱体编号
* @return String
*/
public String getBoxNum(){
return boxNum;
}
/**
* 设置 箱体编号
* @param boxNum
*/
public void setBoxNum(String boxNum){
this.boxNum = boxNum;
}
/**
* 获取 存件时间
* @return Date
*/
public Date getStoreDate(){
return storeDate;
}
/**
* 设置 存件时间
* @param storeDate
*/
public void setStoreDate(Date storeDate){
this.storeDate = storeDate;
}
...@@ -194,6 +361,15 @@ public class UserMatterApplyEntity extends UserMatterApplyVo { ...@@ -194,6 +361,15 @@ public class UserMatterApplyEntity extends UserMatterApplyVo {
sb.append(",applyAddr:").append(getApplyAddr()); sb.append(",applyAddr:").append(getApplyAddr());
sb.append(",deviceName:").append(getDeviceName()); sb.append(",deviceName:").append(getDeviceName());
sb.append(",applyPerson:").append(getApplyPerson()); sb.append(",applyPerson:").append(getApplyPerson());
sb.append(",phoneNum:").append(getPhoneNum());
sb.append(",idCard:").append(getIdCard());
sb.append(",deptName:").append(getDeptName());
sb.append(",applyDate:").append(getApplyDate());
sb.append(",status:").append(getStatus());
sb.append(",applyWay:").append(getApplyWay());
sb.append(",storeDevice:").append(getStoreDevice());
sb.append(",boxNum:").append(getBoxNum());
sb.append(",storeDate:").append(getStoreDate());
return sb.toString(); return sb.toString();
} }
...@@ -214,5 +390,23 @@ public class UserMatterApplyEntity extends UserMatterApplyVo { ...@@ -214,5 +390,23 @@ public class UserMatterApplyEntity extends UserMatterApplyVo {
this.deviceName = ""; this.deviceName = "";
this.applyPerson = ""; this.applyPerson = "";
this.phoneNum = "";
this.idCard = "";
this.deptName = "";
this.applyDate = null;
this.status = 0;
this.applyWay = "";
this.storeDevice = "";
this.boxNum = "";
this.storeDate = null;
} }
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/UserMatterApplyQuery.java
View file @ a54ce107
package com.mortals.xhx.module.matter.model; package com.mortals.xhx.module.matter.model;
import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.matter.model.UserMatterApplyEntity; import com.mortals.xhx.module.matter.model.UserMatterApplyEntity;
/** /**
* 用户申报信息查询对象 * 用户申报信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-10 * @date 2023-04-11
*/ */
public class UserMatterApplyQuery extends UserMatterApplyEntity { public class UserMatterApplyQuery extends UserMatterApplyEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -69,10 +70,10 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity { ...@@ -69,10 +70,10 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity {
/** 申报编号排除列表 */ /** 申报编号排除列表 */
private List <String> applyCodeNotList; private List <String> applyCodeNotList;
/** 申报地址名称 */ /** 申报地址 */
private List<String> applyAddrList; private List<String> applyAddrList;
/** 申报地址名称排除列表 */ /** 申报地址排除列表 */
private List <String> applyAddrNotList; private List <String> applyAddrNotList;
/** 申报设备名称 */ /** 申报设备名称 */
private List<String> deviceNameList; private List<String> deviceNameList;
...@@ -84,6 +85,63 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity { ...@@ -84,6 +85,63 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity {
/** 申请人姓名排除列表 */ /** 申请人姓名排除列表 */
private List <String> applyPersonNotList; private List <String> applyPersonNotList;
/** 联系电话 */
private List<String> phoneNumList;
/** 联系电话排除列表 */
private List <String> phoneNumNotList;
/** 证件号码 */
private List<String> idCardList;
/** 证件号码排除列表 */
private List <String> idCardNotList;
/** 事项所属部门 */
private List<String> deptNameList;
/** 事项所属部门排除列表 */
private List <String> deptNameNotList;
/** 开始 申报时间 */
private String applyDateStart;
/** 结束 申报时间 */
private String applyDateEnd;
/** 开始 受理状态0未受理1已受理 */
private Integer statusStart;
/** 结束 受理状态0未受理1已受理 */
private Integer statusEnd;
/** 增加 受理状态0未受理1已受理 */
private Integer statusIncrement;
/** 受理状态0未受理1已受理列表 */
private List <Integer> statusList;
/** 受理状态0未受理1已受理排除列表 */
private List <Integer> statusNotList;
/** 申报方式 */
private List<String> applyWayList;
/** 申报方式排除列表 */
private List <String> applyWayNotList;
/** 存储设备 */
private List<String> storeDeviceList;
/** 存储设备排除列表 */
private List <String> storeDeviceNotList;
/** 箱体编号 */
private List<String> boxNumList;
/** 箱体编号排除列表 */
private List <String> boxNumNotList;
/** 开始 存件时间 */
private String storeDateStart;
/** 结束 存件时间 */
private String storeDateEnd;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -474,7 +532,7 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity { ...@@ -474,7 +532,7 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity {
} }
/** /**
* 获取 申报地址名称 * 获取 申报地址
* @return applyAddrList * @return applyAddrList
*/ */
public List<String> getApplyAddrList(){ public List<String> getApplyAddrList(){
...@@ -482,7 +540,7 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity { ...@@ -482,7 +540,7 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity {
} }
/** /**
* 设置 申报地址名称 * 设置 申报地址
* @param applyAddrList * @param applyAddrList
*/ */
public void setApplyAddrList(List<String> applyAddrList){ public void setApplyAddrList(List<String> applyAddrList){
...@@ -490,7 +548,7 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity { ...@@ -490,7 +548,7 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity {
} }
/** /**
* 获取 申报地址名称 * 获取 申报地址
* @return applyAddrNotList * @return applyAddrNotList
*/ */
public List<String> getApplyAddrNotList(){ public List<String> getApplyAddrNotList(){
...@@ -498,7 +556,7 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity { ...@@ -498,7 +556,7 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity {
} }
/** /**
* 设置 申报地址名称 * 设置 申报地址
* @param applyAddrNotList * @param applyAddrNotList
*/ */
public void setApplyAddrNotList(List<String> applyAddrNotList){ public void setApplyAddrNotList(List<String> applyAddrNotList){
...@@ -569,6 +627,343 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity { ...@@ -569,6 +627,343 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity {
this.applyPersonNotList = applyPersonNotList; this.applyPersonNotList = applyPersonNotList;
} }
/**
* 获取 联系电话
* @return phoneNumList
*/
public List<String> getPhoneNumList(){
return this.phoneNumList;
}
/**
* 设置 联系电话
* @param phoneNumList
*/
public void setPhoneNumList(List<String> phoneNumList){
this.phoneNumList = phoneNumList;
}
/**
* 获取 联系电话
* @return phoneNumNotList
*/
public List<String> getPhoneNumNotList(){
return this.phoneNumNotList;
}
/**
* 设置 联系电话
* @param phoneNumNotList
*/
public void setPhoneNumNotList(List<String> phoneNumNotList){
this.phoneNumNotList = phoneNumNotList;
}
/**
* 获取 证件号码
* @return idCardList
*/
public List<String> getIdCardList(){
return this.idCardList;
}
/**
* 设置 证件号码
* @param idCardList
*/
public void setIdCardList(List<String> idCardList){
this.idCardList = idCardList;
}
/**
* 获取 证件号码
* @return idCardNotList
*/
public List<String> getIdCardNotList(){
return this.idCardNotList;
}
/**
* 设置 证件号码
* @param idCardNotList
*/
public void setIdCardNotList(List<String> idCardNotList){
this.idCardNotList = idCardNotList;
}
/**
* 获取 事项所属部门
* @return deptNameList
*/
public List<String> getDeptNameList(){
return this.deptNameList;
}
/**
* 设置 事项所属部门
* @param deptNameList
*/
public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
}
/**
* 获取 事项所属部门
* @return deptNameNotList
*/
public List<String> getDeptNameNotList(){
return this.deptNameNotList;
}
/**
* 设置 事项所属部门
* @param deptNameNotList
*/
public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList;
}
/**
* 获取 开始 申报时间
* @return applyDateStart
*/
public String getApplyDateStart(){
return this.applyDateStart;
}
/**
* 设置 开始 申报时间
* @param applyDateStart
*/
public void setApplyDateStart(String applyDateStart){
this.applyDateStart = applyDateStart;
}
/**
* 获取 结束 申报时间
* @return applyDateEnd
*/
public String getApplyDateEnd(){
return this.applyDateEnd;
}
/**
* 设置 结束 申报时间
* @param applyDateEnd
*/
public void setApplyDateEnd(String applyDateEnd){
this.applyDateEnd = applyDateEnd;
}
/**
* 获取 开始 受理状态0未受理1已受理
* @return statusStart
*/
public Integer getStatusStart(){
return this.statusStart;
}
/**
* 设置 开始 受理状态0未受理1已受理
* @param statusStart
*/
public void setStatusStart(Integer statusStart){
this.statusStart = statusStart;
}
/**
* 获取 结束 受理状态0未受理1已受理
* @return $statusEnd
*/
public Integer getStatusEnd(){
return this.statusEnd;
}
/**
* 设置 结束 受理状态0未受理1已受理
* @param statusEnd
*/
public void setStatusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
}
/**
* 获取 增加 受理状态0未受理1已受理
* @return statusIncrement
*/
public Integer getStatusIncrement(){
return this.statusIncrement;
}
/**
* 设置 增加 受理状态0未受理1已受理
* @param statusIncrement
*/
public void setStatusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
}
/**
* 获取 受理状态0未受理1已受理
* @return statusList
*/
public List<Integer> getStatusList(){
return this.statusList;
}
/**
* 设置 受理状态0未受理1已受理
* @param statusList
*/
public void setStatusList(List<Integer> statusList){
this.statusList = statusList;
}
/**
* 获取 受理状态0未受理1已受理
* @return statusNotList
*/
public List<Integer> getStatusNotList(){
return this.statusNotList;
}
/**
* 设置 受理状态0未受理1已受理
* @param statusNotList
*/
public void setStatusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
}
/**
* 获取 申报方式
* @return applyWayList
*/
public List<String> getApplyWayList(){
return this.applyWayList;
}
/**
* 设置 申报方式
* @param applyWayList
*/
public void setApplyWayList(List<String> applyWayList){
this.applyWayList = applyWayList;
}
/**
* 获取 申报方式
* @return applyWayNotList
*/
public List<String> getApplyWayNotList(){
return this.applyWayNotList;
}
/**
* 设置 申报方式
* @param applyWayNotList
*/
public void setApplyWayNotList(List<String> applyWayNotList){
this.applyWayNotList = applyWayNotList;
}
/**
* 获取 存储设备
* @return storeDeviceList
*/
public List<String> getStoreDeviceList(){
return this.storeDeviceList;
}
/**
* 设置 存储设备
* @param storeDeviceList
*/
public void setStoreDeviceList(List<String> storeDeviceList){
this.storeDeviceList = storeDeviceList;
}
/**
* 获取 存储设备
* @return storeDeviceNotList
*/
public List<String> getStoreDeviceNotList(){
return this.storeDeviceNotList;
}
/**
* 设置 存储设备
* @param storeDeviceNotList
*/
public void setStoreDeviceNotList(List<String> storeDeviceNotList){
this.storeDeviceNotList = storeDeviceNotList;
}
/**
* 获取 箱体编号
* @return boxNumList
*/
public List<String> getBoxNumList(){
return this.boxNumList;
}
/**
* 设置 箱体编号
* @param boxNumList
*/
public void setBoxNumList(List<String> boxNumList){
this.boxNumList = boxNumList;
}
/**
* 获取 箱体编号
* @return boxNumNotList
*/
public List<String> getBoxNumNotList(){
return this.boxNumNotList;
}
/**
* 设置 箱体编号
* @param boxNumNotList
*/
public void setBoxNumNotList(List<String> boxNumNotList){
this.boxNumNotList = boxNumNotList;
}
/**
* 获取 开始 存件时间
* @return storeDateStart
*/
public String getStoreDateStart(){
return this.storeDateStart;
}
/**
* 设置 开始 存件时间
* @param storeDateStart
*/
public void setStoreDateStart(String storeDateStart){
this.storeDateStart = storeDateStart;
}
/**
* 获取 结束 存件时间
* @return storeDateEnd
*/
public String getStoreDateEnd(){
return this.storeDateEnd;
}
/**
* 设置 结束 存件时间
* @param storeDateEnd
*/
public void setStoreDateEnd(String storeDateEnd){
this.storeDateEnd = storeDateEnd;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -1016,7 +1411,7 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity { ...@@ -1016,7 +1411,7 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity {
/** /**
* 设置 申报地址名称 * 设置 申报地址
* @param applyAddr * @param applyAddr
*/ */
public UserMatterApplyQuery applyAddr(String applyAddr){ public UserMatterApplyQuery applyAddr(String applyAddr){
...@@ -1025,7 +1420,7 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity { ...@@ -1025,7 +1420,7 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity {
} }
/** /**
* 设置 申报地址名称 * 设置 申报地址
* @param applyAddrList * @param applyAddrList
*/ */
public UserMatterApplyQuery applyAddrList(List<String> applyAddrList){ public UserMatterApplyQuery applyAddrList(List<String> applyAddrList){
...@@ -1071,6 +1466,176 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity { ...@@ -1071,6 +1466,176 @@ public class UserMatterApplyQuery extends UserMatterApplyEntity {
return this; return this;
} }
/**
* 设置 联系电话
* @param phoneNum
*/
public UserMatterApplyQuery phoneNum(String phoneNum){
setPhoneNum(phoneNum);
return this;
}
/**
* 设置 联系电话
* @param phoneNumList
*/
public UserMatterApplyQuery phoneNumList(List<String> phoneNumList){
this.phoneNumList = phoneNumList;
return this;
}
/**
* 设置 证件号码
* @param idCard
*/
public UserMatterApplyQuery idCard(String idCard){
setIdCard(idCard);
return this;
}
/**
* 设置 证件号码
* @param idCardList
*/
public UserMatterApplyQuery idCardList(List<String> idCardList){
this.idCardList = idCardList;
return this;
}
/**
* 设置 事项所属部门
* @param deptName
*/
public UserMatterApplyQuery deptName(String deptName){
setDeptName(deptName);
return this;
}
/**
* 设置 事项所属部门
* @param deptNameList
*/
public UserMatterApplyQuery deptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
return this;
}
/**
* 设置 受理状态0未受理1已受理
* @param status
*/
public UserMatterApplyQuery status(Integer status){
setStatus(status);
return this;
}
/**
* 设置 开始 受理状态0未受理1已受理
* @param statusStart
*/
public UserMatterApplyQuery statusStart(Integer statusStart){
this.statusStart = statusStart;
return this;
}
/**
* 设置 结束 受理状态0未受理1已受理
* @param statusEnd
*/
public UserMatterApplyQuery statusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
return this;
}
/**
* 设置 增加 受理状态0未受理1已受理
* @param statusIncrement
*/
public UserMatterApplyQuery statusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
return this;
}
/**
* 设置 受理状态0未受理1已受理
* @param statusList
*/
public UserMatterApplyQuery statusList(List<Integer> statusList){
this.statusList = statusList;
return this;
}
/**
* 设置 受理状态0未受理1已受理
* @param statusNotList
*/
public UserMatterApplyQuery statusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
return this;
}
/**
* 设置 申报方式
* @param applyWay
*/
public UserMatterApplyQuery applyWay(String applyWay){
setApplyWay(applyWay);
return this;
}
/**
* 设置 申报方式
* @param applyWayList
*/
public UserMatterApplyQuery applyWayList(List<String> applyWayList){
this.applyWayList = applyWayList;
return this;
}
/**
* 设置 存储设备
* @param storeDevice
*/
public UserMatterApplyQuery storeDevice(String storeDevice){
setStoreDevice(storeDevice);
return this;
}
/**
* 设置 存储设备
* @param storeDeviceList
*/
public UserMatterApplyQuery storeDeviceList(List<String> storeDeviceList){
this.storeDeviceList = storeDeviceList;
return this;
}
/**
* 设置 箱体编号
* @param boxNum
*/
public UserMatterApplyQuery boxNum(String boxNum){
setBoxNum(boxNum);
return this;
}
/**
* 设置 箱体编号
* @param boxNumList
*/
public UserMatterApplyQuery boxNumList(List<String> boxNumList){
this.boxNumList = boxNumList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/UserMatterDetailsEntity.java
View file @ a54ce107
...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.UserMatterDetailsVo; ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.UserMatterDetailsVo;
* 用户申报明细实体对象 * 用户申报明细实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-10 * @date 2023-04-11
*/ */
public class UserMatterDetailsEntity extends UserMatterDetailsVo { public class UserMatterDetailsEntity extends UserMatterDetailsVo {
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/UserMatterDetailsQuery.java
View file @ a54ce107
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.UserMatterDetailsEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.UserMatterDetailsEntity;
* 用户申报明细查询对象 * 用户申报明细查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-10 * @date 2023-04-11
*/ */
public class UserMatterDetailsQuery extends UserMatterDetailsEntity { public class UserMatterDetailsQuery extends UserMatterDetailsEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/UserMatterExamineEntity.java 0 → 100644
View file @ a54ce107
package com.mortals.xhx.module.matter.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.matter.model.vo.UserMatterExamineVo;
/**
* 用户申报事项审批实体对象
*
* @author zxfei
* @date 2023-04-11
*/
public class UserMatterExamineEntity extends UserMatterExamineVo {
private static final long serialVersionUID = 1L;
/**
* 用户申报id
*/
private Long applyrId;
/**
* 受理人员
*/
private String acceptPerson;
/**
* 受理结果1通过2拒绝
*/
private Integer acceptResult;
/**
* 受理意见
*/
private String acceptOpinion;
/**
* 受理时间
*/
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date acceptDate;
public UserMatterExamineEntity(){}
/**
* 获取 用户申报id
* @return Long
*/
public Long getApplyrId(){
return applyrId;
}
/**
* 设置 用户申报id
* @param applyrId
*/
public void setApplyrId(Long applyrId){
this.applyrId = applyrId;
}
/**
* 获取 受理人员
* @return String
*/
public String getAcceptPerson(){
return acceptPerson;
}
/**
* 设置 受理人员
* @param acceptPerson
*/
public void setAcceptPerson(String acceptPerson){
this.acceptPerson = acceptPerson;
}
/**
* 获取 受理结果1通过2拒绝
* @return Integer
*/
public Integer getAcceptResult(){
return acceptResult;
}
/**
* 设置 受理结果1通过2拒绝
* @param acceptResult
*/
public void setAcceptResult(Integer acceptResult){
this.acceptResult = acceptResult;
}
/**
* 获取 受理意见
* @return String
*/
public String getAcceptOpinion(){
return acceptOpinion;
}
/**
* 设置 受理意见
* @param acceptOpinion
*/
public void setAcceptOpinion(String acceptOpinion){
this.acceptOpinion = acceptOpinion;
}
/**
* 获取 受理时间
* @return Date
*/
public Date getAcceptDate(){
return acceptDate;
}
/**
* 设置 受理时间
* @param acceptDate
*/
public void setAcceptDate(Date acceptDate){
this.acceptDate = acceptDate;
}
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof UserMatterExamineEntity) {
UserMatterExamineEntity tmp = (UserMatterExamineEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",applyrId:").append(getApplyrId());
sb.append(",acceptPerson:").append(getAcceptPerson());
sb.append(",acceptResult:").append(getAcceptResult());
sb.append(",acceptOpinion:").append(getAcceptOpinion());
sb.append(",acceptDate:").append(getAcceptDate());
return sb.toString();
}
public void initAttrValue(){
this.applyrId = null;
this.acceptPerson = "";
this.acceptResult = null;
this.acceptOpinion = "";
this.acceptDate = null;
}
}
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/UserMatterExamineQuery.java 0 → 100644
View file @ a54ce107
package com.mortals.xhx.module.matter.model;
import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.matter.model.UserMatterExamineEntity;
/**
* 用户申报事项审批查询对象
*
* @author zxfei
* @date 2023-04-11
*/
public class UserMatterExamineQuery extends UserMatterExamineEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
/** 结束 序号，主键，自增长 */
private Long idEnd;
/** 增加 序号，主键，自增长 */
private Long idIncrement;
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 用户申报id */
private Long applyrIdStart;
/** 结束 用户申报id */
private Long applyrIdEnd;
/** 增加 用户申报id */
private Long applyrIdIncrement;
/** 用户申报id列表 */
private List <Long> applyrIdList;
/** 用户申报id排除列表 */
private List <Long> applyrIdNotList;
/** 受理人员 */
private List<String> acceptPersonList;
/** 受理人员排除列表 */
private List <String> acceptPersonNotList;
/** 开始 受理结果1通过2拒绝 */
private Integer acceptResultStart;
/** 结束 受理结果1通过2拒绝 */
private Integer acceptResultEnd;
/** 增加 受理结果1通过2拒绝 */
private Integer acceptResultIncrement;
/** 受理结果1通过2拒绝列表 */
private List <Integer> acceptResultList;
/** 受理结果1通过2拒绝排除列表 */
private List <Integer> acceptResultNotList;
/** 受理意见 */
private List<String> acceptOpinionList;
/** 受理意见排除列表 */
private List <String> acceptOpinionNotList;
/** 开始 受理时间 */
private String acceptDateStart;
/** 结束 受理时间 */
private String acceptDateEnd;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 更新用户 */
private Long updateUserIdStart;
/** 结束 更新用户 */
private Long updateUserIdEnd;
/** 增加 更新用户 */
private Long updateUserIdIncrement;
/** 更新用户列表 */
private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */
private String updateTimeStart;
/** 结束 更新时间 */
private String updateTimeEnd;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<UserMatterExamineQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<UserMatterExamineQuery> andConditionList;
public UserMatterExamineQuery(){}
/**
* 获取 开始 序号，主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 序号，主键，自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 序号，主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 序号，主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 用户申报id
* @return applyrIdStart
*/
public Long getApplyrIdStart(){
return this.applyrIdStart;
}
/**
* 设置 开始 用户申报id
* @param applyrIdStart
*/
public void setApplyrIdStart(Long applyrIdStart){
this.applyrIdStart = applyrIdStart;
}
/**
* 获取 结束 用户申报id
* @return $applyrIdEnd
*/
public Long getApplyrIdEnd(){
return this.applyrIdEnd;
}
/**
* 设置 结束 用户申报id
* @param applyrIdEnd
*/
public void setApplyrIdEnd(Long applyrIdEnd){
this.applyrIdEnd = applyrIdEnd;
}
/**
* 获取 增加 用户申报id
* @return applyrIdIncrement
*/
public Long getApplyrIdIncrement(){
return this.applyrIdIncrement;
}
/**
* 设置 增加 用户申报id
* @param applyrIdIncrement
*/
public void setApplyrIdIncrement(Long applyrIdIncrement){
this.applyrIdIncrement = applyrIdIncrement;
}
/**
* 获取 用户申报id
* @return applyrIdList
*/
public List<Long> getApplyrIdList(){
return this.applyrIdList;
}
/**
* 设置 用户申报id
* @param applyrIdList
*/
public void setApplyrIdList(List<Long> applyrIdList){
this.applyrIdList = applyrIdList;
}
/**
* 获取 用户申报id
* @return applyrIdNotList
*/
public List<Long> getApplyrIdNotList(){
return this.applyrIdNotList;
}
/**
* 设置 用户申报id
* @param applyrIdNotList
*/
public void setApplyrIdNotList(List<Long> applyrIdNotList){
this.applyrIdNotList = applyrIdNotList;
}
/**
* 获取 受理人员
* @return acceptPersonList
*/
public List<String> getAcceptPersonList(){
return this.acceptPersonList;
}
/**
* 设置 受理人员
* @param acceptPersonList
*/
public void setAcceptPersonList(List<String> acceptPersonList){
this.acceptPersonList = acceptPersonList;
}
/**
* 获取 受理人员
* @return acceptPersonNotList
*/
public List<String> getAcceptPersonNotList(){
return this.acceptPersonNotList;
}
/**
* 设置 受理人员
* @param acceptPersonNotList
*/
public void setAcceptPersonNotList(List<String> acceptPersonNotList){
this.acceptPersonNotList = acceptPersonNotList;
}
/**
* 获取 开始 受理结果1通过2拒绝
* @return acceptResultStart
*/
public Integer getAcceptResultStart(){
return this.acceptResultStart;
}
/**
* 设置 开始 受理结果1通过2拒绝
* @param acceptResultStart
*/
public void setAcceptResultStart(Integer acceptResultStart){
this.acceptResultStart = acceptResultStart;
}
/**
* 获取 结束 受理结果1通过2拒绝
* @return $acceptResultEnd
*/
public Integer getAcceptResultEnd(){
return this.acceptResultEnd;
}
/**
* 设置 结束 受理结果1通过2拒绝
* @param acceptResultEnd
*/
public void setAcceptResultEnd(Integer acceptResultEnd){
this.acceptResultEnd = acceptResultEnd;
}
/**
* 获取 增加 受理结果1通过2拒绝
* @return acceptResultIncrement
*/
public Integer getAcceptResultIncrement(){
return this.acceptResultIncrement;
}
/**
* 设置 增加 受理结果1通过2拒绝
* @param acceptResultIncrement
*/
public void setAcceptResultIncrement(Integer acceptResultIncrement){
this.acceptResultIncrement = acceptResultIncrement;
}
/**
* 获取 受理结果1通过2拒绝
* @return acceptResultList
*/
public List<Integer> getAcceptResultList(){
return this.acceptResultList;
}
/**
* 设置 受理结果1通过2拒绝
* @param acceptResultList
*/
public void setAcceptResultList(List<Integer> acceptResultList){
this.acceptResultList = acceptResultList;
}
/**
* 获取 受理结果1通过2拒绝
* @return acceptResultNotList
*/
public List<Integer> getAcceptResultNotList(){
return this.acceptResultNotList;
}
/**
* 设置 受理结果1通过2拒绝
* @param acceptResultNotList
*/
public void setAcceptResultNotList(List<Integer> acceptResultNotList){
this.acceptResultNotList = acceptResultNotList;
}
/**
* 获取 受理意见
* @return acceptOpinionList
*/
public List<String> getAcceptOpinionList(){
return this.acceptOpinionList;
}
/**
* 设置 受理意见
* @param acceptOpinionList
*/
public void setAcceptOpinionList(List<String> acceptOpinionList){
this.acceptOpinionList = acceptOpinionList;
}
/**
* 获取 受理意见
* @return acceptOpinionNotList
*/
public List<String> getAcceptOpinionNotList(){
return this.acceptOpinionNotList;
}
/**
* 设置 受理意见
* @param acceptOpinionNotList
*/
public void setAcceptOpinionNotList(List<String> acceptOpinionNotList){
this.acceptOpinionNotList = acceptOpinionNotList;
}
/**
* 获取 开始 受理时间
* @return acceptDateStart
*/
public String getAcceptDateStart(){
return this.acceptDateStart;
}
/**
* 设置 开始 受理时间
* @param acceptDateStart
*/
public void setAcceptDateStart(String acceptDateStart){
this.acceptDateStart = acceptDateStart;
}
/**
* 获取 结束 受理时间
* @return acceptDateEnd
*/
public String getAcceptDateEnd(){
return this.acceptDateEnd;
}
/**
* 设置 结束 受理时间
* @param acceptDateEnd
*/
public void setAcceptDateEnd(String acceptDateEnd){
this.acceptDateEnd = acceptDateEnd;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 更新用户
* @return updateUserIdStart
*/
public Long getUpdateUserIdStart(){
return this.updateUserIdStart;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
}
/**
* 获取 结束 更新用户
* @return $updateUserIdEnd
*/
public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
}
/**
* 获取 增加 更新用户
* @return updateUserIdIncrement
*/
public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
* 获取 更新用户
* @return updateUserIdList
*/
public List<Long> getUpdateUserIdList(){
return this.updateUserIdList;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
}
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/**
* 获取 开始 更新时间
* @return updateTimeStart
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
* 设置 开始 更新时间
* @param updateTimeStart
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
* 获取 结束 更新时间
* @return updateTimeEnd
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
* 设置 结束 更新时间
* @param updateTimeEnd
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public UserMatterExamineQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public UserMatterExamineQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public UserMatterExamineQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public UserMatterExamineQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public UserMatterExamineQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public UserMatterExamineQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 用户申报id
* @param applyrId
*/
public UserMatterExamineQuery applyrId(Long applyrId){
setApplyrId(applyrId);
return this;
}
/**
* 设置 开始 用户申报id
* @param applyrIdStart
*/
public UserMatterExamineQuery applyrIdStart(Long applyrIdStart){
this.applyrIdStart = applyrIdStart;
return this;
}
/**
* 设置 结束 用户申报id
* @param applyrIdEnd
*/
public UserMatterExamineQuery applyrIdEnd(Long applyrIdEnd){
this.applyrIdEnd = applyrIdEnd;
return this;
}
/**
* 设置 增加 用户申报id
* @param applyrIdIncrement
*/
public UserMatterExamineQuery applyrIdIncrement(Long applyrIdIncrement){
this.applyrIdIncrement = applyrIdIncrement;
return this;
}
/**
* 设置 用户申报id
* @param applyrIdList
*/
public UserMatterExamineQuery applyrIdList(List<Long> applyrIdList){
this.applyrIdList = applyrIdList;
return this;
}
/**
* 设置 用户申报id
* @param applyrIdNotList
*/
public UserMatterExamineQuery applyrIdNotList(List<Long> applyrIdNotList){
this.applyrIdNotList = applyrIdNotList;
return this;
}
/**
* 设置 受理人员
* @param acceptPerson
*/
public UserMatterExamineQuery acceptPerson(String acceptPerson){
setAcceptPerson(acceptPerson);
return this;
}
/**
* 设置 受理人员
* @param acceptPersonList
*/
public UserMatterExamineQuery acceptPersonList(List<String> acceptPersonList){
this.acceptPersonList = acceptPersonList;
return this;
}
/**
* 设置 受理结果1通过2拒绝
* @param acceptResult
*/
public UserMatterExamineQuery acceptResult(Integer acceptResult){
setAcceptResult(acceptResult);
return this;
}
/**
* 设置 开始 受理结果1通过2拒绝
* @param acceptResultStart
*/
public UserMatterExamineQuery acceptResultStart(Integer acceptResultStart){
this.acceptResultStart = acceptResultStart;
return this;
}
/**
* 设置 结束 受理结果1通过2拒绝
* @param acceptResultEnd
*/
public UserMatterExamineQuery acceptResultEnd(Integer acceptResultEnd){
this.acceptResultEnd = acceptResultEnd;
return this;
}
/**
* 设置 增加 受理结果1通过2拒绝
* @param acceptResultIncrement
*/
public UserMatterExamineQuery acceptResultIncrement(Integer acceptResultIncrement){
this.acceptResultIncrement = acceptResultIncrement;
return this;
}
/**
* 设置 受理结果1通过2拒绝
* @param acceptResultList
*/
public UserMatterExamineQuery acceptResultList(List<Integer> acceptResultList){
this.acceptResultList = acceptResultList;
return this;
}
/**
* 设置 受理结果1通过2拒绝
* @param acceptResultNotList
*/
public UserMatterExamineQuery acceptResultNotList(List<Integer> acceptResultNotList){
this.acceptResultNotList = acceptResultNotList;
return this;
}
/**
* 设置 受理意见
* @param acceptOpinion
*/
public UserMatterExamineQuery acceptOpinion(String acceptOpinion){
setAcceptOpinion(acceptOpinion);
return this;
}
/**
* 设置 受理意见
* @param acceptOpinionList
*/
public UserMatterExamineQuery acceptOpinionList(List<String> acceptOpinionList){
this.acceptOpinionList = acceptOpinionList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public UserMatterExamineQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public UserMatterExamineQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public UserMatterExamineQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public UserMatterExamineQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public UserMatterExamineQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public UserMatterExamineQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 设置 更新用户
* @param updateUserId
*/
public UserMatterExamineQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId);
return this;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public UserMatterExamineQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
return this;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public UserMatterExamineQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
return this;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public UserMatterExamineQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public UserMatterExamineQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public UserMatterExamineQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<UserMatterExamineQuery> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<UserMatterExamineQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<UserMatterExamineQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<UserMatterExamineQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterDatumVo.java
View file @ a54ce107
...@@ -18,4 +18,6 @@ public class MatterDatumVo extends BaseEntityLong { ...@@ -18,4 +18,6 @@ public class MatterDatumVo extends BaseEntityLong {
private List<MatterDatumFileEntity> matterDatumFileList; private List<MatterDatumFileEntity> matterDatumFileList;
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 是否加入公共库 0否1是 */
private Integer isAddLibrary;
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/UserMatterExamineVo.java 0 → 100644
View file @ a54ce107
package com.mortals.xhx.module.matter.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.matter.model.UserMatterExamineEntity;
import java.util.ArrayList;
import java.util.List;
/**
* 用户申报事项审批视图对象
*
* @author zxfei
* @date 2023-04-11
*/
public class UserMatterExamineVo extends BaseEntityLong {
}
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/matter/service/UserMatterExamineService.java 0 → 100644
View file @ a54ce107
package com.mortals.xhx.module.matter.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.matter.model.UserMatterExamineEntity;
/**
* UserMatterExamineService
*
* 用户申报事项审批 service接口
*
* @author zxfei
* @date 2023-04-11
*/
public interface UserMatterExamineService extends ICRUDService<UserMatterExamineEntity,Long>{
}
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java
View file @ a54ce107
...@@ -64,6 +64,15 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -64,6 +64,15 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
super.saveBefore(entity,context); super.saveBefore(entity,context);
entity.setFillSum(0); entity.setFillSum(0);
entity.setSuggest(0); entity.setSuggest(0);
if(entity.getNeedType()==null){
entity.setNeedType(0);
}
if(entity.getDatumType()==null){
entity.setDatumType(0);
}
if(entity.getNeedOriginal()==null){
entity.setNeedOriginal(0);
}
} }
@Override @Override
protected void saveAfter(MatterDatumEntity entity, Context context) throws AppException { protected void saveAfter(MatterDatumEntity entity, Context context) throws AppException {
...@@ -76,6 +85,9 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -76,6 +85,9 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
}).count(); }).count();
matterDatumFileService.save(entity.getMatterDatumFileList()); matterDatumFileService.save(entity.getMatterDatumFileList());
} }
if(entity.getIsAddLibrary()!=null && entity.getIsAddLibrary()==1){
addToLibrary(entity.getId()+"", context);
}
super.saveAfter(entity, context); super.saveAfter(entity, context);
} }
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/UserMatterApplyServiceImpl.java
View file @ a54ce107
...@@ -41,7 +41,7 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt ...@@ -41,7 +41,7 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
list.stream().peek(item->{ list.stream().peek(item->{
List<UserMatterDetailsEntity> matterDetailsFileEntities = userMatterDetailsService.find(new UserMatterDetailsQuery().applyrId(item.getId())); List<UserMatterDetailsEntity> matterDetailsFileEntities = userMatterDetailsService.find(new UserMatterDetailsQuery().applyrId(item.getId()));
item.setUserMatterDetails(matterDetailsFileEntities); item.setUserMatterDetails(matterDetailsFileEntities);
item.setApplyPerson(desensitizedName(item.getApplyPerson())); //item.setApplyPerson(desensitizedName(item.getApplyPerson()));
}).count(); }).count();
super.findAfter(params, context, list); super.findAfter(params, context, list);
} }
...@@ -52,7 +52,7 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt ...@@ -52,7 +52,7 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
list.stream().peek(item->{ list.stream().peek(item->{
List<UserMatterDetailsEntity> matterDetailsFileEntities = userMatterDetailsService.find(new UserMatterDetailsQuery().applyrId(item.getId())); List<UserMatterDetailsEntity> matterDetailsFileEntities = userMatterDetailsService.find(new UserMatterDetailsQuery().applyrId(item.getId()));
item.setUserMatterDetails(matterDetailsFileEntities); item.setUserMatterDetails(matterDetailsFileEntities);
item.setApplyPerson(desensitizedName(item.getApplyPerson())); //item.setApplyPerson(desensitizedName(item.getApplyPerson()));
}).count(); }).count();
super.findAfter(params, context, list); super.findAfter(params, context, list);
} }
...@@ -61,6 +61,7 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt ...@@ -61,6 +61,7 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
protected void saveBefore(UserMatterApplyEntity entity, Context context) throws AppException { protected void saveBefore(UserMatterApplyEntity entity, Context context) throws AppException {
super.saveBefore(entity,context); super.saveBefore(entity,context);
entity.setApplyCode("SQ"+ new Date().getTime()); entity.setApplyCode("SQ"+ new Date().getTime());
entity.setStatus(0);
if(entity.getMatterId()==null){ if(entity.getMatterId()==null){
throw new AppException("申请事项不能为空"); throw new AppException("申请事项不能为空");
}else { }else {
...@@ -68,8 +69,11 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt ...@@ -68,8 +69,11 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
if(matterApplyEntity!=null){ if(matterApplyEntity!=null){
entity.setMatterCode(matterApplyEntity.getMatterCode()); entity.setMatterCode(matterApplyEntity.getMatterCode());
entity.setMatterName(matterApplyEntity.getMatterName()); entity.setMatterName(matterApplyEntity.getMatterName());
entity.setDeptName(matterApplyEntity.getDeptName());
} }
} }
entity.setApplyDate(new Date());
entity.setStoreDate(new Date());
} }
@Override @Override
...@@ -78,6 +82,7 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt ...@@ -78,6 +82,7 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
List<UserMatterDetailsEntity> details = doSaveAfer(entity, context); List<UserMatterDetailsEntity> details = doSaveAfer(entity, context);
userMatterDetailsService.save(details); userMatterDetailsService.save(details);
} }
matterApplyService.addReportCount(entity.getMatterId());
super.saveAfter(entity, context); super.saveAfter(entity, context);
} }
...@@ -99,8 +104,14 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt ...@@ -99,8 +104,14 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
matterDetailsEntity.setFullName(datumEntity.getFullName()); matterDetailsEntity.setFullName(datumEntity.getFullName());
matterDetailsEntity.setShortName(datumEntity.getShortName()); matterDetailsEntity.setShortName(datumEntity.getShortName());
matterDetailsEntity.setFileName(datumFile.getFileName()); matterDetailsEntity.setFileName(datumFile.getFileName());
if(StringUtils.isNotEmpty(item.getPreviewUrl())){
matterDetailsEntity.setPreviewUrl(item.getPreviewUrl());
}else {
matterDetailsEntity.setPreviewUrl(datumFile.getPreviewUrl()); matterDetailsEntity.setPreviewUrl(datumFile.getPreviewUrl());
}
matterDetailsEntity.setTemplateUrl(datumFile.getTemplatePath()); matterDetailsEntity.setTemplateUrl(datumFile.getTemplatePath());
matterDetailsEntity.setFormContent(item.getFormContent());
matterDetailsEntity.setFormTemplate(datumFile.getFormContent());
matterDetailsEntity.setCreateTime(new Date()); matterDetailsEntity.setCreateTime(new Date());
details.add(matterDetailsEntity); details.add(matterDetailsEntity);
} }
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/UserMatterExamineServiceImpl.java 0 → 100644
View file @ a54ce107
package com.mortals.xhx.module.matter.service.impl;
import com.mortals.framework.service.IUser;
import com.mortals.xhx.module.matter.model.UserMatterApplyEntity;
import com.mortals.xhx.module.matter.service.UserMatterApplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.matter.dao.UserMatterExamineDao;
import com.mortals.xhx.module.matter.model.UserMatterExamineEntity;
import com.mortals.xhx.module.matter.service.UserMatterExamineService;
import java.util.Date;
/**
* UserMatterExamineService
* 用户申报事项审批 service实现
*
* @author zxfei
* @date 2023-04-11
*/
@Service("userMatterExamineService")
public class UserMatterExamineServiceImpl extends AbstractCRUDServiceImpl<UserMatterExamineDao, UserMatterExamineEntity, Long> implements UserMatterExamineService {
@Autowired
private UserMatterApplyService userMatterApplyService;
@Override
protected void saveBefore(UserMatterExamineEntity entity, Context context) throws AppException {
if(context!=null && context.getUser()!=null){
IUser user = context.getUser();
entity.setAcceptPerson(user.getRealName());
}
}
@Override
protected void saveAfter(UserMatterExamineEntity entity, Context context) throws AppException {
if(entity.getAcceptResult()==1){
UserMatterApplyEntity updateEntity = new UserMatterApplyEntity();
updateEntity.setId(entity.getApplyrId());
updateEntity.setStatus(1);
updateEntity.setUpdateTime(new Date());
userMatterApplyService.update(updateEntity);
}
}
}
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/matter/web/DatumLibraryController.java
View file @ a54ce107
...@@ -45,16 +45,11 @@ public class DatumLibraryController extends BaseCRUDJsonBodyMappingController<Da ...@@ -45,16 +45,11 @@ public class DatumLibraryController extends BaseCRUDJsonBodyMappingController<Da
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "isMust", paramService.getParamBySecondOrganize("DatumLibrary","isMust")); this.addDict(model, "needType", paramService.getParamBySecondOrganize("MatterDatum","needType"));
this.addDict(model, "materialType", paramService.getParamBySecondOrganize("DatumLibrary","materialType")); this.addDict(model, "datumType", paramService.getParamBySecondOrganize("MatterDatum","datumType"));
this.addDict(model, "materialProperty", paramService.getParamBySecondOrganize("DatumLibrary","materialProperty")); this.addDict(model, "needOriginal", paramService.getParamBySecondOrganize("MatterDatum","needOriginal"));
this.addDict(model, "electronicgs", paramService.getParamBySecondOrganize("DatumLibrary","electronicgs")); this.addDict(model, "uselType", paramService.getParamBySecondOrganize("MatterDatum","uselType"));
this.addDict(model, "materialSource", paramService.getParamBySecondOrganize("DatumLibrary","materialSource")); this.addDict(model, "suggest", paramService.getParamBySecondOrganize("MatterDatum","suggest"));
this.addDict(model, "paperNum", paramService.getParamBySecondOrganize("DatumLibrary","paperNum"));
this.addDict(model, "jianmMs", paramService.getParamBySecondOrganize("DatumLibrary","jianmMs"));
this.addDict(model, "isjianm", paramService.getParamBySecondOrganize("DatumLibrary","isjianm"));
this.addDict(model, "isLack", paramService.getParamBySecondOrganize("DatumLibrary","isLack"));
this.addDict(model, "source", paramService.getParamBySecondOrganize("DatumLibrary","source"));
super.init(model, context); super.init(model, context);
} }
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterApplyController.java
View file @ a54ce107
...@@ -55,7 +55,7 @@ public class MatterApplyController extends BaseCRUDJsonBodyMappingController<Mat ...@@ -55,7 +55,7 @@ public class MatterApplyController extends BaseCRUDJsonBodyMappingController<Mat
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterApply","source")); this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterApply","source"));
this.addDict(model, "isConvert", paramService.getParamBySecondOrganize("MatterApply","isConvert"));
super.init(model, context); super.init(model, context);
} }
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java
View file @ a54ce107
...@@ -44,7 +44,11 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat ...@@ -44,7 +44,11 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterDatum","source")); this.addDict(model, "needType", paramService.getParamBySecondOrganize("MatterDatum","needType"));
this.addDict(model, "datumType", paramService.getParamBySecondOrganize("MatterDatum","datumType"));
this.addDict(model, "needOriginal", paramService.getParamBySecondOrganize("MatterDatum","needOriginal"));
this.addDict(model, "uselType", paramService.getParamBySecondOrganize("MatterDatum","uselType"));
this.addDict(model, "suggest", paramService.getParamBySecondOrganize("MatterDatum","suggest"));
super.init(model, context); super.init(model, context);
} }
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumFileController.java
View file @ a54ce107
...@@ -43,7 +43,6 @@ public class MatterDatumFileController extends BaseCRUDJsonBodyMappingController ...@@ -43,7 +43,6 @@ public class MatterDatumFileController extends BaseCRUDJsonBodyMappingController
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "filetype", paramService.getParamBySecondOrganize("MatterDatumFile","filetype")); this.addDict(model, "filetype", paramService.getParamBySecondOrganize("MatterDatumFile","filetype"));
this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterDatumFile","source"));
super.init(model, context); super.init(model, context);
} }
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/web/UserMatterApplyController.java
View file @ a54ce107
...@@ -42,6 +42,7 @@ public class UserMatterApplyController extends BaseCRUDJsonBodyMappingController ...@@ -42,6 +42,7 @@ public class UserMatterApplyController extends BaseCRUDJsonBodyMappingController
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "status", paramService.getParamBySecondOrganize("UserMatterApply","status"));
super.init(model, context); super.init(model, context);
} }
......
sst-manager/src/main/java/com/mortals/xhx/module/matter/web/UserMatterExamineController.java 0 → 100644
View file @ a54ce107
package com.mortals.xhx.module.matter.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.matter.model.UserMatterExamineEntity;
import com.mortals.xhx.module.matter.service.UserMatterExamineService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 用户申报事项审批
*
* @author zxfei
* @date 2023-04-11
*/
@RestController
@RequestMapping("user/matter/examine")
public class UserMatterExamineController extends BaseCRUDJsonBodyMappingController<UserMatterExamineService,UserMatterExamineEntity,Long> {
@Autowired
private ParamService paramService;
public UserMatterExamineController(){
super.setModuleDesc( "用户申报事项审批");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "acceptResult", paramService.getParamBySecondOrganize("UserMatterExamine","acceptResult"));
super.init(model, context);
}
}
\ No newline at end of file
sst-manager/src/main/resources/sqlmap/module/matter/DatumLibraryMapper.xml
View file @ a54ce107
...@@ -11,7 +11,12 @@ ...@@ -11,7 +11,12 @@
<result property="datumId" column="datumId" /> <result property="datumId" column="datumId" />
<result property="shortName" column="shortName" /> <result property="shortName" column="shortName" />
<result property="fullName" column="fullName" /> <result property="fullName" column="fullName" />
<result property="needType" column="needType" />
<result property="datumType" column="datumType" />
<result property="needOriginal" column="needOriginal" />
<result property="uselType" column="uselType" /> <result property="uselType" column="uselType" />
<result property="suggest" column="suggest" />
<result property="fillSum" column="fillSum" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
...@@ -41,9 +46,24 @@ ...@@ -41,9 +46,24 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fullName') or colPickMode == 1 and data.containsKey('fullName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fullName') or colPickMode == 1 and data.containsKey('fullName')))">
a.fullName, a.fullName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('needType') or colPickMode == 1 and data.containsKey('needType')))">
a.needType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('datumType') or colPickMode == 1 and data.containsKey('datumType')))">
a.datumType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('needOriginal') or colPickMode == 1 and data.containsKey('needOriginal')))">
a.needOriginal,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('uselType') or colPickMode == 1 and data.containsKey('uselType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('uselType') or colPickMode == 1 and data.containsKey('uselType')))">
a.uselType, a.uselType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('suggest') or colPickMode == 1 and data.containsKey('suggest')))">
a.suggest,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fillSum') or colPickMode == 1 and data.containsKey('fillSum')))">
a.fillSum,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
...@@ -61,18 +81,18 @@ ...@@ -61,18 +81,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DatumLibraryEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DatumLibraryEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_datum_library insert into mortals_sys_datum_library
(siteId,siteName,datumId,shortName,fullName,uselType,createTime,createUserId,updateUserId,updateTime) (siteId,siteName,datumId,shortName,fullName,needType,datumType,needOriginal,uselType,suggest,fillSum,createTime,createUserId,updateUserId,updateTime)
VALUES VALUES
(#{siteId},#{siteName},#{datumId},#{shortName},#{fullName},#{uselType},#{createTime},#{createUserId},#{updateUserId},#{updateTime}) (#{siteId},#{siteName},#{datumId},#{shortName},#{fullName},#{needType},#{datumType},#{needOriginal},#{uselType},#{suggest},#{fillSum},#{createTime},#{createUserId},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_datum_library insert into mortals_sys_datum_library
(siteId,siteName,datumId,shortName,fullName,uselType,createTime,createUserId,updateUserId,updateTime) (siteId,siteName,datumId,shortName,fullName,needType,datumType,needOriginal,uselType,suggest,fillSum,createTime,createUserId,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.siteName},#{item.datumId},#{item.shortName},#{item.fullName},#{item.uselType},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime}) (#{item.siteId},#{item.siteName},#{item.datumId},#{item.shortName},#{item.fullName},#{item.needType},#{item.datumType},#{item.needOriginal},#{item.uselType},#{item.suggest},#{item.fillSum},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -103,12 +123,42 @@ ...@@ -103,12 +123,42 @@
<if test="(colPickMode==0 and data.containsKey('fullName')) or (colPickMode==1 and !data.containsKey('fullName'))"> <if test="(colPickMode==0 and data.containsKey('fullName')) or (colPickMode==1 and !data.containsKey('fullName'))">
a.fullName=#{data.fullName}, a.fullName=#{data.fullName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('needType')) or (colPickMode==1 and !data.containsKey('needType'))">
a.needType=#{data.needType},
</if>
<if test="(colPickMode==0 and data.containsKey('needTypeIncrement')) or (colPickMode==1 and !data.containsKey('needTypeIncrement'))">
a.needType=ifnull(a.needType,0) + #{data.needTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('datumType')) or (colPickMode==1 and !data.containsKey('datumType'))">
a.datumType=#{data.datumType},
</if>
<if test="(colPickMode==0 and data.containsKey('datumTypeIncrement')) or (colPickMode==1 and !data.containsKey('datumTypeIncrement'))">
a.datumType=ifnull(a.datumType,0) + #{data.datumTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('needOriginal')) or (colPickMode==1 and !data.containsKey('needOriginal'))">
a.needOriginal=#{data.needOriginal},
</if>
<if test="(colPickMode==0 and data.containsKey('needOriginalIncrement')) or (colPickMode==1 and !data.containsKey('needOriginalIncrement'))">
a.needOriginal=ifnull(a.needOriginal,0) + #{data.needOriginalIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('uselType')) or (colPickMode==1 and !data.containsKey('uselType'))"> <if test="(colPickMode==0 and data.containsKey('uselType')) or (colPickMode==1 and !data.containsKey('uselType'))">
a.uselType=#{data.uselType}, a.uselType=#{data.uselType},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('uselTypeIncrement')) or (colPickMode==1 and !data.containsKey('uselTypeIncrement'))"> <if test="(colPickMode==0 and data.containsKey('uselTypeIncrement')) or (colPickMode==1 and !data.containsKey('uselTypeIncrement'))">
a.uselType=ifnull(a.uselType,0) + #{data.uselTypeIncrement}, a.uselType=ifnull(a.uselType,0) + #{data.uselTypeIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('suggest')) or (colPickMode==1 and !data.containsKey('suggest'))">
a.suggest=#{data.suggest},
</if>
<if test="(colPickMode==0 and data.containsKey('suggestIncrement')) or (colPickMode==1 and !data.containsKey('suggestIncrement'))">
a.suggest=ifnull(a.suggest,0) + #{data.suggestIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('fillSum')) or (colPickMode==1 and !data.containsKey('fillSum'))">
a.fillSum=#{data.fillSum},
</if>
<if test="(colPickMode==0 and data.containsKey('fillSumIncrement')) or (colPickMode==1 and !data.containsKey('fillSumIncrement'))">
a.fillSum=ifnull(a.fillSum,0) + #{data.fillSumIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
</if> </if>
...@@ -184,6 +234,42 @@ ...@@ -184,6 +234,42 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="needType=(case" suffix="ELSE needType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('needType')) or (colPickMode==1 and !item.containsKey('needType'))">
when a.id=#{item.id} then #{item.needType}
</when>
<when test="(colPickMode==0 and item.containsKey('needTypeIncrement')) or (colPickMode==1 and !item.containsKey('needTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.needType,0) + #{item.needTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="datumType=(case" suffix="ELSE datumType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('datumType')) or (colPickMode==1 and !item.containsKey('datumType'))">
when a.id=#{item.id} then #{item.datumType}
</when>
<when test="(colPickMode==0 and item.containsKey('datumTypeIncrement')) or (colPickMode==1 and !item.containsKey('datumTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.datumType,0) + #{item.datumTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="needOriginal=(case" suffix="ELSE needOriginal end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('needOriginal')) or (colPickMode==1 and !item.containsKey('needOriginal'))">
when a.id=#{item.id} then #{item.needOriginal}
</when>
<when test="(colPickMode==0 and item.containsKey('needOriginalIncrement')) or (colPickMode==1 and !item.containsKey('needOriginalIncrement'))">
when a.id=#{item.id} then ifnull(a.needOriginal,0) + #{item.needOriginalIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="uselType=(case" suffix="ELSE uselType end),"> <trim prefix="uselType=(case" suffix="ELSE uselType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -196,6 +282,30 @@ ...@@ -196,6 +282,30 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="suggest=(case" suffix="ELSE suggest end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('suggest')) or (colPickMode==1 and !item.containsKey('suggest'))">
when a.id=#{item.id} then #{item.suggest}
</when>
<when test="(colPickMode==0 and item.containsKey('suggestIncrement')) or (colPickMode==1 and !item.containsKey('suggestIncrement'))">
when a.id=#{item.id} then ifnull(a.suggest,0) + #{item.suggestIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="fillSum=(case" suffix="ELSE fillSum end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('fillSum')) or (colPickMode==1 and !item.containsKey('fillSum'))">
when a.id=#{item.id} then #{item.fillSum}
</when>
<when test="(colPickMode==0 and item.containsKey('fillSumIncrement')) or (colPickMode==1 and !item.containsKey('fillSumIncrement'))">
when a.id=#{item.id} then ifnull(a.fillSum,0) + #{item.fillSumIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
...@@ -358,13 +468,13 @@ ...@@ -358,13 +468,13 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList')"> <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in ${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -385,13 +495,13 @@ ...@@ -385,13 +495,13 @@
${_conditionType_} a.siteId is null ${_conditionType_} a.siteId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteIdList')"> <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in ${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteIdNotList')"> <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in ${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -413,13 +523,13 @@ ...@@ -413,13 +523,13 @@
${_conditionType_} a.siteName is null ${_conditionType_} a.siteName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteNameList')"> <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
${_conditionType_} a.siteName in ${_conditionType_} a.siteName in
<foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteNameNotList')"> <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
${_conditionType_} a.siteName not in ${_conditionType_} a.siteName not in
<foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -433,13 +543,13 @@ ...@@ -433,13 +543,13 @@
${_conditionType_} a.datumId is null ${_conditionType_} a.datumId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('datumIdList')"> <if test="conditionParamRef.containsKey('datumIdList') and conditionParamRef.datumIdList.size() > 0">
${_conditionType_} a.datumId in ${_conditionType_} a.datumId in
<foreach collection="conditionParamRef.datumIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.datumIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('datumIdNotList')"> <if test="conditionParamRef.containsKey('datumIdNotList') and conditionParamRef.datumIdNotList.size() > 0">
${_conditionType_} a.datumId not in ${_conditionType_} a.datumId not in
<foreach collection="conditionParamRef.datumIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.datumIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -461,13 +571,13 @@ ...@@ -461,13 +571,13 @@
${_conditionType_} a.shortName is null ${_conditionType_} a.shortName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('shortNameList')"> <if test="conditionParamRef.containsKey('shortNameList') and conditionParamRef.shortNameList.size() > 0">
${_conditionType_} a.shortName in ${_conditionType_} a.shortName in
<foreach collection="conditionParamRef.shortNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.shortNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('shortNameNotList')"> <if test="conditionParamRef.containsKey('shortNameNotList') and conditionParamRef.shortNameNotList.size() > 0">
${_conditionType_} a.shortName not in ${_conditionType_} a.shortName not in
<foreach collection="conditionParamRef.shortNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.shortNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -482,18 +592,99 @@ ...@@ -482,18 +592,99 @@
${_conditionType_} a.fullName is null ${_conditionType_} a.fullName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fullNameList')"> <if test="conditionParamRef.containsKey('fullNameList') and conditionParamRef.fullNameList.size() > 0">
${_conditionType_} a.fullName in ${_conditionType_} a.fullName in
<foreach collection="conditionParamRef.fullNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fullNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('fullNameNotList')"> <if test="conditionParamRef.containsKey('fullNameNotList') and conditionParamRef.fullNameNotList.size() > 0">
${_conditionType_} a.fullName not in ${_conditionType_} a.fullName not in
<foreach collection="conditionParamRef.fullNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fullNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('needType')">
<if test="conditionParamRef.needType != null ">
${_conditionType_} a.needType = #{${_conditionParam_}.needType}
</if>
<if test="conditionParamRef.needType == null">
${_conditionType_} a.needType is null
</if>
</if>
<if test="conditionParamRef.containsKey('needTypeList') and conditionParamRef.needTypeList.size() > 0">
${_conditionType_} a.needType in
<foreach collection="conditionParamRef.needTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('needTypeNotList') and conditionParamRef.needTypeNotList.size() > 0">
${_conditionType_} a.needType not in
<foreach collection="conditionParamRef.needTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('needTypeStart') and conditionParamRef.needTypeStart != null">
${_conditionType_} a.needType <![CDATA[ >= ]]> #{${_conditionParam_}.needTypeStart}
</if>
<if test="conditionParamRef.containsKey('needTypeEnd') and conditionParamRef.needTypeEnd != null">
${_conditionType_} a.needType <![CDATA[ <= ]]> #{${_conditionParam_}.needTypeEnd}
</if>
<if test="conditionParamRef.containsKey('datumType')">
<if test="conditionParamRef.datumType != null ">
${_conditionType_} a.datumType = #{${_conditionParam_}.datumType}
</if>
<if test="conditionParamRef.datumType == null">
${_conditionType_} a.datumType is null
</if>
</if>
<if test="conditionParamRef.containsKey('datumTypeList') and conditionParamRef.datumTypeList.size() > 0">
${_conditionType_} a.datumType in
<foreach collection="conditionParamRef.datumTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('datumTypeNotList') and conditionParamRef.datumTypeNotList.size() > 0">
${_conditionType_} a.datumType not in
<foreach collection="conditionParamRef.datumTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('datumTypeStart') and conditionParamRef.datumTypeStart != null">
${_conditionType_} a.datumType <![CDATA[ >= ]]> #{${_conditionParam_}.datumTypeStart}
</if>
<if test="conditionParamRef.containsKey('datumTypeEnd') and conditionParamRef.datumTypeEnd != null">
${_conditionType_} a.datumType <![CDATA[ <= ]]> #{${_conditionParam_}.datumTypeEnd}
</if>
<if test="conditionParamRef.containsKey('needOriginal')">
<if test="conditionParamRef.needOriginal != null ">
${_conditionType_} a.needOriginal = #{${_conditionParam_}.needOriginal}
</if>
<if test="conditionParamRef.needOriginal == null">
${_conditionType_} a.needOriginal is null
</if>
</if>
<if test="conditionParamRef.containsKey('needOriginalList') and conditionParamRef.needOriginalList.size() > 0">
${_conditionType_} a.needOriginal in
<foreach collection="conditionParamRef.needOriginalList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('needOriginalNotList') and conditionParamRef.needOriginalNotList.size() > 0">
${_conditionType_} a.needOriginal not in
<foreach collection="conditionParamRef.needOriginalNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('needOriginalStart') and conditionParamRef.needOriginalStart != null">
${_conditionType_} a.needOriginal <![CDATA[ >= ]]> #{${_conditionParam_}.needOriginalStart}
</if>
<if test="conditionParamRef.containsKey('needOriginalEnd') and conditionParamRef.needOriginalEnd != null">
${_conditionType_} a.needOriginal <![CDATA[ <= ]]> #{${_conditionParam_}.needOriginalEnd}
</if>
<if test="conditionParamRef.containsKey('uselType')"> <if test="conditionParamRef.containsKey('uselType')">
<if test="conditionParamRef.uselType != null "> <if test="conditionParamRef.uselType != null ">
${_conditionType_} a.uselType = #{${_conditionParam_}.uselType} ${_conditionType_} a.uselType = #{${_conditionParam_}.uselType}
...@@ -502,13 +693,13 @@ ...@@ -502,13 +693,13 @@
${_conditionType_} a.uselType is null ${_conditionType_} a.uselType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('uselTypeList')"> <if test="conditionParamRef.containsKey('uselTypeList') and conditionParamRef.uselTypeList.size() > 0">
${_conditionType_} a.uselType in ${_conditionType_} a.uselType in
<foreach collection="conditionParamRef.uselTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.uselTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('uselTypeNotList')"> <if test="conditionParamRef.containsKey('uselTypeNotList') and conditionParamRef.uselTypeNotList.size() > 0">
${_conditionType_} a.uselType not in ${_conditionType_} a.uselType not in
<foreach collection="conditionParamRef.uselTypeNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.uselTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -521,6 +712,60 @@ ...@@ -521,6 +712,60 @@
${_conditionType_} a.uselType <![CDATA[ <= ]]> #{${_conditionParam_}.uselTypeEnd} ${_conditionType_} a.uselType <![CDATA[ <= ]]> #{${_conditionParam_}.uselTypeEnd}
</if> </if>
<if test="conditionParamRef.containsKey('suggest')">
<if test="conditionParamRef.suggest != null ">
${_conditionType_} a.suggest = #{${_conditionParam_}.suggest}
</if>
<if test="conditionParamRef.suggest == null">
${_conditionType_} a.suggest is null
</if>
</if>
<if test="conditionParamRef.containsKey('suggestList') and conditionParamRef.suggestList.size() > 0">
${_conditionType_} a.suggest in
<foreach collection="conditionParamRef.suggestList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('suggestNotList') and conditionParamRef.suggestNotList.size() > 0">
${_conditionType_} a.suggest not in
<foreach collection="conditionParamRef.suggestNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('suggestStart') and conditionParamRef.suggestStart != null">
${_conditionType_} a.suggest <![CDATA[ >= ]]> #{${_conditionParam_}.suggestStart}
</if>
<if test="conditionParamRef.containsKey('suggestEnd') and conditionParamRef.suggestEnd != null">
${_conditionType_} a.suggest <![CDATA[ <= ]]> #{${_conditionParam_}.suggestEnd}
</if>
<if test="conditionParamRef.containsKey('fillSum')">
<if test="conditionParamRef.fillSum != null ">
${_conditionType_} a.fillSum = #{${_conditionParam_}.fillSum}
</if>
<if test="conditionParamRef.fillSum == null">
${_conditionType_} a.fillSum is null
</if>
</if>
<if test="conditionParamRef.containsKey('fillSumList') and conditionParamRef.fillSumList.size() > 0">
${_conditionType_} a.fillSum in
<foreach collection="conditionParamRef.fillSumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fillSumNotList') and conditionParamRef.fillSumNotList.size() > 0">
${_conditionType_} a.fillSum not in
<foreach collection="conditionParamRef.fillSumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fillSumStart') and conditionParamRef.fillSumStart != null">
${_conditionType_} a.fillSum <![CDATA[ >= ]]> #{${_conditionParam_}.fillSumStart}
</if>
<if test="conditionParamRef.containsKey('fillSumEnd') and conditionParamRef.fillSumEnd != null">
${_conditionType_} a.fillSum <![CDATA[ <= ]]> #{${_conditionParam_}.fillSumEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
...@@ -544,13 +789,13 @@ ...@@ -544,13 +789,13 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList')"> <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in ${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -571,13 +816,13 @@ ...@@ -571,13 +816,13 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList')"> <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in ${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -648,11 +893,36 @@ ...@@ -648,11 +893,36 @@
<if test='orderCol.fullName != null and "DESC".equalsIgnoreCase(orderCol.fullName)'>DESC</if> <if test='orderCol.fullName != null and "DESC".equalsIgnoreCase(orderCol.fullName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('needType')">
a.needType
<if test='orderCol.needType != null and "DESC".equalsIgnoreCase(orderCol.needType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('datumType')">
a.datumType
<if test='orderCol.datumType != null and "DESC".equalsIgnoreCase(orderCol.datumType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('needOriginal')">
a.needOriginal
<if test='orderCol.needOriginal != null and "DESC".equalsIgnoreCase(orderCol.needOriginal)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('uselType')"> <if test="orderCol.containsKey('uselType')">
a.uselType a.uselType
<if test='orderCol.uselType != null and "DESC".equalsIgnoreCase(orderCol.uselType)'>DESC</if> <if test='orderCol.uselType != null and "DESC".equalsIgnoreCase(orderCol.uselType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('suggest')">
a.suggest
<if test='orderCol.suggest != null and "DESC".equalsIgnoreCase(orderCol.suggest)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('fillSum')">
a.fillSum
<if test='orderCol.fillSum != null and "DESC".equalsIgnoreCase(orderCol.fillSum)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
......
sst-manager/src/main/resources/sqlmap/module/matter/MatterDatumMapper.xml
View file @ a54ce107
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.matter.dao.ibatis.MatterDatumDaoImpl"> <mapper namespace="com.mortals.xhx.module.matter.dao.ibatis.MatterDatumDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<result property="matterCode" column="matterCode" /> <result property="matterCode" column="matterCode" />
<result property="shortName" column="shortName" /> <result property="shortName" column="shortName" />
<result property="fullName" column="fullName" /> <result property="fullName" column="fullName" />
<result property="needType" column="needType" />
<result property="datumType" column="datumType" />
<result property="needOriginal" column="needOriginal" />
<result property="uselType" column="uselType" /> <result property="uselType" column="uselType" />
<result property="suggest" column="suggest" /> <result property="suggest" column="suggest" />
<result property="fillSum" column="fillSum" /> <result property="fillSum" column="fillSum" />
...@@ -47,6 +50,15 @@ ...@@ -47,6 +50,15 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fullName') or colPickMode == 1 and data.containsKey('fullName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fullName') or colPickMode == 1 and data.containsKey('fullName')))">
a.fullName, a.fullName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('needType') or colPickMode == 1 and data.containsKey('needType')))">
a.needType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('datumType') or colPickMode == 1 and data.containsKey('datumType')))">
a.datumType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('needOriginal') or colPickMode == 1 and data.containsKey('needOriginal')))">
a.needOriginal,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('uselType') or colPickMode == 1 and data.containsKey('uselType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('uselType') or colPickMode == 1 and data.containsKey('uselType')))">
a.uselType, a.uselType,
</if> </if>
...@@ -73,18 +85,18 @@ ...@@ -73,18 +85,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="MatterDatumEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="MatterDatumEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_matter_datum insert into mortals_sys_matter_datum
(siteId,siteName,matterId,matterCode,shortName,fullName,uselType,suggest,fillSum,createTime,createUserId,updateUserId,updateTime) (siteId,siteName,matterId,matterCode,shortName,fullName,needType,datumType,needOriginal,uselType,suggest,fillSum,createTime,createUserId,updateUserId,updateTime)
VALUES VALUES
(#{siteId},#{siteName},#{matterId},#{matterCode},#{shortName},#{fullName},#{uselType},#{suggest},#{fillSum},#{createTime},#{createUserId},#{updateUserId},#{updateTime}) (#{siteId},#{siteName},#{matterId},#{matterCode},#{shortName},#{fullName},#{needType},#{datumType},#{needOriginal},#{uselType},#{suggest},#{fillSum},#{createTime},#{createUserId},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_matter_datum insert into mortals_sys_matter_datum
(siteId,siteName,matterId,matterCode,shortName,fullName,uselType,suggest,fillSum,createTime,createUserId,updateUserId,updateTime) (siteId,siteName,matterId,matterCode,shortName,fullName,needType,datumType,needOriginal,uselType,suggest,fillSum,createTime,createUserId,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterCode},#{item.shortName},#{item.fullName},#{item.uselType},#{item.suggest},#{item.fillSum},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime}) (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterCode},#{item.shortName},#{item.fullName},#{item.needType},#{item.datumType},#{item.needOriginal},#{item.uselType},#{item.suggest},#{item.fillSum},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -118,6 +130,24 @@ ...@@ -118,6 +130,24 @@
<if test="(colPickMode==0 and data.containsKey('fullName')) or (colPickMode==1 and !data.containsKey('fullName'))"> <if test="(colPickMode==0 and data.containsKey('fullName')) or (colPickMode==1 and !data.containsKey('fullName'))">
a.fullName=#{data.fullName}, a.fullName=#{data.fullName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('needType')) or (colPickMode==1 and !data.containsKey('needType'))">
a.needType=#{data.needType},
</if>
<if test="(colPickMode==0 and data.containsKey('needTypeIncrement')) or (colPickMode==1 and !data.containsKey('needTypeIncrement'))">
a.needType=ifnull(a.needType,0) + #{data.needTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('datumType')) or (colPickMode==1 and !data.containsKey('datumType'))">
a.datumType=#{data.datumType},
</if>
<if test="(colPickMode==0 and data.containsKey('datumTypeIncrement')) or (colPickMode==1 and !data.containsKey('datumTypeIncrement'))">
a.datumType=ifnull(a.datumType,0) + #{data.datumTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('needOriginal')) or (colPickMode==1 and !data.containsKey('needOriginal'))">
a.needOriginal=#{data.needOriginal},
</if>
<if test="(colPickMode==0 and data.containsKey('needOriginalIncrement')) or (colPickMode==1 and !data.containsKey('needOriginalIncrement'))">
a.needOriginal=ifnull(a.needOriginal,0) + #{data.needOriginalIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('uselType')) or (colPickMode==1 and !data.containsKey('uselType'))"> <if test="(colPickMode==0 and data.containsKey('uselType')) or (colPickMode==1 and !data.containsKey('uselType'))">
a.uselType=#{data.uselType}, a.uselType=#{data.uselType},
</if> </if>
...@@ -217,6 +247,42 @@ ...@@ -217,6 +247,42 @@
when a.id=#{item.id} then #{item.fullName} when a.id=#{item.id} then #{item.fullName}
</if> </if>
</foreach> </foreach>
</trim>
<trim prefix="needType=(case" suffix="ELSE needType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('needType')) or (colPickMode==1 and !item.containsKey('needType'))">
when a.id=#{item.id} then #{item.needType}
</when>
<when test="(colPickMode==0 and item.containsKey('needTypeIncrement')) or (colPickMode==1 and !item.containsKey('needTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.needType,0) + #{item.needTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="datumType=(case" suffix="ELSE datumType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('datumType')) or (colPickMode==1 and !item.containsKey('datumType'))">
when a.id=#{item.id} then #{item.datumType}
</when>
<when test="(colPickMode==0 and item.containsKey('datumTypeIncrement')) or (colPickMode==1 and !item.containsKey('datumTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.datumType,0) + #{item.datumTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="needOriginal=(case" suffix="ELSE needOriginal end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('needOriginal')) or (colPickMode==1 and !item.containsKey('needOriginal'))">
when a.id=#{item.id} then #{item.needOriginal}
</when>
<when test="(colPickMode==0 and item.containsKey('needOriginalIncrement')) or (colPickMode==1 and !item.containsKey('needOriginalIncrement'))">
when a.id=#{item.id} then ifnull(a.needOriginal,0) + #{item.needOriginalIncrement}
</when>
</choose>
</foreach>
</trim> </trim>
<trim prefix="uselType=(case" suffix="ELSE uselType end),"> <trim prefix="uselType=(case" suffix="ELSE uselType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
...@@ -573,6 +639,87 @@ ...@@ -573,6 +639,87 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('needType')">
<if test="conditionParamRef.needType != null ">
${_conditionType_} a.needType = #{${_conditionParam_}.needType}
</if>
<if test="conditionParamRef.needType == null">
${_conditionType_} a.needType is null
</if>
</if>
<if test="conditionParamRef.containsKey('needTypeList')">
${_conditionType_} a.needType in
<foreach collection="conditionParamRef.needTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('needTypeNotList')">
${_conditionType_} a.needType not in
<foreach collection="conditionParamRef.needTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('needTypeStart') and conditionParamRef.needTypeStart != null">
${_conditionType_} a.needType <![CDATA[ >= ]]> #{${_conditionParam_}.needTypeStart}
</if>
<if test="conditionParamRef.containsKey('needTypeEnd') and conditionParamRef.needTypeEnd != null">
${_conditionType_} a.needType <![CDATA[ <= ]]> #{${_conditionParam_}.needTypeEnd}
</if>
<if test="conditionParamRef.containsKey('datumType')">
<if test="conditionParamRef.datumType != null ">
${_conditionType_} a.datumType = #{${_conditionParam_}.datumType}
</if>
<if test="conditionParamRef.datumType == null">
${_conditionType_} a.datumType is null
</if>
</if>
<if test="conditionParamRef.containsKey('datumTypeList')">
${_conditionType_} a.datumType in
<foreach collection="conditionParamRef.datumTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('datumTypeNotList')">
${_conditionType_} a.datumType not in
<foreach collection="conditionParamRef.datumTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('datumTypeStart') and conditionParamRef.datumTypeStart != null">
${_conditionType_} a.datumType <![CDATA[ >= ]]> #{${_conditionParam_}.datumTypeStart}
</if>
<if test="conditionParamRef.containsKey('datumTypeEnd') and conditionParamRef.datumTypeEnd != null">
${_conditionType_} a.datumType <![CDATA[ <= ]]> #{${_conditionParam_}.datumTypeEnd}
</if>
<if test="conditionParamRef.containsKey('needOriginal')">
<if test="conditionParamRef.needOriginal != null ">
${_conditionType_} a.needOriginal = #{${_conditionParam_}.needOriginal}
</if>
<if test="conditionParamRef.needOriginal == null">
${_conditionType_} a.needOriginal is null
</if>
</if>
<if test="conditionParamRef.containsKey('needOriginalList')">
${_conditionType_} a.needOriginal in
<foreach collection="conditionParamRef.needOriginalList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('needOriginalNotList')">
${_conditionType_} a.needOriginal not in
<foreach collection="conditionParamRef.needOriginalNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('needOriginalStart') and conditionParamRef.needOriginalStart != null">
${_conditionType_} a.needOriginal <![CDATA[ >= ]]> #{${_conditionParam_}.needOriginalStart}
</if>
<if test="conditionParamRef.containsKey('needOriginalEnd') and conditionParamRef.needOriginalEnd != null">
${_conditionType_} a.needOriginal <![CDATA[ <= ]]> #{${_conditionParam_}.needOriginalEnd}
</if>
<if test="conditionParamRef.containsKey('uselType')"> <if test="conditionParamRef.containsKey('uselType')">
<if test="conditionParamRef.uselType != null "> <if test="conditionParamRef.uselType != null ">
${_conditionType_} a.uselType = #{${_conditionParam_}.uselType} ${_conditionType_} a.uselType = #{${_conditionParam_}.uselType}
...@@ -786,6 +933,21 @@ ...@@ -786,6 +933,21 @@
<if test='orderCol.fullName != null and "DESC".equalsIgnoreCase(orderCol.fullName)'>DESC</if> <if test='orderCol.fullName != null and "DESC".equalsIgnoreCase(orderCol.fullName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('needType')">
a.needType
<if test='orderCol.needType != null and "DESC".equalsIgnoreCase(orderCol.needType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('datumType')">
a.datumType
<if test='orderCol.datumType != null and "DESC".equalsIgnoreCase(orderCol.datumType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('needOriginal')">
a.needOriginal
<if test='orderCol.needOriginal != null and "DESC".equalsIgnoreCase(orderCol.needOriginal)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('uselType')"> <if test="orderCol.containsKey('uselType')">
a.uselType a.uselType
<if test='orderCol.uselType != null and "DESC".equalsIgnoreCase(orderCol.uselType)'>DESC</if> <if test='orderCol.uselType != null and "DESC".equalsIgnoreCase(orderCol.uselType)'>DESC</if>
......
sst-manager/src/main/resources/sqlmap/module/matter/UserMatterApplyMapper.xml
View file @ a54ce107
...@@ -14,6 +14,15 @@ ...@@ -14,6 +14,15 @@
<result property="applyAddr" column="applyAddr" /> <result property="applyAddr" column="applyAddr" />
<result property="deviceName" column="deviceName" /> <result property="deviceName" column="deviceName" />
<result property="applyPerson" column="applyPerson" /> <result property="applyPerson" column="applyPerson" />
<result property="phoneNum" column="phoneNum" />
<result property="idCard" column="idCard" />
<result property="deptName" column="deptName" />
<result property="applyDate" column="applyDate" />
<result property="status" column="status" />
<result property="applyWay" column="applyWay" />
<result property="storeDevice" column="storeDevice" />
<result property="boxNum" column="boxNum" />
<result property="storeDate" column="storeDate" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
...@@ -52,6 +61,33 @@ ...@@ -52,6 +61,33 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applyPerson') or colPickMode == 1 and data.containsKey('applyPerson')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applyPerson') or colPickMode == 1 and data.containsKey('applyPerson')))">
a.applyPerson, a.applyPerson,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('phoneNum') or colPickMode == 1 and data.containsKey('phoneNum')))">
a.phoneNum,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('idCard') or colPickMode == 1 and data.containsKey('idCard')))">
a.idCard,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
a.deptName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applyDate') or colPickMode == 1 and data.containsKey('applyDate')))">
a.applyDate,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applyWay') or colPickMode == 1 and data.containsKey('applyWay')))">
a.applyWay,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('storeDevice') or colPickMode == 1 and data.containsKey('storeDevice')))">
a.storeDevice,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('boxNum') or colPickMode == 1 and data.containsKey('boxNum')))">
a.boxNum,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('storeDate') or colPickMode == 1 and data.containsKey('storeDate')))">
a.storeDate,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId, a.createUserId,
</if> </if>
...@@ -69,18 +105,18 @@ ...@@ -69,18 +105,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="UserMatterApplyEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="UserMatterApplyEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_user_matter_apply insert into mortals_xhx_user_matter_apply
(userId,matterId,matterName,matterCode,applyCode,applyAddr,deviceName,applyPerson,createUserId,createTime,updateUserId,updateTime) (userId,matterId,matterName,matterCode,applyCode,applyAddr,deviceName,applyPerson,phoneNum,idCard,deptName,applyDate,status,applyWay,storeDevice,boxNum,storeDate,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
(#{userId},#{matterId},#{matterName},#{matterCode},#{applyCode},#{applyAddr},#{deviceName},#{applyPerson},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{userId},#{matterId},#{matterName},#{matterCode},#{applyCode},#{applyAddr},#{deviceName},#{applyPerson},#{phoneNum},#{idCard},#{deptName},#{applyDate},#{status},#{applyWay},#{storeDevice},#{boxNum},#{storeDate},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_user_matter_apply insert into mortals_xhx_user_matter_apply
(userId,matterId,matterName,matterCode,applyCode,applyAddr,deviceName,applyPerson,createUserId,createTime,updateUserId,updateTime) (userId,matterId,matterName,matterCode,applyCode,applyAddr,deviceName,applyPerson,phoneNum,idCard,deptName,applyDate,status,applyWay,storeDevice,boxNum,storeDate,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.userId},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.applyCode},#{item.applyAddr},#{item.deviceName},#{item.applyPerson},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.userId},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.applyCode},#{item.applyAddr},#{item.deviceName},#{item.applyPerson},#{item.phoneNum},#{item.idCard},#{item.deptName},#{item.applyDate},#{item.status},#{item.applyWay},#{item.storeDevice},#{item.boxNum},#{item.storeDate},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -120,6 +156,36 @@ ...@@ -120,6 +156,36 @@
<if test="(colPickMode==0 and data.containsKey('applyPerson')) or (colPickMode==1 and !data.containsKey('applyPerson'))"> <if test="(colPickMode==0 and data.containsKey('applyPerson')) or (colPickMode==1 and !data.containsKey('applyPerson'))">
a.applyPerson=#{data.applyPerson}, a.applyPerson=#{data.applyPerson},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('phoneNum')) or (colPickMode==1 and !data.containsKey('phoneNum'))">
a.phoneNum=#{data.phoneNum},
</if>
<if test="(colPickMode==0 and data.containsKey('idCard')) or (colPickMode==1 and !data.containsKey('idCard'))">
a.idCard=#{data.idCard},
</if>
<if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
a.deptName=#{data.deptName},
</if>
<if test="(colPickMode==0 and data.containsKey('applyDate')) or (colPickMode==1 and !data.containsKey('applyDate'))">
a.applyDate=#{data.applyDate},
</if>
<if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
a.status=#{data.status},
</if>
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('applyWay')) or (colPickMode==1 and !data.containsKey('applyWay'))">
a.applyWay=#{data.applyWay},
</if>
<if test="(colPickMode==0 and data.containsKey('storeDevice')) or (colPickMode==1 and !data.containsKey('storeDevice'))">
a.storeDevice=#{data.storeDevice},
</if>
<if test="(colPickMode==0 and data.containsKey('boxNum')) or (colPickMode==1 and !data.containsKey('boxNum'))">
a.boxNum=#{data.boxNum},
</if>
<if test="(colPickMode==0 and data.containsKey('storeDate')) or (colPickMode==1 and !data.containsKey('storeDate'))">
a.storeDate=#{data.storeDate},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))"> <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId}, a.createUserId=#{data.createUserId},
</if> </if>
...@@ -215,6 +281,74 @@ ...@@ -215,6 +281,74 @@
when a.id=#{item.id} then #{item.applyPerson} when a.id=#{item.id} then #{item.applyPerson}
</if> </if>
</foreach> </foreach>
</trim>
<trim prefix="phoneNum=(case" suffix="ELSE phoneNum end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('phoneNum')) or (colPickMode==1 and !item.containsKey('phoneNum'))">
when a.id=#{item.id} then #{item.phoneNum}
</if>
</foreach>
</trim>
<trim prefix="idCard=(case" suffix="ELSE idCard end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('idCard')) or (colPickMode==1 and !item.containsKey('idCard'))">
when a.id=#{item.id} then #{item.idCard}
</if>
</foreach>
</trim>
<trim prefix="deptName=(case" suffix="ELSE deptName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
when a.id=#{item.id} then #{item.deptName}
</if>
</foreach>
</trim>
<trim prefix="applyDate=(case" suffix="ELSE applyDate end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('applyDate')) or (colPickMode==1 and !item.containsKey('applyDate'))">
when a.id=#{item.id} then #{item.applyDate}
</if>
</foreach>
</trim>
<trim prefix="status=(case" suffix="ELSE status end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
when a.id=#{item.id} then #{item.status}
</when>
<when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="applyWay=(case" suffix="ELSE applyWay end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('applyWay')) or (colPickMode==1 and !item.containsKey('applyWay'))">
when a.id=#{item.id} then #{item.applyWay}
</if>
</foreach>
</trim>
<trim prefix="storeDevice=(case" suffix="ELSE storeDevice end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('storeDevice')) or (colPickMode==1 and !item.containsKey('storeDevice'))">
when a.id=#{item.id} then #{item.storeDevice}
</if>
</foreach>
</trim>
<trim prefix="boxNum=(case" suffix="ELSE boxNum end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('boxNum')) or (colPickMode==1 and !item.containsKey('boxNum'))">
when a.id=#{item.id} then #{item.boxNum}
</if>
</foreach>
</trim>
<trim prefix="storeDate=(case" suffix="ELSE storeDate end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('storeDate')) or (colPickMode==1 and !item.containsKey('storeDate'))">
when a.id=#{item.id} then #{item.storeDate}
</if>
</foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
...@@ -577,6 +711,189 @@ ...@@ -577,6 +711,189 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('phoneNum')">
<if test="conditionParamRef.phoneNum != null and conditionParamRef.phoneNum != ''">
${_conditionType_} a.phoneNum like #{${_conditionParam_}.phoneNum}
</if>
<if test="conditionParamRef.phoneNum == null">
${_conditionType_} a.phoneNum is null
</if>
</if>
<if test="conditionParamRef.containsKey('phoneNumList')">
${_conditionType_} a.phoneNum in
<foreach collection="conditionParamRef.phoneNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('phoneNumNotList')">
${_conditionType_} a.phoneNum not in
<foreach collection="conditionParamRef.phoneNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idCard')">
<if test="conditionParamRef.idCard != null and conditionParamRef.idCard != ''">
${_conditionType_} a.idCard like #{${_conditionParam_}.idCard}
</if>
<if test="conditionParamRef.idCard == null">
${_conditionType_} a.idCard is null
</if>
</if>
<if test="conditionParamRef.containsKey('idCardList')">
${_conditionType_} a.idCard in
<foreach collection="conditionParamRef.idCardList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idCardNotList')">
${_conditionType_} a.idCard not in
<foreach collection="conditionParamRef.idCardNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptName')">
<if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
</if>
<if test="conditionParamRef.deptName == null">
${_conditionType_} a.deptName is null
</if>
</if>
<if test="conditionParamRef.containsKey('deptNameList')">
${_conditionType_} a.deptName in
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptNameNotList')">
${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applyDate')">
<if test="conditionParamRef.applyDate != null ">
${_conditionType_} a.applyDate = #{${_conditionParam_}.applyDate}
</if>
<if test="conditionParamRef.applyDate == null">
${_conditionType_} a.applyDate is null
</if>
</if>
<if test="conditionParamRef.containsKey('applyDateStart') and conditionParamRef.applyDateStart != null and conditionParamRef.applyDateStart!=''">
${_conditionType_} a.applyDate <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.applyDateStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('applyDateEnd') and conditionParamRef.applyDateEnd != null and conditionParamRef.applyDateEnd!=''">
${_conditionType_} a.applyDate <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.applyDateEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('status')">
<if test="conditionParamRef.status != null ">
${_conditionType_} a.status = #{${_conditionParam_}.status}
</if>
<if test="conditionParamRef.status == null">
${_conditionType_} a.status is null
</if>
</if>
<if test="conditionParamRef.containsKey('statusList')">
${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusNotList')">
${_conditionType_} a.status not in
<foreach collection="conditionParamRef.statusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if>
<if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if>
<if test="conditionParamRef.containsKey('applyWay')">
<if test="conditionParamRef.applyWay != null and conditionParamRef.applyWay != ''">
${_conditionType_} a.applyWay like #{${_conditionParam_}.applyWay}
</if>
<if test="conditionParamRef.applyWay == null">
${_conditionType_} a.applyWay is null
</if>
</if>
<if test="conditionParamRef.containsKey('applyWayList')">
${_conditionType_} a.applyWay in
<foreach collection="conditionParamRef.applyWayList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applyWayNotList')">
${_conditionType_} a.applyWay not in
<foreach collection="conditionParamRef.applyWayNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('storeDevice')">
<if test="conditionParamRef.storeDevice != null and conditionParamRef.storeDevice != ''">
${_conditionType_} a.storeDevice like #{${_conditionParam_}.storeDevice}
</if>
<if test="conditionParamRef.storeDevice == null">
${_conditionType_} a.storeDevice is null
</if>
</if>
<if test="conditionParamRef.containsKey('storeDeviceList')">
${_conditionType_} a.storeDevice in
<foreach collection="conditionParamRef.storeDeviceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('storeDeviceNotList')">
${_conditionType_} a.storeDevice not in
<foreach collection="conditionParamRef.storeDeviceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('boxNum')">
<if test="conditionParamRef.boxNum != null and conditionParamRef.boxNum != ''">
${_conditionType_} a.boxNum like #{${_conditionParam_}.boxNum}
</if>
<if test="conditionParamRef.boxNum == null">
${_conditionType_} a.boxNum is null
</if>
</if>
<if test="conditionParamRef.containsKey('boxNumList')">
${_conditionType_} a.boxNum in
<foreach collection="conditionParamRef.boxNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('boxNumNotList')">
${_conditionType_} a.boxNum not in
<foreach collection="conditionParamRef.boxNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('storeDate')">
<if test="conditionParamRef.storeDate != null ">
${_conditionType_} a.storeDate = #{${_conditionParam_}.storeDate}
</if>
<if test="conditionParamRef.storeDate == null">
${_conditionType_} a.storeDate is null
</if>
</if>
<if test="conditionParamRef.containsKey('storeDateStart') and conditionParamRef.storeDateStart != null and conditionParamRef.storeDateStart!=''">
${_conditionType_} a.storeDate <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.storeDateStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('storeDateEnd') and conditionParamRef.storeDateEnd != null and conditionParamRef.storeDateEnd!=''">
${_conditionType_} a.storeDate <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.storeDateEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
...@@ -719,6 +1036,51 @@ ...@@ -719,6 +1036,51 @@
<if test='orderCol.applyPerson != null and "DESC".equalsIgnoreCase(orderCol.applyPerson)'>DESC</if> <if test='orderCol.applyPerson != null and "DESC".equalsIgnoreCase(orderCol.applyPerson)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('phoneNum')">
a.phoneNum
<if test='orderCol.phoneNum != null and "DESC".equalsIgnoreCase(orderCol.phoneNum)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('idCard')">
a.idCard
<if test='orderCol.idCard != null and "DESC".equalsIgnoreCase(orderCol.idCard)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deptName')">
a.deptName
<if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('applyDate')">
a.applyDate
<if test='orderCol.applyDate != null and "DESC".equalsIgnoreCase(orderCol.applyDate)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('status')">
a.status
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('applyWay')">
a.applyWay
<if test='orderCol.applyWay != null and "DESC".equalsIgnoreCase(orderCol.applyWay)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('storeDevice')">
a.storeDevice
<if test='orderCol.storeDevice != null and "DESC".equalsIgnoreCase(orderCol.storeDevice)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('boxNum')">
a.boxNum
<if test='orderCol.boxNum != null and "DESC".equalsIgnoreCase(orderCol.boxNum)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('storeDate')">
a.storeDate
<if test='orderCol.storeDate != null and "DESC".equalsIgnoreCase(orderCol.storeDate)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('createUserId')">
a.createUserId a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
......
sst-manager/src/main/resources/sqlmap/module/matter/UserMatterExamineMapper.xml 0 → 100644
View file @ a54ce107
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.matter.dao.ibatis.UserMatterExamineDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="UserMatterExamineEntity" id="UserMatterExamineEntity-Map">
<id property="id" column="id" />
<result property="applyrId" column="applyrId" />
<result property="acceptPerson" column="acceptPerson" />
<result property="acceptResult" column="acceptResult" />
<result property="acceptOpinion" column="acceptOpinion" />
<result property="acceptDate" column="acceptDate" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applyrId') or colPickMode == 1 and data.containsKey('applyrId')))">
a.applyrId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('acceptPerson') or colPickMode == 1 and data.containsKey('acceptPerson')))">
a.acceptPerson,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('acceptResult') or colPickMode == 1 and data.containsKey('acceptResult')))">
a.acceptResult,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('acceptOpinion') or colPickMode == 1 and data.containsKey('acceptOpinion')))">
a.acceptOpinion,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('acceptDate') or colPickMode == 1 and data.containsKey('acceptDate')))">
a.acceptDate,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="UserMatterExamineEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_user_matter_examine
(applyrId,acceptPerson,acceptResult,acceptOpinion,acceptDate,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{applyrId},#{acceptPerson},#{acceptResult},#{acceptOpinion},#{acceptDate},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_user_matter_examine
(applyrId,acceptPerson,acceptResult,acceptOpinion,acceptDate,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.applyrId},#{item.acceptPerson},#{item.acceptResult},#{item.acceptOpinion},#{item.acceptDate},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update mortals_xhx_user_matter_examine as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('applyrId')) or (colPickMode==1 and !data.containsKey('applyrId'))">
a.applyrId=#{data.applyrId},
</if>
<if test="(colPickMode==0 and data.containsKey('applyrIdIncrement')) or (colPickMode==1 and !data.containsKey('applyrIdIncrement'))">
a.applyrId=ifnull(a.applyrId,0) + #{data.applyrIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('acceptPerson')) or (colPickMode==1 and !data.containsKey('acceptPerson'))">
a.acceptPerson=#{data.acceptPerson},
</if>
<if test="(colPickMode==0 and data.containsKey('acceptResult')) or (colPickMode==1 and !data.containsKey('acceptResult'))">
a.acceptResult=#{data.acceptResult},
</if>
<if test="(colPickMode==0 and data.containsKey('acceptResultIncrement')) or (colPickMode==1 and !data.containsKey('acceptResultIncrement'))">
a.acceptResult=ifnull(a.acceptResult,0) + #{data.acceptResultIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('acceptOpinion')) or (colPickMode==1 and !data.containsKey('acceptOpinion'))">
a.acceptOpinion=#{data.acceptOpinion},
</if>
<if test="(colPickMode==0 and data.containsKey('acceptDate')) or (colPickMode==1 and !data.containsKey('acceptDate'))">
a.acceptDate=#{data.acceptDate},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
a.updateUserId=#{data.updateUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</update>
<!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_user_matter_examine as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="applyrId=(case" suffix="ELSE applyrId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('applyrId')) or (colPickMode==1 and !item.containsKey('applyrId'))">
when a.id=#{item.id} then #{item.applyrId}
</when>
<when test="(colPickMode==0 and item.containsKey('applyrIdIncrement')) or (colPickMode==1 and !item.containsKey('applyrIdIncrement'))">
when a.id=#{item.id} then ifnull(a.applyrId,0) + #{item.applyrIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="acceptPerson=(case" suffix="ELSE acceptPerson end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('acceptPerson')) or (colPickMode==1 and !item.containsKey('acceptPerson'))">
when a.id=#{item.id} then #{item.acceptPerson}
</if>
</foreach>
</trim>
<trim prefix="acceptResult=(case" suffix="ELSE acceptResult end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('acceptResult')) or (colPickMode==1 and !item.containsKey('acceptResult'))">
when a.id=#{item.id} then #{item.acceptResult}
</when>
<when test="(colPickMode==0 and item.containsKey('acceptResultIncrement')) or (colPickMode==1 and !item.containsKey('acceptResultIncrement'))">
when a.id=#{item.id} then ifnull(a.acceptResult,0) + #{item.acceptResultIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="acceptOpinion=(case" suffix="ELSE acceptOpinion end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('acceptOpinion')) or (colPickMode==1 and !item.containsKey('acceptOpinion'))">
when a.id=#{item.id} then #{item.acceptOpinion}
</if>
</foreach>
</trim>
<trim prefix="acceptDate=(case" suffix="ELSE acceptDate end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('acceptDate')) or (colPickMode==1 and !item.containsKey('acceptDate'))">
when a.id=#{item.id} then #{item.acceptDate}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="UserMatterExamineEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_user_matter_examine as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_user_matter_examine as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys">
delete from mortals_xhx_user_matter_examine where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_user_matter_examine where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_user_matter_examine where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_user_matter_examine as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</delete>
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="UserMatterExamineEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_user_matter_examine as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
select count(1)
from mortals_xhx_user_matter_examine as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</select>
<!-- 条件映射 -->
<sql id="_condition_">
<if test="condition != null and !condition.isEmpty()">
<!-- 条件映射-普通条件 -->
<include refid="_condition_param_">
<property name="_conditionParam_" value="condition"/>
<property name="_conditionType_" value="and"/>
</include>
<!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
<if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
and
<foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
<trim prefixOverrides="or" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="andCondition"/>
<property name="_conditionType_" value="or"/>
</include>
</trim>
</foreach>
</if>
<!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
<if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
and
<foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
<trim prefixOverrides="and" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="orCondition"/>
<property name="_conditionType_" value="and"/>
</include>
</trim>
</foreach>
</if>
</if>
</sql>
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList')">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('applyrId')">
<if test="conditionParamRef.applyrId != null ">
${_conditionType_} a.applyrId = #{${_conditionParam_}.applyrId}
</if>
<if test="conditionParamRef.applyrId == null">
${_conditionType_} a.applyrId is null
</if>
</if>
<if test="conditionParamRef.containsKey('applyrIdList')">
${_conditionType_} a.applyrId in
<foreach collection="conditionParamRef.applyrIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applyrIdNotList')">
${_conditionType_} a.applyrId not in
<foreach collection="conditionParamRef.applyrIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applyrIdStart') and conditionParamRef.applyrIdStart != null">
${_conditionType_} a.applyrId <![CDATA[ >= ]]> #{${_conditionParam_}.applyrIdStart}
</if>
<if test="conditionParamRef.containsKey('applyrIdEnd') and conditionParamRef.applyrIdEnd != null">
${_conditionType_} a.applyrId <![CDATA[ <= ]]> #{${_conditionParam_}.applyrIdEnd}
</if>
<if test="conditionParamRef.containsKey('acceptPerson')">
<if test="conditionParamRef.acceptPerson != null and conditionParamRef.acceptPerson != ''">
${_conditionType_} a.acceptPerson like #{${_conditionParam_}.acceptPerson}
</if>
<if test="conditionParamRef.acceptPerson == null">
${_conditionType_} a.acceptPerson is null
</if>
</if>
<if test="conditionParamRef.containsKey('acceptPersonList')">
${_conditionType_} a.acceptPerson in
<foreach collection="conditionParamRef.acceptPersonList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('acceptPersonNotList')">
${_conditionType_} a.acceptPerson not in
<foreach collection="conditionParamRef.acceptPersonNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('acceptResult')">
<if test="conditionParamRef.acceptResult != null ">
${_conditionType_} a.acceptResult = #{${_conditionParam_}.acceptResult}
</if>
<if test="conditionParamRef.acceptResult == null">
${_conditionType_} a.acceptResult is null
</if>
</if>
<if test="conditionParamRef.containsKey('acceptResultList')">
${_conditionType_} a.acceptResult in
<foreach collection="conditionParamRef.acceptResultList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('acceptResultNotList')">
${_conditionType_} a.acceptResult not in
<foreach collection="conditionParamRef.acceptResultNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('acceptResultStart') and conditionParamRef.acceptResultStart != null">
${_conditionType_} a.acceptResult <![CDATA[ >= ]]> #{${_conditionParam_}.acceptResultStart}
</if>
<if test="conditionParamRef.containsKey('acceptResultEnd') and conditionParamRef.acceptResultEnd != null">
${_conditionType_} a.acceptResult <![CDATA[ <= ]]> #{${_conditionParam_}.acceptResultEnd}
</if>
<if test="conditionParamRef.containsKey('acceptOpinion')">
<if test="conditionParamRef.acceptOpinion != null and conditionParamRef.acceptOpinion != ''">
${_conditionType_} a.acceptOpinion like #{${_conditionParam_}.acceptOpinion}
</if>
<if test="conditionParamRef.acceptOpinion == null">
${_conditionType_} a.acceptOpinion is null
</if>
</if>
<if test="conditionParamRef.containsKey('acceptOpinionList')">
${_conditionType_} a.acceptOpinion in
<foreach collection="conditionParamRef.acceptOpinionList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('acceptOpinionNotList')">
${_conditionType_} a.acceptOpinion not in
<foreach collection="conditionParamRef.acceptOpinionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('acceptDate')">
<if test="conditionParamRef.acceptDate != null ">
${_conditionType_} a.acceptDate = #{${_conditionParam_}.acceptDate}
</if>
<if test="conditionParamRef.acceptDate == null">
${_conditionType_} a.acceptDate is null
</if>
</if>
<if test="conditionParamRef.containsKey('acceptDateStart') and conditionParamRef.acceptDateStart != null and conditionParamRef.acceptDateStart!=''">
${_conditionType_} a.acceptDate <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.acceptDateStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('acceptDateEnd') and conditionParamRef.acceptDateEnd != null and conditionParamRef.acceptDateEnd!=''">
${_conditionType_} a.acceptDate <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.acceptDateEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList')">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdNotList')">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('applyrId')">
a.applyrId
<if test='orderCol.applyrId != null and "DESC".equalsIgnoreCase(orderCol.applyrId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('acceptPerson')">
a.acceptPerson
<if test='orderCol.acceptPerson != null and "DESC".equalsIgnoreCase(orderCol.acceptPerson)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('acceptResult')">
a.acceptResult
<if test='orderCol.acceptResult != null and "DESC".equalsIgnoreCase(orderCol.acceptResult)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('acceptOpinion')">
a.acceptOpinion
<if test='orderCol.acceptOpinion != null and "DESC".equalsIgnoreCase(orderCol.acceptOpinion)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('acceptDate')">
a.acceptDate
<if test='orderCol.acceptDate != null and "DESC".equalsIgnoreCase(orderCol.acceptDate)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateUserId')">
a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
GROUP BY
<trim suffixOverrides="," suffix="">
<foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item}
</foreach>
</trim>
</if>
</sql>
</mapper>
\ No newline at end of file
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