添加优势

company-manager/src/main/java/com/mortals/xhx/module/advantage/dao/AdvantageDao.java

+package com.mortals.xhx.module.advantage.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.advantage.model.AdvantageEntity;
+import java.util.List;
+/**
+* 公司优势特点Dao
+* 公司优势特点 DAO接口
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+
+public interface  AdvantageDao extends ICRUDDao<AdvantageEntity,Long>{
+
+
+}

company-manager/src/main/java/com/mortals/xhx/module/advantage/dao/ibatis/AdvantageDaoImpl.java

+package com.mortals.xhx.module.advantage.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.advantage.dao.AdvantageDao;
+import com.mortals.xhx.module.advantage.model.AdvantageEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 公司优势特点DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Repository("advantageDao")
+public class AdvantageDaoImpl extends BaseCRUDDaoMybatis<AdvantageEntity,Long> implements AdvantageDao {
+
+
+
+}

company-manager/src/main/java/com/mortals/xhx/module/advantage/model/AdvantageEntity.java

+package com.mortals.xhx.module.advantage.model;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.advantage.model.vo.AdvantageVo;
+import lombok.Data;
+/**
+* 公司优势特点实体对象
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Data
+public class AdvantageEntity extends AdvantageVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 标题
+    */
+    private String title;
+    /**
+    * 内容
+    */
+    private String content;
+    /**
+    * 图片
+    */
+    private String imagePath;
+    /**
+    * 备注
+    */
+    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 AdvantageEntity) {
+            AdvantageEntity tmp = (AdvantageEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.title = "";
+            this.content = "";
+            this.imagePath = "";
+            this.remark = "";
+    }
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/advantage/model/AdvantageQuery.java

+package com.mortals.xhx.module.advantage.model;
+
+import java.util.List;
+import com.mortals.xhx.module.advantage.model.AdvantageEntity;
+/**
+* 公司优势特点查询对象
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+public class AdvantageQuery extends AdvantageEntity {
+    /** 开始 id */
+    private Long idStart;
+
+    /** 结束 id */
+    private Long idEnd;
+
+    /** 增加 id */
+    private Long idIncrement;
+
+    /** id列表 */
+    private List <Long> idList;
+
+    /** id排除列表 */
+    private List <Long> idNotList;
+
+    /** 标题 */
+    private List<String> titleList;
+
+    /** 标题排除列表 */
+    private List <String> titleNotList;
+    /** 内容 */
+    private List<String> contentList;
+
+    /** 内容排除列表 */
+    private List <String> contentNotList;
+    /** 图片 */
+    private List<String> imagePathList;
+
+    /** 图片排除列表 */
+    private List <String> imagePathNotList;
+    /** 备注 */
+    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 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<AdvantageQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<AdvantageQuery> andConditionList;
+
+    public AdvantageQuery(){}
+
+    /**
+    * 获取 开始 id
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 id
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 id
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 id
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 id
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 id
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 id
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 id
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 id
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 id
+    * @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 contentList
+    */
+    public List<String> getContentList(){
+        return this.contentList;
+    }
+
+    /**
+    * 设置 内容
+    * @param contentList
+    */
+    public void setContentList(List<String> contentList){
+        this.contentList = contentList;
+    }
+
+    /**
+    * 获取 内容
+    * @return contentNotList
+    */
+    public List<String> getContentNotList(){
+        return this.contentNotList;
+    }
+
+    /**
+    * 设置 内容
+    * @param contentNotList
+    */
+    public void setContentNotList(List<String> contentNotList){
+        this.contentNotList = contentNotList;
+    }
+
+    /**
+    * 获取 图片
+    * @return imagePathList
+    */
+    public List<String> getImagePathList(){
+        return this.imagePathList;
+    }
+
+    /**
+    * 设置 图片
+    * @param imagePathList
+    */
+    public void setImagePathList(List<String> imagePathList){
+        this.imagePathList = imagePathList;
+    }
+
+    /**
+    * 获取 图片
+    * @return imagePathNotList
+    */
+    public List<String> getImagePathNotList(){
+        return this.imagePathNotList;
+    }
+
+    /**
+    * 设置 图片
+    * @param imagePathNotList
+    */
+    public void setImagePathNotList(List<String> imagePathNotList){
+        this.imagePathNotList = imagePathNotList;
+    }
+
+    /**
+    * 获取 备注
+    * @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 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;
+    }
+
+    /**
+    * 设置  id
+    * @param id
+    */
+    public AdvantageQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 id
+    * @param idStart
+    */
+    public AdvantageQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 id
+    * @param idEnd
+    */
+    public AdvantageQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 id
+    * @param idIncrement
+    */
+    public AdvantageQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 id
+    * @param idList
+    */
+    public AdvantageQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 id
+        * @param idNotList
+        */
+        public AdvantageQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 标题
+    * @param title
+    */
+    public AdvantageQuery title(String title){
+        setTitle(title);
+		return this;
+    }
+
+    /**
+    * 设置 标题
+    * @param titleList
+    */
+    public AdvantageQuery titleList(List<String> titleList){
+        this.titleList = titleList;
+		return this;
+    }
+
+
+	/**
+    * 设置 内容
+    * @param content
+    */
+    public AdvantageQuery content(String content){
+        setContent(content);
+		return this;
+    }
+
+    /**
+    * 设置 内容
+    * @param contentList
+    */
+    public AdvantageQuery contentList(List<String> contentList){
+        this.contentList = contentList;
+		return this;
+    }
+
+
+	/**
+    * 设置 图片
+    * @param imagePath
+    */
+    public AdvantageQuery imagePath(String imagePath){
+        setImagePath(imagePath);
+		return this;
+    }
+
+    /**
+    * 设置 图片
+    * @param imagePathList
+    */
+    public AdvantageQuery imagePathList(List<String> imagePathList){
+        this.imagePathList = imagePathList;
+		return this;
+    }
+
+
+	/**
+    * 设置 备注
+    * @param remark
+    */
+    public AdvantageQuery remark(String remark){
+        setRemark(remark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public AdvantageQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public AdvantageQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public AdvantageQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public AdvantageQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public AdvantageQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public AdvantageQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public AdvantageQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<AdvantageQuery> 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<AdvantageQuery> 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<AdvantageQuery> 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<AdvantageQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/advantage/model/vo/AdvantageVo.java

+package com.mortals.xhx.module.advantage.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.advantage.model.AdvantageEntity;
+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 2024-11-29
+*/
+@Data
+public class AdvantageVo extends BaseEntityLong {
+
+    /** id列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/advantage/service/AdvantageService.java

+package com.mortals.xhx.module.advantage.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.advantage.model.AdvantageEntity;
+import com.mortals.xhx.module.advantage.dao.AdvantageDao;
+/**
+* AdvantageService
+*
+* 公司优势特点 service接口
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+public interface AdvantageService extends ICRUDService<AdvantageEntity,Long>{
+
+    AdvantageDao getDao();
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/advantage/service/impl/AdvantageServiceImpl.java

+package com.mortals.xhx.module.advantage.service.impl;
+import org.springframework.beans.BeanUtils;
+import java.util.function.Function;
+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.advantage.dao.AdvantageDao;
+import com.mortals.xhx.module.advantage.model.AdvantageEntity;
+import com.mortals.xhx.module.advantage.service.AdvantageService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* AdvantageService
+* 公司优势特点 service实现
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Service("advantageService")
+@Slf4j
+public class AdvantageServiceImpl extends AbstractCRUDServiceImpl<AdvantageDao, AdvantageEntity, Long> implements AdvantageService {
+    
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/advantage/web/AdvantageController.java

+package com.mortals.xhx.module.advantage.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.advantage.model.AdvantageEntity;
+import com.mortals.xhx.module.advantage.service.AdvantageService;
+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.*;
+import com.mortals.xhx.common.code.*;
+/**
+*
+* 公司优势特点
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@RestController
+@RequestMapping("advantage")
+public class AdvantageController extends BaseCRUDJsonBodyMappingController<AdvantageService,AdvantageEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public AdvantageController(){
+        super.setModuleDesc( "公司优势特点");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/article/model/vo/ArticleVo.java

@@ -19,5 +19,7 @@ public class ArticleVo extends BaseEntityLong {
     /** 文章id列表 */
     private List <Long> idList;
 
+    private List <Long> idNotList;
+
 
 }
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/article/web/ArticleController.java

 package com.mortals.xhx.module.article.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,5 +48,10 @@ public class ArticleController extends BaseCRUDJsonBodyMappingController<Article
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(ArticleEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        query.setOrderColList(Arrays.asList(new OrderCol("create_time", "desc")));
 
+    }
 }
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/company/web/CompanyController.java

 package com.mortals.xhx.module.company.web;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -47,4 +49,12 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
     }
 
 
+    @Override
+    protected void saveBefore(CompanyEntity entity, Map<String, Object> model, Context context) throws AppException {
+        CompanyEntity companyEntity = this.service.selectOne(new CompanyEntity());
+        if(!ObjectUtils.isEmpty(companyEntity)){
+            entity.setId(companyEntity.getId());
+        }
+        super.saveBefore(entity, model, context);
+    }
 }
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/service/dao/ServiceDao.java

+package com.mortals.xhx.module.service.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.service.model.ServiceEntity;
+import java.util.List;
+/**
+* 公司服务Dao
+* 公司服务 DAO接口
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+
+public interface  ServiceDao extends ICRUDDao<ServiceEntity,Long>{
+
+
+}

company-manager/src/main/java/com/mortals/xhx/module/service/dao/ibatis/ServiceDaoImpl.java

+package com.mortals.xhx.module.service.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.service.dao.ServiceDao;
+import com.mortals.xhx.module.service.model.ServiceEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 公司服务DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Repository("serviceDao")
+public class ServiceDaoImpl extends BaseCRUDDaoMybatis<ServiceEntity,Long> implements ServiceDao {
+
+
+
+}

company-manager/src/main/java/com/mortals/xhx/module/service/model/ServiceEntity.java

+package com.mortals.xhx.module.service.model;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.service.model.vo.ServiceVo;
+import lombok.Data;
+/**
+* 公司服务实体对象
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Data
+public class ServiceEntity extends ServiceVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 标题
+    */
+    private String title;
+    /**
+    * 内容
+    */
+    private String content;
+    /**
+    * 图标
+    */
+    private String icon;
+    /**
+    * 备注
+    */
+    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 ServiceEntity) {
+            ServiceEntity tmp = (ServiceEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.title = "";
+            this.content = "";
+            this.icon = "";
+            this.remark = "";
+    }
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/service/model/ServiceQuery.java

+package com.mortals.xhx.module.service.model;
+
+import java.util.List;
+import com.mortals.xhx.module.service.model.ServiceEntity;
+/**
+* 公司服务查询对象
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+public class ServiceQuery extends ServiceEntity {
+    /** 开始 id */
+    private Long idStart;
+
+    /** 结束 id */
+    private Long idEnd;
+
+    /** 增加 id */
+    private Long idIncrement;
+
+    /** id列表 */
+    private List <Long> idList;
+
+    /** id排除列表 */
+    private List <Long> idNotList;
+
+    /** 标题 */
+    private List<String> titleList;
+
+    /** 标题排除列表 */
+    private List <String> titleNotList;
+    /** 内容 */
+    private List<String> contentList;
+
+    /** 内容排除列表 */
+    private List <String> contentNotList;
+    /** 图标 */
+    private List<String> iconList;
+
+    /** 图标排除列表 */
+    private List <String> iconNotList;
+    /** 备注 */
+    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 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<ServiceQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<ServiceQuery> andConditionList;
+
+    public ServiceQuery(){}
+
+    /**
+    * 获取 开始 id
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 id
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 id
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 id
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 id
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 id
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 id
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 id
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 id
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 id
+    * @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 contentList
+    */
+    public List<String> getContentList(){
+        return this.contentList;
+    }
+
+    /**
+    * 设置 内容
+    * @param contentList
+    */
+    public void setContentList(List<String> contentList){
+        this.contentList = contentList;
+    }
+
+    /**
+    * 获取 内容
+    * @return contentNotList
+    */
+    public List<String> getContentNotList(){
+        return this.contentNotList;
+    }
+
+    /**
+    * 设置 内容
+    * @param contentNotList
+    */
+    public void setContentNotList(List<String> contentNotList){
+        this.contentNotList = contentNotList;
+    }
+
+    /**
+    * 获取 图标
+    * @return iconList
+    */
+    public List<String> getIconList(){
+        return this.iconList;
+    }
+
+    /**
+    * 设置 图标
+    * @param iconList
+    */
+    public void setIconList(List<String> iconList){
+        this.iconList = iconList;
+    }
+
+    /**
+    * 获取 图标
+    * @return iconNotList
+    */
+    public List<String> getIconNotList(){
+        return this.iconNotList;
+    }
+
+    /**
+    * 设置 图标
+    * @param iconNotList
+    */
+    public void setIconNotList(List<String> iconNotList){
+        this.iconNotList = iconNotList;
+    }
+
+    /**
+    * 获取 备注
+    * @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 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;
+    }
+
+    /**
+    * 设置  id
+    * @param id
+    */
+    public ServiceQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 id
+    * @param idStart
+    */
+    public ServiceQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 id
+    * @param idEnd
+    */
+    public ServiceQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 id
+    * @param idIncrement
+    */
+    public ServiceQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 id
+    * @param idList
+    */
+    public ServiceQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 id
+        * @param idNotList
+        */
+        public ServiceQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 标题
+    * @param title
+    */
+    public ServiceQuery title(String title){
+        setTitle(title);
+		return this;
+    }
+
+    /**
+    * 设置 标题
+    * @param titleList
+    */
+    public ServiceQuery titleList(List<String> titleList){
+        this.titleList = titleList;
+		return this;
+    }
+
+
+	/**
+    * 设置 内容
+    * @param content
+    */
+    public ServiceQuery content(String content){
+        setContent(content);
+		return this;
+    }
+
+    /**
+    * 设置 内容
+    * @param contentList
+    */
+    public ServiceQuery contentList(List<String> contentList){
+        this.contentList = contentList;
+		return this;
+    }
+
+
+	/**
+    * 设置 图标
+    * @param icon
+    */
+    public ServiceQuery icon(String icon){
+        setIcon(icon);
+		return this;
+    }
+
+    /**
+    * 设置 图标
+    * @param iconList
+    */
+    public ServiceQuery iconList(List<String> iconList){
+        this.iconList = iconList;
+		return this;
+    }
+
+
+	/**
+    * 设置 备注
+    * @param remark
+    */
+    public ServiceQuery remark(String remark){
+        setRemark(remark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public ServiceQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public ServiceQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public ServiceQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public ServiceQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public ServiceQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public ServiceQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public ServiceQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<ServiceQuery> 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<ServiceQuery> 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<ServiceQuery> 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<ServiceQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/service/model/vo/ServiceVo.java

+package com.mortals.xhx.module.service.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.service.model.ServiceEntity;
+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 2024-11-29
+*/
+@Data
+public class ServiceVo extends BaseEntityLong {
+
+    /** id列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/service/service/ServiceService.java

+package com.mortals.xhx.module.service.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.service.model.ServiceEntity;
+import com.mortals.xhx.module.service.dao.ServiceDao;
+/**
+* ServiceService
+*
+* 公司服务 service接口
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+public interface ServiceService extends ICRUDService<ServiceEntity,Long>{
+
+    ServiceDao getDao();
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/service/service/impl/ServiceServiceImpl.java

+package com.mortals.xhx.module.service.service.impl;
+import org.springframework.beans.BeanUtils;
+import java.util.function.Function;
+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.service.dao.ServiceDao;
+import com.mortals.xhx.module.service.model.ServiceEntity;
+import com.mortals.xhx.module.service.service.ServiceService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* ServiceService
+* 公司服务 service实现
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@Service("serviceService")
+@Slf4j
+public class ServiceServiceImpl extends AbstractCRUDServiceImpl<ServiceDao, ServiceEntity, Long> implements ServiceService {
+    
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/service/web/ServiceController.java

+package com.mortals.xhx.module.service.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.service.model.ServiceEntity;
+import com.mortals.xhx.module.service.service.ServiceService;
+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.*;
+import com.mortals.xhx.common.code.*;
+/**
+*
+* 公司服务
+*
+* @author zxfei
+* @date 2024-11-29
+*/
+@RestController
+@RequestMapping("service")
+public class ServiceController extends BaseCRUDJsonBodyMappingController<ServiceService,ServiceEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public ServiceController(){
+        super.setModuleDesc( "公司服务");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/slideshow/model/SlideshowEntity.java

@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.slideshow.model.vo.SlideshowVo;
 import lombok.Data;
 /**
-* 轮播实体对象
-*
-* @author zxfei
-* @date 2024-11-25
-*/
+ * 轮播实体对象
+ *
+ * @author zxfei
+ * @date 2024-11-29
+ */
 @Data
 public class SlideshowEntity extends SlideshowVo {
     private static final long serialVersionUID = 1L;
@@ -27,6 +27,14 @@ public class SlideshowEntity extends SlideshowVo {
      * 描述
      */
     private String introduction;
+    /**
+     * 图标
+     */
+    private String icon;
+    /**
+     * 名称
+     */
+    private String name;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -46,5 +54,7 @@ public class SlideshowEntity extends SlideshowVo {
     public void initAttrValue(){
         this.imageUrl = "";
         this.introduction = "";
+        this.icon = "";
+        this.name = "";
     }
 }
\ No newline at end of file

company-manager/src/main/java/com/mortals/xhx/module/slideshow/model/SlideshowQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.slideshow.model;
 import java.util.List;
 import com.mortals.xhx.module.slideshow.model.SlideshowEntity;
 /**
-* 轮播查询对象
-*
-* @author zxfei
-* @date 2024-11-25
-*/
+ * 轮播查询对象
+ *
+ * @author zxfei
+ * @date 2024-11-29
+ */
 public class SlideshowQuery extends SlideshowEntity {
     /** 开始 轮播图id */
     private Long idStart;
@@ -61,6 +61,16 @@ public class SlideshowQuery extends SlideshowEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 图标 */
+    private List<String> iconList;
+
+    /** 图标排除列表 */
+    private List <String> iconNotList;
+    /** 名称 */
+    private List<String> nameList;
+
+    /** 名称排除列表 */
+    private List <String> nameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<SlideshowQuery> orConditionList;
 
@@ -359,6 +369,70 @@ public class SlideshowQuery extends SlideshowEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 图标
+     * @return iconList
+     */
+    public List<String> getIconList(){
+        return this.iconList;
+    }
+
+    /**
+     * 设置 图标
+     * @param iconList
+     */
+    public void setIconList(List<String> iconList){
+        this.iconList = iconList;
+    }
+
+    /**
+     * 获取 图标
+     * @return iconNotList
+     */
+    public List<String> getIconNotList(){
+        return this.iconNotList;
+    }
+
+    /**
+     * 设置 图标
+     * @param iconNotList
+     */
+    public void setIconNotList(List<String> iconNotList){
+        this.iconNotList = iconNotList;
+    }
+
+    /**
+     * 获取 名称
+     * @return nameList
+     */
+    public List<String> getNameList(){
+        return this.nameList;
+    }
+
+    /**
+     * 设置 名称
+     * @param nameList
+     */
+    public void setNameList(List<String> nameList){
+        this.nameList = nameList;
+    }
+
+    /**
+     * 获取 名称
+     * @return nameNotList
+     */
+    public List<String> getNameNotList(){
+        return this.nameNotList;
+    }
+
+    /**
+     * 设置 名称
+     * @param nameNotList
+     */
+    public void setNameNotList(List<String> nameNotList){
+        this.nameNotList = nameNotList;
+    }
+
     /**
      * 设置  轮播图id
      * @param id
@@ -507,6 +581,44 @@ public class SlideshowQuery extends SlideshowEntity {
 
 
 
+
+    /**
+     * 设置 图标
+     * @param icon
+     */
+    public SlideshowQuery icon(String icon){
+        setIcon(icon);
+        return this;
+    }
+
+    /**
+     * 设置 图标
+     * @param iconList
+     */
+    public SlideshowQuery iconList(List<String> iconList){
+        this.iconList = iconList;
+        return this;
+    }
+
+
+    /**
+     * 设置 名称
+     * @param name
+     */
+    public SlideshowQuery name(String name){
+        setName(name);
+        return this;
+    }
+
+    /**
+     * 设置 名称
+     * @param nameList
+     */
+    public SlideshowQuery nameList(List<String> nameList){
+        this.nameList = nameList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

company-manager/src/main/resources/sqlmap/module/advantage/AdvantageMapper.xml

+<?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.advantage.dao.ibatis.AdvantageDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="AdvantageEntity" id="AdvantageEntity-Map">
+            <id  property="id" column="id" />
+            <result property="title" column="title" />
+            <result property="content" column="content" />
+            <result property="imagePath" column="imagePath" />
+            <result property="remark" column="remark" />
+            <result property="createUserId" column="create_user_id" />
+            <result property="createTime" column="create_time" />
+            <result property="updateTime" column="update_time" />
+    </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('content') or colPickMode == 1 and data.containsKey('content')))">
+                    a.content,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('imagePath') or colPickMode == 1 and data.containsKey('imagePath')))">
+                    a.imagePath,
+                </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.create_user_id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.create_time,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.update_time,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="AdvantageEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_advantage
+        (title,content,imagePath,remark,create_user_id,create_time,update_time)
+        VALUES
+        (#{title},#{content},#{imagePath},#{remark},#{createUserId},#{createTime},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_advantage
+        (title,content,imagePath,remark,create_user_id,create_time,update_time)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.title},#{item.content},#{item.imagePath},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_advantage 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('content')) or (colPickMode==1 and !data.containsKey('content'))">
+                a.content=#{data.content},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('imagePath')) or (colPickMode==1 and !data.containsKey('imagePath'))">
+                a.imagePath=#{data.imagePath},
+            </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.create_user_id=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.create_user_id=ifnull(a.create_user_id,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.create_time=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.update_time=#{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_advantage 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="content=(case" suffix="ELSE content end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))">
+                            when a.id=#{item.id} then #{item.content}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="imagePath=(case" suffix="ELSE imagePath end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('imagePath')) or (colPickMode==1 and !item.containsKey('imagePath'))">
+                            when a.id=#{item.id} then #{item.imagePath}
+                        </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="create_user_id=(case" suffix="ELSE create_user_id 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.create_user_id,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="create_time=(case" suffix="ELSE create_time 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="update_time=(case" suffix="ELSE update_time 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="AdvantageEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_advantage as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_advantage as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_advantage where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_advantage where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_advantage 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_advantage as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="AdvantageEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_advantage 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_advantage 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="permissionSql != null and permissionSql != ''">
+            ${permissionSql}
+        </if>
+
+        <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('content')">
+                <if test="conditionParamRef.content != null and conditionParamRef.content != ''">
+                    ${_conditionType_} a.content like #{${_conditionParam_}.content}
+                </if>
+                <if test="conditionParamRef.content == null">
+                    ${_conditionType_} a.content is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('contentList') and conditionParamRef.contentList.size() > 0">
+                ${_conditionType_} a.content in
+                <foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('contentNotList') and conditionParamRef.contentNotList.size() > 0">
+                ${_conditionType_} a.content not in
+                <foreach collection="conditionParamRef.contentNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('imagePath')">
+                <if test="conditionParamRef.imagePath != null and conditionParamRef.imagePath != ''">
+                    ${_conditionType_} a.imagePath like #{${_conditionParam_}.imagePath}
+                </if>
+                <if test="conditionParamRef.imagePath == null">
+                    ${_conditionType_} a.imagePath is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('imagePathList') and conditionParamRef.imagePathList.size() > 0">
+                ${_conditionType_} a.imagePath in
+                <foreach collection="conditionParamRef.imagePathList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('imagePathNotList') and conditionParamRef.imagePathNotList.size() > 0">
+                ${_conditionType_} a.imagePath not in
+                <foreach collection="conditionParamRef.imagePathNotList" 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.create_user_id = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.create_user_id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.create_user_id 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.create_user_id 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.create_user_id <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.create_user_id <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.create_time = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.create_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.create_time <![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.create_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.update_time = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.update_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.update_time <![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.update_time <![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
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     a.${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <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('content')">
+                        a.content
+                        <if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('imagePath')">
+                        a.imagePath
+                        <if test='orderCol.imagePath != null and "DESC".equalsIgnoreCase(orderCol.imagePath)'>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.create_user_id
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.create_time
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.update_time
+                        <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

company-manager/src/main/resources/sqlmap/module/service/ServiceMapper.xml

+<?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.service.dao.ibatis.ServiceDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="ServiceEntity" id="ServiceEntity-Map">
+            <id  property="id" column="id" />
+            <result property="title" column="title" />
+            <result property="content" column="content" />
+            <result property="icon" column="icon" />
+            <result property="remark" column="remark" />
+            <result property="createUserId" column="create_user_id" />
+            <result property="createTime" column="create_time" />
+            <result property="updateTime" column="update_time" />
+    </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('content') or colPickMode == 1 and data.containsKey('content')))">
+                    a.content,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('icon') or colPickMode == 1 and data.containsKey('icon')))">
+                    a.icon,
+                </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.create_user_id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.create_time,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.update_time,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="ServiceEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_service
+        (title,content,icon,remark,create_user_id,create_time,update_time)
+        VALUES
+        (#{title},#{content},#{icon},#{remark},#{createUserId},#{createTime},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_service
+        (title,content,icon,remark,create_user_id,create_time,update_time)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.title},#{item.content},#{item.icon},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_service 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('content')) or (colPickMode==1 and !data.containsKey('content'))">
+                a.content=#{data.content},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('icon')) or (colPickMode==1 and !data.containsKey('icon'))">
+                a.icon=#{data.icon},
+            </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.create_user_id=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.create_user_id=ifnull(a.create_user_id,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.create_time=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.update_time=#{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_service 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="content=(case" suffix="ELSE content end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))">
+                            when a.id=#{item.id} then #{item.content}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="icon=(case" suffix="ELSE icon end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('icon')) or (colPickMode==1 and !item.containsKey('icon'))">
+                            when a.id=#{item.id} then #{item.icon}
+                        </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="create_user_id=(case" suffix="ELSE create_user_id 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.create_user_id,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="create_time=(case" suffix="ELSE create_time 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="update_time=(case" suffix="ELSE update_time 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="ServiceEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_service as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_service as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_service where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_service where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_service 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_service as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="ServiceEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_service 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_service 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="permissionSql != null and permissionSql != ''">
+            ${permissionSql}
+        </if>
+
+        <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('content')">
+                <if test="conditionParamRef.content != null and conditionParamRef.content != ''">
+                    ${_conditionType_} a.content like #{${_conditionParam_}.content}
+                </if>
+                <if test="conditionParamRef.content == null">
+                    ${_conditionType_} a.content is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('contentList') and conditionParamRef.contentList.size() > 0">
+                ${_conditionType_} a.content in
+                <foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('contentNotList') and conditionParamRef.contentNotList.size() > 0">
+                ${_conditionType_} a.content not in
+                <foreach collection="conditionParamRef.contentNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('icon')">
+                <if test="conditionParamRef.icon != null and conditionParamRef.icon != ''">
+                    ${_conditionType_} a.icon like #{${_conditionParam_}.icon}
+                </if>
+                <if test="conditionParamRef.icon == null">
+                    ${_conditionType_} a.icon is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('iconList') and conditionParamRef.iconList.size() > 0">
+                ${_conditionType_} a.icon in
+                <foreach collection="conditionParamRef.iconList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('iconNotList') and conditionParamRef.iconNotList.size() > 0">
+                ${_conditionType_} a.icon not in
+                <foreach collection="conditionParamRef.iconNotList" 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.create_user_id = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.create_user_id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.create_user_id 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.create_user_id 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.create_user_id <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.create_user_id <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.create_time = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.create_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.create_time <![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.create_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.update_time = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.update_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.update_time <![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.update_time <![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
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     a.${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <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('content')">
+                        a.content
+                        <if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('icon')">
+                        a.icon
+                        <if test='orderCol.icon != null and "DESC".equalsIgnoreCase(orderCol.icon)'>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.create_user_id
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.create_time
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.update_time
+                        <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

company-manager/src/main/resources/sqlmap/module/slideshow/SlideshowMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.slideshow.dao.ibatis.SlideshowDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -11,6 +11,8 @@
         <result property="createUserId" column="create_user_id" />
         <result property="createTime" column="create_time" />
         <result property="updateTime" column="update_time" />
+        <result property="icon" column="icon" />
+        <result property="name" column="name" />
     </resultMap>
 
     <!-- 表所有列 -->
@@ -34,23 +36,29 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
                 a.update_time,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('icon') or colPickMode == 1 and data.containsKey('icon')))">
+                a.icon,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                a.name,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="SlideshowEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_slideshow
-        (image_url,introduction,create_user_id,create_time,update_time)
+        (image_url,introduction,create_user_id,create_time,update_time,icon,name)
         VALUES
-        (#{imageUrl},#{introduction},#{createUserId},#{createTime},#{updateTime})
+        (#{imageUrl},#{introduction},#{createUserId},#{createTime},#{updateTime},#{icon},#{name})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_slideshow
-        (image_url,introduction,create_user_id,create_time,update_time)
+        (image_url,introduction,create_user_id,create_time,update_time,icon,name)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.imageUrl},#{item.introduction},#{item.createUserId},#{item.createTime},#{item.updateTime})
+            (#{item.imageUrl},#{item.introduction},#{item.createUserId},#{item.createTime},#{item.updateTime},#{item.icon},#{item.name})
         </foreach>
     </insert>
 
@@ -78,6 +86,12 @@
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                 a.update_time=#{data.updateTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('icon')) or (colPickMode==1 and !data.containsKey('icon'))">
+                a.icon=#{data.icon},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
+                a.name=#{data.name},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -130,6 +144,20 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="icon=(case" suffix="ELSE icon end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('icon')) or (colPickMode==1 and !item.containsKey('icon'))">
+                        when a.id=#{item.id} then #{item.icon}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="name=(case" suffix="ELSE name end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                        when a.id=#{item.id} then #{item.name}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -376,6 +404,48 @@
         <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
             ${_conditionType_} a.update_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
+
+        <if test="conditionParamRef.containsKey('icon')">
+            <if test="conditionParamRef.icon != null and conditionParamRef.icon != ''">
+                ${_conditionType_} a.icon like #{${_conditionParam_}.icon}
+            </if>
+            <if test="conditionParamRef.icon == null">
+                ${_conditionType_} a.icon is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('iconList') and conditionParamRef.iconList.size() > 0">
+            ${_conditionType_} a.icon in
+            <foreach collection="conditionParamRef.iconList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('iconNotList') and conditionParamRef.iconNotList.size() > 0">
+            ${_conditionType_} a.icon not in
+            <foreach collection="conditionParamRef.iconNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('name')">
+            <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                ${_conditionType_} a.name like #{${_conditionParam_}.name}
+            </if>
+            <if test="conditionParamRef.name == null">
+                ${_conditionType_} a.name is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
+            ${_conditionType_} a.name in
+            <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
+            ${_conditionType_} a.name not in
+            <foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -447,6 +517,16 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('icon')">
+                    a.icon
+                    <if test='orderCol.icon != null and "DESC".equalsIgnoreCase(orderCol.icon)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('name')">
+                    a.name
+                    <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
 

company-manager/src/test/java/com/mortals/httpclient/advantage/AdvantageController.http

+###登录
+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}}/advantage/list
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###公司优势特点更新与保存
+POST {{baseUrl}}/advantage/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "title":"dvkEWw",
+        "content":"BVanCC",
+        "imagePath":"Az0Cmo",
+        "remark":"NIamOD",
+}
+
+> {%
+client.global.set("Advantage_id", JSON.parse(response.body).data.id);
+%}
+
+###公司优势特点查看
+GET {{baseUrl}}/advantage/info?id=1
+
+###公司优势特点编辑
+GET {{baseUrl}}/advantage/edit?id=1
+Accept: application/json
+
+
+###公司优势特点删除
+GET {{baseUrl}}/advantage/delete?id=1
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

company-manager/src/test/java/com/mortals/httpclient/article/ArticleController.http

@@ -14,12 +14,14 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 ###文章列表
-POST {{baseUrl}}/article/list
+POST {{baseUrl}}/article/interlist
 Content-Type: application/json
 
 {
+    "idNotList": [1],
     "page":1,
-    "size":10
+    "size":2,
+     "orderColList":[{"colName": "create_time","sortKind": "desc"}]
 }
 
 

company-manager/src/test/java/com/mortals/httpclient/service/ServiceController.http

+###登录
+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}}/service/list
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###公司服务更新与保存
+POST {{baseUrl}}/service/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "title":"ctuA6k",
+        "content":"1L97zF",
+        "icon":"Nzancw",
+        "remark":"cD6k6y",
+}
+
+> {%
+client.global.set("Service_id", JSON.parse(response.body).data.id);
+%}
+
+###公司服务查看
+GET {{baseUrl}}/service/info?id=1
+
+###公司服务编辑
+GET {{baseUrl}}/service/edit?id=1
+Accept: application/json
+
+
+###公司服务删除
+GET {{baseUrl}}/service/delete?id=1
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

company-manager/src/test/java/httpclient/http-client.env.json

 {
   "local": {
-    "baseUrl": "http://127.0.0.1:18000/m"
+    "baseUrl": "http://127.0.0.1:18001/m"
   },
   "dev": {
-    "baseUrl": "http://127.0.0.1:18000/m"
+    "baseUrl": "http://127.0.0.1:18001/m"
   },
   "test": {
     "baseUrl": "http://192.168.0.250:8082/m"