添加首页统计报表

db/module.sql

@@ -96,8 +96,9 @@ DROP TABLE IF EXISTS `mortals_xhx_company_labels`;
 CREATE TABLE mortals_xhx_company_labels(
     `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
     `labelId` bigint(20) NOT NULL     COMMENT '标签Id',
+    `labelName` varchar(64)      COMMENT '公司名称',
     `companyId` bigint(20) NOT NULL     COMMENT '公司Id',
-    `labelName` varchar(64)      COMMENT '标签名称',
+    `companyName` varchar(64)      COMMENT '公司名称',
     `remark` varchar(64)      COMMENT '备注',
     `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
     `createTime` datetime NOT NULL     COMMENT '创建时间',
@@ -105,6 +106,7 @@ CREATE TABLE mortals_xhx_company_labels(
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='公司标注';
+
 -- ----------------------------
 -- 公司专利表
 -- ----------------------------
@@ -119,8 +121,10 @@ CREATE TABLE mortals_xhx_company_patent(
     `createTime` datetime NOT NULL     COMMENT '创建时间',
     `updateUserId` bigint(20)      COMMENT '更新用户',
     `updateTime` datetime      COMMENT '更新时间',
+    `companyName` varchar(64)      COMMENT '公司名称',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='公司专利';
+
 -- ----------------------------
 -- 分类表
 -- ----------------------------
@@ -356,3 +360,22 @@ CREATE TABLE mortals_xhx_feedback(
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='反馈信息';
+
+
+-- ----------------------------
+-- 公司产品表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_company_product`;
+CREATE TABLE mortals_xhx_company_product(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `companyId` bigint(20) NOT NULL     COMMENT '公司Id',
+    `companyName` varchar(64)      COMMENT '公司名称',
+    `productId` bigint(20) NOT NULL     COMMENT '产品Id',
+    `productName` varchar(64)      COMMENT '产品名称',
+    `remark` varchar(64)      COMMENT '备注',
+    `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
+    `createTime` datetime NOT NULL     COMMENT '创建时间',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='公司产品';

enterprise-manager/src/main/java/com/mortals/xhx/module/company/dao/CompanyProductDao.java

+package com.mortals.xhx.module.company.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.company.model.CompanyProductEntity;
+import java.util.List;
+/**
+* 公司产品Dao
+* 公司产品 DAO接口
+*
+* @author zxfei
+* @date 2023-09-19
+*/
+
+public interface  CompanyProductDao extends ICRUDDao<CompanyProductEntity,Long>{
+
+
+}

enterprise-manager/src/main/java/com/mortals/xhx/module/company/dao/ibatis/CompanyProductDaoImpl.java

+package com.mortals.xhx.module.company.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.company.dao.CompanyProductDao;
+import com.mortals.xhx.module.company.model.CompanyProductEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 公司产品DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-09-19
+*/
+@Repository("companyProductDao")
+public class CompanyProductDaoImpl extends BaseCRUDDaoMybatis<CompanyProductEntity,Long> implements CompanyProductDao {
+
+
+
+}

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyLabelsEntity.java

@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.company.model.vo.CompanyLabelsVo;
 import lombok.Data;
 /**
-* 公司标注实体对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 公司标注实体对象
+ *
+ * @author zxfei
+ * @date 2023-09-19
+ */
 @Data
 public class CompanyLabelsEntity extends CompanyLabelsVo {
     private static final long serialVersionUID = 1L;
@@ -24,15 +24,19 @@ public class CompanyLabelsEntity extends CompanyLabelsVo {
      */
     @Excel(name = "标签Id")
     private Long labelId;
+    /**
+     * 公司名称
+     */
+    private String labelName;
     /**
      * 公司Id
      */
     @Excel(name = "公司Id")
     private Long companyId;
     /**
-    * 标签名称
+     * 公司名称
      */
-    private String labelName;
+    private String companyName;
     /**
      * 备注
      */
@@ -55,8 +59,9 @@ public class CompanyLabelsEntity extends CompanyLabelsVo {
 
     public void initAttrValue(){
         this.labelId = 0L;
-            this.companyId = 0L;
         this.labelName = "";
+        this.companyId = 0L;
+        this.companyName = "";
         this.remark = "";
     }
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyLabelsQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.company.model;
 import java.util.List;
 import com.mortals.xhx.module.company.model.CompanyLabelsEntity;
 /**
-* 公司标注查询对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 公司标注查询对象
+ *
+ * @author zxfei
+ * @date 2023-09-19
+ */
 public class CompanyLabelsQuery extends CompanyLabelsEntity {
     /** 开始 主键ID，主键，自增长 */
     private Long idStart;
@@ -39,6 +39,11 @@ public class CompanyLabelsQuery extends CompanyLabelsEntity {
     /** 标签Id排除列表 */
     private List <Long> labelIdNotList;
 
+    /** 公司名称 */
+    private List<String> labelNameList;
+
+    /** 公司名称排除列表 */
+    private List <String> labelNameNotList;
     /** 开始 公司Id */
     private Long companyIdStart;
 
@@ -54,11 +59,11 @@ public class CompanyLabelsQuery extends CompanyLabelsEntity {
     /** 公司Id排除列表 */
     private List <Long> companyIdNotList;
 
-    /** 标签名称 */
-    private List<String> labelNameList;
+    /** 公司名称 */
+    private List<String> companyNameList;
 
-    /** 标签名称排除列表 */
-    private List <String> labelNameNotList;
+    /** 公司名称排除列表 */
+    private List <String> companyNameNotList;
     /** 备注 */
     private List<String> remarkList;
 
@@ -276,6 +281,38 @@ public class CompanyLabelsQuery extends CompanyLabelsEntity {
     }
 
 
+    /**
+     * 获取 公司名称
+     * @return labelNameList
+     */
+    public List<String> getLabelNameList(){
+        return this.labelNameList;
+    }
+
+    /**
+     * 设置 公司名称
+     * @param labelNameList
+     */
+    public void setLabelNameList(List<String> labelNameList){
+        this.labelNameList = labelNameList;
+    }
+
+    /**
+     * 获取 公司名称
+     * @return labelNameNotList
+     */
+    public List<String> getLabelNameNotList(){
+        return this.labelNameNotList;
+    }
+
+    /**
+     * 设置 公司名称
+     * @param labelNameNotList
+     */
+    public void setLabelNameNotList(List<String> labelNameNotList){
+        this.labelNameNotList = labelNameNotList;
+    }
+
     /**
      * 获取 开始 公司Id
      * @return companyIdStart
@@ -358,35 +395,35 @@ public class CompanyLabelsQuery extends CompanyLabelsEntity {
 
 
     /**
-    * 获取 标签名称
-    * @return labelNameList
+     * 获取 公司名称
+     * @return companyNameList
      */
-    public List<String> getLabelNameList(){
-        return this.labelNameList;
+    public List<String> getCompanyNameList(){
+        return this.companyNameList;
     }
 
     /**
-    * 设置 标签名称
-    * @param labelNameList
+     * 设置 公司名称
+     * @param companyNameList
      */
-    public void setLabelNameList(List<String> labelNameList){
-        this.labelNameList = labelNameList;
+    public void setCompanyNameList(List<String> companyNameList){
+        this.companyNameList = companyNameList;
     }
 
     /**
-    * 获取 标签名称
-    * @return labelNameNotList
+     * 获取 公司名称
+     * @return companyNameNotList
      */
-    public List<String> getLabelNameNotList(){
-        return this.labelNameNotList;
+    public List<String> getCompanyNameNotList(){
+        return this.companyNameNotList;
     }
 
     /**
-    * 设置 标签名称
-    * @param labelNameNotList
+     * 设置 公司名称
+     * @param companyNameNotList
      */
-    public void setLabelNameNotList(List<String> labelNameNotList){
-        this.labelNameNotList = labelNameNotList;
+    public void setCompanyNameNotList(List<String> companyNameNotList){
+        this.companyNameNotList = companyNameNotList;
     }
 
     /**
@@ -755,6 +792,25 @@ public class CompanyLabelsQuery extends CompanyLabelsEntity {
         return this;
     }
 
+
+    /**
+     * 设置 公司名称
+     * @param labelName
+     */
+    public CompanyLabelsQuery labelName(String labelName){
+        setLabelName(labelName);
+        return this;
+    }
+
+    /**
+     * 设置 公司名称
+     * @param labelNameList
+     */
+    public CompanyLabelsQuery labelNameList(List<String> labelNameList){
+        this.labelNameList = labelNameList;
+        return this;
+    }
+
     /**
      * 设置  公司Id
      * @param companyId
@@ -811,20 +867,20 @@ public class CompanyLabelsQuery extends CompanyLabelsEntity {
 
 
     /**
-    * 设置 标签名称
-    * @param labelName
+     * 设置 公司名称
+     * @param companyName
      */
-    public CompanyLabelsQuery labelName(String labelName){
-        setLabelName(labelName);
+    public CompanyLabelsQuery companyName(String companyName){
+        setCompanyName(companyName);
         return this;
     }
 
     /**
-    * 设置 标签名称
-    * @param labelNameList
+     * 设置 公司名称
+     * @param companyNameList
      */
-    public CompanyLabelsQuery labelNameList(List<String> labelNameList){
-        this.labelNameList = labelNameList;
+    public CompanyLabelsQuery companyNameList(List<String> companyNameList){
+        this.companyNameList = companyNameList;
         return this;
     }
 

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyPatentEntity.java

@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.company.model.vo.CompanyPatentVo;
 import lombok.Data;
 /**
-* 公司专利实体对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 公司专利实体对象
+ *
+ * @author zxfei
+ * @date 2023-09-19
+ */
 @Data
 public class CompanyPatentEntity extends CompanyPatentVo {
     private static final long serialVersionUID = 1L;
@@ -36,6 +36,10 @@ public class CompanyPatentEntity extends CompanyPatentVo {
      * 备注
      */
     private String remark;
+    /**
+     * 公司名称
+     */
+    private String companyName;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -57,5 +61,6 @@ public class CompanyPatentEntity extends CompanyPatentVo {
         this.intellectPropertyType = "";
         this.intellectPropertyNum = 0;
         this.remark = "";
+        this.companyName = "";
     }
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyPatentQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.company.model;
 import java.util.List;
 import com.mortals.xhx.module.company.model.CompanyPatentEntity;
 /**
-* 公司专利查询对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 公司专利查询对象
+ *
+ * @author zxfei
+ * @date 2023-09-19
+ */
 public class CompanyPatentQuery extends CompanyPatentEntity {
     /** 开始 主键ID，主键，自增长 */
     private Long idStart;
@@ -106,6 +106,11 @@ public class CompanyPatentQuery extends CompanyPatentEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 公司名称 */
+    private List<String> companyNameList;
+
+    /** 公司名称排除列表 */
+    private List <String> companyNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CompanyPatentQuery> orConditionList;
 
@@ -647,6 +652,38 @@ public class CompanyPatentQuery extends CompanyPatentEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 公司名称
+     * @return companyNameList
+     */
+    public List<String> getCompanyNameList(){
+        return this.companyNameList;
+    }
+
+    /**
+     * 设置 公司名称
+     * @param companyNameList
+     */
+    public void setCompanyNameList(List<String> companyNameList){
+        this.companyNameList = companyNameList;
+    }
+
+    /**
+     * 获取 公司名称
+     * @return companyNameNotList
+     */
+    public List<String> getCompanyNameNotList(){
+        return this.companyNameNotList;
+    }
+
+    /**
+     * 设置 公司名称
+     * @param companyNameNotList
+     */
+    public void setCompanyNameNotList(List<String> companyNameNotList){
+        this.companyNameNotList = companyNameNotList;
+    }
+
     /**
      * 设置  主键ID，主键，自增长
      * @param id
@@ -957,6 +994,25 @@ public class CompanyPatentQuery extends CompanyPatentEntity {
     }
 
 
+
+    /**
+     * 设置 公司名称
+     * @param companyName
+     */
+    public CompanyPatentQuery companyName(String companyName){
+        setCompanyName(companyName);
+        return this;
+    }
+
+    /**
+     * 设置 公司名称
+     * @param companyNameList
+     */
+    public CompanyPatentQuery companyNameList(List<String> companyNameList){
+        this.companyNameList = companyNameList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyProductEntity.java

+package com.mortals.xhx.module.company.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.company.model.vo.CompanyProductVo;
+import lombok.Data;
+/**
+* 公司产品实体对象
+*
+* @author zxfei
+* @date 2023-09-19
+*/
+@Data
+public class CompanyProductEntity extends CompanyProductVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 公司Id
+    */
+    @Excel(name = "公司Id")
+    private Long companyId;
+    /**
+    * 公司名称
+    */
+    private String companyName;
+    /**
+    * 产品Id
+    */
+    @Excel(name = "产品Id")
+    private Long productId;
+    /**
+    * 产品名称
+    */
+    private String productName;
+    /**
+    * 备注
+    */
+    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 CompanyProductEntity) {
+            CompanyProductEntity tmp = (CompanyProductEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.companyId = 0L;
+            this.companyName = "";
+            this.productId = 0L;
+            this.productName = "";
+            this.remark = "";
+    }
+}
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyProductQuery.java

+package com.mortals.xhx.module.company.model;
+
+import java.util.List;
+import com.mortals.xhx.module.company.model.CompanyProductEntity;
+/**
+* 公司产品查询对象
+*
+* @author zxfei
+* @date 2023-09-19
+*/
+public class CompanyProductQuery extends CompanyProductEntity {
+    /** 开始 主键ID，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键ID，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键ID，主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 主键ID，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 公司Id */
+    private Long companyIdStart;
+
+    /** 结束 公司Id */
+    private Long companyIdEnd;
+
+    /** 增加 公司Id */
+    private Long companyIdIncrement;
+
+    /** 公司Id列表 */
+    private List <Long> companyIdList;
+
+    /** 公司Id排除列表 */
+    private List <Long> companyIdNotList;
+
+    /** 公司名称 */
+    private List<String> companyNameList;
+
+    /** 公司名称排除列表 */
+    private List <String> companyNameNotList;
+    /** 开始 产品Id */
+    private Long productIdStart;
+
+    /** 结束 产品Id */
+    private Long productIdEnd;
+
+    /** 增加 产品Id */
+    private Long productIdIncrement;
+
+    /** 产品Id列表 */
+    private List <Long> productIdList;
+
+    /** 产品Id排除列表 */
+    private List <Long> productIdNotList;
+
+    /** 产品名称 */
+    private List<String> productNameList;
+
+    /** 产品名称排除列表 */
+    private List <String> productNameNotList;
+    /** 备注 */
+    private List<String> remarkList;
+
+    /** 备注排除列表 */
+    private List <String> remarkNotList;
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新用户 */
+    private Long updateUserIdStart;
+
+    /** 结束 更新用户 */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新用户 */
+    private Long updateUserIdIncrement;
+
+    /** 更新用户列表 */
+    private List <Long> updateUserIdList;
+
+    /** 更新用户排除列表 */
+    private List <Long> updateUserIdNotList;
+
+    /** 开始 更新时间 */
+    private String updateTimeStart;
+
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<CompanyProductQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<CompanyProductQuery> andConditionList;
+
+    public CompanyProductQuery(){}
+
+    /**
+    * 获取 开始 主键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;
+    }
+
+
+    /**
+    * 获取 开始 公司Id
+    * @return companyIdStart
+    */
+    public Long getCompanyIdStart(){
+        return this.companyIdStart;
+    }
+
+    /**
+    * 设置 开始 公司Id
+    * @param companyIdStart
+    */
+    public void setCompanyIdStart(Long companyIdStart){
+        this.companyIdStart = companyIdStart;
+    }
+
+    /**
+    * 获取 结束 公司Id
+    * @return $companyIdEnd
+    */
+    public Long getCompanyIdEnd(){
+        return this.companyIdEnd;
+    }
+
+    /**
+    * 设置 结束 公司Id
+    * @param companyIdEnd
+    */
+    public void setCompanyIdEnd(Long companyIdEnd){
+        this.companyIdEnd = companyIdEnd;
+    }
+
+    /**
+    * 获取 增加 公司Id
+    * @return companyIdIncrement
+    */
+    public Long getCompanyIdIncrement(){
+        return this.companyIdIncrement;
+    }
+
+    /**
+    * 设置 增加 公司Id
+    * @param companyIdIncrement
+    */
+    public void setCompanyIdIncrement(Long companyIdIncrement){
+        this.companyIdIncrement = companyIdIncrement;
+    }
+
+    /**
+    * 获取 公司Id
+    * @return companyIdList
+    */
+    public List<Long> getCompanyIdList(){
+        return this.companyIdList;
+    }
+
+    /**
+    * 设置 公司Id
+    * @param companyIdList
+    */
+    public void setCompanyIdList(List<Long> companyIdList){
+        this.companyIdList = companyIdList;
+    }
+
+    /**
+    * 获取 公司Id
+    * @return companyIdNotList
+    */
+    public List<Long> getCompanyIdNotList(){
+        return this.companyIdNotList;
+    }
+
+    /**
+    * 设置 公司Id
+    * @param companyIdNotList
+    */
+    public void setCompanyIdNotList(List<Long> companyIdNotList){
+        this.companyIdNotList = companyIdNotList;
+    }
+
+
+    /**
+    * 获取 公司名称
+    * @return companyNameList
+    */
+    public List<String> getCompanyNameList(){
+        return this.companyNameList;
+    }
+
+    /**
+    * 设置 公司名称
+    * @param companyNameList
+    */
+    public void setCompanyNameList(List<String> companyNameList){
+        this.companyNameList = companyNameList;
+    }
+
+    /**
+    * 获取 公司名称
+    * @return companyNameNotList
+    */
+    public List<String> getCompanyNameNotList(){
+        return this.companyNameNotList;
+    }
+
+    /**
+    * 设置 公司名称
+    * @param companyNameNotList
+    */
+    public void setCompanyNameNotList(List<String> companyNameNotList){
+        this.companyNameNotList = companyNameNotList;
+    }
+
+    /**
+    * 获取 开始 产品Id
+    * @return productIdStart
+    */
+    public Long getProductIdStart(){
+        return this.productIdStart;
+    }
+
+    /**
+    * 设置 开始 产品Id
+    * @param productIdStart
+    */
+    public void setProductIdStart(Long productIdStart){
+        this.productIdStart = productIdStart;
+    }
+
+    /**
+    * 获取 结束 产品Id
+    * @return $productIdEnd
+    */
+    public Long getProductIdEnd(){
+        return this.productIdEnd;
+    }
+
+    /**
+    * 设置 结束 产品Id
+    * @param productIdEnd
+    */
+    public void setProductIdEnd(Long productIdEnd){
+        this.productIdEnd = productIdEnd;
+    }
+
+    /**
+    * 获取 增加 产品Id
+    * @return productIdIncrement
+    */
+    public Long getProductIdIncrement(){
+        return this.productIdIncrement;
+    }
+
+    /**
+    * 设置 增加 产品Id
+    * @param productIdIncrement
+    */
+    public void setProductIdIncrement(Long productIdIncrement){
+        this.productIdIncrement = productIdIncrement;
+    }
+
+    /**
+    * 获取 产品Id
+    * @return productIdList
+    */
+    public List<Long> getProductIdList(){
+        return this.productIdList;
+    }
+
+    /**
+    * 设置 产品Id
+    * @param productIdList
+    */
+    public void setProductIdList(List<Long> productIdList){
+        this.productIdList = productIdList;
+    }
+
+    /**
+    * 获取 产品Id
+    * @return productIdNotList
+    */
+    public List<Long> getProductIdNotList(){
+        return this.productIdNotList;
+    }
+
+    /**
+    * 设置 产品Id
+    * @param productIdNotList
+    */
+    public void setProductIdNotList(List<Long> productIdNotList){
+        this.productIdNotList = productIdNotList;
+    }
+
+
+    /**
+    * 获取 产品名称
+    * @return productNameList
+    */
+    public List<String> getProductNameList(){
+        return this.productNameList;
+    }
+
+    /**
+    * 设置 产品名称
+    * @param productNameList
+    */
+    public void setProductNameList(List<String> productNameList){
+        this.productNameList = productNameList;
+    }
+
+    /**
+    * 获取 产品名称
+    * @return productNameNotList
+    */
+    public List<String> getProductNameNotList(){
+        return this.productNameNotList;
+    }
+
+    /**
+    * 设置 产品名称
+    * @param productNameNotList
+    */
+    public void setProductNameNotList(List<String> productNameNotList){
+        this.productNameNotList = productNameNotList;
+    }
+
+    /**
+    * 获取 备注
+    * @return remarkList
+    */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+
+    /**
+    * 获取 备注
+    * @return remarkNotList
+    */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkNotList
+    */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdNotList
+    */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 更新用户
+    * @return updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新用户
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新用户
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdNotList
+    */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdNotList
+    */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 更新时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 更新时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 更新时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 更新时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  主键ID，主键，自增长
+    * @param id
+    */
+    public CompanyProductQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public CompanyProductQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public CompanyProductQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public CompanyProductQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public CompanyProductQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 主键ID，主键，自增长
+        * @param idNotList
+        */
+        public CompanyProductQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  公司Id
+    * @param companyId
+    */
+    public CompanyProductQuery companyId(Long companyId){
+	    setCompanyId(companyId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 公司Id
+    * @param companyIdStart
+    */
+    public CompanyProductQuery companyIdStart(Long companyIdStart){
+		this.companyIdStart = companyIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 公司Id
+    * @param companyIdEnd
+    */
+    public CompanyProductQuery companyIdEnd(Long companyIdEnd){
+		this.companyIdEnd = companyIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 公司Id
+    * @param companyIdIncrement
+    */
+    public CompanyProductQuery companyIdIncrement(Long companyIdIncrement){
+		this.companyIdIncrement = companyIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 公司Id
+    * @param companyIdList
+    */
+    public CompanyProductQuery companyIdList(List<Long> companyIdList){
+        this.companyIdList = companyIdList;
+		return this;
+        }
+
+        /**
+        * 设置 公司Id
+        * @param companyIdNotList
+        */
+        public CompanyProductQuery companyIdNotList(List<Long> companyIdNotList){
+        this.companyIdNotList = companyIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 公司名称
+    * @param companyName
+    */
+    public CompanyProductQuery companyName(String companyName){
+        setCompanyName(companyName);
+		return this;
+    }
+
+    /**
+    * 设置 公司名称
+    * @param companyNameList
+    */
+    public CompanyProductQuery companyNameList(List<String> companyNameList){
+        this.companyNameList = companyNameList;
+		return this;
+    }
+
+    /**
+    * 设置  产品Id
+    * @param productId
+    */
+    public CompanyProductQuery productId(Long productId){
+	    setProductId(productId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 产品Id
+    * @param productIdStart
+    */
+    public CompanyProductQuery productIdStart(Long productIdStart){
+		this.productIdStart = productIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 产品Id
+    * @param productIdEnd
+    */
+    public CompanyProductQuery productIdEnd(Long productIdEnd){
+		this.productIdEnd = productIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 产品Id
+    * @param productIdIncrement
+    */
+    public CompanyProductQuery productIdIncrement(Long productIdIncrement){
+		this.productIdIncrement = productIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 产品Id
+    * @param productIdList
+    */
+    public CompanyProductQuery productIdList(List<Long> productIdList){
+        this.productIdList = productIdList;
+		return this;
+        }
+
+        /**
+        * 设置 产品Id
+        * @param productIdNotList
+        */
+        public CompanyProductQuery productIdNotList(List<Long> productIdNotList){
+        this.productIdNotList = productIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 产品名称
+    * @param productName
+    */
+    public CompanyProductQuery productName(String productName){
+        setProductName(productName);
+		return this;
+    }
+
+    /**
+    * 设置 产品名称
+    * @param productNameList
+    */
+    public CompanyProductQuery productNameList(List<String> productNameList){
+        this.productNameList = productNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 备注
+    * @param remark
+    */
+    public CompanyProductQuery remark(String remark){
+        setRemark(remark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public CompanyProductQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public CompanyProductQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public CompanyProductQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public CompanyProductQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public CompanyProductQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public CompanyProductQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public CompanyProductQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public CompanyProductQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public CompanyProductQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public CompanyProductQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public CompanyProductQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public CompanyProductQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新用户
+        * @param updateUserIdNotList
+        */
+        public CompanyProductQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<CompanyProductQuery> 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<CompanyProductQuery> 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<CompanyProductQuery> 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<CompanyProductQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/vo/CompanyProductVo.java

+package com.mortals.xhx.module.company.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.company.model.CompanyProductEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 公司产品视图对象
+*
+* @author zxfei
+* @date 2023-09-19
+*/
+@Data
+public class CompanyProductVo extends BaseEntityLong {
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/vo/CompanyVo.java

 package com.mortals.xhx.module.company.model.vo;
+
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.company.model.CompanyEntity;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -8,22 +10,32 @@ import com.mortals.xhx.module.company.model.CompanyLabelsEntity;
 import com.mortals.xhx.module.company.model.CompanyPatentEntity;
 import lombok.Data;
 import com.mortals.framework.annotation.Excel;
+
 import java.math.BigDecimal;
 import java.util.Date;
+
 /**
-* 公司视图对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 公司视图对象
+ *
+ * @author zxfei
+ * @date 2023-09-18
+ */
 @Data
 public class CompanyVo extends BaseEntityLong {
 
-    /** 主键ID，主键，自增长列表 */
-    private List <Long> idList;
+    /**
+     * 主键ID，主键，自增长列表
+     */
+    private List<Long> idList;
 
     //公司专利
-    private List<CompanyPatentEntity> companyPatentList=new ArrayList<>();;
+    private List<CompanyPatentEntity> companyPatentList = new ArrayList<>();
+
+    //产品数量
+    private Integer productNums = 0;
+
+    //名片数量
+    private Integer businessCardNums = 0;
 
 
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/vo/HomeStatInfo.java

+package com.mortals.xhx.module.company.model.vo;
+
+import com.mortals.xhx.module.company.model.CompanyEntity;
+import com.mortals.xhx.module.news.model.NewsCategoryEntity;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import com.mortals.xhx.module.staff.model.StaffEntity;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 统计信息
+ *
+ * @author: zxfei
+ * @date: 2023/9/19 14:49
+ */
+@Data
+public class HomeStatInfo {
+    /**
+     * 企业总量
+     */
+    private Integer enterpriseNums;
+
+    /**
+     * 产品数量
+     */
+    private Integer productNums;
+
+    /**
+     * 员工数量
+     */
+    private Integer staffNums;
+
+
+    /**
+     * 新闻数量
+     */
+    private Integer newsNums;
+
+    /**
+     * 反馈数量
+     */
+    private Integer feedbackNums;
+
+    /**
+     * 用户数量
+     */
+    private Integer customerNums;
+
+    /**
+     * 公司产品分布列表
+     */
+    private List<CompanyEntity> productDistributionList;
+
+    /**
+     * 名片分布列表
+     */
+    private List<CompanyEntity> businessCardDistributionList;
+
+    /**
+     * 新闻分布列表
+     */
+    private List<NewsCategoryEntity> newsDistributionList;
+
+
+    /**
+     * 小程序近30日访问统计报表
+     */
+    private List<Map<String, Integer>> accessStatList;
+
+    /**
+     * 发送卡片总量
+     */
+    private List<StaffEntity> sendCardStaffList;
+
+
+}

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

+package com.mortals.xhx.module.company.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.company.model.CompanyProductEntity;
+import com.mortals.xhx.module.company.dao.CompanyProductDao;
+/**
+* CompanyProductService
+*
+* 公司产品 service接口
+*
+* @author zxfei
+* @date 2023-09-19
+*/
+public interface CompanyProductService extends ICRUDService<CompanyProductEntity,Long>{
+
+    CompanyProductDao getDao();
+}
\ No newline at end of file

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

 package com.mortals.xhx.module.company.service;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.company.model.CompanyEntity;
 import com.mortals.xhx.module.company.dao.CompanyDao;
+import com.mortals.xhx.module.company.model.vo.HomeStatInfo;
+
 /**
-* CompanyService
-*
-* 公司 service接口
-*
-* @author zxfei
-* @date 2023-09-18
-*/
-public interface CompanyService extends ICRUDService<CompanyEntity,Long>{
+ * CompanyService
+ * <p>
+ * 公司 service接口
+ *
+ * @author zxfei
+ * @date 2023-09-18
+ */
+public interface CompanyService extends ICRUDService<CompanyEntity, Long> {
 
     CompanyDao getDao();
+
+    /**
+     * 首页统计
+     * @param context
+     * @return
+     */
+    Rest<HomeStatInfo> indexStat(Context context);
+
 }
\ No newline at end of file

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

+package com.mortals.xhx.module.company.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.company.dao.CompanyProductDao;
+import com.mortals.xhx.module.company.model.CompanyProductEntity;
+import com.mortals.xhx.module.company.service.CompanyProductService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* CompanyProductService
+* 公司产品 service实现
+*
+* @author zxfei
+* @date 2023-09-19
+*/
+@Service("companyProductService")
+@Slf4j
+public class CompanyProductServiceImpl extends AbstractCRUDServiceImpl<CompanyProductDao, CompanyProductEntity, Long> implements CompanyProductService {
+    
+}
\ No newline at end of file

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

 package com.mortals.xhx.module.company.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.module.company.model.*;
+import com.mortals.xhx.module.company.model.vo.HomeStatInfo;
 import com.mortals.xhx.module.company.service.CompanyPatentService;
+import com.mortals.xhx.module.company.service.CompanyProductService;
+import com.mortals.xhx.module.feedback.model.FeedbackQuery;
+import com.mortals.xhx.module.feedback.service.FeedbackService;
+import com.mortals.xhx.module.news.model.NewsCategoryEntity;
+import com.mortals.xhx.module.news.model.NewsCategoryQuery;
+import com.mortals.xhx.module.news.model.NewsQuery;
+import com.mortals.xhx.module.news.service.NewsCategoryService;
+import com.mortals.xhx.module.news.service.NewsService;
+import com.mortals.xhx.module.product.model.ProductQuery;
+import com.mortals.xhx.module.product.service.ProductService;
+import com.mortals.xhx.module.staff.model.StaffEntity;
+import com.mortals.xhx.module.staff.model.StaffQuery;
+import com.mortals.xhx.module.staff.model.StaffRecordEntity;
+import com.mortals.xhx.module.staff.model.StaffRecordQuery;
+import com.mortals.xhx.module.staff.service.StaffRecordService;
+import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -13,9 +36,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.mortals.xhx.module.company.service.CompanyLabelsService;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Date;
-import java.util.Arrays;
-import java.util.List;
+import java.sql.Array;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -33,6 +56,25 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
     private CompanyLabelsService companyLabelsService;
     @Autowired
     private CompanyPatentService companyPatentService;
+    @Autowired
+    private CompanyService companyService;
+    @Autowired
+    private ProductService productService;
+    @Autowired
+    private StaffService staffService;
+    @Autowired
+    private NewsService newsService;
+    @Autowired
+    private FeedbackService feedbackService;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private CompanyProductService companyProductService;
+    @Autowired
+    private NewsCategoryService newsCategoryService;
+    @Autowired
+    private StaffRecordService staffRecordService;
+
 
     @Override
     protected void findAfter(CompanyEntity params, PageInfo pageInfo, Context context, List<CompanyEntity> list) throws AppException {
@@ -107,4 +149,85 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
 
         super.removeAfter(ids, context, result);
     }
+
+    @Override
+    public Rest<HomeStatInfo> indexStat(Context context) {
+        HomeStatInfo homeStatInfo = new HomeStatInfo();
+        //统计公司数量
+        List<CompanyEntity> companyList = companyService.find(new CompanyQuery(), context);
+        homeStatInfo.setEnterpriseNums(companyList.size());
+        //
+        int productNums = productService.count(new ProductQuery(), context);
+        homeStatInfo.setProductNums(productNums);
+
+        List<StaffEntity> staffList = staffService.find(new StaffQuery(), context);
+
+        homeStatInfo.setStaffNums(staffList.size());
+
+        int newsNums = newsService.count(new NewsQuery(), context);
+        homeStatInfo.setNewsNums(newsNums);
+
+        int feedbackNums = feedbackService.count(new FeedbackQuery(), context);
+        homeStatInfo.setFeedbackNums(feedbackNums);
+
+        //客户数据待定
+        int userCount = userService.count(new UserQuery(), context);
+        homeStatInfo.setCustomerNums(userCount);
+
+        //产品分布
+        companyList.forEach(company -> {
+            int count = companyProductService.count(new CompanyProductQuery().companyId(company.getId()), context);
+            company.setProductNums(count);
+        });
+        homeStatInfo.setProductDistributionList(companyList);
+
+        //发送名片分布
+        Map<String, Integer> collect = staffList.stream().collect(Collectors.groupingBy(x -> x.getCompanyIds(), Collectors.summingInt(StaffEntity::getSendBusinessCardTimes)));
+
+        companyList.forEach(company -> {
+            //归集公司发送卡片数量
+            Long companyId = company.getId();
+            collect.entrySet().stream().forEach(item -> {
+                String key = item.getKey();
+                Integer nums = item.getValue();
+                List<String> split = StrUtil.split(key, ",");
+                if (split.contains(companyId.toString())) {
+                    company.setBusinessCardNums(company.getBusinessCardNums() + nums);
+                }
+            });
+        });
+        homeStatInfo.setBusinessCardDistributionList(companyList);
+
+        List<NewsCategoryEntity> newsCategoryList = newsCategoryService.find(new NewsCategoryQuery(), context);
+        newsCategoryList.forEach(category -> {
+            int count = newsService.count(new NewsQuery().categoryId(category.getId()), context);
+            category.setNewsNums(count);
+        });
+        homeStatInfo.setNewsDistributionList(newsCategoryList);
+
+        //近三十天访问记录
+        List<Map<String, Integer>> dayAccessList = new ArrayList<>();
+
+        DateTime beforeDay = DateUtil.offsetDay(new Date(), -30);
+        for (int i = 0; i < 30; i++) {
+            DateTime curDate = DateUtil.offsetDay(beforeDay, i);
+            Map<String, Integer> map = new HashMap<>();
+
+            StaffRecordQuery staffRecordQuery = new StaffRecordQuery();
+            staffRecordQuery.setCreateTimeStart(curDate.toDateStr());
+            staffRecordQuery.setCreateTimeEnd(curDate.toDateStr());
+            List<StaffRecordEntity> staffRecordEntities = staffRecordService.find(staffRecordQuery, context);
+
+            if (!ObjectUtils.isEmpty(staffRecordEntities)) {
+                int sum = staffRecordEntities.stream().mapToInt(item -> item.getSumViews()).sum();
+                map.put(curDate.toDateStr(), sum);
+            }
+            dayAccessList.add(map);
+        }
+
+        homeStatInfo.setAccessStatList(dayAccessList);
+
+        homeStatInfo.setSendCardStaffList(staffList);
+        return Rest.ok(homeStatInfo);
+    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.company.web;
+
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.module.company.model.vo.HomeStatInfo;
 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.company.model.CompanyEntity;
 import com.mortals.xhx.module.company.service.CompanyService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
+
 import java.util.Arrays;
+
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 公司
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 公司
+ *
+ * @author zxfei
+ * @date 2023-09-18
+ */
 @RestController
 @RequestMapping("company")
-public class CompanyController extends BaseCRUDJsonBodyMappingController<CompanyService,CompanyEntity,Long> {
+public class CompanyController extends BaseCRUDJsonBodyMappingController<CompanyService, CompanyEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public CompanyController(){
-        super.setModuleDesc( "公司");
+    public CompanyController() {
+        super.setModuleDesc("公司");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "totalEmployees", paramService.getParamBySecondOrganize("Company","totalEmployees"));
-        this.addDict(model, "softNum", paramService.getParamBySecondOrganize("Company","softNum"));
-        this.addDict(model, "patentNum", paramService.getParamBySecondOrganize("Company","patentNum"));
+        this.addDict(model, "totalEmployees", paramService.getParamBySecondOrganize("Company", "totalEmployees"));
+        this.addDict(model, "softNum", paramService.getParamBySecondOrganize("Company", "softNum"));
+        this.addDict(model, "patentNum", paramService.getParamBySecondOrganize("Company", "patentNum"));
         super.init(model, context);
     }
 
 
+    /**
+     * 首页统计
+     */
+    @PostMapping(value = "stat")
+    public String indexStat() {
+        JSONObject jsonObject = new JSONObject();
+        Map<String, Object> model = new HashMap<>();
+        jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+        jsonObject.put(KEY_RESULT_MSG, "");
+        try {
+            Rest<HomeStatInfo> rest = this.service.indexStat(getContext());
+            if (YesNoEnum.YES.getValue() == rest.getCode()) {
+                model.put("stat", rest.getData());
+            }
+            jsonObject.put(KEY_RESULT_DATA, model);
+            recordSysLog(request, "首页统计 【成功】");
+        } catch (Exception e) {
+            log.error("异常", e);
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
+        }
+        return jsonObject.toJSONString();
+    }
+
+
 }
\ No newline at end of file

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

+package com.mortals.xhx.module.company.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.company.model.CompanyProductEntity;
+import com.mortals.xhx.module.company.service.CompanyProductService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 公司产品
+*
+* @author zxfei
+* @date 2023-09-19
+*/
+@RestController
+@RequestMapping("company/product")
+public class CompanyProductController extends BaseCRUDJsonBodyMappingController<CompanyProductService,CompanyProductEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public CompanyProductController(){
+        super.setModuleDesc( "公司产品");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/news/model/vo/NewsCategoryVo.java

 package com.mortals.xhx.module.news.model.vo;
+
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.news.model.NewsCategoryEntity;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import lombok.Data;
 import com.mortals.framework.annotation.Excel;
+
 import java.math.BigDecimal;
 import java.util.Date;
+
 /**
-* 新闻频道分类视图对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 新闻频道分类视图对象
+ *
+ * @author zxfei
+ * @date 2023-09-18
+ */
 @Data
 public class NewsCategoryVo extends BaseEntityLong {
 
-    /** 序号，主键，自增长列表 */
-    private List <Long> idList;
+    /**
+     * 序号，主键，自增长列表
+     */
+    private List<Long> idList;
+
+    /**
+     * 新闻数量
+     */
+    private Integer newsNums;
 
 
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffVo.java

@@ -19,5 +19,10 @@ public class StaffVo extends BaseEntityLong {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
+    /**
+     * 累计发卡片数量
+     */
+    private Integer sendCardTotalNums;
+
 
 }
\ No newline at end of file

enterprise-manager/src/main/resources/sqlmap/module/company/CompanyLabelsMapper.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.company.dao.ibatis.CompanyLabelsDaoImpl">
 
     <!-- 字段和属性映射 -->
     <resultMap type="CompanyLabelsEntity" id="CompanyLabelsEntity-Map">
         <id  property="id" column="id" />
         <result property="labelId" column="labelId" />
-            <result property="companyId" column="companyId" />
         <result property="labelName" column="labelName" />
+        <result property="companyId" column="companyId" />
+        <result property="companyName" column="companyName" />
         <result property="remark" column="remark" />
         <result property="createUserId" column="createUserId" />
         <result property="createTime" column="createTime" />
@@ -27,11 +28,14 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('labelId') or colPickMode == 1 and data.containsKey('labelId')))">
                 a.labelId,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('labelName') or colPickMode == 1 and data.containsKey('labelName')))">
+                a.labelName,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('companyId') or colPickMode == 1 and data.containsKey('companyId')))">
                 a.companyId,
             </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('labelName') or colPickMode == 1 and data.containsKey('labelName')))">
-                    a.labelName,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('companyName') or colPickMode == 1 and data.containsKey('companyName')))">
+                a.companyName,
             </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
                 a.remark,
@@ -53,18 +57,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="CompanyLabelsEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_company_labels
-        (labelId,companyId,labelName,remark,createUserId,createTime,updateUserId,updateTime)
+        (labelId,labelName,companyId,companyName,remark,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{labelId},#{companyId},#{labelName},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{labelId},#{labelName},#{companyId},#{companyName},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_company_labels
-        (labelId,companyId,labelName,remark,createUserId,createTime,updateUserId,updateTime)
+        (labelId,labelName,companyId,companyName,remark,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.labelId},#{item.companyId},#{item.labelName},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.labelId},#{item.labelName},#{item.companyId},#{item.companyName},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -80,14 +84,17 @@
             <if test="(colPickMode==0 and data.containsKey('labelIdIncrement')) or (colPickMode==1 and !data.containsKey('labelIdIncrement'))">
                 a.labelId=ifnull(a.labelId,0) + #{data.labelIdIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('labelName')) or (colPickMode==1 and !data.containsKey('labelName'))">
+                a.labelName=#{data.labelName},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('companyId')) or (colPickMode==1 and !data.containsKey('companyId'))">
                 a.companyId=#{data.companyId},
             </if>
             <if test="(colPickMode==0 and data.containsKey('companyIdIncrement')) or (colPickMode==1 and !data.containsKey('companyIdIncrement'))">
                 a.companyId=ifnull(a.companyId,0) + #{data.companyIdIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('labelName')) or (colPickMode==1 and !data.containsKey('labelName'))">
-                a.labelName=#{data.labelName},
+            <if test="(colPickMode==0 and data.containsKey('companyName')) or (colPickMode==1 and !data.containsKey('companyName'))">
+                a.companyName=#{data.companyName},
             </if>
             <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
                 a.remark=#{data.remark},
@@ -134,6 +141,13 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="labelName=(case" suffix="ELSE labelName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('labelName')) or (colPickMode==1 and !item.containsKey('labelName'))">
+                        when a.id=#{item.id} then #{item.labelName}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="companyId=(case" suffix="ELSE companyId end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <choose>
@@ -146,10 +160,10 @@
                     </choose>
                 </foreach>
             </trim>
-                <trim prefix="labelName=(case" suffix="ELSE labelName end),">
+            <trim prefix="companyName=(case" suffix="ELSE companyName end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('labelName')) or (colPickMode==1 and !item.containsKey('labelName'))">
-                            when a.id=#{item.id} then #{item.labelName}
+                    <if test="(colPickMode==0 and item.containsKey('companyName')) or (colPickMode==1 and !item.containsKey('companyName'))">
+                        when a.id=#{item.id} then #{item.companyName}
                     </if>
                 </foreach>
             </trim>
@@ -368,6 +382,27 @@
             ${_conditionType_} a.labelId <![CDATA[ <= ]]> #{${_conditionParam_}.labelIdEnd}
         </if>
 
+
+        <if test="conditionParamRef.containsKey('labelName')">
+            <if test="conditionParamRef.labelName != null and conditionParamRef.labelName != ''">
+                ${_conditionType_} a.labelName like #{${_conditionParam_}.labelName}
+            </if>
+            <if test="conditionParamRef.labelName == null">
+                ${_conditionType_} a.labelName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('labelNameList') and conditionParamRef.labelNameList.size() > 0">
+            ${_conditionType_} a.labelName in
+            <foreach collection="conditionParamRef.labelNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('labelNameNotList') and conditionParamRef.labelNameNotList.size() > 0">
+            ${_conditionType_} a.labelName not in
+            <foreach collection="conditionParamRef.labelNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('companyId')">
             <if test="conditionParamRef.companyId != null ">
                 ${_conditionType_} a.companyId = #{${_conditionParam_}.companyId}
@@ -396,23 +431,23 @@
         </if>
 
 
-            <if test="conditionParamRef.containsKey('labelName')">
-                <if test="conditionParamRef.labelName != null and conditionParamRef.labelName != ''">
-                    ${_conditionType_} a.labelName like #{${_conditionParam_}.labelName}
+        <if test="conditionParamRef.containsKey('companyName')">
+            <if test="conditionParamRef.companyName != null and conditionParamRef.companyName != ''">
+                ${_conditionType_} a.companyName like #{${_conditionParam_}.companyName}
             </if>
-                <if test="conditionParamRef.labelName == null">
-                    ${_conditionType_} a.labelName is null
+            <if test="conditionParamRef.companyName == null">
+                ${_conditionType_} a.companyName is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('labelNameList') and conditionParamRef.labelNameList.size() > 0">
-                ${_conditionType_} a.labelName in
-                <foreach collection="conditionParamRef.labelNameList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('companyNameList') and conditionParamRef.companyNameList.size() > 0">
+            ${_conditionType_} a.companyName in
+            <foreach collection="conditionParamRef.companyNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('labelNameNotList') and conditionParamRef.labelNameNotList.size() > 0">
-                ${_conditionType_} a.labelName not in
-                <foreach collection="conditionParamRef.labelNameNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('companyNameNotList') and conditionParamRef.companyNameNotList.size() > 0">
+            ${_conditionType_} a.companyName not in
+            <foreach collection="conditionParamRef.companyNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
@@ -544,14 +579,19 @@
                     <if test='orderCol.labelId != null and "DESC".equalsIgnoreCase(orderCol.labelId)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('labelName')">
+                    a.labelName
+                    <if test='orderCol.labelName != null and "DESC".equalsIgnoreCase(orderCol.labelName)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('companyId')">
                     a.companyId
                     <if test='orderCol.companyId != null and "DESC".equalsIgnoreCase(orderCol.companyId)'>DESC</if>
                     ,
                 </if>
-                    <if test="orderCol.containsKey('labelName')">
-                        a.labelName
-                        <if test='orderCol.labelName != null and "DESC".equalsIgnoreCase(orderCol.labelName)'>DESC</if>
+                <if test="orderCol.containsKey('companyName')">
+                    a.companyName
+                    <if test='orderCol.companyName != null and "DESC".equalsIgnoreCase(orderCol.companyName)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('remark')">

enterprise-manager/src/main/resources/sqlmap/module/company/CompanyPatentMapper.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.company.dao.ibatis.CompanyPatentDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -14,6 +14,7 @@
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="companyName" column="companyName" />
 
     </resultMap>
 
@@ -48,23 +49,26 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
                 a.updateTime,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('companyName') or colPickMode == 1 and data.containsKey('companyName')))">
+                a.companyName,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="CompanyPatentEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_company_patent
-        (companyId,intellectPropertyType,intellectPropertyNum,remark,createUserId,createTime,updateUserId,updateTime)
+        (companyId,intellectPropertyType,intellectPropertyNum,remark,createUserId,createTime,updateUserId,updateTime,companyName)
         VALUES
-        (#{companyId},#{intellectPropertyType},#{intellectPropertyNum},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{companyId},#{intellectPropertyType},#{intellectPropertyNum},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{companyName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_company_patent
-        (companyId,intellectPropertyType,intellectPropertyNum,remark,createUserId,createTime,updateUserId,updateTime)
+        (companyId,intellectPropertyType,intellectPropertyNum,remark,createUserId,createTime,updateUserId,updateTime,companyName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.companyId},#{item.intellectPropertyType},#{item.intellectPropertyNum},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.companyId},#{item.intellectPropertyType},#{item.intellectPropertyNum},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.companyName})
         </foreach>
     </insert>
 
@@ -110,6 +114,9 @@
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                 a.updateTime=#{data.updateTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('companyName')) or (colPickMode==1 and !data.containsKey('companyName'))">
+                a.companyName=#{data.companyName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -198,6 +205,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="companyName=(case" suffix="ELSE companyName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('companyName')) or (colPickMode==1 and !item.containsKey('companyName'))">
+                        when a.id=#{item.id} then #{item.companyName}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -521,6 +535,27 @@
         <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
             ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
+
+        <if test="conditionParamRef.containsKey('companyName')">
+            <if test="conditionParamRef.companyName != null and conditionParamRef.companyName != ''">
+                ${_conditionType_} a.companyName like #{${_conditionParam_}.companyName}
+            </if>
+            <if test="conditionParamRef.companyName == null">
+                ${_conditionType_} a.companyName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('companyNameList') and conditionParamRef.companyNameList.size() > 0">
+            ${_conditionType_} a.companyName in
+            <foreach collection="conditionParamRef.companyNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('companyNameNotList') and conditionParamRef.companyNameNotList.size() > 0">
+            ${_conditionType_} a.companyName not in
+            <foreach collection="conditionParamRef.companyNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -579,6 +614,11 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('companyName')">
+                    a.companyName
+                    <if test='orderCol.companyName != null and "DESC".equalsIgnoreCase(orderCol.companyName)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

enterprise-manager/src/main/resources/sqlmap/module/company/CompanyProductMapper.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.company.dao.ibatis.CompanyProductDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="CompanyProductEntity" id="CompanyProductEntity-Map">
+            <id  property="id" column="id" />
+            <result property="companyId" column="companyId" />
+            <result property="companyName" column="companyName" />
+            <result property="productId" column="productId" />
+            <result property="productName" column="productName" />
+            <result property="remark" column="remark" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('companyId') or colPickMode == 1 and data.containsKey('companyId')))">
+                    a.companyId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('companyName') or colPickMode == 1 and data.containsKey('companyName')))">
+                    a.companyName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productId') or colPickMode == 1 and data.containsKey('productId')))">
+                    a.productId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productName') or colPickMode == 1 and data.containsKey('productName')))">
+                    a.productName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                    a.remark,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="CompanyProductEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_company_product
+        (companyId,companyName,productId,productName,remark,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{companyId},#{companyName},#{productId},#{productName},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_company_product
+        (companyId,companyName,productId,productName,remark,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.companyId},#{item.companyName},#{item.productId},#{item.productName},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_company_product as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('companyId')) or (colPickMode==1 and !data.containsKey('companyId'))">
+                a.companyId=#{data.companyId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('companyIdIncrement')) or (colPickMode==1 and !data.containsKey('companyIdIncrement'))">
+                a.companyId=ifnull(a.companyId,0) + #{data.companyIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('companyName')) or (colPickMode==1 and !data.containsKey('companyName'))">
+                a.companyName=#{data.companyName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('productId')) or (colPickMode==1 and !data.containsKey('productId'))">
+                a.productId=#{data.productId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('productIdIncrement')) or (colPickMode==1 and !data.containsKey('productIdIncrement'))">
+                a.productId=ifnull(a.productId,0) + #{data.productIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('productName')) or (colPickMode==1 and !data.containsKey('productName'))">
+                a.productName=#{data.productName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
+                a.remark=#{data.remark},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_company_product as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="companyId=(case" suffix="ELSE companyId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('companyId')) or (colPickMode==1 and !item.containsKey('companyId'))">
+                                        when a.id=#{item.id} then #{item.companyId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('companyIdIncrement')) or (colPickMode==1 and !item.containsKey('companyIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.companyId,0) + #{item.companyIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="companyName=(case" suffix="ELSE companyName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('companyName')) or (colPickMode==1 and !item.containsKey('companyName'))">
+                            when a.id=#{item.id} then #{item.companyName}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="productId=(case" suffix="ELSE productId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('productId')) or (colPickMode==1 and !item.containsKey('productId'))">
+                                        when a.id=#{item.id} then #{item.productId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('productIdIncrement')) or (colPickMode==1 and !item.containsKey('productIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.productId,0) + #{item.productIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="productName=(case" suffix="ELSE productName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('productName')) or (colPickMode==1 and !item.containsKey('productName'))">
+                            when a.id=#{item.id} then #{item.productName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="remark=(case" suffix="ELSE remark end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                            when a.id=#{item.id} then #{item.remark}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="CompanyProductEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_company_product as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_company_product as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_company_product where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_company_product where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_company_product 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_company_product as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="CompanyProductEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_company_product 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_company_product as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+                ${_conditionType_} a.id not in
+                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('companyId')">
+                <if test="conditionParamRef.companyId != null ">
+                    ${_conditionType_} a.companyId = #{${_conditionParam_}.companyId}
+                </if>
+                <if test="conditionParamRef.companyId == null">
+                    ${_conditionType_} a.companyId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('companyIdList') and conditionParamRef.companyIdList.size() > 0">
+                ${_conditionType_} a.companyId in
+                <foreach collection="conditionParamRef.companyIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('companyIdNotList') and conditionParamRef.companyIdNotList.size() > 0">
+                ${_conditionType_} a.companyId not in
+                <foreach collection="conditionParamRef.companyIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('companyIdStart') and conditionParamRef.companyIdStart != null">
+                ${_conditionType_} a.companyId <![CDATA[ >= ]]> #{${_conditionParam_}.companyIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('companyIdEnd') and conditionParamRef.companyIdEnd != null">
+                ${_conditionType_} a.companyId <![CDATA[ <= ]]> #{${_conditionParam_}.companyIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('companyName')">
+                <if test="conditionParamRef.companyName != null and conditionParamRef.companyName != ''">
+                    ${_conditionType_} a.companyName like #{${_conditionParam_}.companyName}
+                </if>
+                <if test="conditionParamRef.companyName == null">
+                    ${_conditionType_} a.companyName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('companyNameList') and conditionParamRef.companyNameList.size() > 0">
+                ${_conditionType_} a.companyName in
+                <foreach collection="conditionParamRef.companyNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('companyNameNotList') and conditionParamRef.companyNameNotList.size() > 0">
+                ${_conditionType_} a.companyName not in
+                <foreach collection="conditionParamRef.companyNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('productId')">
+                <if test="conditionParamRef.productId != null ">
+                    ${_conditionType_} a.productId = #{${_conditionParam_}.productId}
+                </if>
+                <if test="conditionParamRef.productId == null">
+                    ${_conditionType_} a.productId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('productIdList') and conditionParamRef.productIdList.size() > 0">
+                ${_conditionType_} a.productId in
+                <foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('productIdNotList') and conditionParamRef.productIdNotList.size() > 0">
+                ${_conditionType_} a.productId not in
+                <foreach collection="conditionParamRef.productIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('productIdStart') and conditionParamRef.productIdStart != null">
+                ${_conditionType_} a.productId <![CDATA[ >= ]]> #{${_conditionParam_}.productIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('productIdEnd') and conditionParamRef.productIdEnd != null">
+                ${_conditionType_} a.productId <![CDATA[ <= ]]> #{${_conditionParam_}.productIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('productName')">
+                <if test="conditionParamRef.productName != null and conditionParamRef.productName != ''">
+                    ${_conditionType_} a.productName like #{${_conditionParam_}.productName}
+                </if>
+                <if test="conditionParamRef.productName == null">
+                    ${_conditionType_} a.productName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('productNameList') and conditionParamRef.productNameList.size() > 0">
+                ${_conditionType_} a.productName in
+                <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('productNameNotList') and conditionParamRef.productNameNotList.size() > 0">
+                ${_conditionType_} a.productName not in
+                <foreach collection="conditionParamRef.productNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('remark')">
+                <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                    ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
+                </if>
+                <if test="conditionParamRef.remark == null">
+                    ${_conditionType_} a.remark is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
+                ${_conditionType_} a.remark in
+                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+                ${_conditionType_} a.remark not in
+                <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_conditionType_} a.createUserId not in
+                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+                ${_conditionType_} a.updateUserId not in
+                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('companyId')">
+                        a.companyId
+                        <if test='orderCol.companyId != null and "DESC".equalsIgnoreCase(orderCol.companyId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('companyName')">
+                        a.companyName
+                        <if test='orderCol.companyName != null and "DESC".equalsIgnoreCase(orderCol.companyName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('productId')">
+                        a.productId
+                        <if test='orderCol.productId != null and "DESC".equalsIgnoreCase(orderCol.productId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('productName')">
+                        a.productName
+                        <if test='orderCol.productName != null and "DESC".equalsIgnoreCase(orderCol.productName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('remark')">
+                        a.remark
+                        <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

enterprise-manager/src/test/java/com/mortals/httpclient/company/CompanyProductController.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}}/company/product/list
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###公司产品更新与保存
+POST {{baseUrl}}/company/product/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "companyId":430,
+        "companyName":"mv9hur",
+        "productId":39,
+        "productName":"3x315j",
+        "remark":"e2sjue",
+}
+
+> {%
+client.global.set("CompanyProduct_id", JSON.parse(response.body).data.id);
+%}
+
+###公司产品查看
+GET {{baseUrl}}/company/product/info?id={{CompanyProduct_id}}
+Accept: application/json
+
+###公司产品编辑
+GET {{baseUrl}}/company/product/edit?id={{CompanyProduct_id}}
+Accept: application/json
+
+
+###公司产品删除
+GET {{baseUrl}}/company/product/delete?id={{CompanyProduct_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+