Skip to content

S
smart_gov_platform
Commit ffae5126 authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

parents d88ba78d f889ca8e
Hide whitespace changes
Inline Side-by-side
Showing with 1294 additions and 952 deletions
base-manager/db/add.sql
View file @ ffae5126
...@@ -184,3 +184,11 @@ CREATE TABLE mortals_sys_app_category( ...@@ -184,3 +184,11 @@ CREATE TABLE mortals_sys_app_category(
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用分类'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用分类';
-- ----------------------------
2023-7-05
-- ----------------------------
ALTER TABLE mortals_sys_app_category ADD COLUMN `cover` varchar(256) DEFAULT '' COMMENT '封面' AFTER sort;
ALTER TABLE mortals_sys_app_category ADD COLUMN `remark` varchar(256) DEFAULT '' COMMENT '备注' AFTER cover;
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppCategoryEntity.java
View file @ ffae5126
...@@ -7,38 +7,46 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -7,38 +7,46 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.app.model.vo.AppCategoryVo; import com.mortals.xhx.module.app.model.vo.AppCategoryVo;
import lombok.Data; import lombok.Data;
/** /**
* 自助终端应用分类实体对象 * 自助终端应用分类实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-06-15 * @date 2023-07-05
*/ */
@Data @Data
public class AppCategoryEntity extends AppCategoryVo { public class AppCategoryEntity extends AppCategoryVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 站点Id * 站点Id
*/ */
private Long siteId; private Long siteId;
/** /**
* 站点名称 * 站点名称
*/ */
private String siteName; private String siteName;
/** /**
* 分类编码 * 分类编码
*/ */
private String categoryCode; private String categoryCode;
/** /**
* 分类名称 * 分类名称
*/ */
private String categoryName; private String categoryName;
/** /**
* 排序字段 * 排序字段
*/ */
private Integer sort; private Integer sort;
/**
* 封面
*/
private String cover;
/**
* 备注
*/
private String remark;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -46,7 +54,7 @@ public class AppCategoryEntity extends AppCategoryVo { ...@@ -46,7 +54,7 @@ public class AppCategoryEntity extends AppCategoryVo {
if (obj instanceof AppCategoryEntity) { if (obj instanceof AppCategoryEntity) {
AppCategoryEntity tmp = (AppCategoryEntity) obj; AppCategoryEntity tmp = (AppCategoryEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -54,14 +62,18 @@ public class AppCategoryEntity extends AppCategoryVo { ...@@ -54,14 +62,18 @@ public class AppCategoryEntity extends AppCategoryVo {
public void initAttrValue(){ public void initAttrValue(){
this.siteId = -1L; this.siteId = -1L;
this.siteName = "";
this.categoryCode = "";
this.siteName = ""; this.categoryName = "";
this.categoryCode = ""; this.sort = 0;
this.categoryName = ""; this.cover = "";
this.sort = 0; this.remark = "";
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppCategoryQuery.java
View file @ ffae5126
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.app.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.app.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.app.model.AppCategoryEntity; import com.mortals.xhx.module.app.model.AppCategoryEntity;
/** /**
* 自助终端应用分类查询对象 * 自助终端应用分类查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-06-15 * @date 2023-07-05
*/ */
public class AppCategoryQuery extends AppCategoryEntity { public class AppCategoryQuery extends AppCategoryEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -111,6 +111,16 @@ public class AppCategoryQuery extends AppCategoryEntity { ...@@ -111,6 +111,16 @@ public class AppCategoryQuery extends AppCategoryEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 封面 */
private List<String> coverList;
/** 封面排除列表 */
private List <String> coverNotList;
/** 备注 */
private List<String> remarkList;
/** 备注排除列表 */
private List <String> remarkNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<AppCategoryQuery> orConditionList; private List<AppCategoryQuery> orConditionList;
...@@ -120,927 +130,1029 @@ public class AppCategoryQuery extends AppCategoryEntity { ...@@ -120,927 +130,1029 @@ public class AppCategoryQuery extends AppCategoryEntity {
public AppCategoryQuery(){} public AppCategoryQuery(){}
/** /**
* 获取 开始 主键ID，主键，自增长 * 获取 开始 主键ID，主键，自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 主键ID，主键，自增长 * 获取 结束 主键ID，主键，自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 主键ID，主键，自增长 * 获取 增加 主键ID，主键，自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 主键ID，主键，自增长 * 获取 主键ID，主键，自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 主键ID，主键，自增长 * 获取 主键ID，主键，自增长
* @return idNotList * @return idNotList
*/ */
public List<Long> getIdNotList(){ public List<Long> getIdNotList(){
return this.idNotList; return this.idNotList;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idNotList * @param idNotList
*/ */
public void setIdNotList(List<Long> idNotList){ public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList; this.idNotList = idNotList;
} }
/** /**
* 获取 开始 站点Id * 获取 开始 站点Id
* @return siteIdStart * @return siteIdStart
*/ */
public Long getSiteIdStart(){ public Long getSiteIdStart(){
return this.siteIdStart; return this.siteIdStart;
} }
/** /**
* 设置 开始 站点Id * 设置 开始 站点Id
* @param siteIdStart * @param siteIdStart
*/ */
public void setSiteIdStart(Long siteIdStart){ public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart; this.siteIdStart = siteIdStart;
} }
/** /**
* 获取 结束 站点Id * 获取 结束 站点Id
* @return $siteIdEnd * @return $siteIdEnd
*/ */
public Long getSiteIdEnd(){ public Long getSiteIdEnd(){
return this.siteIdEnd; return this.siteIdEnd;
} }
/** /**
* 设置 结束 站点Id * 设置 结束 站点Id
* @param siteIdEnd * @param siteIdEnd
*/ */
public void setSiteIdEnd(Long siteIdEnd){ public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd; this.siteIdEnd = siteIdEnd;
} }
/** /**
* 获取 增加 站点Id * 获取 增加 站点Id
* @return siteIdIncrement * @return siteIdIncrement
*/ */
public Long getSiteIdIncrement(){ public Long getSiteIdIncrement(){
return this.siteIdIncrement; return this.siteIdIncrement;
} }
/** /**
* 设置 增加 站点Id * 设置 增加 站点Id
* @param siteIdIncrement * @param siteIdIncrement
*/ */
public void setSiteIdIncrement(Long siteIdIncrement){ public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement; this.siteIdIncrement = siteIdIncrement;
} }
/** /**
* 获取 站点Id * 获取 站点Id
* @return siteIdList * @return siteIdList
*/ */
public List<Long> getSiteIdList(){ public List<Long> getSiteIdList(){
return this.siteIdList; return this.siteIdList;
} }
/** /**
* 设置 站点Id * 设置 站点Id
* @param siteIdList * @param siteIdList
*/ */
public void setSiteIdList(List<Long> siteIdList){ public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList; this.siteIdList = siteIdList;
} }
/** /**
* 获取 站点Id * 获取 站点Id
* @return siteIdNotList * @return siteIdNotList
*/ */
public List<Long> getSiteIdNotList(){ public List<Long> getSiteIdNotList(){
return this.siteIdNotList; return this.siteIdNotList;
} }
/** /**
* 设置 站点Id * 设置 站点Id
* @param siteIdNotList * @param siteIdNotList
*/ */
public void setSiteIdNotList(List<Long> siteIdNotList){ public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList; this.siteIdNotList = siteIdNotList;
} }
/** /**
* 获取 站点名称 * 获取 站点名称
* @return siteNameList * @return siteNameList
*/ */
public List<String> getSiteNameList(){ public List<String> getSiteNameList(){
return this.siteNameList; return this.siteNameList;
} }
/** /**
* 设置 站点名称 * 设置 站点名称
* @param siteNameList * @param siteNameList
*/ */
public void setSiteNameList(List<String> siteNameList){ public void setSiteNameList(List<String> siteNameList){
this.siteNameList = siteNameList; this.siteNameList = siteNameList;
} }
/** /**
* 获取 站点名称 * 获取 站点名称
* @return siteNameNotList * @return siteNameNotList
*/ */
public List<String> getSiteNameNotList(){ public List<String> getSiteNameNotList(){
return this.siteNameNotList; return this.siteNameNotList;
} }
/** /**
* 设置 站点名称 * 设置 站点名称
* @param siteNameNotList * @param siteNameNotList
*/ */
public void setSiteNameNotList(List<String> siteNameNotList){ public void setSiteNameNotList(List<String> siteNameNotList){
this.siteNameNotList = siteNameNotList; this.siteNameNotList = siteNameNotList;
} }
/** /**
* 获取 分类编码 * 获取 分类编码
* @return categoryCodeList * @return categoryCodeList
*/ */
public List<String> getCategoryCodeList(){ public List<String> getCategoryCodeList(){
return this.categoryCodeList; return this.categoryCodeList;
} }
/** /**
* 设置 分类编码 * 设置 分类编码
* @param categoryCodeList * @param categoryCodeList
*/ */
public void setCategoryCodeList(List<String> categoryCodeList){ public void setCategoryCodeList(List<String> categoryCodeList){
this.categoryCodeList = categoryCodeList; this.categoryCodeList = categoryCodeList;
} }
/** /**
* 获取 分类编码 * 获取 分类编码
* @return categoryCodeNotList * @return categoryCodeNotList
*/ */
public List<String> getCategoryCodeNotList(){ public List<String> getCategoryCodeNotList(){
return this.categoryCodeNotList; return this.categoryCodeNotList;
} }
/** /**
* 设置 分类编码 * 设置 分类编码
* @param categoryCodeNotList * @param categoryCodeNotList
*/ */
public void setCategoryCodeNotList(List<String> categoryCodeNotList){ public void setCategoryCodeNotList(List<String> categoryCodeNotList){
this.categoryCodeNotList = categoryCodeNotList; this.categoryCodeNotList = categoryCodeNotList;
} }
/** /**
* 获取 分类名称 * 获取 分类名称
* @return categoryNameList * @return categoryNameList
*/ */
public List<String> getCategoryNameList(){ public List<String> getCategoryNameList(){
return this.categoryNameList; return this.categoryNameList;
} }
/** /**
* 设置 分类名称 * 设置 分类名称
* @param categoryNameList * @param categoryNameList
*/ */
public void setCategoryNameList(List<String> categoryNameList){ public void setCategoryNameList(List<String> categoryNameList){
this.categoryNameList = categoryNameList; this.categoryNameList = categoryNameList;
} }
/** /**
* 获取 分类名称 * 获取 分类名称
* @return categoryNameNotList * @return categoryNameNotList
*/ */
public List<String> getCategoryNameNotList(){ public List<String> getCategoryNameNotList(){
return this.categoryNameNotList; return this.categoryNameNotList;
} }
/** /**
* 设置 分类名称 * 设置 分类名称
* @param categoryNameNotList * @param categoryNameNotList
*/ */
public void setCategoryNameNotList(List<String> categoryNameNotList){ public void setCategoryNameNotList(List<String> categoryNameNotList){
this.categoryNameNotList = categoryNameNotList; this.categoryNameNotList = categoryNameNotList;
} }
/** /**
* 获取 开始 排序字段 * 获取 开始 排序字段
* @return sortStart * @return sortStart
*/ */
public Integer getSortStart(){ public Integer getSortStart(){
return this.sortStart; return this.sortStart;
} }
/** /**
* 设置 开始 排序字段 * 设置 开始 排序字段
* @param sortStart * @param sortStart
*/ */
public void setSortStart(Integer sortStart){ public void setSortStart(Integer sortStart){
this.sortStart = sortStart; this.sortStart = sortStart;
} }
/** /**
* 获取 结束 排序字段 * 获取 结束 排序字段
* @return $sortEnd * @return $sortEnd
*/ */
public Integer getSortEnd(){ public Integer getSortEnd(){
return this.sortEnd; return this.sortEnd;
} }
/** /**
* 设置 结束 排序字段 * 设置 结束 排序字段
* @param sortEnd * @param sortEnd
*/ */
public void setSortEnd(Integer sortEnd){ public void setSortEnd(Integer sortEnd){
this.sortEnd = sortEnd; this.sortEnd = sortEnd;
} }
/** /**
* 获取 增加 排序字段 * 获取 增加 排序字段
* @return sortIncrement * @return sortIncrement
*/ */
public Integer getSortIncrement(){ public Integer getSortIncrement(){
return this.sortIncrement; return this.sortIncrement;
} }
/** /**
* 设置 增加 排序字段 * 设置 增加 排序字段
* @param sortIncrement * @param sortIncrement
*/ */
public void setSortIncrement(Integer sortIncrement){ public void setSortIncrement(Integer sortIncrement){
this.sortIncrement = sortIncrement; this.sortIncrement = sortIncrement;
} }
/** /**
* 获取 排序字段 * 获取 排序字段
* @return sortList * @return sortList
*/ */
public List<Integer> getSortList(){ public List<Integer> getSortList(){
return this.sortList; return this.sortList;
} }
/** /**
* 设置 排序字段 * 设置 排序字段
* @param sortList * @param sortList
*/ */
public void setSortList(List<Integer> sortList){ public void setSortList(List<Integer> sortList){
this.sortList = sortList; this.sortList = sortList;
} }
/** /**
* 获取 排序字段 * 获取 排序字段
* @return sortNotList * @return sortNotList
*/ */
public List<Integer> getSortNotList(){ public List<Integer> getSortNotList(){
return this.sortNotList; return this.sortNotList;
} }
/** /**
* 设置 排序字段 * 设置 排序字段
* @param sortNotList * @param sortNotList
*/ */
public void setSortNotList(List<Integer> sortNotList){ public void setSortNotList(List<Integer> sortNotList){
this.sortNotList = sortNotList; this.sortNotList = sortNotList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
*/ */
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdNotList * @return createUserIdNotList
*/ */
public List<Long> getCreateUserIdNotList(){ public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList; return this.createUserIdNotList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdNotList * @param createUserIdNotList
*/ */
public void setCreateUserIdNotList(List<Long> createUserIdNotList){ public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList; this.createUserIdNotList = createUserIdNotList;
} }
/** /**
* 获取 开始 更新用户 * 获取 开始 更新用户
* @return updateUserIdStart * @return updateUserIdStart
*/ */
public Long getUpdateUserIdStart(){ public Long getUpdateUserIdStart(){
return this.updateUserIdStart; return this.updateUserIdStart;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public void setUpdateUserIdStart(Long updateUserIdStart){ public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
} }
/** /**
* 获取 结束 更新用户 * 获取 结束 更新用户
* @return $updateUserIdEnd * @return $updateUserIdEnd
*/ */
public Long getUpdateUserIdEnd(){ public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd; return this.updateUserIdEnd;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
} }
/** /**
* 获取 增加 更新用户 * 获取 增加 更新用户
* @return updateUserIdIncrement * @return updateUserIdIncrement
*/ */
public Long getUpdateUserIdIncrement(){ public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement; return this.updateUserIdIncrement;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdList * @return updateUserIdList
*/ */
public List<Long> getUpdateUserIdList(){ public List<Long> getUpdateUserIdList(){
return this.updateUserIdList; return this.updateUserIdList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdNotList * @return updateUserIdNotList
*/ */
public List<Long> getUpdateUserIdNotList(){ public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList; return this.updateUserIdNotList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdNotList * @param updateUserIdNotList
*/ */
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){ public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList; this.updateUserIdNotList = updateUserIdNotList;
} }
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 更新时间 * 设置 开始 更新时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 更新时间 * 获取 结束 更新时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 更新时间 * 设置 结束 更新时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 设置 主键ID，主键，自增长 * 获取 封面
* @param id * @return coverList
*/ */
public List<String> getCoverList(){
return this.coverList;
}
/**
* 设置 封面
* @param coverList
*/
public void setCoverList(List<String> coverList){
this.coverList = coverList;
}
/**
* 获取 封面
* @return coverNotList
*/
public List<String> getCoverNotList(){
return this.coverNotList;
}
/**
* 设置 封面
* @param coverNotList
*/
public void setCoverNotList(List<String> coverNotList){
this.coverNotList = coverNotList;
}
/**
* 获取 备注
* @return remarkList
*/
public List<String> getRemarkList(){
return this.remarkList;
}
/**
* 设置 备注
* @param remarkList
*/
public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList;
}
/**
* 获取 备注
* @return remarkNotList
*/
public List<String> getRemarkNotList(){
return this.remarkNotList;
}
/**
* 设置 备注
* @param remarkNotList
*/
public void setRemarkNotList(List<String> remarkNotList){
this.remarkNotList = remarkNotList;
}
/**
* 设置 主键ID，主键，自增长
* @param id
*/
public AppCategoryQuery id(Long id){ public AppCategoryQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public AppCategoryQuery idStart(Long idStart){ public AppCategoryQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public AppCategoryQuery idEnd(Long idEnd){ public AppCategoryQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public AppCategoryQuery idIncrement(Long idIncrement){ public AppCategoryQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public AppCategoryQuery idList(List<Long> idList){ public AppCategoryQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idNotList * @param idNotList
*/ */
public AppCategoryQuery idNotList(List<Long> idNotList){ public AppCategoryQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList; this.idNotList = idNotList;
return this; return this;
} }
/** /**
* 设置 站点Id * 设置 站点Id
* @param siteId * @param siteId
*/ */
public AppCategoryQuery siteId(Long siteId){ public AppCategoryQuery siteId(Long siteId){
setSiteId(siteId); setSiteId(siteId);
return this; return this;
} }
/** /**
* 设置 开始 站点Id * 设置 开始 站点Id
* @param siteIdStart * @param siteIdStart
*/ */
public AppCategoryQuery siteIdStart(Long siteIdStart){ public AppCategoryQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart; this.siteIdStart = siteIdStart;
return this; return this;
} }
/** /**
* 设置 结束 站点Id * 设置 结束 站点Id
* @param siteIdEnd * @param siteIdEnd
*/ */
public AppCategoryQuery siteIdEnd(Long siteIdEnd){ public AppCategoryQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd; this.siteIdEnd = siteIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 站点Id * 设置 增加 站点Id
* @param siteIdIncrement * @param siteIdIncrement
*/ */
public AppCategoryQuery siteIdIncrement(Long siteIdIncrement){ public AppCategoryQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement; this.siteIdIncrement = siteIdIncrement;
return this; return this;
} }
/** /**
* 设置 站点Id * 设置 站点Id
* @param siteIdList * @param siteIdList
*/ */
public AppCategoryQuery siteIdList(List<Long> siteIdList){ public AppCategoryQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList; this.siteIdList = siteIdList;
return this; return this;
} }
/** /**
* 设置 站点Id * 设置 站点Id
* @param siteIdNotList * @param siteIdNotList
*/ */
public AppCategoryQuery siteIdNotList(List<Long> siteIdNotList){ public AppCategoryQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList; this.siteIdNotList = siteIdNotList;
return this; return this;
} }
/** /**
* 设置 站点名称 * 设置 站点名称
* @param siteName * @param siteName
*/ */
public AppCategoryQuery siteName(String siteName){ public AppCategoryQuery siteName(String siteName){
setSiteName(siteName); setSiteName(siteName);
return this; return this;
} }
/** /**
* 设置 站点名称 * 设置 站点名称
* @param siteNameList * @param siteNameList
*/ */
public AppCategoryQuery siteNameList(List<String> siteNameList){ public AppCategoryQuery siteNameList(List<String> siteNameList){
this.siteNameList = siteNameList; this.siteNameList = siteNameList;
return this; return this;
} }
/** /**
* 设置 分类编码 * 设置 分类编码
* @param categoryCode * @param categoryCode
*/ */
public AppCategoryQuery categoryCode(String categoryCode){ public AppCategoryQuery categoryCode(String categoryCode){
setCategoryCode(categoryCode); setCategoryCode(categoryCode);
return this; return this;
} }
/** /**
* 设置 分类编码 * 设置 分类编码
* @param categoryCodeList * @param categoryCodeList
*/ */
public AppCategoryQuery categoryCodeList(List<String> categoryCodeList){ public AppCategoryQuery categoryCodeList(List<String> categoryCodeList){
this.categoryCodeList = categoryCodeList; this.categoryCodeList = categoryCodeList;
return this; return this;
} }
/** /**
* 设置 分类名称 * 设置 分类名称
* @param categoryName * @param categoryName
*/ */
public AppCategoryQuery categoryName(String categoryName){ public AppCategoryQuery categoryName(String categoryName){
setCategoryName(categoryName); setCategoryName(categoryName);
return this; return this;
} }
/** /**
* 设置 分类名称 * 设置 分类名称
* @param categoryNameList * @param categoryNameList
*/ */
public AppCategoryQuery categoryNameList(List<String> categoryNameList){ public AppCategoryQuery categoryNameList(List<String> categoryNameList){
this.categoryNameList = categoryNameList; this.categoryNameList = categoryNameList;
return this; return this;
} }
/** /**
* 设置 排序字段 * 设置 排序字段
* @param sort * @param sort
*/ */
public AppCategoryQuery sort(Integer sort){ public AppCategoryQuery sort(Integer sort){
setSort(sort); setSort(sort);
return this; return this;
} }
/** /**
* 设置 开始 排序字段 * 设置 开始 排序字段
* @param sortStart * @param sortStart
*/ */
public AppCategoryQuery sortStart(Integer sortStart){ public AppCategoryQuery sortStart(Integer sortStart){
this.sortStart = sortStart; this.sortStart = sortStart;
return this; return this;
} }
/** /**
* 设置 结束 排序字段 * 设置 结束 排序字段
* @param sortEnd * @param sortEnd
*/ */
public AppCategoryQuery sortEnd(Integer sortEnd){ public AppCategoryQuery sortEnd(Integer sortEnd){
this.sortEnd = sortEnd; this.sortEnd = sortEnd;
return this; return this;
} }
/** /**
* 设置 增加 排序字段 * 设置 增加 排序字段
* @param sortIncrement * @param sortIncrement
*/ */
public AppCategoryQuery sortIncrement(Integer sortIncrement){ public AppCategoryQuery sortIncrement(Integer sortIncrement){
this.sortIncrement = sortIncrement; this.sortIncrement = sortIncrement;
return this; return this;
} }
/** /**
* 设置 排序字段 * 设置 排序字段
* @param sortList * @param sortList
*/ */
public AppCategoryQuery sortList(List<Integer> sortList){ public AppCategoryQuery sortList(List<Integer> sortList){
this.sortList = sortList; this.sortList = sortList;
return this; return this;
} }
/** /**
* 设置 排序字段 * 设置 排序字段
* @param sortNotList * @param sortNotList
*/ */
public AppCategoryQuery sortNotList(List<Integer> sortNotList){ public AppCategoryQuery sortNotList(List<Integer> sortNotList){
this.sortNotList = sortNotList; this.sortNotList = sortNotList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public AppCategoryQuery createUserId(Long createUserId){ public AppCategoryQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public AppCategoryQuery createUserIdStart(Long createUserIdStart){ public AppCategoryQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public AppCategoryQuery createUserIdEnd(Long createUserIdEnd){ public AppCategoryQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public AppCategoryQuery createUserIdIncrement(Long createUserIdIncrement){ public AppCategoryQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public AppCategoryQuery createUserIdList(List<Long> createUserIdList){ public AppCategoryQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdNotList * @param createUserIdNotList
*/ */
public AppCategoryQuery createUserIdNotList(List<Long> createUserIdNotList){ public AppCategoryQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList; this.createUserIdNotList = createUserIdNotList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserId * @param updateUserId
*/ */
public AppCategoryQuery updateUserId(Long updateUserId){ public AppCategoryQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public AppCategoryQuery updateUserIdStart(Long updateUserIdStart){ public AppCategoryQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public AppCategoryQuery updateUserIdEnd(Long updateUserIdEnd){ public AppCategoryQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public AppCategoryQuery updateUserIdIncrement(Long updateUserIdIncrement){ public AppCategoryQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public AppCategoryQuery updateUserIdList(List<Long> updateUserIdList){ public AppCategoryQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdNotList * @param updateUserIdNotList
*/ */
public AppCategoryQuery updateUserIdNotList(List<Long> updateUserIdNotList){ public AppCategoryQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList; this.updateUserIdNotList = updateUserIdNotList;
return this; return this;
} }
/**
* 设置 封面
* @param cover
*/
public AppCategoryQuery cover(String cover){
setCover(cover);
return this;
}
/**
* 设置 封面
* @param coverList
*/
public AppCategoryQuery coverList(List<String> coverList){
this.coverList = coverList;
return this;
}
/**
* 设置 备注
* @param remark
*/
public AppCategoryQuery remark(String remark){
setRemark(remark);
return this;
}
/**
* 设置 备注
* @param remarkList
*/
public AppCategoryQuery remarkList(List<String> remarkList){
this.remarkList = remarkList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
*/ */
public List<AppCategoryQuery> getOrConditionList(){ public List<AppCategoryQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<AppCategoryQuery> orConditionList){ public void setOrConditionList(List<AppCategoryQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<AppCategoryQuery> getAndConditionList(){ public List<AppCategoryQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<AppCategoryQuery> andConditionList){ public void setAndConditionList(List<AppCategoryQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
base-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java
View file @ ffae5126
...@@ -149,14 +149,6 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE ...@@ -149,14 +149,6 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE
deptEntity.setCreateUserId(1L); deptEntity.setCreateUserId(1L);
deptService.save(deptEntity, context); deptService.save(deptEntity, context);
} }
/* else {
//更新
deptEntity.setName(deptName);
deptEntity.setSource(SourceEnum.政务网.getValue());
deptEntity.setUpdateTime(new Date());
deptEntity.setUpdateUserId(1L);
deptService.update(deptEntity, context);
}*/
sortN++; sortN++;
} }
} else { } else {
......
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @ ffae5126
...@@ -185,6 +185,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -185,6 +185,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
@Override @Override
protected void saveAfter(SiteEntity entity, Context context) throws AppException { protected void saveAfter(SiteEntity entity, Context context) throws AppException {
super.saveAfter(entity, context);
//刷新站点树 //刷新站点树
//ThreadPool.getInstance().execute(new SyncTreeSiteThread(this,context)); //ThreadPool.getInstance().execute(new SyncTreeSiteThread(this,context));
Rest<String> rest = userFeign.synchSiteAuth(); Rest<String> rest = userFeign.synchSiteAuth();
...@@ -200,7 +201,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -200,7 +201,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
//更新同步部门相关 //更新同步部门相关
deptService.syncDeptBySiteId(entity, context); deptService.syncDeptBySiteId(entity, context);
log.info("站点更新4"); log.info("站点更新4");
super.saveAfter(entity, context);
} }
...@@ -324,6 +325,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -324,6 +325,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
@Override @Override
protected void updateAfter(SiteEntity entity, Context context) throws AppException { protected void updateAfter(SiteEntity entity, Context context) throws AppException {
super.updateAfter(entity,context);
//刷新站点树 //刷新站点树
log.info("update1"); log.info("update1");
Rest<String> rest = userFeign.synchSiteAuth(); Rest<String> rest = userFeign.synchSiteAuth();
......
base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowServiceImpl.java
View file @ ffae5126
...@@ -69,13 +69,9 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W ...@@ -69,13 +69,9 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
Map<Long, List<WorkmanEntity>> workmanCollect = workmanService.find(new WorkmanQuery()).stream().filter(f -> f.getWindowId() != null).collect(Collectors.groupingBy(x -> x.getWindowId())); Map<Long, List<WorkmanEntity>> workmanCollect = workmanService.find(new WorkmanQuery()).stream().filter(f -> f.getWindowId() != null).collect(Collectors.groupingBy(x -> x.getWindowId()));
Map<Long, List<WindowBusinessEntity>> windowBusinessCollect = windowBusinessService.find(new WindowBusinessQuery()) Map<Long, List<WindowBusinessEntity>> windowBusinessCollect = windowBusinessService.find(new WindowBusinessQuery())
.stream().filter(f -> f.getWindowId() != null).collect(Collectors.groupingBy(x -> x.getWindowId())); .stream().filter(f -> f.getWindowId() != null).collect(Collectors.groupingBy(x -> x.getWindowId()));
Map<Long, List<WindowMatterEntity>> windowMatterCollect = windowMatterService.find(new WindowMatterQuery()) Map<Long, List<WindowMatterEntity>> windowMatterCollect = windowMatterService.find(new WindowMatterQuery())
.stream().filter(f -> f.getWindowId() != null).collect(Collectors.groupingBy(x -> x.getWindowId())); .stream().filter(f -> f.getWindowId() != null).collect(Collectors.groupingBy(x -> x.getWindowId()));
Map<Long, WindowHallEntity> windowHallMap = windowHallService.find(new WindowHallQuery()).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), y -> y, (o, n) -> n)); Map<Long, WindowHallEntity> windowHallMap = windowHallService.find(new WindowHallQuery()).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), y -> y, (o, n) -> n));
list.stream().peek(item -> { list.stream().peek(item -> {
if (!ObjectUtils.isEmpty(workmanCollect.get(item.getId()))) { if (!ObjectUtils.isEmpty(workmanCollect.get(item.getId()))) {
item.setWorkmanList(workmanCollect.get(item.getId())); item.setWorkmanList(workmanCollect.get(item.getId()));
...@@ -83,7 +79,6 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W ...@@ -83,7 +79,6 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
if (!ObjectUtils.isEmpty(windowBusinessCollect.get(item.getId()))) { if (!ObjectUtils.isEmpty(windowBusinessCollect.get(item.getId()))) {
item.setWindowBusinessList(windowBusinessCollect.get(item.getId())); item.setWindowBusinessList(windowBusinessCollect.get(item.getId()));
} }
if (!ObjectUtils.isEmpty(windowMatterCollect.get(item.getId()))) { if (!ObjectUtils.isEmpty(windowMatterCollect.get(item.getId()))) {
item.setWindowMatterList(windowMatterCollect.get(item.getId())); item.setWindowMatterList(windowMatterCollect.get(item.getId()));
} }
...@@ -92,7 +87,6 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W ...@@ -92,7 +87,6 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
item.setHallId(windowHallEntity.getHallId()); item.setHallId(windowHallEntity.getHallId());
item.setHallName(windowHallEntity.getHallName()); item.setHallName(windowHallEntity.getHallName());
} }
}).count(); }).count();
super.findAfter(params, pageInfo, context, list); super.findAfter(params, pageInfo, context, list);
} }
...@@ -109,7 +103,6 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W ...@@ -109,7 +103,6 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
} }
WindowBusinessQuery windowBusinessQuery = new WindowBusinessQuery(); WindowBusinessQuery windowBusinessQuery = new WindowBusinessQuery();
//windowBusinessQuery.setSiteBusinessIdList(businessIdList); //windowBusinessQuery.setSiteBusinessIdList(businessIdList);
//先删除后再新增 //先删除后再新增
windowBusinessQuery.setWindowId(windowId); windowBusinessQuery.setWindowId(windowId);
Long[] ids = windowBusinessService.find(windowBusinessQuery).stream() Long[] ids = windowBusinessService.find(windowBusinessQuery).stream()
...@@ -215,6 +208,13 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W ...@@ -215,6 +208,13 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
@Override @Override
protected void saveAfter(WindowEntity entity, Context context) throws AppException { protected void saveAfter(WindowEntity entity, Context context) throws AppException {
super.saveAfter(entity, context); super.saveAfter(entity, context);
//判断是否存在id,如果不存在 查询后获取
if(entity.newEntity()){
WindowEntity windowEntity = this.selectOne(new WindowQuery().siteId(entity.getSiteId()).fromnum(entity.getFromnum()));
if(!ObjectUtils.isEmpty(windowEntity)){
entity.setId(windowEntity.getId());
}
}
pushChangeMsg(entity.getId()); pushChangeMsg(entity.getId());
} }
......
base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowController.java
View file @ ffae5126
...@@ -167,10 +167,8 @@ public class WindowController extends BaseCRUDJsonBodyMappingController<WindowSe ...@@ -167,10 +167,8 @@ public class WindowController extends BaseCRUDJsonBodyMappingController<WindowSe
*/ */
@Override @Override
public void doImportDataBefore(List<WindowEntity> list, boolean updateSupport, Context context) throws AppException { public void doImportDataBefore(List<WindowEntity> list, boolean updateSupport, Context context) throws AppException {
String siteId = request.getParameter("siteId"); String siteId = request.getParameter("siteId");
String deptId = request.getParameter("deptId"); String deptId = request.getParameter("deptId");
log.info("siteId:{}", siteId);
SiteEntity siteEntity = null; SiteEntity siteEntity = null;
DeptEntity deptEntity = null; DeptEntity deptEntity = null;
if (!ObjectUtils.isEmpty(siteId)) { if (!ObjectUtils.isEmpty(siteId)) {
......
base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java
View file @ ffae5126
...@@ -9,32 +9,18 @@ import com.mortals.framework.annotation.UnAuth; ...@@ -9,32 +9,18 @@ import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.FileUtil; import com.mortals.framework.util.FileUtil;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
import com.mortals.xhx.base.framework.annotation.Operlog;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.role.model.RoleQuery;
import com.mortals.xhx.base.system.role.model.RoleUserEntity;
import com.mortals.xhx.base.system.role.model.RoleUserQuery;
import com.mortals.xhx.base.system.role.service.RoleService;
import com.mortals.xhx.base.system.role.service.RoleUserService;
import com.mortals.xhx.base.system.upload.service.UploadService; import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.OnlineEnum; import com.mortals.xhx.common.code.OnlineEnum;
import com.mortals.xhx.module.dept.model.DeptEntity; import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.service.DeptService; import com.mortals.xhx.module.dept.service.DeptService;
import com.mortals.xhx.module.model.model.ModelQuery;
import com.mortals.xhx.module.model.service.ModelService;
import com.mortals.xhx.module.site.model.SiteEntity; import com.mortals.xhx.module.site.model.SiteEntity;
import com.mortals.xhx.module.site.service.SiteService; import com.mortals.xhx.module.site.service.SiteService;
import com.mortals.xhx.module.window.model.WindowEntity; import com.mortals.xhx.module.window.model.WindowEntity;
import com.mortals.xhx.module.window.service.WindowService; import com.mortals.xhx.module.window.service.WindowService;
import com.mortals.xhx.module.workman.model.WorkmanEntity; import com.mortals.xhx.module.workman.model.WorkmanEntity;
import com.mortals.xhx.module.workman.model.WorkmanQuery;
import com.mortals.xhx.module.workman.service.WorkmanService; import com.mortals.xhx.module.workman.service.WorkmanService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -45,7 +31,6 @@ import java.io.IOException; ...@@ -45,7 +31,6 @@ import java.io.IOException;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* 工作人员 * 工作人员
...@@ -107,6 +92,13 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman ...@@ -107,6 +92,13 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(), ip); WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(), ip);
workmanEntity.setLastLoginAddress(ip); workmanEntity.setLastLoginAddress(ip);
workmanEntity.setLastLoginTime(new Date()); workmanEntity.setLastLoginTime(new Date());
if(query.getWindowId()!=null) {
workmanEntity.setWindowId(query.getWindowId());
WindowEntity windowEntity = windowService.get(query.getWindowId());
if(windowEntity!=null){
workmanEntity.setWindowName(windowEntity.getName());
}
}
this.service.getDao().update(workmanEntity); this.service.getDao().update(workmanEntity);
if (query.getSiteId() != workmanEntity.getSiteId()) { if (query.getSiteId() != workmanEntity.getSiteId()) {
throw new AppException("当前工作人员不在当前站点下！"); throw new AppException("当前工作人员不在当前站点下！");
......
base-manager/src/main/resources/sqlmap/module/app/AppCategoryMapper.xml
View file @ ffae5126
<?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.app.dao.ibatis.AppCategoryDaoImpl"> <mapper namespace="com.mortals.xhx.module.app.dao.ibatis.AppCategoryDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="AppCategoryEntity" id="AppCategoryEntity-Map"> <resultMap type="AppCategoryEntity" id="AppCategoryEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="siteId" column="siteId" /> <result property="siteId" column="siteId" />
<result property="siteName" column="siteName" /> <result property="siteName" column="siteName" />
<result property="categoryCode" column="categoryCode" /> <result property="categoryCode" column="categoryCode" />
<result property="categoryName" column="categoryName" /> <result property="categoryName" column="categoryName" />
<result property="sort" column="sort" /> <result property="sort" column="sort" />
<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" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="cover" column="cover" />
<result property="remark" column="remark" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId, a.siteId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
a.siteName, a.siteName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryCode') or colPickMode == 1 and data.containsKey('categoryCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryCode') or colPickMode == 1 and data.containsKey('categoryCode')))">
a.categoryCode, a.categoryCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
a.categoryName, a.categoryName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
a.sort, a.sort,
</if> </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>
<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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId, a.updateUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('cover') or colPickMode == 1 and data.containsKey('cover')))">
a.cover,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AppCategoryEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AppCategoryEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_app_category insert into mortals_sys_app_category
(siteId,siteName,categoryCode,categoryName,sort,createTime,createUserId,updateUserId,updateTime) (siteId,siteName,categoryCode,categoryName,sort,createTime,createUserId,updateUserId,updateTime,cover,remark)
VALUES VALUES
(#{siteId},#{siteName},#{categoryCode},#{categoryName},#{sort},#{createTime},#{createUserId},#{updateUserId},#{updateTime}) (#{siteId},#{siteName},#{categoryCode},#{categoryName},#{sort},#{createTime},#{createUserId},#{updateUserId},#{updateTime},#{cover},#{remark})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_app_category insert into mortals_sys_app_category
(siteId,siteName,categoryCode,categoryName,sort,createTime,createUserId,updateUserId,updateTime) (siteId,siteName,categoryCode,categoryName,sort,createTime,createUserId,updateUserId,updateTime,cover,remark)
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.categoryCode},#{item.categoryName},#{item.sort},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime}) (#{item.siteId},#{item.siteName},#{item.categoryCode},#{item.categoryName},#{item.sort},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime},#{item.cover},#{item.remark})
</foreach> </foreach>
</insert> </insert>
...@@ -117,6 +125,12 @@ ...@@ -117,6 +125,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('cover')) or (colPickMode==1 and !data.containsKey('cover'))">
a.cover=#{data.cover},
</if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -129,89 +143,103 @@ ...@@ -129,89 +143,103 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_sys_app_category as a update mortals_sys_app_category as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),"> <trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))"> <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId} when a.id=#{item.id} then #{item.siteId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))"> <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 a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="siteName=(case" suffix="ELSE siteName end),"> <trim prefix="siteName=(case" suffix="ELSE siteName 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('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))"> <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
when a.id=#{item.id} then #{item.siteName} when a.id=#{item.id} then #{item.siteName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="categoryCode=(case" suffix="ELSE categoryCode end),"> <trim prefix="categoryCode=(case" suffix="ELSE categoryCode 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('categoryCode')) or (colPickMode==1 and !item.containsKey('categoryCode'))"> <if test="(colPickMode==0 and item.containsKey('categoryCode')) or (colPickMode==1 and !item.containsKey('categoryCode'))">
when a.id=#{item.id} then #{item.categoryCode} when a.id=#{item.id} then #{item.categoryCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="categoryName=(case" suffix="ELSE categoryName end),"> <trim prefix="categoryName=(case" suffix="ELSE categoryName 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('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))"> <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
when a.id=#{item.id} then #{item.categoryName} when a.id=#{item.id} then #{item.categoryName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="sort=(case" suffix="ELSE sort end),"> <trim prefix="sort=(case" suffix="ELSE sort end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('sort')) or (colPickMode==1 and !item.containsKey('sort'))"> <when test="(colPickMode==0 and item.containsKey('sort')) or (colPickMode==1 and !item.containsKey('sort'))">
when a.id=#{item.id} then #{item.sort} when a.id=#{item.id} then #{item.sort}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('sortIncrement')) or (colPickMode==1 and !item.containsKey('sortIncrement'))"> <when test="(colPickMode==0 and item.containsKey('sortIncrement')) or (colPickMode==1 and !item.containsKey('sortIncrement'))">
when a.id=#{item.id} then ifnull(a.sort,0) + #{item.sortIncrement} when a.id=#{item.id} then ifnull(a.sort,0) + #{item.sortIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </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'))">
when a.id=#{item.id} then #{item.createTime} when a.id=#{item.id} then #{item.createTime}
</if> </if>
</foreach> </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="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId} when a.id=#{item.id} then #{item.createUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <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 a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),"> <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))"> <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId} when a.id=#{item.id} then #{item.updateUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))"> <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 a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> <trim prefix="updateTime=(case" suffix="ELSE updateTime 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('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime} when a.id=#{item.id} then #{item.updateTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="cover=(case" suffix="ELSE cover end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('cover')) or (colPickMode==1 and !item.containsKey('cover'))">
when a.id=#{item.id} then #{item.cover}
</if>
</foreach>
</trim>
<trim prefix="remark=(case" suffix="ELSE remark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
when a.id=#{item.id} then #{item.remark}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -328,297 +356,349 @@ ...@@ -328,297 +356,349 @@
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null "> <if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id} ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_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>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> <if test="conditionParamRef.id == null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_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('siteId')"> <if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null "> <if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId} ${_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>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null"> <if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd} ${_conditionType_} a.siteId is null
</if> </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('siteName')"> <if test="conditionParamRef.containsKey('siteName')">
<if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''"> <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
${_conditionType_} a.siteName like #{${_conditionParam_}.siteName} ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
</if>
<if test="conditionParamRef.siteName == null">
${_conditionType_} a.siteName is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
${_conditionType_} a.siteName in
<foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0"> <if test="conditionParamRef.siteName == null">
${_conditionType_} a.siteName not in ${_conditionType_} a.siteName is null
<foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
${_conditionType_} a.siteName in
<foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
${_conditionType_} a.siteName not in
<foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('categoryCode')"> <if test="conditionParamRef.containsKey('categoryCode')">
<if test="conditionParamRef.categoryCode != null and conditionParamRef.categoryCode != ''"> <if test="conditionParamRef.categoryCode != null and conditionParamRef.categoryCode != ''">
${_conditionType_} a.categoryCode like #{${_conditionParam_}.categoryCode} ${_conditionType_} a.categoryCode like #{${_conditionParam_}.categoryCode}
</if>
<if test="conditionParamRef.categoryCode == null">
${_conditionType_} a.categoryCode is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('categoryCodeList') and conditionParamRef.categoryCodeList.size() > 0"> <if test="conditionParamRef.categoryCode == null">
${_conditionType_} a.categoryCode in ${_conditionType_} a.categoryCode is null
<foreach collection="conditionParamRef.categoryCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('categoryCodeNotList') and conditionParamRef.categoryCodeNotList.size() > 0">
${_conditionType_} a.categoryCode not in
<foreach collection="conditionParamRef.categoryCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('categoryCodeList') and conditionParamRef.categoryCodeList.size() > 0">
${_conditionType_} a.categoryCode in
<foreach collection="conditionParamRef.categoryCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('categoryCodeNotList') and conditionParamRef.categoryCodeNotList.size() > 0">
${_conditionType_} a.categoryCode not in
<foreach collection="conditionParamRef.categoryCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('categoryName')"> <if test="conditionParamRef.containsKey('categoryName')">
<if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''"> <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName} ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
</if>
<if test="conditionParamRef.categoryName == null">
${_conditionType_} a.categoryName is null
</if>
</if>
<if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
${_conditionType_} a.categoryName in
<foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0"> <if test="conditionParamRef.categoryName == null">
${_conditionType_} a.categoryName not in ${_conditionType_} a.categoryName is null
<foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sort')"> </if>
<if test="conditionParamRef.sort != null "> <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
${_conditionType_} a.sort = #{${_conditionParam_}.sort} ${_conditionType_} a.categoryName in
</if> <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.sort == null"> #{item}
${_conditionType_} a.sort is null </foreach>
</if> </if>
</if> <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
<if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0"> ${_conditionType_} a.categoryName not in
${_conditionType_} a.sort in <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
<foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=","> #{item}
#{item} </foreach>
</foreach> </if>
</if> <if test="conditionParamRef.containsKey('sort')">
<if test="conditionParamRef.containsKey('sortNotList') and conditionParamRef.sortNotList.size() > 0"> <if test="conditionParamRef.sort != null ">
${_conditionType_} a.sort not in ${_conditionType_} a.sort = #{${_conditionParam_}.sort}
<foreach collection="conditionParamRef.sortNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
</if> </if>
<if test="conditionParamRef.containsKey('sortEnd') and conditionParamRef.sortEnd != null"> <if test="conditionParamRef.sort == null">
${_conditionType_} a.sort <![CDATA[ <= ]]> #{${_conditionParam_}.sortEnd} ${_conditionType_} a.sort is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
${_conditionType_} a.sort in
<foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sortNotList') and conditionParamRef.sortNotList.size() > 0">
${_conditionType_} a.sort not in
<foreach collection="conditionParamRef.sortNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
</if>
<if test="conditionParamRef.containsKey('sortEnd') and conditionParamRef.sortEnd != null">
${_conditionType_} a.sort <![CDATA[ <= ]]> #{${_conditionParam_}.sortEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_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>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.createTime is null
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> </if>
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.createUserId == null"> <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createUserId is null ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
</if> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0"> <if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId not in ${_conditionType_} a.createUserId is null
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> </if>
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_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('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.updateUserId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_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('updateUserId')">
<if test="conditionParamRef.updateUserId != null "> <if test="conditionParamRef.containsKey('updateTime')">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId} <if test="conditionParamRef.updateTime != null ">
</if> ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0"> <if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateUserId not in ${_conditionType_} a.updateTime is null
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> </if>
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('cover')">
<if test="conditionParamRef.cover != null and conditionParamRef.cover != ''">
${_conditionType_} a.cover like #{${_conditionParam_}.cover}
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null"> <if test="conditionParamRef.cover == null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} ${_conditionType_} a.cover is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('coverList') and conditionParamRef.coverList.size() > 0">
${_conditionType_} a.cover in
<foreach collection="conditionParamRef.coverList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('coverNotList') and conditionParamRef.coverNotList.size() > 0">
${_conditionType_} a.cover not in
<foreach collection="conditionParamRef.coverNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.containsKey('updateTime')"> <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
<if test="conditionParamRef.updateTime != null "> ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
${_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>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.remark == null">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.remark is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} ${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteId')"> <if test="orderCol.containsKey('siteId')">
a.siteId a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if> <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteName')"> <if test="orderCol.containsKey('siteName')">
a.siteName a.siteName
<if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if> <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('categoryCode')"> <if test="orderCol.containsKey('categoryCode')">
a.categoryCode a.categoryCode
<if test='orderCol.categoryCode != null and "DESC".equalsIgnoreCase(orderCol.categoryCode)'>DESC</if> <if test='orderCol.categoryCode != null and "DESC".equalsIgnoreCase(orderCol.categoryCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('categoryName')"> <if test="orderCol.containsKey('categoryName')">
a.categoryName a.categoryName
<if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if> <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('sort')"> <if test="orderCol.containsKey('sort')">
a.sort a.sort
<if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if> <if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
, ,
</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>
, ,
</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>
, ,
</if> </if>
<if test="orderCol.containsKey('updateUserId')"> <if test="orderCol.containsKey('updateUserId')">
a.updateUserId a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('updateTime')">
a.updateTime a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('cover')">
a.cover
<if test='orderCol.cover != null and "DESC".equalsIgnoreCase(orderCol.cover)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('remark')">
a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
portal-manager-ui/admin/src/api/customer.js
View file @ ffae5126
...@@ -11,3 +11,8 @@ export function getCustomer(params) { ...@@ -11,3 +11,8 @@ export function getCustomer(params) {
export function windowList(params) { export function windowList(params) {
return http.post(`${proURL}/base/window/list`, params); return http.post(`${proURL}/base/window/list`, params);
} }
// 图片作品
export function picInfoList(params) {
return http.post(`${baseURL}/eas/customer/work/design/picture/list`, params);
}
\ No newline at end of file
portal-manager-ui/admin/src/views/dataActuary/behaviour/usinghabit/usinghabit.vue
View file @ ffae5126
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
methods: { methods: {
getData() { getData() {
this.queryform.dateTimeStart = this.time ? this.time[0] : null this.queryform.dateTimeStart = this.time ? this.time[0] : null
this.queryform.dateTimeStart = this.time ? this.time[1] : null this.queryform.dateTimeEnd = this.time ? this.time[1] : null
getUsageCensus(this.queryform).then(res=>{ getUsageCensus(this.queryform).then(res=>{
let data = res.data.map(({businessName,propValue})=>({name:businessName,value:propValue * 100})) let data = res.data.map(({businessName,propValue})=>({name:businessName,value:propValue * 100}))
this.initType(data) this.initType(data)
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
let myChart = echarts.init(chartDom); let myChart = echarts.init(chartDom);
myChart.setOption({ myChart.setOption({
title: { title: {
text: '取号类型分析', text: this.queryform.productId==1?'取号类型分析':'功能使用分布',
left: 'center' left: 'center'
}, },
tooltip: { tooltip: {
......
portal-manager-ui/admin/src/views/dataActuary/business/analysiscontent/index.vue
View file @ ffae5126
...@@ -13,10 +13,11 @@ ...@@ -13,10 +13,11 @@
</a-col> </a-col>
<a-col :span="10"> <a-col :span="10">
<a-form layout="horizontal" :model="formState" :label-col="{span: 4}" :wrapper-col="{span: 20}"> <a-form layout="horizontal" :model="formState" :label-col="{span: 4}" :wrapper-col="{span: 20}">
<a-form-item label="流水号：">{{ formState.flownum }}</a-form-item> <a-form-item label="流水号：">{{ formState.flownum?formState.flownum:'--' }}</a-form-item>
<a-form-item label="关联排号：">{{ formState.device_name }}</a-form-item> <a-form-item label="关联排号：">{{ formState.device_name?formState.device_name:'--' }}</a-form-item>
<a-form-item label="受理区域："> <a-form-item label="受理区域：">
<a-tag v-for="(item, index) in formState.region" :key="index">{{ item }}</a-tag> <a-tag v-for="(item, index) in formState.region" :key="index">{{ item }}</a-tag>
<span v-if="formState.region.length<1">--</span>
</a-form-item> </a-form-item>
<a-form-item label="是否延时：">{{ formState.isweek_work ? '是' : '否' }}</a-form-item> <a-form-item label="是否延时：">{{ formState.isweek_work ? '是' : '否' }}</a-form-item>
<a-form-item label="优先叫号：">{{ formState.first ? '是' : '否' }}</a-form-item> <a-form-item label="优先叫号：">{{ formState.first ? '是' : '否' }}</a-form-item>
...@@ -25,12 +26,13 @@ ...@@ -25,12 +26,13 @@
<a-col :span="10"> <a-col :span="10">
<a-form layout="horizontal" :model="formState" :label-col="{span: 4}" :wrapper-col="{span: 20}"> <a-form layout="horizontal" :model="formState" :label-col="{span: 4}" :wrapper-col="{span: 20}">
<a-form-item label="业务级别：">{{ formState.level ? '二级业务' : '一级业务' }}</a-form-item> <a-form-item label="业务级别：">{{ formState.level ? '二级业务' : '一级业务' }}</a-form-item>
<a-form-item label="父级业务：">{{ formState.parent_name }}</a-form-item> <a-form-item label="父级业务：">{{ formState.parent_name?formState.parent_name:'--' }}</a-form-item>
<a-form-item label="关联事项："> <a-form-item label="关联事项：">
<a-tag v-for="(item, index) in formState.matter" :key="index">{{ item.matterName }}</a-tag> <a-tag v-for="(item, index) in formState.matter" :key="index">{{ item.matterName }}</a-tag>
<span v-if="formState.matter.length<1">--</span>
</a-form-item> </a-form-item>
<a-form-item label="是否预约：">{{ formState.canorder ? '允许' : '不允许'}}</a-form-item> <a-form-item label="是否预约：">{{ formState.canorder ? '允许' : '不允许'}}</a-form-item>
<a-form-item label="验证方式：">{{testWay.join(',')}}</a-form-item> <a-form-item label="验证方式：">{{testWay.length>0?testWay.join(','):'--'}}</a-form-item>
</a-form> </a-form>
</a-col> </a-col>
</a-row> </a-row>
...@@ -167,7 +169,7 @@ import {getBusInfoById} from '@/api/dataActuary.js' ...@@ -167,7 +169,7 @@ import {getBusInfoById} from '@/api/dataActuary.js'
margin-bottom: .9375rem; margin-bottom: .9375rem;
} }
.f_40{ .f_40{
font-size: 2.5rem; font-size: 2rem;
} }
.f_center{ .f_center{
text-align: center; text-align: center;
......
portal-manager-ui/admin/src/views/dataActuary/business/basecontent/index.vue
View file @ ffae5126
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</a-col> </a-col>
<a-col :span="20"> <a-col :span="20">
<div class="table_title">排队业务分布情况</div> <div class="table_title">排队业务分布情况</div>
<a-table :row-key="record => record.key" :dataSource="lineUp" :columns="lineUpColumns" :pagination="false" :scroll="{ x: 1400, y: 0 }"/> <a-table :row-key="(record,index) => index" :dataSource="lineUp" :columns="lineUpColumns" :pagination="false" :scroll="{ x: 1400, y: 0 }"/>
</a-col> </a-col>
</a-row> </a-row>
</a-card> </a-card>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</a-col> </a-col>
<a-col :span="20"> <a-col :span="20">
<div>预约业务分布情况</div> <div>预约业务分布情况</div>
<a-table :row-key="record => record.id" :dataSource="appointment" :columns="appointmentColumns" :pagination="false" :scroll="{ x: 1400, y: 0 }"/> <a-table :row-key="(record,index) => index" :dataSource="appointment" :columns="appointmentColumns" :pagination="false" :scroll="{ x: 1400, y: 0 }"/>
</a-col> </a-col>
</a-row> </a-row>
</a-card> </a-card>
...@@ -125,14 +125,14 @@ ...@@ -125,14 +125,14 @@
<template #extra> <template #extra>
<a-select <a-select
ref="select" ref="select"
v-model:value="takeNumberTopDate" v-model="takeNumberTopDate"
:options="options" :options="options"
style="width: 120px" style="width: 120px"
@change="changeTakeNumberTopDate" @change="changeTakeNumberTopDate"
> >
</a-select> </a-select>
</template> </template>
<a-table :row-key="record => record.index" :dataSource="takeNumberTop" :columns="takeNumberTopColumns" :pagination="false"> <a-table :row-key="(record,index) => index" :dataSource="takeNumberTop" :columns="takeNumberTopColumns" :pagination="false">
<span slot="index" slot-scope="text, record, index"> <span slot="index" slot-scope="text, record, index">
{{ index + 1 }} {{ index + 1 }}
</span> </span>
...@@ -153,14 +153,14 @@ ...@@ -153,14 +153,14 @@
<template #extra> <template #extra>
<a-select <a-select
ref="select" ref="select"
v-model:value="appointmentTopDate" v-model="appointmentTopDate"
:options="options" :options="options"
style="width: 120px" style="width: 120px"
@change="changeAppointmentTopDate" @change="changeAppointmentTopDate"
> >
</a-select> </a-select>
</template> </template>
<a-table :row-key="record => record.index" :dataSource="appointmentTop" :columns="appointmentTopColumns" :pagination="false"> <a-table :row-key="(record,index) => index" :dataSource="appointmentTop" :columns="appointmentTopColumns" :pagination="false">
<span slot="index" slot-scope="text, record, index"> <span slot="index" slot-scope="text, record, index">
{{ index + 1 }} {{ index + 1 }}
</span> </span>
...@@ -183,14 +183,14 @@ ...@@ -183,14 +183,14 @@
<template #extra> <template #extra>
<a-select <a-select
ref="select" ref="select"
v-model:value="takeNumberLessDate" v-model="takeNumberLessDate"
:options="options" :options="options"
style="width: 120px" style="width: 120px"
@change="changeTakeNumberLessDate" @change="changeTakeNumberLessDate"
> >
</a-select> </a-select>
</template> </template>
<a-table :row-key="record => record.index" :dataSource="takeNumberLess" :columns="takeNumberLessColumns" :pagination="false"> <a-table :row-key="(record,index) => index" :dataSource="takeNumberLess" :columns="takeNumberLessColumns" :pagination="false">
<span slot="index" slot-scope="text, record, index"> <span slot="index" slot-scope="text, record, index">
{{ index + 1 }} {{ index + 1 }}
</span> </span>
...@@ -211,14 +211,14 @@ ...@@ -211,14 +211,14 @@
<template #extra> <template #extra>
<a-select <a-select
ref="select" ref="select"
v-model:value="appointmentLessDate" v-model="appointmentLessDate"
:options="options" :options="options"
style="width: 120px" style="width: 120px"
@change="changeAppointmentLessDate" @change="changeAppointmentLessDate"
> >
</a-select> </a-select>
</template> </template>
<a-table :row-key="record => record.index" :dataSource="appointmentLess" :columns="appointmentLessColumns" :pagination="false"> <a-table :row-key="(record,index) => index" :dataSource="appointmentLess" :columns="appointmentLessColumns" :pagination="false">
<span slot="index" slot-scope="text, record, index"> <span slot="index" slot-scope="text, record, index">
{{ index + 1 }} {{ index + 1 }}
</span> </span>
...@@ -422,7 +422,7 @@ import moment from "moment" ...@@ -422,7 +422,7 @@ import moment from "moment"
key:'index', key:'index',
title: '排名', title: '排名',
dataIndex: 'index', dataIndex: 'index',
scopedSlots: { customRender: 'index' }, // scopedSlots: { customRender: 'index' },
}, },
{ {
key:'businessName', key:'businessName',
...@@ -433,16 +433,20 @@ import moment from "moment" ...@@ -433,16 +433,20 @@ import moment from "moment"
key:'number', key:'number',
title: '办理数量', title: '办理数量',
dataIndex: 'nums', dataIndex: 'nums',
scopedSlots: { customRender: 'nums' }, // scopedSlots: { customRender: 'nums' },
}, },
], ],
takeNumberTopDate: '0', takeNumberTopDate: '0',
appointmentTopDate: '0', appointmentTopDate: '0',
takeNumberLessDate: '0', takeNumberLessDate: '0',
appointmentLessDate: '0', appointmentLessDate: '0',
siteid:localStorage.getItem("siteId")
} }
}, },
mounted(){ mounted(){
this.$bus.$on("changeSite", () => {
this.siteid = localStorage.getItem("siteId")
});
this.getAllData() this.getAllData()
this.getTakeLineData() this.getTakeLineData()
this.getAppointmentData() this.getAppointmentData()
...@@ -451,11 +455,22 @@ import moment from "moment" ...@@ -451,11 +455,22 @@ import moment from "moment"
this.getTakeNumberLess() this.getTakeNumberLess()
this.getAppointmentLess() this.getAppointmentLess()
}, },
watch:{
siteid(){
this.getAllData()
this.getTakeLineData()
this.getAppointmentData()
this.getTakeNumberTop()
this.getAppointmentTop()
this.getTakeNumberLess()
this.getAppointmentLess()
}
},
methods:{ methods:{
//获取全部基本数据 //获取全部基本数据
async getAllData() { async getAllData() {
this.nowDate= moment(new Date()).format('YYYY-MM-DD h:mm:ss') this.nowDate= moment(new Date()).format('YYYY-MM-DD h:mm:ss')
const res = await getAllInfo() const res = await getAllInfo({siteid:this.siteid})
if(res.code == 1){ if(res.code == 1){
this.situation= res.data this.situation= res.data
this.firstPie= { this.firstPie= {
...@@ -474,7 +489,7 @@ import moment from "moment" ...@@ -474,7 +489,7 @@ import moment from "moment"
}, },
// 排队取号 // 排队取号
async getTakeLineData() { async getTakeLineData() {
const res = await getBusinessInfo() const res = await getBusinessInfo({siteid:this.siteid})
if(res.code == 1){ if(res.code == 1){
let arr= res.data.info let arr= res.data.info
let newArr= [] let newArr= []
...@@ -503,7 +518,7 @@ import moment from "moment" ...@@ -503,7 +518,7 @@ import moment from "moment"
}, },
// 预约情况 // 预约情况
async getAppointmentData() { async getAppointmentData() {
const res = await getWyInfo() const res = await getWyInfo({siteid:this.siteid})
if(res.code == 1){ if(res.code == 1){
let arr= res.data.info let arr= res.data.info
let newArr= [] let newArr= []
...@@ -535,7 +550,7 @@ import moment from "moment" ...@@ -535,7 +550,7 @@ import moment from "moment"
if(val== undefined){ if(val== undefined){
val = 0 val = 0
} }
const res = getTopBusiness({selected: val,sort: 'DESC'}) const res = await getTopBusiness({selected: val,sort: 'DESC',siteid:this.siteid})
if(res.code == 1) { if(res.code == 1) {
this.takeNumberTop= res.data this.takeNumberTop= res.data
} }
...@@ -545,7 +560,7 @@ import moment from "moment" ...@@ -545,7 +560,7 @@ import moment from "moment"
if(val== undefined){ if(val== undefined){
val = 0 val = 0
} }
const res = getTopBusiness({selected: val,sort: 'ASC'}) const res = await getTopBusiness({selected: val,sort: 'ASC',siteid:this.siteid})
if(res.code == 1) { if(res.code == 1) {
this.takeNumberLess= res.data this.takeNumberLess= res.data
} }
...@@ -555,7 +570,7 @@ import moment from "moment" ...@@ -555,7 +570,7 @@ import moment from "moment"
if(val== undefined){ if(val== undefined){
val = 0 val = 0
} }
const res = getTopWy({selected: val,sort: 'DESC'}) const res = await getTopWy({selected: val,sort: 'DESC',siteid:this.siteid})
if(res.code == 1) { if(res.code == 1) {
this.appointmentTop= res.data this.appointmentTop= res.data
} }
...@@ -565,7 +580,7 @@ import moment from "moment" ...@@ -565,7 +580,7 @@ import moment from "moment"
if(val== undefined){ if(val== undefined){
val = 0 val = 0
} }
const res = getTopWy({selected: val,sort: 'ASC'}) const res = await getTopWy({selected: val,sort: 'ASC',siteid:this.siteid})
if(res.code == 1) { if(res.code == 1) {
this.appointmentLess= res.data this.appointmentLess= res.data
} }
......
portal-manager-ui/admin/src/views/dataActuary/business/index.vue
View file @ ffae5126
...@@ -40,13 +40,13 @@ export default { ...@@ -40,13 +40,13 @@ export default {
businessName: '', businessName: '',
dataSource: [], dataSource: [],
sourceList:[], sourceList:[],
dataList: [], // dataList: [],
btnShow: false, btnShow: false,
} }
}, },
mounted() { mounted() {
this.getList() // this.getList()
}, },
created(){ created(){
}, },
...@@ -69,15 +69,15 @@ export default { ...@@ -69,15 +69,15 @@ export default {
this.btnShow= false this.btnShow= false
this.businessName= '' this.businessName= ''
}, },
async getList(){ // async getList(){
await axios.get('http://192.168.0.98:8090/inter/statistic/busList',{params: {siteid: 1}}).then((res)=>{ // await axios.get('http://192.168.0.98:8090/inter/statistic/busList',{params: {siteid: 1}}).then((res)=>{
if(res && res.status==200){ // if(res && res.status==200){
res.data.data.forEach(item=>{ // res.data.data.forEach(item=>{
this.dataList.push(item.name) // this.dataList.push(item.name)
}) // })
} // }
}) // })
}, // },
onSearch: _.debounce(function(val){ onSearch: _.debounce(function(val){
this.dataSource= [] this.dataSource= []
userSiteBus({siteid: localStorage.getItem('siteId'),bus_name:val}).then(res => { userSiteBus({siteid: localStorage.getItem('siteId'),bus_name:val}).then(res => {
......
portal-manager-ui/admin/src/views/dataAdmin/components/easyPoliticsShow/PoliticsShow.vue
View file @ ffae5126
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
}" :scroll="{ y: 590 }" :pagination="tablePagination" @change="pagTableChange" :loading="tableLoading" }" :scroll="{ y: 590 }" :pagination="tablePagination" @change="pagTableChange" :loading="tableLoading"
:columns="tableHeaders" :dataSource="tableList"> :columns="tableHeaders" :dataSource="tableList">
<template slot="zhenshixingming" slot-scope="text, record, index"> <template slot="zhenshixingming" slot-scope="text, record, index">
<a-button type="link" @click="openUserDetails">{{ text }}</a-button> <a-button type="link" @click="openUserDetails(record)">{{ text?text:'--' }}</a-button>
</template> </template>
<template slot="tupianzuopinshuliang" slot-scope="text, record, index"> <template slot="tupianzuopinshuliang" slot-scope="text, record, index">
<a-button type="link" @click="openPicWorks">{{ text }}</a-button> <a-button type="link" @click="openPicWorks(record.id)">{{ (text || text==0)?text:'--' }}</a-button>
</template> </template>
</a-table> </a-table>
<PicWorks ref="PicWorks" /> <PicWorks ref="PicWorks" />
...@@ -87,27 +87,36 @@ export default { ...@@ -87,27 +87,36 @@ export default {
{ {
title: "真实姓名", title: "真实姓名",
align: "center", align: "center",
dataIndex: "custName" dataIndex: "custName",
scopedSlots: {
customRender: "zhenshixingming",
},
}, },
{ {
title: "联系电话", title: "联系电话",
align: "center", align: "center",
dataIndex: "contactTelphone", dataIndex: "contactTelphone",
customRender: (text) => `${text?text:'--'}`,
}, },
{ {
title: "单位名称", title: "单位名称",
align: "center", align: "center",
dataIndex: "organization", dataIndex: "organization",
customRender: (text) => `${text?text:'--'}`,
}, },
{ {
title: "图片作品数量", title: "图片作品数量",
align: "center", align: "center",
dataIndex: "customerDesignPictures", dataIndex: "customerDesignPictures",
scopedSlots: {
customRender: "tupianzuopinshuliang",
},
}, },
{ {
title: "视频作品数量", title: "视频作品数量",
align: "center", align: "center",
dataIndex: "customerDesignVideos", dataIndex: "customerDesignVideos",
customRender: (text) => `${(text || text==0)?text:'--'}`,
}, },
{ {
title: "会员等级", title: "会员等级",
...@@ -119,6 +128,7 @@ export default { ...@@ -119,6 +128,7 @@ export default {
title: "最近登录时间", title: "最近登录时间",
align: "center", align: "center",
dataIndex: "lastLoginTime", dataIndex: "lastLoginTime",
customRender: (text) => `${text?text:'--'}`,
}, },
{ {
title: "使用状态", title: "使用状态",
...@@ -264,14 +274,16 @@ export default { ...@@ -264,14 +274,16 @@ export default {
return "type0"; return "type0";
} }
}, },
openPicWorks() { openPicWorks(id) {
this.$refs.PicWorks.modalInfo.title = "作品数量"; this.$refs.PicWorks.modalInfo.title = "作品数量";
this.$refs.PicWorks.modalInfo.visible = true; this.$refs.PicWorks.modalInfo.visible = true;
this.$refs.PicWorks.modalInfo.width = "32%"; this.$refs.PicWorks.modalInfo.width = "32%";
this.$refs.PicWorks.modalInfo.id = id
}, },
openUserDetails() { openUserDetails(record) {
this.$refs.UserDetails.modalInfo.title = "客户详情"; this.$refs.UserDetails.modalInfo.title = "客户详情";
this.$refs.UserDetails.modalInfo.visible = true; this.$refs.UserDetails.modalInfo.visible = true;
this.$refs.UserDetails.modalInfo.record = record;
}, },
}, },
}; };
......
portal-manager-ui/admin/src/views/dataAdmin/components/easyPoliticsShow/components/PicWorks.vue
View file @ ffae5126
...@@ -6,18 +6,18 @@ ...@@ -6,18 +6,18 @@
:visible="modalInfo.visible" :visible="modalInfo.visible"
@close="modalClose" @close="modalClose"
> >
<div class="headerInfo"><span>作品数量</span><i>4</i></div> <div class="headerInfo"><span>作品数量</span><i>{{tableList.length}}</i></div>
<div class="zuoping_box"> <div class="zuoping_box">
<div class="_list" v-for="item of 5"> <div class="_list" v-for="item in tableList" :key="item.id">
<div class="_top"> <div class="_top">
<img class="logo_img" src="~@/assets/images/logo.png" alt="" /> <img class="logo_img" src="~@/assets/images/logo.png" alt="" />
<h1> <h1>
<p>我要开公司</p> <p>{{item.workDesignName}}</p>
<p>创建于：2022-05-23 20:00:00</p> <p>创建于：{{item.updateTimeStr}}</p>
</h1> </h1>
</div> </div>
<div class="_bottom"> <div class="_bottom">
<img class="works_img" src="~@/assets/images/u22.png" alt="" /> <img class="works_img" :src="baseurl+'/'+item.previewUrl" alt="" />
</div> </div>
</div> </div>
</div> </div>
...@@ -26,17 +26,41 @@ ...@@ -26,17 +26,41 @@
<script> <script>
import modal from "../mixins/modal"; import modal from "../mixins/modal";
import {picInfoList} from "@/api/customer";
export default { export default {
mixins: [modal], mixins: [modal],
name: "PortalAdminVuePicWorks", name: "PortalAdminVuePicWorks",
data() { data() {
return {}; return {
modalInfo:{},
tableList:[],
baseurl:'http://8.136.255.30'
};
}, },
mounted() {}, mounted() {
},
watch:{
'modalInfo.visible'(newval){
if(newval){
this.getPicInfo(this.modalInfo.id)
}
}
},
methods: { methods: {
async getPicInfo(id){
let res = await picInfoList({
customerId:id
});
console.log(res);
if (res.code == 1) {
let {data} = res.data;
this.tableList = data;
}
},
openPicWorks() { openPicWorks() {
this.$emit("openPicWorks"); this.$emit("openPicWorks");
}, },
......
portal-manager-ui/admin/src/views/dataAdmin/components/easyPoliticsShow/components/UserDetails.vue
View file @ ffae5126
...@@ -6,12 +6,60 @@ ...@@ -6,12 +6,60 @@
:visible="modalInfo.visible" :visible="modalInfo.visible"
@close="modalClose" @close="modalClose"
> >
<div class="box1" v-for="item of 3"> <div class="box1">
<p class="details1" v-for="item of 3"> <p class="details1">
<span>真实姓名</span><i>刘德华</i> <span>真实姓名</span><i>{{modalInfo.record.custName}}</i>
</p> </p>
<p class="details2" v-for="item of 3"> <p class="details1">
<span>图片作品数量</span><i @click="openPicWorks">4</i> <span>性别</span><i>{{modalInfo.record.sex?modalInfo.record.sex%2==0?'女':'男':'--'}}</i>
</p>
<p class="details1">
<span>联系电话</span><i>{{modalInfo.record.contactTelphone}}</i>
</p>
<p class="details1">
<span>单位名称</span><i>{{modalInfo.record.organization}}</i>
</p>
<p class="details1">
<span>会员等级</span><i>{{modalInfo.record.memberLevel==0?'未开启':modalInfo.record.memberLevel==1?'试用客户':modalInfo.record.memberLevel==2?'VIP':modalInfo.record.memberLevel==3?'设计师':'--'}}</i>
</p>
<p class="details1">
<span>邮箱</span><i>{{modalInfo.record.mailbox?modalInfo.record.mailbox:'未填写'}}</i>
</p>
<p class="details1">
<span>职位</span><i>{{modalInfo.record.job?modalInfo.record.job:'未填写'}}</i>
</p>
<p class="details1">
<span>客户来源</span><i>{{modalInfo.record.customerSrc?modalInfo.record.customerSrc==1?'申请试用':'顾问签单':'未填写'}}</i>
</p>
<p class="details1">
<span>企业顾问</span><i>{{modalInfo.record.enterpriseConsultant}}</i>
</p>
<p class="details1">
<span>微信号</span><i>{{modalInfo.record.custName}}</i>
</p>
</div>
<div class="box1">
<p class="details1">
<span>登录账号</span><i>{{modalInfo.record.loginName}}</i>
</p>
<p class="details1">
<span>登录密码</span><i>{{modalInfo.record.password?modalInfo.record.password.replace(/\S/g, "*"):''}}</i>
</p>
</div>
<div class="box1">
<p class="details2">
<span>图片作品数量</span><i @click="openPicWorks(modalInfo.record.id)">{{modalInfo.record.customerDesignPictures}}</i>
</p>
<p class="details1">
<span>视屏作品数量</span><i>{{modalInfo.record.customerDesignVideos?modalInfo.record.customerDesignVideos:'0'}}</i>
</p>
</div>
<div class="box1">
<p class="details1">
<span>注册时间</span><i>{{modalInfo.record.createTime}}</i>
</p>
<p class="details1">
<span>最近登录时间</span><i>{{modalInfo.record.lastLoginTimeStr}}</i>
</p> </p>
</div> </div>
</a-drawer> </a-drawer>
...@@ -24,14 +72,21 @@ export default { ...@@ -24,14 +72,21 @@ export default {
name: "PortalAdminVueUserDetails", name: "PortalAdminVueUserDetails",
data() { data() {
return {}; return {
modalInfo:{
record:{
custName:''
}
}
};
}, },
mounted() {}, mounted() {},
methods: { methods: {
openPicWorks() { openPicWorks(id) {
this.$emit("openPicWorks"); this.modalInfo.visible = false
this.$emit("openPicWorks",id);
}, },
}, },
}; };
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue
View file @ ffae5126
...@@ -174,7 +174,7 @@ export default { ...@@ -174,7 +174,7 @@ export default {
{ {
title: "评价设备", title: "评价设备",
align: "center", align: "center",
dataIndex: "pj_name", dataIndex: "devicenum",
customRender: (text) => { customRender: (text) => {
return text ? text : "--"; return text ? text : "--";
}, },
......
portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/makeRecordReport.vue
View file @ ffae5126
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
<div> <div>
<a-button <a-button
:loading="btnLoading" :loading="btnLoading"
type="primary" class="addclass" type="primary"
class="addclass"
@click="handleExportTable" @click="handleExportTable"
> >
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span> <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
...@@ -28,7 +29,11 @@ ...@@ -28,7 +29,11 @@
v-model="searchForm.time" v-model="searchForm.time"
> >
</a-range-picker> </a-range-picker>
<a-select v-model="searchForm.sectionid" showSearch :option-filter-prop="'label'"> <a-select
v-model="searchForm.sectionid"
showSearch
:option-filter-prop="'label'"
>
<a-select-option value="" label="全部"> 全部部门 </a-select-option> <a-select-option value="" label="全部"> 全部部门 </a-select-option>
<a-select-option <a-select-option
v-for="(v, key) in depList" v-for="(v, key) in depList"
...@@ -43,14 +48,15 @@ ...@@ -43,14 +48,15 @@
<a-select-option value=""> 全部 </a-select-option> <a-select-option value=""> 全部 </a-select-option>
<a-select-option <a-select-option
v-for="(v, key) in statusItem" v-for="(v, key) in statusItem"
:key="key" :key="key"
:value="Number(key)" :value="Number(key)"
> >
{{ v }} {{ v }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button> <a-button type="primary" class="addclass" @click="handleSearch"
>搜索</a-button
>
<a-button @click="handleReset">重置</a-button> <a-button @click="handleReset">重置</a-button>
</a-space> </a-space>
</span> </span>
...@@ -91,28 +97,28 @@ ...@@ -91,28 +97,28 @@
v-if="text.status == 0" v-if="text.status == 0"
color="#108ee9" color="#108ee9"
> >
{{statusItem[text.status]}} {{ statusItem[text.status] }}
</a-tag> </a-tag>
<a-tag <a-tag
@click="openDetails(text.id)" @click="openDetails(text.id)"
v-else-if="text.status == 1" v-else-if="text.status == 1"
color="#2db7f5" color="#2db7f5"
> >
{{statusItem[text.status]}} {{ statusItem[text.status] }}
</a-tag> </a-tag>
<a-tag <a-tag
@click="openDetails(text.id)" @click="openDetails(text.id)"
v-else-if="text.status == 2" v-else-if="text.status == 2"
color="#f50" color="#f50"
> >
{{statusItem[text.status]}} {{ statusItem[text.status] }}
</a-tag> </a-tag>
<a-tag <a-tag
@click="openDetails(text.id)" @click="openDetails(text.id)"
v-else-if="text.status == 3" v-else-if="text.status == 3"
color="red" color="red"
> >
{{statusItem[text.status]}} {{ statusItem[text.status] }}
</a-tag> </a-tag>
</template> </template>
</a-table> </a-table>
...@@ -121,7 +127,7 @@ ...@@ -121,7 +127,7 @@
</template> </template>
<script> <script>
import { getOrderList,getDeptList } from "@/api/dataAdmin"; import { getOrderList, getDeptList } from "@/api/dataAdmin";
import { export2Excel } from "@/utils/js/exportExcel"; import { export2Excel } from "@/utils/js/exportExcel";
let tHeader = [ let tHeader = [
// 导出的表头名信息 // 导出的表头名信息
...@@ -162,7 +168,7 @@ const style = { ...@@ -162,7 +168,7 @@ const style = {
2: "办理中", 2: "办理中",
3: "办理中", 3: "办理中",
4: "办理完成", 4: "办理完成",
} };
export default { export default {
name: "PortalAdminVueMakeRecordReport", name: "PortalAdminVueMakeRecordReport",
data() { data() {
...@@ -206,17 +212,31 @@ export default { ...@@ -206,17 +212,31 @@ export default {
title: "办理地点", title: "办理地点",
align: "center", align: "center",
dataIndex: "address", dataIndex: "address",
customRender: (text, row) => {
return row.address || "--";
},
}, },
{ {
title: "预约编号", title: "预约编号",
align: "center", align: "center",
dataIndex: "number", dataIndex: "number",
customRender: (text,row) => {
return row.number || "--";
},
},
{
title: "排号编码",
align: "center",
dataIndex: "flownum",
customRender: (text,row) => {
return row.flownum || "--";
},
}, },
{ {
title: "预约时间", title: "预约时间",
align: "center", align: "center",
dataIndex: "starttime", dataIndex: "starttime",
customRender: (text,row) => { customRender: (text, row) => {
return `${row.starttime}-${row.endtime}` || "--"; return `${row.starttime}-${row.endtime}` || "--";
}, },
}, },
...@@ -230,8 +250,8 @@ export default { ...@@ -230,8 +250,8 @@ export default {
{ {
title: "取消时间", title: "取消时间",
align: "center", align: "center",
customRender: (text) => { customRender: (text,row) => {
return text.canceltime || "--"; return row.canceltime || "--";
}, },
}, },
{ {
...@@ -271,7 +291,7 @@ export default { ...@@ -271,7 +291,7 @@ export default {
searchForm: { searchForm: {
status: "", status: "",
title: "", title: "",
sectionid:"", sectionid: "",
time: [ time: [
this.$moment(new Date()).format("YYYY-MM-DD"), this.$moment(new Date()).format("YYYY-MM-DD"),
this.$moment(new Date()).format("YYYY-MM-DD"), this.$moment(new Date()).format("YYYY-MM-DD"),
...@@ -284,22 +304,22 @@ export default { ...@@ -284,22 +304,22 @@ export default {
tableSelectedKeys: [], tableSelectedKeys: [],
tableSelectedRows: [], tableSelectedRows: [],
tableSourceData: [], tableSourceData: [],
depList:[]//部门列表 depList: [], //部门列表
}; };
}, },
created() { created() {
this.getOrderList(); this.getOrderList();
this.getDeptList() this.getDeptList();
}, },
methods: { methods: {
// 部门列表 // 部门列表
getDeptList(){ getDeptList() {
getDeptList({page:1,size:-1}).then(res=>{ getDeptList({ page: 1, size: -1 }).then((res) => {
const {data} = res.data const { data } = res.data;
if(res.code == 1){ if (res.code == 1) {
this.depList = data this.depList = data;
} }
}) });
}, },
// 获取报表数据 // 获取报表数据
async getOrderList(search = {}) { async getOrderList(search = {}) {
...@@ -320,7 +340,7 @@ export default { ...@@ -320,7 +340,7 @@ export default {
return { ...v, ...v.people }; return { ...v, ...v.people };
}); });
this.total = total; this.total = total;
return this.tableSourceData; return this.tableSourceData;
} }
}, },
...@@ -388,7 +408,10 @@ export default { ...@@ -388,7 +408,10 @@ export default {
for (let item of data) { for (let item of data) {
Object.keys(this.statusItem).forEach((key) => { Object.keys(this.statusItem).forEach((key) => {
if (item.status == key) { if (item.status == key) {
item.status = item.status==1?this.style[item.style]:this.statusItem[key]; item.status =
item.status == 1
? this.style[item.style]
: this.statusItem[key];
} }
}); });
} }
...@@ -400,7 +423,10 @@ export default { ...@@ -400,7 +423,10 @@ export default {
for (let item of data) { for (let item of data) {
Object.keys(this.statusItem).forEach((key) => { Object.keys(this.statusItem).forEach((key) => {
if (item.status == key) { if (item.status == key) {
item.status = item.status==1?this.style[item.style]:this.statusItem[key]; item.status =
item.status == 1
? this.style[item.style]
: this.statusItem[key];
} }
}); });
} }
...@@ -425,5 +451,3 @@ export default { ...@@ -425,5 +451,3 @@ export default {
cursor: pointer; cursor: pointer;
} }
</style> </style>
portal-manager-ui/admin/src/views/dataAdmin/components/microOfficialWebsite/microForm.vue
View file @ ffae5126
...@@ -67,8 +67,9 @@ ...@@ -67,8 +67,9 @@
:columns="tableHeaders" :columns="tableHeaders"
:dataSource="tableSourceData" :dataSource="tableSourceData"
> >
<template slot="avater"> <template slot="avater" slot-scope="text">
<a-avatar :size="40" icon="user" /> <a-avatar v-if="!text" :size="40" icon="user" />
<img v-else :src="baseurl+text" style="width: 60px;height: 60px;">
</template> </template>
<template slot="action" slot-scope="text"> <template slot="action" slot-scope="text">
<a-button type="link" @click="showDrawer(text)">详细信息</a-button> <a-button type="link" @click="showDrawer(text)">详细信息</a-button>
...@@ -151,6 +152,7 @@ export default { ...@@ -151,6 +152,7 @@ export default {
{ {
title: "用户头像", title: "用户头像",
align: "center", align: "center",
dataIndex:"icon",
scopedSlots: { scopedSlots: {
customRender: "avater", customRender: "avater",
}, },
...@@ -198,6 +200,7 @@ export default { ...@@ -198,6 +200,7 @@ export default {
tableSelectedRows: [], tableSelectedRows: [],
tableSourceData: [], tableSourceData: [],
userInfo: {}, // 用户信息 userInfo: {}, // 用户信息
baseurl: process.env.VUE_APP_API_PHP_URL,
}; };
}, },
components: { components: {
......
portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/callRecord.vue
View file @ ffae5126
...@@ -315,6 +315,9 @@ export default { ...@@ -315,6 +315,9 @@ export default {
"办理窗口", "办理窗口",
"工作人员", "工作人员",
"办理结束时间", "办理结束时间",
"当前排号总时长",
"业务平均办理时长",
"业务平均等待时长",
"状态", "状态",
], ],
filterVal: [ filterVal: [
......
portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/components/HandlingDetails.vue
View file @ ffae5126
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</div> </div>
<div class="description_box" slot="description"> <div class="description_box" slot="description">
<div class="details"> <div class="details">
<span><i class="lable">办理窗口：</i>{{ dataList.window_name || "--" }}</span> <span><i class="lable">办理窗口：</i>{{ dataList.window_name + '-' + dataList.window_fromnum || "--" }}</span>
<span><i class="lable">办理开始时间：</i>{{ dataList.calltime || "--" }}</span> <span><i class="lable">办理开始时间：</i>{{ dataList.calltime || "--" }}</span>
<span><i class="lable">工作人员：</i>{{ dataList.workman_name || "--" }}</span> <span><i class="lable">工作人员：</i>{{ dataList.workman_name || "--" }}</span>
<span><i class="lable">叫号设备：</i>{{ dataList.call_name || "--" }}</span> <span><i class="lable">叫号设备：</i>{{ dataList.call_name || "--" }}</span>
......
portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/queueRecord.vue
View file @ ffae5126
...@@ -287,6 +287,9 @@ export default { ...@@ -287,6 +287,9 @@ export default {
"办理窗口", "办理窗口",
"工作人员", "工作人员",
"办理结束时间", "办理结束时间",
"当前排号总时长",
"业务平均办理时长",
"业务平均等待时长",
"状态", "状态",
], ],
filterVal: [ filterVal: [
...@@ -314,8 +317,8 @@ export default { ...@@ -314,8 +317,8 @@ export default {
style: "", // 状态 style: "", // 状态
time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间 time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
flownum: "", // 排号编码 flownum: "", // 排号编码
hallid:"", hallid: "",
sectionid:"" sectionid: ""
}, },
//状态 //状态
style: [ style: [
...@@ -342,9 +345,9 @@ export default { ...@@ -342,9 +345,9 @@ export default {
tableSelectedKeys: [], tableSelectedKeys: [],
tableSelectedRows: [], tableSelectedRows: [],
// 大厅列表 // 大厅列表
datingList:[], datingList: [],
// 部门列表 // 部门列表
bumenList:[], bumenList: [],
}; };
}, },
components: { components: {
......
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