Skip to content

S
sample-form-platform
Commit 7b2c98e6 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加样表设备列表

parent d929f9e6
Show whitespace changes
Inline Side-by-side
Showing with 345 additions and 1147 deletions
doc/api.md
View file @ 7b2c98e6
......@@ -2574,6 +2574,8 @@ dict|object|字典对象
:---|:---|:---|:------
page|Integer|否|当前页
size|Integer|否|每页条数，值为-1，查询所有记录
deviceId|Long|否|设备id
deviceCode|String|否|设备编码
**请求样例:**
```
......@@ -2596,25 +2598,19 @@ data|object|数据对象
 current_page|Integer|当前页
 data|array|结果集列表|数组
  id|Long|主键，自增长
  siteId|Long|站点ID
  deviceId|Long|设备id
  deviceCode|String|设备编码
  deviceName|String|设备名称
  matterId|Long|事项id
  matterCode|String|事项编码
  matterName|String|事项名称
  siteId|Long|站点ID
  deptId|Long|部门ID
  deptCode|String|部门编号
  deptName|String|部门名称
  materialName|String|材料名
  materiaFullName|String|材料全名
  materialId|Long|材料id
  source|Integer|事项来源(0.政务网，1.自定义)
  isRecommend|Integer|是否推荐(0.未推荐，1.推荐)
  sort|Integer|排序
  sampleName|String|样表名称
  samplePath|String|样表地址
  preViewPath|String|样表预览地址
  createTime|Date|创建时间
  createUserId|Long|创建用户
  updateTime|Date|修改时间
......@@ -2659,28 +2655,23 @@ code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|主键，自增长
 siteId|Long|站点ID
 deviceId|Long|设备id
 deviceCode|String|设备编码
 deviceName|String|设备名称
 matterId|Long|事项id
 matterCode|String|事项编码
 matterName|String|事项名称
 siteId|Long|站点ID
 deptId|Long|部门ID
 deptCode|String|部门编号
 deptName|String|部门名称
 materialName|String|材料名
 materiaFullName|String|材料全名
 materialId|Long|材料id
 source|Integer|事项来源(0.政务网，1.自定义)
 isRecommend|Integer|是否推荐(0.未推荐，1.推荐)
 sort|Integer|排序
 sampleName|String|样表名称
 samplePath|String|样表地址
 preViewPath|String|样表预览地址
 createTime|Date|创建时间
 createUserId|Long|创建用户
 updateTime|Date|修改时间
 matterDatumList|Arrays|材料列表
dict|object|字典对象
 source|object|字典属性对象，详见附录
 isRecommend|object|字典属性对象，详见附录
......@@ -2690,29 +2681,24 @@ dict|object|字典对象
{
"code": 1,
"data": {
"id":7287,
"deviceId":4805,
"deviceCode":"ezsu52",
"deviceName":"gio16r",
"matterId":8179,
"matterCode":"wuz4op",
"matterName":"3j5eg0",
"siteId":9985,
"deptId":3702,
"deptCode":"dvslci",
"deptName":"urebgs",
"materialName":"znzxp8",
"materiaFullName":"ar03ng",
"materialId":3055,
"source":6317,
"isRecommend":1887,
"sort":5527,
"sampleName":"f6e961",
"samplePath":"67xnm5",
"preViewPath":"r6w3s6",
"createTime":"2023-03-22",
"createUserId":8413,
"updateTime":"2023-03-22"
"id":2918,
"siteId":2722,
"deviceId":7656,
"deviceCode":"2chaii",
"deviceName":"g9qyjr",
"matterId":7754,
"matterCode":"ddi0db",
"matterName":"4ttn0d",
"deptId":9159,
"deptCode":"zkv745",
"deptName":"wa75ev",
"source":4828,
"isRecommend":7338,
"sort":7624,
"createTime":"2023-03-23",
"createUserId":7824,
"updateTime":"2023-03-23"
"matterDatumList":[...]
}
}
```
......@@ -2731,17 +2717,18 @@ dict|object|字典对象
参数名称|类型|必填|描述
:---|:---|:---|:-------
deviceId|Long|否|设备id
matterId|Lon;g|否|事项id
siteId|Long|否|站点ID
materialId|Long|否|材料id
deviceId|Long|否|设备id
matterId|Long|否|事项id
sort|Integer|否|排序
**请求样例:**
```
{
"deviceId":9730,
"matterId":5750,
"materialId":8061
"siteId":3,
"deviceId":2646,
"matterId":418,
"sort":0,
}
```
......@@ -2755,25 +2742,19 @@ data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
  id|Long|主键，自增长
  siteId|Long|站点ID
  deviceId|Long|设备id
  deviceCode|String|设备编码
  deviceName|String|设备名称
  matterId|Long|事项id
  matterCode|String|事项编码
  matterName|String|事项名称
  siteId|Long|站点ID
  deptId|Long|部门ID
  deptCode|String|部门编号
  deptName|String|部门名称
  materialName|String|材料名
  materiaFullName|String|材料全名
  materialId|Long|材料id
  source|Integer|事项来源(0.政务网，1.自定义)
  isRecommend|Integer|是否推荐(0.未推荐，1.推荐)
  sort|Integer|排序
  sampleName|String|样表名称
  samplePath|String|样表地址
  preViewPath|String|样表预览地址
  createTime|Date|创建时间
  createUserId|Long|创建用户
  updateTime|Date|修改时间
......@@ -2822,3 +2803,5 @@ msg|String|消息|-
"code":1,
"msg":"成功"
}
```
sample-form-manager/db/module.sql
View file @ 7b2c98e6
......@@ -291,25 +291,19 @@ CREATE TABLE `mortals_xhx_device` (
DROP TABLE IF EXISTS `mortals_xhx_device_matter_datum`;
CREATE TABLE mortals_xhx_device_matter_datum(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
`siteId` bigint(20) COMMENT '站点ID',
`deviceId` bigint(20) COMMENT '设备id',
`deviceCode` varchar(255) COMMENT '设备编码',
`deviceName` varchar(255) COMMENT '设备名称',
`matterId` bigint(20) COMMENT '事项id',
`matterCode` varchar(255) COMMENT '事项编码',
`matterName` varchar(255) COMMENT '事项名称',
`siteId` bigint(20) COMMENT '站点ID',
`deptId` bigint(20) COMMENT '部门ID',
`deptCode` varchar(256) COMMENT '部门编号',
`deptName` varchar(256) COMMENT '部门名称',
`materialName` varchar(1024) COMMENT '材料名',
`materiaFullName` varchar(1024) COMMENT '材料全名',
`materialId` bigint(20) COMMENT '材料id',
`source` tinyint(2) COMMENT '事项来源(0.政务网，1.自定义)',
`isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐，1.推荐)',
`sort` int(4) COMMENT '排序',
`sampleName` varchar(255) COMMENT '样表名称',
`samplePath` varchar(255) COMMENT '样表地址',
`preViewPath` varchar(255) COMMENT '样表预览地址',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
......@@ -319,3 +313,4 @@ CREATE TABLE mortals_xhx_device_matter_datum(
sample-form-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceMatterDatumEntity.java
View file @ 7b2c98e6
......@@ -10,12 +10,16 @@ import com.mortals.xhx.module.device.model.vo.DeviceMatterDatumVo;
* 设备事项申请材料业务实体对象
*
* @author zxfei
* @date 2023-03-22
* @date 2023-03-23
*/
public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
private static final long serialVersionUID = 1L;
/**
* 站点ID
*/
private Long siteId;
/**
* 设备id
*/
......@@ -40,10 +44,6 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
* 事项名称
*/
private String matterName;
/**
* 站点ID
*/
private Long siteId;
/**
* 部门ID
*/
......@@ -56,18 +56,6 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
* 部门名称
*/
private String deptName;
/**
* 材料名
*/
private String materialName;
/**
* 材料全名
*/
private String materiaFullName;
/**
* 材料id
*/
private Long materialId;
/**
* 事项来源(0.政务网，1.自定义)
*/
......@@ -80,22 +68,24 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
* 排序
*/
private Integer sort;
/**
* 样表名称
*/
private String sampleName;
/**
* 样表地址
*/
private String samplePath;
/**
* 样表预览地址
*/
private String preViewPath;
public DeviceMatterDatumEntity(){}
/**
* 获取 站点ID
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点ID
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
* 获取 设备id
* @return Long
......@@ -180,20 +170,6 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
public void setMatterName(String matterName){
this.matterName = matterName;
}
/**
* 获取 站点ID
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点ID
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
* 获取 部门ID
* @return Long
......@@ -236,48 +212,6 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 材料名
* @return String
*/
public String getMaterialName(){
return materialName;
}
/**
* 设置 材料名
* @param materialName
*/
public void setMaterialName(String materialName){
this.materialName = materialName;
}
/**
* 获取 材料全名
* @return String
*/
public String getMateriaFullName(){
return materiaFullName;
}
/**
* 设置 材料全名
* @param materiaFullName
*/
public void setMateriaFullName(String materiaFullName){
this.materiaFullName = materiaFullName;
}
/**
* 获取 材料id
* @return Long
*/
public Long getMaterialId(){
return materialId;
}
/**
* 设置 材料id
* @param materialId
*/
public void setMaterialId(Long materialId){
this.materialId = materialId;
}
/**
* 获取 事项来源(0.政务网，1.自定义)
* @return Integer
......@@ -320,48 +254,6 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
public void setSort(Integer sort){
this.sort = sort;
}
/**
* 获取 样表名称
* @return String
*/
public String getSampleName(){
return sampleName;
}
/**
* 设置 样表名称
* @param sampleName
*/
public void setSampleName(String sampleName){
this.sampleName = sampleName;
}
/**
* 获取 样表地址
* @return String
*/
public String getSamplePath(){
return samplePath;
}
/**
* 设置 样表地址
* @param samplePath
*/
public void setSamplePath(String samplePath){
this.samplePath = samplePath;
}
/**
* 获取 样表预览地址
* @return String
*/
public String getPreViewPath(){
return preViewPath;
}
/**
* 设置 样表预览地址
* @param preViewPath
*/
public void setPreViewPath(String preViewPath){
this.preViewPath = preViewPath;
}
......@@ -384,30 +276,26 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",siteId:").append(getSiteId());
sb.append(",deviceId:").append(getDeviceId());
sb.append(",deviceCode:").append(getDeviceCode());
sb.append(",deviceName:").append(getDeviceName());
sb.append(",matterId:").append(getMatterId());
sb.append(",matterCode:").append(getMatterCode());
sb.append(",matterName:").append(getMatterName());
sb.append(",siteId:").append(getSiteId());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptCode:").append(getDeptCode());
sb.append(",deptName:").append(getDeptName());
sb.append(",materialName:").append(getMaterialName());
sb.append(",materiaFullName:").append(getMateriaFullName());
sb.append(",materialId:").append(getMaterialId());
sb.append(",source:").append(getSource());
sb.append(",isRecommend:").append(getIsRecommend());
sb.append(",sort:").append(getSort());
sb.append(",sampleName:").append(getSampleName());
sb.append(",samplePath:").append(getSamplePath());
sb.append(",preViewPath:").append(getPreViewPath());
return sb.toString();
}
public void initAttrValue(){
this.siteId = null;
this.deviceId = null;
this.deviceCode = null;
......@@ -420,30 +308,16 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
this.matterName = null;
this.siteId = null;
this.deptId = null;
this.deptCode = null;
this.deptName = null;
this.materialName = null;
this.materiaFullName = null;
this.materialId = null;
this.source = null;
this.isRecommend = null;
this.sort = null;
this.sampleName = null;
this.samplePath = null;
this.preViewPath = null;
}
}
\ No newline at end of file
sample-form-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceMatterDatumQuery.java
View file @ 7b2c98e6
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
* 设备事项申请材料业务查询对象
*
* @author zxfei
* @date 2023-03-22
* @date 2023-03-23
*/
public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
/** 开始 主键，自增长 */
......@@ -24,6 +24,21 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
/** 主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点ID */
private Long siteIdStart;
/** 结束 站点ID */
private Long siteIdEnd;
/** 增加 站点ID */
private Long siteIdIncrement;
/** 站点ID列表 */
private List <Long> siteIdList;
/** 站点ID排除列表 */
private List <Long> siteIdNotList;
/** 开始 设备id */
private Long deviceIdStart;
......@@ -74,21 +89,6 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
/** 事项名称排除列表 */
private List <String> matterNameNotList;
/** 开始 站点ID */
private Long siteIdStart;
/** 结束 站点ID */
private Long siteIdEnd;
/** 增加 站点ID */
private Long siteIdIncrement;
/** 站点ID列表 */
private List <Long> siteIdList;
/** 站点ID排除列表 */
private List <Long> siteIdNotList;
/** 开始 部门ID */
private Long deptIdStart;
......@@ -114,31 +114,6 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
/** 部门名称排除列表 */
private List <String> deptNameNotList;
/** 材料名 */
private List<String> materialNameList;
/** 材料名排除列表 */
private List <String> materialNameNotList;
/** 材料全名 */
private List<String> materiaFullNameList;
/** 材料全名排除列表 */
private List <String> materiaFullNameNotList;
/** 开始 材料id */
private Long materialIdStart;
/** 结束 材料id */
private Long materialIdEnd;
/** 增加 材料id */
private Long materialIdIncrement;
/** 材料id列表 */
private List <Long> materialIdList;
/** 材料id排除列表 */
private List <Long> materialIdNotList;
/** 开始 事项来源(0.政务网，1.自定义) */
private Integer sourceStart;
......@@ -184,21 +159,6 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
/** 排序排除列表 */
private List <Integer> sortNotList;
/** 样表名称 */
private List<String> sampleNameList;
/** 样表名称排除列表 */
private List <String> sampleNameNotList;
/** 样表地址 */
private List<String> samplePathList;
/** 样表地址排除列表 */
private List <String> samplePathNotList;
/** 样表预览地址 */
private List<String> preViewPathList;
/** 样表预览地址排除列表 */
private List <String> preViewPathNotList;
/** 开始 创建时间 */
private String createTimeStart;
......@@ -315,6 +275,87 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
}
/**
* 获取 开始 站点ID
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点ID
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点ID
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点ID
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点ID
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点ID
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点ID
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点ID
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点ID
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 开始 设备id
* @return deviceIdStart
......@@ -605,87 +646,6 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
this.matterNameNotList = matterNameNotList;
}
/**
* 获取 开始 站点ID
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点ID
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点ID
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点ID
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点ID
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点ID
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点ID
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点ID
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点ID
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 开始 部门ID
* @return deptIdStart
......@@ -803,179 +763,34 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
* 获取 部门名称
* @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 materialNameList
*/
public List<String> getMaterialNameList(){
return this.materialNameList;
}
/**
* 设置 材料名
* @param materialNameList
*/
public void setMaterialNameList(List<String> materialNameList){
this.materialNameList = materialNameList;
}
/**
* 获取 材料名
* @return materialNameNotList
*/
public List<String> getMaterialNameNotList(){
return this.materialNameNotList;
}
/**
* 设置 材料名
* @param materialNameNotList
*/
public void setMaterialNameNotList(List<String> materialNameNotList){
this.materialNameNotList = materialNameNotList;
}
/**
* 获取 材料全名
* @return materiaFullNameList
*/
public List<String> getMateriaFullNameList(){
return this.materiaFullNameList;
}
/**
* 设置 材料全名
* @param materiaFullNameList
*/
public void setMateriaFullNameList(List<String> materiaFullNameList){
this.materiaFullNameList = materiaFullNameList;
}
/**
* 获取 材料全名
* @return materiaFullNameNotList
*/
public List<String> getMateriaFullNameNotList(){
return this.materiaFullNameNotList;
}
/**
* 设置 材料全名
* @param materiaFullNameNotList
*/
public void setMateriaFullNameNotList(List<String> materiaFullNameNotList){
this.materiaFullNameNotList = materiaFullNameNotList;
}
/**
* 获取 开始 材料id
* @return materialIdStart
*/
public Long getMaterialIdStart(){
return this.materialIdStart;
}
/**
* 设置 开始 材料id
* @param materialIdStart
*/
public void setMaterialIdStart(Long materialIdStart){
this.materialIdStart = materialIdStart;
}
/**
* 获取 结束 材料id
* @return $materialIdEnd
*/
public Long getMaterialIdEnd(){
return this.materialIdEnd;
}
/**
* 设置 结束 材料id
* @param materialIdEnd
*/
public void setMaterialIdEnd(Long materialIdEnd){
this.materialIdEnd = materialIdEnd;
}
/**
* 获取 增加 材料id
* @return materialIdIncrement
*/
public Long getMaterialIdIncrement(){
return this.materialIdIncrement;
}
/**
* 设置 增加 材料id
* @param materialIdIncrement
*/
public void setMaterialIdIncrement(Long materialIdIncrement){
this.materialIdIncrement = materialIdIncrement;
}
/**
* 获取 材料id
* @return materialIdList
*/
public List<Long> getMaterialIdList(){
return this.materialIdList;
public List<String> getDeptNameList(){
return this.deptNameList;
}
/**
* 设置 材料id
* @param materialIdList
* 设置 部门名称
* @param deptNameList
*/
public void setMaterialIdList(List<Long> materialIdList){
this.materialIdList = materialIdList;
public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
}
/**
* 获取 材料id
* @return materialIdNotList
* 获取 部门名称
* @return deptNameNotList
*/
public List<Long> getMaterialIdNotList(){
return this.materialIdNotList;
public List<String> getDeptNameNotList(){
return this.deptNameNotList;
}
/**
* 设置 材料id
* @param materialIdNotList
* 设置 部门名称
* @param deptNameNotList
*/
public void setMaterialIdNotList(List<Long> materialIdNotList){
this.materialIdNotList = materialIdNotList;
public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList;
}
/**
* 获取 开始 事项来源(0.政务网，1.自定义)
* @return sourceStart
......@@ -1219,102 +1034,6 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
}
/**
* 获取 样表名称
* @return sampleNameList
*/
public List<String> getSampleNameList(){
return this.sampleNameList;
}
/**
* 设置 样表名称
* @param sampleNameList
*/
public void setSampleNameList(List<String> sampleNameList){
this.sampleNameList = sampleNameList;
}
/**
* 获取 样表名称
* @return sampleNameNotList
*/
public List<String> getSampleNameNotList(){
return this.sampleNameNotList;
}
/**
* 设置 样表名称
* @param sampleNameNotList
*/
public void setSampleNameNotList(List<String> sampleNameNotList){
this.sampleNameNotList = sampleNameNotList;
}
/**
* 获取 样表地址
* @return samplePathList
*/
public List<String> getSamplePathList(){
return this.samplePathList;
}
/**
* 设置 样表地址
* @param samplePathList
*/
public void setSamplePathList(List<String> samplePathList){
this.samplePathList = samplePathList;
}
/**
* 获取 样表地址
* @return samplePathNotList
*/
public List<String> getSamplePathNotList(){
return this.samplePathNotList;
}
/**
* 设置 样表地址
* @param samplePathNotList
*/
public void setSamplePathNotList(List<String> samplePathNotList){
this.samplePathNotList = samplePathNotList;
}
/**
* 获取 样表预览地址
* @return preViewPathList
*/
public List<String> getPreViewPathList(){
return this.preViewPathList;
}
/**
* 设置 样表预览地址
* @param preViewPathList
*/
public void setPreViewPathList(List<String> preViewPathList){
this.preViewPathList = preViewPathList;
}
/**
* 获取 样表预览地址
* @return preViewPathNotList
*/
public List<String> getPreViewPathNotList(){
return this.preViewPathNotList;
}
/**
* 设置 样表预览地址
* @param preViewPathNotList
*/
public void setPreViewPathNotList(List<String> preViewPathNotList){
this.preViewPathNotList = preViewPathNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
......@@ -1514,6 +1233,60 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
return this;
}
/**
* 设置 站点ID
* @param siteId
*/
public DeviceMatterDatumQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点ID
* @param siteIdStart
*/
public DeviceMatterDatumQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点ID
* @param siteIdEnd
*/
public DeviceMatterDatumQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点ID
* @param siteIdIncrement
*/
public DeviceMatterDatumQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点ID
* @param siteIdList
*/
public DeviceMatterDatumQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public DeviceMatterDatumQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 设备id
* @param deviceId
......@@ -1698,60 +1471,6 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
return this;
}
/**
* 设置 站点ID
* @param siteId
*/
public DeviceMatterDatumQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点ID
* @param siteIdStart
*/
public DeviceMatterDatumQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点ID
* @param siteIdEnd
*/
public DeviceMatterDatumQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点ID
* @param siteIdIncrement
*/
public DeviceMatterDatumQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点ID
* @param siteIdList
*/
public DeviceMatterDatumQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public DeviceMatterDatumQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 部门ID
* @param deptId
......@@ -1844,98 +1563,6 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
return this;
}
/**
* 设置 材料名
* @param materialName
*/
public DeviceMatterDatumQuery materialName(String materialName){
setMaterialName(materialName);
return this;
}
/**
* 设置 材料名
* @param materialNameList
*/
public DeviceMatterDatumQuery materialNameList(List<String> materialNameList){
this.materialNameList = materialNameList;
return this;
}
/**
* 设置 材料全名
* @param materiaFullName
*/
public DeviceMatterDatumQuery materiaFullName(String materiaFullName){
setMateriaFullName(materiaFullName);
return this;
}
/**
* 设置 材料全名
* @param materiaFullNameList
*/
public DeviceMatterDatumQuery materiaFullNameList(List<String> materiaFullNameList){
this.materiaFullNameList = materiaFullNameList;
return this;
}
/**
* 设置 材料id
* @param materialId
*/
public DeviceMatterDatumQuery materialId(Long materialId){
setMaterialId(materialId);
return this;
}
/**
* 设置 开始 材料id
* @param materialIdStart
*/
public DeviceMatterDatumQuery materialIdStart(Long materialIdStart){
this.materialIdStart = materialIdStart;
return this;
}
/**
* 设置 结束 材料id
* @param materialIdEnd
*/
public DeviceMatterDatumQuery materialIdEnd(Long materialIdEnd){
this.materialIdEnd = materialIdEnd;
return this;
}
/**
* 设置 增加 材料id
* @param materialIdIncrement
*/
public DeviceMatterDatumQuery materialIdIncrement(Long materialIdIncrement){
this.materialIdIncrement = materialIdIncrement;
return this;
}
/**
* 设置 材料id
* @param materialIdList
*/
public DeviceMatterDatumQuery materialIdList(List<Long> materialIdList){
this.materialIdList = materialIdList;
return this;
}
/**
* 设置 材料id
* @param materialIdNotList
*/
public DeviceMatterDatumQuery materialIdNotList(List<Long> materialIdNotList){
this.materialIdNotList = materialIdNotList;
return this;
}
/**
* 设置 事项来源(0.政务网，1.自定义)
* @param source
......@@ -2099,63 +1726,6 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
}
/**
* 设置 样表名称
* @param sampleName
*/
public DeviceMatterDatumQuery sampleName(String sampleName){
setSampleName(sampleName);
return this;
}
/**
* 设置 样表名称
* @param sampleNameList
*/
public DeviceMatterDatumQuery sampleNameList(List<String> sampleNameList){
this.sampleNameList = sampleNameList;
return this;
}
/**
* 设置 样表地址
* @param samplePath
*/
public DeviceMatterDatumQuery samplePath(String samplePath){
setSamplePath(samplePath);
return this;
}
/**
* 设置 样表地址
* @param samplePathList
*/
public DeviceMatterDatumQuery samplePathList(List<String> samplePathList){
this.samplePathList = samplePathList;
return this;
}
/**
* 设置 样表预览地址
* @param preViewPath
*/
public DeviceMatterDatumQuery preViewPath(String preViewPath){
setPreViewPath(preViewPath);
return this;
}
/**
* 设置 样表预览地址
* @param preViewPathList
*/
public DeviceMatterDatumQuery preViewPathList(List<String> preViewPathList){
this.preViewPathList = preViewPathList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
......
sample-form-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceMatterDatumVo.java
View file @ 7b2c98e6
package com.mortals.xhx.module.device.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
import com.mortals.xhx.module.matter.model.MatterDatumEntity;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* 设备事项申请材料业务视图对象
*
* @author zxfei
* @date 2023-02-25
*/
* 设备事项申请材料业务视图对象
*
* @author zxfei
* @date 2023-02-25
*/
@Data
public class DeviceMatterDatumVo extends BaseEntityLong {
private List<MatterDatumEntity> matterDatumList;
}
\ No newline at end of file
sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceMatterDatumServiceImpl.java
View file @ 7b2c98e6
package com.mortals.xhx.module.device.service.impl;
import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.service.DeviceService;
import com.mortals.xhx.module.matter.model.MatterDatumEntity;
import com.mortals.xhx.module.matter.model.MatterDatumQuery;
import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.service.MatterDatumService;
import com.mortals.xhx.module.matter.service.MatterService;
......@@ -15,6 +17,9 @@ import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
/**
* DeviceMatterDatumService
* 设备事项申请材料业务 service实现
......@@ -28,9 +33,24 @@ public class DeviceMatterDatumServiceImpl extends AbstractCRUDServiceImpl<Device
@Autowired
private MatterService matterService;
@Autowired
private MatterDatumService matterDatumService;
@Autowired
private DeviceService deviceService;
@Autowired
private MatterDatumService matterDatumService;
@Override
protected void findAfter(DeviceMatterDatumEntity params, PageInfo pageInfo, Context context, List<DeviceMatterDatumEntity> list) throws AppException {
//super.findAfter(params, pageInfo, context, list);
list.forEach(item->{
List<MatterDatumEntity> matterDatumEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
if(!ObjectUtils.isEmpty(matterDatumEntities)){
item.setMatterDatumList(matterDatumEntities);
}else{
item.setMatterDatumList(new ArrayList<>());
}
});
}
@Override
protected void saveBefore(DeviceMatterDatumEntity entity, Context context) throws AppException {
......@@ -47,17 +67,6 @@ public class DeviceMatterDatumServiceImpl extends AbstractCRUDServiceImpl<Device
}
}
if(!ObjectUtils.isEmpty(entity.getMaterialId())){
MatterDatumEntity matterDatumEntity = matterDatumService.get(entity.getMaterialId());
if(!ObjectUtils.isEmpty(matterDatumEntity)){
entity.setMaterialName(matterDatumEntity.getMaterialName());
entity.setIsRecommend(matterDatumEntity.getIsRecommend());
entity.setSampleName(matterDatumEntity.getSampleName());
entity.setSamplePath(matterDatumEntity.getSamplePath());
entity.setPreViewPath(matterDatumEntity.getPreViewPath());
entity.setSource(matterDatumEntity.getSource());
}
}
if(!ObjectUtils.isEmpty(entity.getDeviceId())){
DeviceEntity deviceEntity = deviceService.get(entity.getDeviceId());
if(!ObjectUtils.isEmpty(deviceEntity)){
......
sample-form-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceMatterDatumController.java
View file @ 7b2c98e6
package com.mortals.xhx.module.device.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.matter.model.MatterDatumEntity;
import com.mortals.xhx.module.matter.model.MatterDatumQuery;
import com.mortals.xhx.module.matter.service.MatterDatumService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -36,6 +40,9 @@ public class DeviceMatterDatumController extends BaseCRUDJsonBodyMappingControll
@Autowired
private ParamService paramService;
@Autowired
private MatterDatumService matterDatumService;
public DeviceMatterDatumController(){
super.setModuleDesc( "设备事项申请材料业务");
}
......@@ -48,4 +55,10 @@ public class DeviceMatterDatumController extends BaseCRUDJsonBodyMappingControll
}
@Override
protected int infoAfter(Long id, Map<String, Object> model, DeviceMatterDatumEntity entity, Context context) throws AppException {
List<MatterDatumEntity> matterDatumEntities = matterDatumService.find(new MatterDatumQuery().matterId(entity.getMatterId()));
entity.setMatterDatumList(matterDatumEntities);
return super.infoAfter(id, model, entity, context);
}
}
\ No newline at end of file
sample-form-manager/src/main/resources/sqlmap/module/device/DeviceMatterDatumMapper.xml
View file @ 7b2c98e6
......@@ -6,25 +6,19 @@
<!-- 字段和属性映射 -->
<resultMap type="DeviceMatterDatumEntity" id="DeviceMatterDatumEntity-Map">
<id property="id" column="id" />
<result property="siteId" column="siteId" />
<result property="deviceId" column="deviceId" />
<result property="deviceCode" column="deviceCode" />
<result property="deviceName" column="deviceName" />
<result property="matterId" column="matterId" />
<result property="matterCode" column="matterCode" />
<result property="matterName" column="matterName" />
<result property="siteId" column="siteId" />
<result property="deptId" column="deptId" />
<result property="deptCode" column="deptCode" />
<result property="deptName" column="deptName" />
<result property="materialName" column="materialName" />
<result property="materiaFullName" column="materiaFullName" />
<result property="materialId" column="materialId" />
<result property="source" column="source" />
<result property="isRecommend" column="isRecommend" />
<result property="sort" column="sort" />
<result property="sampleName" column="sampleName" />
<result property="samplePath" column="samplePath" />
<result property="preViewPath" column="preViewPath" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
......@@ -38,6 +32,9 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
a.deviceId,
</if>
......@@ -56,9 +53,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
a.matterName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
a.deptId,
</if>
......@@ -68,15 +62,6 @@
<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('materialName') or colPickMode == 1 and data.containsKey('materialName')))">
a.materialName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materiaFullName') or colPickMode == 1 and data.containsKey('materiaFullName')))">
a.materiaFullName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materialId') or colPickMode == 1 and data.containsKey('materialId')))">
a.materialId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
a.source,
</if>
......@@ -86,15 +71,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
a.sort,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sampleName') or colPickMode == 1 and data.containsKey('sampleName')))">
a.sampleName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('samplePath') or colPickMode == 1 and data.containsKey('samplePath')))">
a.samplePath,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('preViewPath') or colPickMode == 1 and data.containsKey('preViewPath')))">
a.preViewPath,
</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>
......@@ -109,18 +85,18 @@
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceMatterDatumEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_device_matter_datum
(deviceId,deviceCode,deviceName,matterId,matterCode,matterName,siteId,deptId,deptCode,deptName,materialName,materiaFullName,materialId,source,isRecommend,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
(siteId,deviceId,deviceCode,deviceName,matterId,matterCode,matterName,deptId,deptCode,deptName,source,isRecommend,sort,createTime,createUserId,updateTime)
VALUES
(#{deviceId},#{deviceCode},#{deviceName},#{matterId},#{matterCode},#{matterName},#{siteId},#{deptId},#{deptCode},#{deptName},#{materialName},#{materiaFullName},#{materialId},#{source},#{isRecommend},#{sort},#{sampleName},#{samplePath},#{preViewPath},#{createTime},#{createUserId},#{updateTime})
(#{siteId},#{deviceId},#{deviceCode},#{deviceName},#{matterId},#{matterCode},#{matterName},#{deptId},#{deptCode},#{deptName},#{source},#{isRecommend},#{sort},#{createTime},#{createUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device_matter_datum
(deviceId,deviceCode,deviceName,matterId,matterCode,matterName,siteId,deptId,deptCode,deptName,materialName,materiaFullName,materialId,source,isRecommend,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
(siteId,deviceId,deviceCode,deviceName,matterId,matterCode,matterName,deptId,deptCode,deptName,source,isRecommend,sort,createTime,createUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.deviceId},#{item.deviceCode},#{item.deviceName},#{item.matterId},#{item.matterCode},#{item.matterName},#{item.siteId},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.materialName},#{item.materiaFullName},#{item.materialId},#{item.source},#{item.isRecommend},#{item.sort},#{item.sampleName},#{item.samplePath},#{item.preViewPath},#{item.createTime},#{item.createUserId},#{item.updateTime})
(#{item.siteId},#{item.deviceId},#{item.deviceCode},#{item.deviceName},#{item.matterId},#{item.matterCode},#{item.matterName},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.source},#{item.isRecommend},#{item.sort},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -130,6 +106,12 @@
update mortals_xhx_device_matter_datum as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceId')) or (colPickMode==1 and !data.containsKey('deviceId'))">
a.deviceId=#{data.deviceId},
</if>
......@@ -154,12 +136,6 @@
<if test="(colPickMode==0 and data.containsKey('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
a.matterName=#{data.matterName},
</if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))">
a.deptId=#{data.deptId},
</if>
......@@ -172,18 +148,6 @@
<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('materialName')) or (colPickMode==1 and !data.containsKey('materialName'))">
a.materialName=#{data.materialName},
</if>
<if test="(colPickMode==0 and data.containsKey('materiaFullName')) or (colPickMode==1 and !data.containsKey('materiaFullName'))">
a.materiaFullName=#{data.materiaFullName},
</if>
<if test="(colPickMode==0 and data.containsKey('materialId')) or (colPickMode==1 and !data.containsKey('materialId'))">
a.materialId=#{data.materialId},
</if>
<if test="(colPickMode==0 and data.containsKey('materialIdIncrement')) or (colPickMode==1 and !data.containsKey('materialIdIncrement'))">
a.materialId=ifnull(a.materialId,0) + #{data.materialIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
a.source=#{data.source},
</if>
......@@ -202,15 +166,6 @@
<if test="(colPickMode==0 and data.containsKey('sortIncrement')) or (colPickMode==1 and !data.containsKey('sortIncrement'))">
a.sort=ifnull(a.sort,0) + #{data.sortIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('sampleName')) or (colPickMode==1 and !data.containsKey('sampleName'))">
a.sampleName=#{data.sampleName},
</if>
<if test="(colPickMode==0 and data.containsKey('samplePath')) or (colPickMode==1 and !data.containsKey('samplePath'))">
a.samplePath=#{data.samplePath},
</if>
<if test="(colPickMode==0 and data.containsKey('preViewPath')) or (colPickMode==1 and !data.containsKey('preViewPath'))">
a.preViewPath=#{data.preViewPath},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
......@@ -235,6 +190,18 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_device_matter_datum as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="deviceId=(case" suffix="ELSE deviceId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -287,18 +254,6 @@
</if>
</foreach>
</trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="deptId=(case" suffix="ELSE deptId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -325,32 +280,6 @@
</if>
</foreach>
</trim>
<trim prefix="materialName=(case" suffix="ELSE materialName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('materialName')) or (colPickMode==1 and !item.containsKey('materialName'))">
when a.id=#{item.id} then #{item.materialName}
</if>
</foreach>
</trim>
<trim prefix="materiaFullName=(case" suffix="ELSE materiaFullName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('materiaFullName')) or (colPickMode==1 and !item.containsKey('materiaFullName'))">
when a.id=#{item.id} then #{item.materiaFullName}
</if>
</foreach>
</trim>
<trim prefix="materialId=(case" suffix="ELSE materialId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('materialId')) or (colPickMode==1 and !item.containsKey('materialId'))">
when a.id=#{item.id} then #{item.materialId}
</when>
<when test="(colPickMode==0 and item.containsKey('materialIdIncrement')) or (colPickMode==1 and !item.containsKey('materialIdIncrement'))">
when a.id=#{item.id} then ifnull(a.materialId,0) + #{item.materialIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="source=(case" suffix="ELSE source end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -387,27 +316,6 @@
</choose>
</foreach>
</trim>
<trim prefix="sampleName=(case" suffix="ELSE sampleName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('sampleName')) or (colPickMode==1 and !item.containsKey('sampleName'))">
when a.id=#{item.id} then #{item.sampleName}
</if>
</foreach>
</trim>
<trim prefix="samplePath=(case" suffix="ELSE samplePath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('samplePath')) or (colPickMode==1 and !item.containsKey('samplePath'))">
when a.id=#{item.id} then #{item.samplePath}
</if>
</foreach>
</trim>
<trim prefix="preViewPath=(case" suffix="ELSE preViewPath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('preViewPath')) or (colPickMode==1 and !item.containsKey('preViewPath'))">
when a.id=#{item.id} then #{item.preViewPath}
</if>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
......@@ -577,6 +485,33 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('deviceId')">
<if test="conditionParamRef.deviceId != null ">
${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
......@@ -715,33 +650,6 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('deptId')">
<if test="conditionParamRef.deptId != null ">
${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
......@@ -811,75 +719,6 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('materialName')">
<if test="conditionParamRef.materialName != null and conditionParamRef.materialName != ''">
${_conditionType_} a.materialName like #{${_conditionParam_}.materialName}
</if>
<if test="conditionParamRef.materialName == null">
${_conditionType_} a.materialName is null
</if>
</if>
<if test="conditionParamRef.containsKey('materialNameList') and conditionParamRef.materialNameList.size() > 0">
${_conditionType_} a.materialName in
<foreach collection="conditionParamRef.materialNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('materialNameNotList') and conditionParamRef.materialNameNotList.size() > 0">
${_conditionType_} a.materialName not in
<foreach collection="conditionParamRef.materialNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('materiaFullName')">
<if test="conditionParamRef.materiaFullName != null and conditionParamRef.materiaFullName != ''">
${_conditionType_} a.materiaFullName like #{${_conditionParam_}.materiaFullName}
</if>
<if test="conditionParamRef.materiaFullName == null">
${_conditionType_} a.materiaFullName is null
</if>
</if>
<if test="conditionParamRef.containsKey('materiaFullNameList') and conditionParamRef.materiaFullNameList.size() > 0">
${_conditionType_} a.materiaFullName in
<foreach collection="conditionParamRef.materiaFullNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('materiaFullNameNotList') and conditionParamRef.materiaFullNameNotList.size() > 0">
${_conditionType_} a.materiaFullName not in
<foreach collection="conditionParamRef.materiaFullNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('materialId')">
<if test="conditionParamRef.materialId != null ">
${_conditionType_} a.materialId = #{${_conditionParam_}.materialId}
</if>
<if test="conditionParamRef.materialId == null">
${_conditionType_} a.materialId is null
</if>
</if>
<if test="conditionParamRef.containsKey('materialIdList') and conditionParamRef.materialIdList.size() > 0">
${_conditionType_} a.materialId in
<foreach collection="conditionParamRef.materialIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('materialIdNotList') and conditionParamRef.materialIdNotList.size() > 0">
${_conditionType_} a.materialId not in
<foreach collection="conditionParamRef.materialIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('materialIdStart') and conditionParamRef.materialIdStart != null">
${_conditionType_} a.materialId <![CDATA[ >= ]]> #{${_conditionParam_}.materialIdStart}
</if>
<if test="conditionParamRef.containsKey('materialIdEnd') and conditionParamRef.materialIdEnd != null">
${_conditionType_} a.materialId <![CDATA[ <= ]]> #{${_conditionParam_}.materialIdEnd}
</if>
<if test="conditionParamRef.containsKey('source')">
<if test="conditionParamRef.source != null ">
${_conditionType_} a.source = #{${_conditionParam_}.source}
......@@ -962,69 +801,6 @@
</if>
<if test="conditionParamRef.containsKey('sampleName')">
<if test="conditionParamRef.sampleName != null and conditionParamRef.sampleName != ''">
${_conditionType_} a.sampleName like #{${_conditionParam_}.sampleName}
</if>
<if test="conditionParamRef.sampleName == null">
${_conditionType_} a.sampleName is null
</if>
</if>
<if test="conditionParamRef.containsKey('sampleNameList') and conditionParamRef.sampleNameList.size() > 0">
${_conditionType_} a.sampleName in
<foreach collection="conditionParamRef.sampleNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sampleNameNotList') and conditionParamRef.sampleNameNotList.size() > 0">
${_conditionType_} a.sampleName not in
<foreach collection="conditionParamRef.sampleNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('samplePath')">
<if test="conditionParamRef.samplePath != null and conditionParamRef.samplePath != ''">
${_conditionType_} a.samplePath like #{${_conditionParam_}.samplePath}
</if>
<if test="conditionParamRef.samplePath == null">
${_conditionType_} a.samplePath is null
</if>
</if>
<if test="conditionParamRef.containsKey('samplePathList') and conditionParamRef.samplePathList.size() > 0">
${_conditionType_} a.samplePath in
<foreach collection="conditionParamRef.samplePathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('samplePathNotList') and conditionParamRef.samplePathNotList.size() > 0">
${_conditionType_} a.samplePath not in
<foreach collection="conditionParamRef.samplePathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('preViewPath')">
<if test="conditionParamRef.preViewPath != null and conditionParamRef.preViewPath != ''">
${_conditionType_} a.preViewPath like #{${_conditionParam_}.preViewPath}
</if>
<if test="conditionParamRef.preViewPath == null">
${_conditionType_} a.preViewPath is null
</if>
</if>
<if test="conditionParamRef.containsKey('preViewPathList') and conditionParamRef.preViewPathList.size() > 0">
${_conditionType_} a.preViewPath in
<foreach collection="conditionParamRef.preViewPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('preViewPathNotList') and conditionParamRef.preViewPathNotList.size() > 0">
${_conditionType_} a.preViewPath not in
<foreach collection="conditionParamRef.preViewPathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
......@@ -1099,6 +875,11 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deviceId')">
a.deviceId
<if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if>
......@@ -1129,11 +910,6 @@
<if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deptId')">
a.deptId
<if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
......@@ -1149,21 +925,6 @@
<if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('materialName')">
a.materialName
<if test='orderCol.materialName != null and "DESC".equalsIgnoreCase(orderCol.materialName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('materiaFullName')">
a.materiaFullName
<if test='orderCol.materiaFullName != null and "DESC".equalsIgnoreCase(orderCol.materiaFullName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('materialId')">
a.materialId
<if test='orderCol.materialId != null and "DESC".equalsIgnoreCase(orderCol.materialId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('source')">
a.source
<if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
......@@ -1179,21 +940,6 @@
<if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('sampleName')">
a.sampleName
<if test='orderCol.sampleName != null and "DESC".equalsIgnoreCase(orderCol.sampleName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('samplePath')">
a.samplePath
<if test='orderCol.samplePath != null and "DESC".equalsIgnoreCase(orderCol.samplePath)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('preViewPath')">
a.preViewPath
<if test='orderCol.preViewPath != null and "DESC".equalsIgnoreCase(orderCol.preViewPath)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
......
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