Commit 22d9696c authored by 赵啸非's avatar 赵啸非

修改考勤汇总

parent d624a027
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 置顶 (0.否,1.是)枚举类
*
* @author zxfei
*/
public enum TopEnum {
(0, "否"),
(1, "是");
private Integer value;
private String desc;
TopEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static TopEnum getByValue(Integer value) {
for (TopEnum topEnum : TopEnum.values()) {
if (topEnum.getValue() == value) {
return topEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (TopEnum item : TopEnum.values()) {
try {
boolean hasE = false;
for (Integer e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception ex) {
}
}
return resultMap;
}
}
\ No newline at end of file
package com.mortals.xhx.module.feedback.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.feedback.model.FeedbackFileEntity;
import java.util.List;
/**
* 绩效反馈附件Dao
* 绩效反馈附件 DAO接口
*
* @author zxfei
* @date 2023-07-18
*/
public interface FeedbackFileDao extends ICRUDDao<FeedbackFileEntity,Long>{
}
package com.mortals.xhx.module.feedback.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.feedback.dao.FeedbackFileDao;
import com.mortals.xhx.module.feedback.model.FeedbackFileEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 绩效反馈附件DaoImpl DAO接口
*
* @author zxfei
* @date 2023-07-18
*/
@Repository("feedbackFileDao")
public class FeedbackFileDaoImpl extends BaseCRUDDaoMybatis<FeedbackFileEntity,Long> implements FeedbackFileDao {
}
......@@ -13,7 +13,7 @@ import lombok.Data;
* 绩效反馈记录信息实体对象
*
* @author zxfei
* @date 2023-07-10
* @date 2023-07-18
*/
@Data
public class FeedbackEntity extends FeedbackVo {
......@@ -63,6 +63,14 @@ public class FeedbackEntity extends FeedbackVo {
* 规则内容
*/
private String ruleContent;
/**
* 图片id
*/
private Long feedbackFileId;
/**
* 图片路径
*/
private String feedbackFilePath;
/**
* 绩效反馈问题信息
*/
......@@ -113,5 +121,9 @@ public class FeedbackEntity extends FeedbackVo {
this.formContent = "";
this.ruleContent = "";
this.feedbackFileId = -1L;
this.feedbackFilePath = "";
}
}
\ No newline at end of file
package com.mortals.xhx.module.feedback.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.feedback.model.vo.FeedbackFileVo;
import lombok.Data;
/**
* 绩效反馈附件实体对象
*
* @author zxfei
* @date 2023-07-18
*/
@Data
public class FeedbackFileEntity extends FeedbackFileVo {
private static final long serialVersionUID = 1L;
/**
* 标题
*/
private String title;
/**
* 排序
*/
private Integer sort;
/**
* 置顶 (0.否,1.是)
*/
private Integer top;
/**
* 图片名称
*/
private String feedbackFileName;
/**
* 图片路径
*/
private String feedbackFilePath;
/**
* 备注说明
*/
private String remark;
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof FeedbackFileEntity) {
FeedbackFileEntity tmp = (FeedbackFileEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public void initAttrValue(){
this.title = "";
this.sort = 0;
this.top = 0;
this.feedbackFileName = "";
this.feedbackFilePath = "";
this.remark = "";
}
}
\ No newline at end of file
package com.mortals.xhx.module.feedback.model;
import java.util.List;
import com.mortals.xhx.module.feedback.model.FeedbackFileEntity;
/**
* 绩效反馈附件查询对象
*
* @author zxfei
* @date 2023-07-18
*/
public class FeedbackFileQuery extends FeedbackFileEntity {
/** 开始 序号,主键,自增长 */
private Long idStart;
/** 结束 序号,主键,自增长 */
private Long idEnd;
/** 增加 序号,主键,自增长 */
private Long idIncrement;
/** 序号,主键,自增长列表 */
private List <Long> idList;
/** 序号,主键,自增长排除列表 */
private List <Long> idNotList;
/** 标题 */
private List<String> titleList;
/** 标题排除列表 */
private List <String> titleNotList;
/** 开始 排序 */
private Integer sortStart;
/** 结束 排序 */
private Integer sortEnd;
/** 增加 排序 */
private Integer sortIncrement;
/** 排序列表 */
private List <Integer> sortList;
/** 排序排除列表 */
private List <Integer> sortNotList;
/** 开始 置顶 (0.否,1.是) */
private Integer topStart;
/** 结束 置顶 (0.否,1.是) */
private Integer topEnd;
/** 增加 置顶 (0.否,1.是) */
private Integer topIncrement;
/** 置顶 (0.否,1.是)列表 */
private List <Integer> topList;
/** 置顶 (0.否,1.是)排除列表 */
private List <Integer> topNotList;
/** 图片名称 */
private List<String> feedbackFileNameList;
/** 图片名称排除列表 */
private List <String> feedbackFileNameNotList;
/** 图片路径 */
private List<String> feedbackFilePathList;
/** 图片路径排除列表 */
private List <String> feedbackFilePathNotList;
/** 备注说明 */
private List<String> remarkList;
/** 备注说明排除列表 */
private List <String> remarkNotList;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 更新用户 */
private Long updateUserIdStart;
/** 结束 更新用户 */
private Long updateUserIdEnd;
/** 增加 更新用户 */
private Long updateUserIdIncrement;
/** 更新用户列表 */
private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */
private String updateTimeStart;
/** 结束 更新时间 */
private String updateTimeEnd;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<FeedbackFileQuery> orConditionList;
/** AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<FeedbackFileQuery> andConditionList;
public FeedbackFileQuery(){}
/**
* 获取 开始 序号,主键,自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 序号,主键,自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 序号,主键,自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 序号,主键,自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 序号,主键,自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 序号,主键,自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 序号,主键,自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 序号,主键,自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 序号,主键,自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号,主键,自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 标题
* @return titleList
*/
public List<String> getTitleList(){
return this.titleList;
}
/**
* 设置 标题
* @param titleList
*/
public void setTitleList(List<String> titleList){
this.titleList = titleList;
}
/**
* 获取 标题
* @return titleNotList
*/
public List<String> getTitleNotList(){
return this.titleNotList;
}
/**
* 设置 标题
* @param titleNotList
*/
public void setTitleNotList(List<String> titleNotList){
this.titleNotList = titleNotList;
}
/**
* 获取 开始 排序
* @return sortStart
*/
public Integer getSortStart(){
return this.sortStart;
}
/**
* 设置 开始 排序
* @param sortStart
*/
public void setSortStart(Integer sortStart){
this.sortStart = sortStart;
}
/**
* 获取 结束 排序
* @return $sortEnd
*/
public Integer getSortEnd(){
return this.sortEnd;
}
/**
* 设置 结束 排序
* @param sortEnd
*/
public void setSortEnd(Integer sortEnd){
this.sortEnd = sortEnd;
}
/**
* 获取 增加 排序
* @return sortIncrement
*/
public Integer getSortIncrement(){
return this.sortIncrement;
}
/**
* 设置 增加 排序
* @param sortIncrement
*/
public void setSortIncrement(Integer sortIncrement){
this.sortIncrement = sortIncrement;
}
/**
* 获取 排序
* @return sortList
*/
public List<Integer> getSortList(){
return this.sortList;
}
/**
* 设置 排序
* @param sortList
*/
public void setSortList(List<Integer> sortList){
this.sortList = sortList;
}
/**
* 获取 排序
* @return sortNotList
*/
public List<Integer> getSortNotList(){
return this.sortNotList;
}
/**
* 设置 排序
* @param sortNotList
*/
public void setSortNotList(List<Integer> sortNotList){
this.sortNotList = sortNotList;
}
/**
* 获取 开始 置顶 (0.否,1.是)
* @return topStart
*/
public Integer getTopStart(){
return this.topStart;
}
/**
* 设置 开始 置顶 (0.否,1.是)
* @param topStart
*/
public void setTopStart(Integer topStart){
this.topStart = topStart;
}
/**
* 获取 结束 置顶 (0.否,1.是)
* @return $topEnd
*/
public Integer getTopEnd(){
return this.topEnd;
}
/**
* 设置 结束 置顶 (0.否,1.是)
* @param topEnd
*/
public void setTopEnd(Integer topEnd){
this.topEnd = topEnd;
}
/**
* 获取 增加 置顶 (0.否,1.是)
* @return topIncrement
*/
public Integer getTopIncrement(){
return this.topIncrement;
}
/**
* 设置 增加 置顶 (0.否,1.是)
* @param topIncrement
*/
public void setTopIncrement(Integer topIncrement){
this.topIncrement = topIncrement;
}
/**
* 获取 置顶 (0.否,1.是)
* @return topList
*/
public List<Integer> getTopList(){
return this.topList;
}
/**
* 设置 置顶 (0.否,1.是)
* @param topList
*/
public void setTopList(List<Integer> topList){
this.topList = topList;
}
/**
* 获取 置顶 (0.否,1.是)
* @return topNotList
*/
public List<Integer> getTopNotList(){
return this.topNotList;
}
/**
* 设置 置顶 (0.否,1.是)
* @param topNotList
*/
public void setTopNotList(List<Integer> topNotList){
this.topNotList = topNotList;
}
/**
* 获取 图片名称
* @return feedbackFileNameList
*/
public List<String> getFeedbackFileNameList(){
return this.feedbackFileNameList;
}
/**
* 设置 图片名称
* @param feedbackFileNameList
*/
public void setFeedbackFileNameList(List<String> feedbackFileNameList){
this.feedbackFileNameList = feedbackFileNameList;
}
/**
* 获取 图片名称
* @return feedbackFileNameNotList
*/
public List<String> getFeedbackFileNameNotList(){
return this.feedbackFileNameNotList;
}
/**
* 设置 图片名称
* @param feedbackFileNameNotList
*/
public void setFeedbackFileNameNotList(List<String> feedbackFileNameNotList){
this.feedbackFileNameNotList = feedbackFileNameNotList;
}
/**
* 获取 图片路径
* @return feedbackFilePathList
*/
public List<String> getFeedbackFilePathList(){
return this.feedbackFilePathList;
}
/**
* 设置 图片路径
* @param feedbackFilePathList
*/
public void setFeedbackFilePathList(List<String> feedbackFilePathList){
this.feedbackFilePathList = feedbackFilePathList;
}
/**
* 获取 图片路径
* @return feedbackFilePathNotList
*/
public List<String> getFeedbackFilePathNotList(){
return this.feedbackFilePathNotList;
}
/**
* 设置 图片路径
* @param feedbackFilePathNotList
*/
public void setFeedbackFilePathNotList(List<String> feedbackFilePathNotList){
this.feedbackFilePathNotList = feedbackFilePathNotList;
}
/**
* 获取 备注说明
* @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;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 更新用户
* @return updateUserIdStart
*/
public Long getUpdateUserIdStart(){
return this.updateUserIdStart;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
}
/**
* 获取 结束 更新用户
* @return $updateUserIdEnd
*/
public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
}
/**
* 获取 增加 更新用户
* @return updateUserIdIncrement
*/
public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
* 获取 更新用户
* @return updateUserIdList
*/
public List<Long> getUpdateUserIdList(){
return this.updateUserIdList;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
}
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/**
* 获取 开始 更新时间
* @return updateTimeStart
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
* 设置 开始 更新时间
* @param updateTimeStart
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
* 获取 结束 更新时间
* @return updateTimeEnd
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
* 设置 结束 更新时间
* @param updateTimeEnd
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/**
* 设置 序号,主键,自增长
* @param id
*/
public FeedbackFileQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号,主键,自增长
* @param idStart
*/
public FeedbackFileQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号,主键,自增长
* @param idEnd
*/
public FeedbackFileQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号,主键,自增长
* @param idIncrement
*/
public FeedbackFileQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号,主键,自增长
* @param idList
*/
public FeedbackFileQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 序号,主键,自增长
* @param idNotList
*/
public FeedbackFileQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 标题
* @param title
*/
public FeedbackFileQuery title(String title){
setTitle(title);
return this;
}
/**
* 设置 标题
* @param titleList
*/
public FeedbackFileQuery titleList(List<String> titleList){
this.titleList = titleList;
return this;
}
/**
* 设置 排序
* @param sort
*/
public FeedbackFileQuery sort(Integer sort){
setSort(sort);
return this;
}
/**
* 设置 开始 排序
* @param sortStart
*/
public FeedbackFileQuery sortStart(Integer sortStart){
this.sortStart = sortStart;
return this;
}
/**
* 设置 结束 排序
* @param sortEnd
*/
public FeedbackFileQuery sortEnd(Integer sortEnd){
this.sortEnd = sortEnd;
return this;
}
/**
* 设置 增加 排序
* @param sortIncrement
*/
public FeedbackFileQuery sortIncrement(Integer sortIncrement){
this.sortIncrement = sortIncrement;
return this;
}
/**
* 设置 排序
* @param sortList
*/
public FeedbackFileQuery sortList(List<Integer> sortList){
this.sortList = sortList;
return this;
}
/**
* 设置 排序
* @param sortNotList
*/
public FeedbackFileQuery sortNotList(List<Integer> sortNotList){
this.sortNotList = sortNotList;
return this;
}
/**
* 设置 置顶 (0.否,1.是)
* @param top
*/
public FeedbackFileQuery top(Integer top){
setTop(top);
return this;
}
/**
* 设置 开始 置顶 (0.否,1.是)
* @param topStart
*/
public FeedbackFileQuery topStart(Integer topStart){
this.topStart = topStart;
return this;
}
/**
* 设置 结束 置顶 (0.否,1.是)
* @param topEnd
*/
public FeedbackFileQuery topEnd(Integer topEnd){
this.topEnd = topEnd;
return this;
}
/**
* 设置 增加 置顶 (0.否,1.是)
* @param topIncrement
*/
public FeedbackFileQuery topIncrement(Integer topIncrement){
this.topIncrement = topIncrement;
return this;
}
/**
* 设置 置顶 (0.否,1.是)
* @param topList
*/
public FeedbackFileQuery topList(List<Integer> topList){
this.topList = topList;
return this;
}
/**
* 设置 置顶 (0.否,1.是)
* @param topNotList
*/
public FeedbackFileQuery topNotList(List<Integer> topNotList){
this.topNotList = topNotList;
return this;
}
/**
* 设置 图片名称
* @param feedbackFileName
*/
public FeedbackFileQuery feedbackFileName(String feedbackFileName){
setFeedbackFileName(feedbackFileName);
return this;
}
/**
* 设置 图片名称
* @param feedbackFileNameList
*/
public FeedbackFileQuery feedbackFileNameList(List<String> feedbackFileNameList){
this.feedbackFileNameList = feedbackFileNameList;
return this;
}
/**
* 设置 图片路径
* @param feedbackFilePath
*/
public FeedbackFileQuery feedbackFilePath(String feedbackFilePath){
setFeedbackFilePath(feedbackFilePath);
return this;
}
/**
* 设置 图片路径
* @param feedbackFilePathList
*/
public FeedbackFileQuery feedbackFilePathList(List<String> feedbackFilePathList){
this.feedbackFilePathList = feedbackFilePathList;
return this;
}
/**
* 设置 备注说明
* @param remark
*/
public FeedbackFileQuery remark(String remark){
setRemark(remark);
return this;
}
/**
* 设置 备注说明
* @param remarkList
*/
public FeedbackFileQuery remarkList(List<String> remarkList){
this.remarkList = remarkList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public FeedbackFileQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public FeedbackFileQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public FeedbackFileQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public FeedbackFileQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public FeedbackFileQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public FeedbackFileQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 设置 更新用户
* @param updateUserId
*/
public FeedbackFileQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId);
return this;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public FeedbackFileQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
return this;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public FeedbackFileQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
return this;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public FeedbackFileQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public FeedbackFileQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public FeedbackFileQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<FeedbackFileQuery> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<FeedbackFileQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<FeedbackFileQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<FeedbackFileQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
\ No newline at end of file
......@@ -8,7 +8,7 @@ import com.mortals.xhx.module.feedback.model.FeedbackEntity;
* 绩效反馈记录信息查询对象
*
* @author zxfei
* @date 2023-07-10
* @date 2023-07-18
*/
public class FeedbackQuery extends FeedbackEntity {
/** 开始 序号,主键,自增长 */
......@@ -165,6 +165,26 @@ public class FeedbackQuery extends FeedbackEntity {
/** 规则内容排除列表 */
private List <String> ruleContentNotList;
/** 开始 图片id */
private Long feedbackFileIdStart;
/** 结束 图片id */
private Long feedbackFileIdEnd;
/** 增加 图片id */
private Long feedbackFileIdIncrement;
/** 图片id列表 */
private List <Long> feedbackFileIdList;
/** 图片id排除列表 */
private List <Long> feedbackFileIdNotList;
/** 图片路径 */
private List<String> feedbackFilePathList;
/** 图片路径排除列表 */
private List <String> feedbackFilePathNotList;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<FeedbackQuery> orConditionList;
......@@ -1028,6 +1048,119 @@ public class FeedbackQuery extends FeedbackEntity {
this.ruleContentNotList = ruleContentNotList;
}
/**
* 获取 开始 图片id
* @return feedbackFileIdStart
*/
public Long getFeedbackFileIdStart(){
return this.feedbackFileIdStart;
}
/**
* 设置 开始 图片id
* @param feedbackFileIdStart
*/
public void setFeedbackFileIdStart(Long feedbackFileIdStart){
this.feedbackFileIdStart = feedbackFileIdStart;
}
/**
* 获取 结束 图片id
* @return $feedbackFileIdEnd
*/
public Long getFeedbackFileIdEnd(){
return this.feedbackFileIdEnd;
}
/**
* 设置 结束 图片id
* @param feedbackFileIdEnd
*/
public void setFeedbackFileIdEnd(Long feedbackFileIdEnd){
this.feedbackFileIdEnd = feedbackFileIdEnd;
}
/**
* 获取 增加 图片id
* @return feedbackFileIdIncrement
*/
public Long getFeedbackFileIdIncrement(){
return this.feedbackFileIdIncrement;
}
/**
* 设置 增加 图片id
* @param feedbackFileIdIncrement
*/
public void setFeedbackFileIdIncrement(Long feedbackFileIdIncrement){
this.feedbackFileIdIncrement = feedbackFileIdIncrement;
}
/**
* 获取 图片id
* @return feedbackFileIdList
*/
public List<Long> getFeedbackFileIdList(){
return this.feedbackFileIdList;
}
/**
* 设置 图片id
* @param feedbackFileIdList
*/
public void setFeedbackFileIdList(List<Long> feedbackFileIdList){
this.feedbackFileIdList = feedbackFileIdList;
}
/**
* 获取 图片id
* @return feedbackFileIdNotList
*/
public List<Long> getFeedbackFileIdNotList(){
return this.feedbackFileIdNotList;
}
/**
* 设置 图片id
* @param feedbackFileIdNotList
*/
public void setFeedbackFileIdNotList(List<Long> feedbackFileIdNotList){
this.feedbackFileIdNotList = feedbackFileIdNotList;
}
/**
* 获取 图片路径
* @return feedbackFilePathList
*/
public List<String> getFeedbackFilePathList(){
return this.feedbackFilePathList;
}
/**
* 设置 图片路径
* @param feedbackFilePathList
*/
public void setFeedbackFilePathList(List<String> feedbackFilePathList){
this.feedbackFilePathList = feedbackFilePathList;
}
/**
* 获取 图片路径
* @return feedbackFilePathNotList
*/
public List<String> getFeedbackFilePathNotList(){
return this.feedbackFilePathNotList;
}
/**
* 设置 图片路径
* @param feedbackFilePathNotList
*/
public void setFeedbackFilePathNotList(List<String> feedbackFilePathNotList){
this.feedbackFilePathNotList = feedbackFilePathNotList;
}
/**
* 设置 序号,主键,自增长
* @param id
......@@ -1505,6 +1638,79 @@ public class FeedbackQuery extends FeedbackEntity {
return this;
}
/**
* 设置 图片id
* @param feedbackFileId
*/
public FeedbackQuery feedbackFileId(Long feedbackFileId){
setFeedbackFileId(feedbackFileId);
return this;
}
/**
* 设置 开始 图片id
* @param feedbackFileIdStart
*/
public FeedbackQuery feedbackFileIdStart(Long feedbackFileIdStart){
this.feedbackFileIdStart = feedbackFileIdStart;
return this;
}
/**
* 设置 结束 图片id
* @param feedbackFileIdEnd
*/
public FeedbackQuery feedbackFileIdEnd(Long feedbackFileIdEnd){
this.feedbackFileIdEnd = feedbackFileIdEnd;
return this;
}
/**
* 设置 增加 图片id
* @param feedbackFileIdIncrement
*/
public FeedbackQuery feedbackFileIdIncrement(Long feedbackFileIdIncrement){
this.feedbackFileIdIncrement = feedbackFileIdIncrement;
return this;
}
/**
* 设置 图片id
* @param feedbackFileIdList
*/
public FeedbackQuery feedbackFileIdList(List<Long> feedbackFileIdList){
this.feedbackFileIdList = feedbackFileIdList;
return this;
}
/**
* 设置 图片id
* @param feedbackFileIdNotList
*/
public FeedbackQuery feedbackFileIdNotList(List<Long> feedbackFileIdNotList){
this.feedbackFileIdNotList = feedbackFileIdNotList;
return this;
}
/**
* 设置 图片路径
* @param feedbackFilePath
*/
public FeedbackQuery feedbackFilePath(String feedbackFilePath){
setFeedbackFilePath(feedbackFilePath);
return this;
}
/**
* 设置 图片路径
* @param feedbackFilePathList
*/
public FeedbackQuery feedbackFilePathList(List<String> feedbackFilePathList){
this.feedbackFilePathList = feedbackFilePathList;
return this;
}
/**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
package com.mortals.xhx.module.feedback.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.feedback.model.FeedbackFileEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/**
* 绩效反馈附件视图对象
*
* @author zxfei
* @date 2023-07-18
*/
@Data
public class FeedbackFileVo extends BaseEntityLong {
}
\ No newline at end of file
package com.mortals.xhx.module.feedback.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.feedback.model.FeedbackFileEntity;
import com.mortals.xhx.module.feedback.dao.FeedbackFileDao;
/**
* FeedbackFileService
*
* 绩效反馈附件 service接口
*
* @author zxfei
* @date 2023-07-18
*/
public interface FeedbackFileService extends ICRUDService<FeedbackFileEntity,Long>{
FeedbackFileDao getDao();
}
\ No newline at end of file
package com.mortals.xhx.module.feedback.service.impl;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.feedback.dao.FeedbackFileDao;
import com.mortals.xhx.module.feedback.model.FeedbackFileEntity;
import com.mortals.xhx.module.feedback.service.FeedbackFileService;
import lombok.extern.slf4j.Slf4j;
/**
* FeedbackFileService
* 绩效反馈附件 service实现
*
* @author zxfei
* @date 2023-07-18
*/
@Service("feedbackFileService")
@Slf4j
public class FeedbackFileServiceImpl extends AbstractCRUDServiceImpl<FeedbackFileDao, FeedbackFileEntity, Long> implements FeedbackFileService {
}
\ No newline at end of file
......@@ -50,7 +50,7 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
updateProcessStatus(list);
}
private static void updateProcessStatus(List<FeedbackEntity> list) {
private void updateProcessStatus(List<FeedbackEntity> list) {
list.stream().forEach(item->{
Date feedbackTimeStart = item.getFeedbackTimeStart();
Date feedbackTimeEnd = item.getFeedbackTimeEnd();
......@@ -73,7 +73,13 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
@Override
protected void saveBefore(FeedbackEntity entity, Context context) throws AppException {
super.saveBefore(entity,context);
if(!ObjectUtils.isEmpty(entity.getStaffList())){
entity.setInviteNum(entity.getStaffList().size());
}
}
@Override
protected void updateBefore(FeedbackEntity entity, Context context) throws AppException {
if(!ObjectUtils.isEmpty(entity.getStaffList())){
entity.setInviteNum(entity.getStaffList().size());
}
......
package com.mortals.xhx.module.feedback.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.feedback.model.FeedbackFileEntity;
import com.mortals.xhx.module.feedback.service.FeedbackFileService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 绩效反馈附件
*
* @author zxfei
* @date 2023-07-18
*/
@RestController
@RequestMapping("feedback/file")
public class FeedbackFileController extends BaseCRUDJsonBodyMappingController<FeedbackFileService,FeedbackFileEntity,Long> {
@Autowired
private ParamService paramService;
public FeedbackFileController(){
super.setModuleDesc( "绩效反馈附件");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "top", paramService.getParamBySecondOrganize("FeedbackFile","top"));
super.init(model, context);
}
}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.feedback.dao.ibatis.FeedbackFileDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="FeedbackFileEntity" id="FeedbackFileEntity-Map">
<id property="id" column="id" />
<result property="title" column="title" />
<result property="sort" column="sort" />
<result property="top" column="top" />
<result property="feedbackFileName" column="feedbackFileName" />
<result property="feedbackFilePath" column="feedbackFilePath" />
<result property="remark" column="remark" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('title') or colPickMode == 1 and data.containsKey('title')))">
a.title,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
a.sort,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('top') or colPickMode == 1 and data.containsKey('top')))">
a.top,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('feedbackFileName') or colPickMode == 1 and data.containsKey('feedbackFileName')))">
a.feedbackFileName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('feedbackFilePath') or colPickMode == 1 and data.containsKey('feedbackFilePath')))">
a.feedbackFilePath,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="FeedbackFileEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_feedback_file
(title,sort,top,feedbackFileName,feedbackFilePath,remark,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{title},#{sort},#{top},#{feedbackFileName},#{feedbackFilePath},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_feedback_file
(title,sort,top,feedbackFileName,feedbackFilePath,remark,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.title},#{item.sort},#{item.top},#{item.feedbackFileName},#{item.feedbackFilePath},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update mortals_xhx_feedback_file as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('title')) or (colPickMode==1 and !data.containsKey('title'))">
a.title=#{data.title},
</if>
<if test="(colPickMode==0 and data.containsKey('sort')) or (colPickMode==1 and !data.containsKey('sort'))">
a.sort=#{data.sort},
</if>
<if test="(colPickMode==0 and data.containsKey('sortIncrement')) or (colPickMode==1 and !data.containsKey('sortIncrement'))">
a.sort=ifnull(a.sort,0) + #{data.sortIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('top')) or (colPickMode==1 and !data.containsKey('top'))">
a.top=#{data.top},
</if>
<if test="(colPickMode==0 and data.containsKey('topIncrement')) or (colPickMode==1 and !data.containsKey('topIncrement'))">
a.top=ifnull(a.top,0) + #{data.topIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('feedbackFileName')) or (colPickMode==1 and !data.containsKey('feedbackFileName'))">
a.feedbackFileName=#{data.feedbackFileName},
</if>
<if test="(colPickMode==0 and data.containsKey('feedbackFilePath')) or (colPickMode==1 and !data.containsKey('feedbackFilePath'))">
a.feedbackFilePath=#{data.feedbackFilePath},
</if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
a.updateUserId=#{data.updateUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</update>
<!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_feedback_file as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="title=(case" suffix="ELSE title end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('title')) or (colPickMode==1 and !item.containsKey('title'))">
when a.id=#{item.id} then #{item.title}
</if>
</foreach>
</trim>
<trim prefix="sort=(case" suffix="ELSE sort end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('sort')) or (colPickMode==1 and !item.containsKey('sort'))">
when a.id=#{item.id} then #{item.sort}
</when>
<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>
</choose>
</foreach>
</trim>
<trim prefix="top=(case" suffix="ELSE top end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('top')) or (colPickMode==1 and !item.containsKey('top'))">
when a.id=#{item.id} then #{item.top}
</when>
<when test="(colPickMode==0 and item.containsKey('topIncrement')) or (colPickMode==1 and !item.containsKey('topIncrement'))">
when a.id=#{item.id} then ifnull(a.top,0) + #{item.topIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="feedbackFileName=(case" suffix="ELSE feedbackFileName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('feedbackFileName')) or (colPickMode==1 and !item.containsKey('feedbackFileName'))">
when a.id=#{item.id} then #{item.feedbackFileName}
</if>
</foreach>
</trim>
<trim prefix="feedbackFilePath=(case" suffix="ELSE feedbackFilePath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('feedbackFilePath')) or (colPickMode==1 and !item.containsKey('feedbackFilePath'))">
when a.id=#{item.id} then #{item.feedbackFilePath}
</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 prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="FeedbackFileEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_feedback_file as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_feedback_file as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批,针对单一主健有效 -->
<delete id="deleteByKeys">
delete from mortals_xhx_feedback_file where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批,针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_feedback_file where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批,针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_feedback_file where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_feedback_file as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</delete>
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="FeedbackFileEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_feedback_file as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
select count(1)
from mortals_xhx_feedback_file as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</select>
<!-- 条件映射 -->
<sql id="_condition_">
<if test="condition != null and !condition.isEmpty()">
<!-- 条件映射-普通条件 -->
<include refid="_condition_param_">
<property name="_conditionParam_" value="condition"/>
<property name="_conditionType_" value="and"/>
</include>
<!-- 条件映射-集合之间使用AND,集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
<if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
and
<foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
<trim prefixOverrides="or" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="andCondition"/>
<property name="_conditionType_" value="or"/>
</include>
</trim>
</foreach>
</if>
<!-- 条件映射-集合之间使用OR,集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
<if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
and
<foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
<trim prefixOverrides="and" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="orCondition"/>
<property name="_conditionType_" value="and"/>
</include>
</trim>
</foreach>
</if>
</if>
</sql>
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList') 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('title')">
<if test="conditionParamRef.title != null and conditionParamRef.title != ''">
${_conditionType_} a.title like #{${_conditionParam_}.title}
</if>
<if test="conditionParamRef.title == null">
${_conditionType_} a.title is null
</if>
</if>
<if test="conditionParamRef.containsKey('titleList') and conditionParamRef.titleList.size() > 0">
${_conditionType_} a.title in
<foreach collection="conditionParamRef.titleList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('titleNotList') and conditionParamRef.titleNotList.size() > 0">
${_conditionType_} a.title not in
<foreach collection="conditionParamRef.titleNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sort')">
<if test="conditionParamRef.sort != null ">
${_conditionType_} a.sort = #{${_conditionParam_}.sort}
</if>
<if test="conditionParamRef.sort == null">
${_conditionType_} a.sort is null
</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('top')">
<if test="conditionParamRef.top != null ">
${_conditionType_} a.top = #{${_conditionParam_}.top}
</if>
<if test="conditionParamRef.top == null">
${_conditionType_} a.top is null
</if>
</if>
<if test="conditionParamRef.containsKey('topList') and conditionParamRef.topList.size() > 0">
${_conditionType_} a.top in
<foreach collection="conditionParamRef.topList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('topNotList') and conditionParamRef.topNotList.size() > 0">
${_conditionType_} a.top not in
<foreach collection="conditionParamRef.topNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('topStart') and conditionParamRef.topStart != null">
${_conditionType_} a.top <![CDATA[ >= ]]> #{${_conditionParam_}.topStart}
</if>
<if test="conditionParamRef.containsKey('topEnd') and conditionParamRef.topEnd != null">
${_conditionType_} a.top <![CDATA[ <= ]]> #{${_conditionParam_}.topEnd}
</if>
<if test="conditionParamRef.containsKey('feedbackFileName')">
<if test="conditionParamRef.feedbackFileName != null and conditionParamRef.feedbackFileName != ''">
${_conditionType_} a.feedbackFileName like #{${_conditionParam_}.feedbackFileName}
</if>
<if test="conditionParamRef.feedbackFileName == null">
${_conditionType_} a.feedbackFileName is null
</if>
</if>
<if test="conditionParamRef.containsKey('feedbackFileNameList') and conditionParamRef.feedbackFileNameList.size() > 0">
${_conditionType_} a.feedbackFileName in
<foreach collection="conditionParamRef.feedbackFileNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('feedbackFileNameNotList') and conditionParamRef.feedbackFileNameNotList.size() > 0">
${_conditionType_} a.feedbackFileName not in
<foreach collection="conditionParamRef.feedbackFileNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('feedbackFilePath')">
<if test="conditionParamRef.feedbackFilePath != null and conditionParamRef.feedbackFilePath != ''">
${_conditionType_} a.feedbackFilePath like #{${_conditionParam_}.feedbackFilePath}
</if>
<if test="conditionParamRef.feedbackFilePath == null">
${_conditionType_} a.feedbackFilePath is null
</if>
</if>
<if test="conditionParamRef.containsKey('feedbackFilePathList') and conditionParamRef.feedbackFilePathList.size() > 0">
${_conditionType_} a.feedbackFilePath in
<foreach collection="conditionParamRef.feedbackFilePathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('feedbackFilePathNotList') and conditionParamRef.feedbackFilePathNotList.size() > 0">
${_conditionType_} a.feedbackFilePath not in
<foreach collection="conditionParamRef.feedbackFilePathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</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>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList') 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('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') 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('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('title')">
a.title
<if test='orderCol.title != null and "DESC".equalsIgnoreCase(orderCol.title)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('sort')">
a.sort
<if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('top')">
a.top
<if test='orderCol.top != null and "DESC".equalsIgnoreCase(orderCol.top)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('feedbackFileName')">
a.feedbackFileName
<if test='orderCol.feedbackFileName != null and "DESC".equalsIgnoreCase(orderCol.feedbackFileName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('feedbackFilePath')">
a.feedbackFilePath
<if test='orderCol.feedbackFilePath != null and "DESC".equalsIgnoreCase(orderCol.feedbackFilePath)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('remark')">
a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateUserId')">
a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
GROUP BY
<trim suffixOverrides="," suffix="">
<foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item}
</foreach>
</trim>
</if>
</sql>
</mapper>
\ No newline at end of file
......@@ -21,6 +21,8 @@
<result property="updateTime" column="updateTime" />
<result property="formContent" column="formContent" />
<result property="ruleContent" column="ruleContent" />
<result property="feedbackFileId" column="feedbackFileId" />
<result property="feedbackFilePath" column="feedbackFilePath" />
<collection property="feedbackQuestionList" column="id" ofType="FeedbackQuestionEntity" javaType="ArrayList" select="getFeedbackQuestionByFeedbackId"></collection>
</resultMap>
<resultMap type="FeedbackQuestionEntity" id="FeedbackQuestionEntity-Map">
......@@ -89,6 +91,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ruleContent') or colPickMode == 1 and data.containsKey('ruleContent')))">
a.ruleContent,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('feedbackFileId') or colPickMode == 1 and data.containsKey('feedbackFileId')))">
a.feedbackFileId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('feedbackFilePath') or colPickMode == 1 and data.containsKey('feedbackFilePath')))">
a.feedbackFilePath,
</if>
</trim>
</sql>
<!-- 子表所有列 -->
......@@ -100,18 +108,18 @@
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="FeedbackEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_feedback
(title,feedbackTimeStart,feedbackTimeEnd,inviteNum,feedbackNum,processStatus,weblink,webUrl,remark,createUserId,createTime,updateUserId,updateTime,formContent,ruleContent)
(title,feedbackTimeStart,feedbackTimeEnd,inviteNum,feedbackNum,processStatus,weblink,webUrl,remark,createUserId,createTime,updateUserId,updateTime,formContent,ruleContent,feedbackFileId,feedbackFilePath)
VALUES
(#{title},#{feedbackTimeStart},#{feedbackTimeEnd},#{inviteNum},#{feedbackNum},#{processStatus},#{weblink},#{webUrl},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{formContent},#{ruleContent})
(#{title},#{feedbackTimeStart},#{feedbackTimeEnd},#{inviteNum},#{feedbackNum},#{processStatus},#{weblink},#{webUrl},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{formContent},#{ruleContent},#{feedbackFileId},#{feedbackFilePath})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_feedback
(title,feedbackTimeStart,feedbackTimeEnd,inviteNum,feedbackNum,processStatus,weblink,webUrl,remark,createUserId,createTime,updateUserId,updateTime,formContent,ruleContent)
(title,feedbackTimeStart,feedbackTimeEnd,inviteNum,feedbackNum,processStatus,weblink,webUrl,remark,createUserId,createTime,updateUserId,updateTime,formContent,ruleContent,feedbackFileId,feedbackFilePath)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.title},#{item.feedbackTimeStart},#{item.feedbackTimeEnd},#{item.inviteNum},#{item.feedbackNum},#{item.processStatus},#{item.weblink},#{item.webUrl},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.formContent},#{item.ruleContent})
(#{item.title},#{item.feedbackTimeStart},#{item.feedbackTimeEnd},#{item.inviteNum},#{item.feedbackNum},#{item.processStatus},#{item.weblink},#{item.webUrl},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.formContent},#{item.ruleContent},#{item.feedbackFileId},#{item.feedbackFilePath})
</foreach>
</insert>
......@@ -184,6 +192,15 @@
<if test="(colPickMode==0 and data.containsKey('ruleContent')) or (colPickMode==1 and !data.containsKey('ruleContent'))">
a.ruleContent=#{data.ruleContent},
</if>
<if test="(colPickMode==0 and data.containsKey('feedbackFileId')) or (colPickMode==1 and !data.containsKey('feedbackFileId'))">
a.feedbackFileId=#{data.feedbackFileId},
</if>
<if test="(colPickMode==0 and data.containsKey('feedbackFileIdIncrement')) or (colPickMode==1 and !data.containsKey('feedbackFileIdIncrement'))">
a.feedbackFileId=ifnull(a.feedbackFileId,0) + #{data.feedbackFileIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('feedbackFilePath')) or (colPickMode==1 and !data.containsKey('feedbackFilePath'))">
a.feedbackFilePath=#{data.feedbackFilePath},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -331,6 +348,25 @@
</if>
</foreach>
</trim>
<trim prefix="feedbackFileId=(case" suffix="ELSE feedbackFileId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('feedbackFileId')) or (colPickMode==1 and !item.containsKey('feedbackFileId'))">
when a.id=#{item.id} then #{item.feedbackFileId}
</when>
<when test="(colPickMode==0 and item.containsKey('feedbackFileIdIncrement')) or (colPickMode==1 and !item.containsKey('feedbackFileIdIncrement'))">
when a.id=#{item.id} then ifnull(a.feedbackFileId,0) + #{item.feedbackFileIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="feedbackFilePath=(case" suffix="ELSE feedbackFilePath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('feedbackFilePath')) or (colPickMode==1 and !item.containsKey('feedbackFilePath'))">
when a.id=#{item.id} then #{item.feedbackFilePath}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -809,6 +845,54 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('feedbackFileId')">
<if test="conditionParamRef.feedbackFileId != null ">
${_conditionType_} a.feedbackFileId = #{${_conditionParam_}.feedbackFileId}
</if>
<if test="conditionParamRef.feedbackFileId == null">
${_conditionType_} a.feedbackFileId is null
</if>
</if>
<if test="conditionParamRef.containsKey('feedbackFileIdList') and conditionParamRef.feedbackFileIdList.size() > 0">
${_conditionType_} a.feedbackFileId in
<foreach collection="conditionParamRef.feedbackFileIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('feedbackFileIdNotList') and conditionParamRef.feedbackFileIdNotList.size() > 0">
${_conditionType_} a.feedbackFileId not in
<foreach collection="conditionParamRef.feedbackFileIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('feedbackFileIdStart') and conditionParamRef.feedbackFileIdStart != null">
${_conditionType_} a.feedbackFileId <![CDATA[ >= ]]> #{${_conditionParam_}.feedbackFileIdStart}
</if>
<if test="conditionParamRef.containsKey('feedbackFileIdEnd') and conditionParamRef.feedbackFileIdEnd != null">
${_conditionType_} a.feedbackFileId <![CDATA[ <= ]]> #{${_conditionParam_}.feedbackFileIdEnd}
</if>
<if test="conditionParamRef.containsKey('feedbackFilePath')">
<if test="conditionParamRef.feedbackFilePath != null and conditionParamRef.feedbackFilePath != ''">
${_conditionType_} a.feedbackFilePath like #{${_conditionParam_}.feedbackFilePath}
</if>
<if test="conditionParamRef.feedbackFilePath == null">
${_conditionType_} a.feedbackFilePath is null
</if>
</if>
<if test="conditionParamRef.containsKey('feedbackFilePathList') and conditionParamRef.feedbackFilePathList.size() > 0">
${_conditionType_} a.feedbackFilePath in
<foreach collection="conditionParamRef.feedbackFilePathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('feedbackFilePathNotList') and conditionParamRef.feedbackFilePathNotList.size() > 0">
${_conditionType_} a.feedbackFilePath not in
<foreach collection="conditionParamRef.feedbackFilePathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -902,6 +986,16 @@
<if test='orderCol.ruleContent != null and "DESC".equalsIgnoreCase(orderCol.ruleContent)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('feedbackFileId')">
a.feedbackFileId
<if test='orderCol.feedbackFileId != null and "DESC".equalsIgnoreCase(orderCol.feedbackFileId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('feedbackFilePath')">
a.feedbackFilePath
<if test='orderCol.feedbackFilePath != null and "DESC".equalsIgnoreCase(orderCol.feedbackFilePath)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
###登录
POST {{baseUrl}}/login/login
Content-Type: application/json
{
"loginName":"admin",
"password":"admin",
"securityCode":"8888"
}
> {%
client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
client.global.set("authToken", JSON.parse(response.body).data.token);
%}
###绩效反馈附件列表
POST {{baseUrl}}/feedback/file/list
Content-Type: application/json
{
"page":1,
"size":10
}
###绩效反馈附件更新与保存
POST {{baseUrl}}/feedback/file/save
Authorization: {{authToken}}
Content-Type: application/json
{
"title":"iscvob",
"sort":0,
"top":0,
"feedbackFileName":"6iua5k",
"feedbackFilePath":"1yat2m",
"remark":"0w4vjj",
}
> {%
client.global.set("FeedbackFile_id", JSON.parse(response.body).data.id);
%}
###绩效反馈附件查看
GET {{baseUrl}}/feedback/file/info?id={{FeedbackFile_id}}
Accept: application/json
###绩效反馈附件编辑
GET {{baseUrl}}/feedback/file/edit?id={{FeedbackFile_id}}
Accept: application/json
###绩效反馈附件删除
GET {{baseUrl}}/feedback/file/delete?id={{FeedbackFile_id}}
Authorization: {{authToken}}
Accept: application/json
###登录
POST {{baseUrl}}/login/login
Content-Type: application/json
{
"loginName":"admin",
"password":"admin",
"securityCode":"8888"
}
> {%
client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
client.global.set("authToken", JSON.parse(response.body).data.token);
%}
###绩效记录申诉信息列表
POST {{baseUrl}}/perform/attend/appeal/list
Content-Type: application/json
{
"page":1,
"size":10
}
###绩效记录申诉信息更新与保存
POST {{baseUrl}}/perform/attend/appeal/save
Authorization: {{authToken}}
Content-Type: application/json
{
"checkRecordId":702,
"staffId":566,
"staffName":"b7xpn0",
"workNum":"ymsc43",
"deptId":975,
"deptName":"x9lhxh",
"attendanceGroupId":352,
"attendanceGroupName":"ijhjyv",
"attendanceDate":"1689091200000",
"ruleId":714,
"ruleName":"k3nou3",
"subMethod":1,
"subAddType":1,
"score":0.00,
"goOffTimeStr":"3tpp9v",
"errorTime":"1689091200000",
"actualAttendTime":"1689091200000",
"errorResult":"e36tyi",
"checkPerson":"brd56v",
"checkTime":"1689091200000",
"checkDesc":"dxif0b",
"checkResult":"5wz0wh",
"processStatus":1,
"appealDesc":"bhhaf6",
"appealTime":"1689091200000",
"appealResult":2,
"remark":"owbk12",
"violationType":"7tb1sj",
"reviewResult":378,
"reviewTime":"1689091200000",
"reviewSource":"hvc7j5",
"reviewDevice":"rbmr61",
"complainTitle":"tirz94",
"complainContent":"wtjqma",
"complainRealName":"v9550o",
"contact":"9lzrer",
"complainTime":"1689091200000",
"complainSource":"r8xzzy",
"complainDevice":"odwoei",
"goworkCode":"ac7kwy",
"goworkDepts":"90jn57",
"matterlName":"9e1tph",
"goworkTime":"1689091200000",
"irregularType":767,
"happenTime":"1689091200000",
"duration":0,
"alarmTime":"1689091200000",
"snapPath":"7r7qk4",
"irregularOtherType":754,
"performType":"yqp4d7"
}
> {%
client.global.set("PerformAttendAppeal_id", JSON.parse(response.body).data.id);
%}
###绩效记录申诉信息查看
GET {{baseUrl}}/perform/attend/appeal/info?id={{PerformAttendAppeal_id}}
Accept: application/json
###绩效记录申诉信息编辑
GET {{baseUrl}}/perform/attend/appeal/edit?id={{PerformAttendAppeal_id}}
Accept: application/json
###绩效记录申诉信息删除
GET {{baseUrl}}/perform/attend/appeal/delete?id={{PerformAttendAppeal_id}}
Authorization: {{authToken}}
Accept: application/json
......@@ -769,3 +769,30 @@ ALTER TABLE mortals_xhx_attendance_stat ADD COLUMN `afternoonTimes` int(9) def
ALTER TABLE mortals_xhx_staff_perform_summary ADD COLUMN `belongCenter` varchar(512) DEFAULT '宜宾市民中心' COMMENT '所属中心' AFTER staffName;
ALTER TABLE mortals_xhx_feedback ADD COLUMN `feedbackFileId` bigint(20) default 0 COMMENT '图片id' ;
ALTER TABLE mortals_xhx_feedback ADD COLUMN `feedbackFilePath` varchar(512) default '' COMMENT '图片路径' ;
-- ----------------------------
-- 绩效反馈附件表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_feedback_file`;
CREATE TABLE mortals_xhx_feedback_file(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号,主键,自增长',
`title` varchar(64) NOT NULL COMMENT '标题',
`sort` int(4) DEFAULT '0' COMMENT '排序',
`top` tinyint(2) DEFAULT '0' COMMENT '置顶 (0.否,1.是)',
`feedbackFileName` varchar(1024) COMMENT '图片名称',
`feedbackFilePath` varchar(512) COMMENT '图片路径',
`remark` varchar(512) COMMENT '备注说明',
`createUserId` bigint(20) COMMENT '创建用户',
`createTime` datetime COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='绩效反馈附件';
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