添加优势

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/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/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/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"