大屏接口相关修改

src/main/java/com/glxp/api/controller/stat/BigVisController.java

@@ -232,6 +232,8 @@ public class BigVisController extends BaseController {
     StatProductCategoryMonitorService statProductCategoryMonitorService;
     @Resource
     StatCorpInvService statCorpInvService;
+    @Resource
+    StatCorpFlbmService statCorpFlbmService;
 
     /**
      * 获取重点监控品种产品数量
@@ -269,4 +271,24 @@ public class BigVisController extends BaseController {
         pageSimpleResponse.setList(selectlist);
         return ResultVOUtils.success(pageSimpleResponse);
     }
+
+    /**
+     * 生产企业获取大目录分类
+     */
+    @ApiOperation(value = "生产企业获取大目录分类", response = registComPerResponse.class)
+    @GetMapping("/bigVis/manu/flbm/list")
+    public BaseResponse manuFlbnList(StatCorpInvRequest statCorpInvRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<StatCorpFlbmEntity> selectlist = statCorpFlbmService.filterList(statCorpInvRequest);
+        PageInfo<StatCorpFlbmEntity> pageInfo;
+        pageInfo = new PageInfo<>(selectlist);
+        PageSimpleResponse<StatCorpFlbmEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(selectlist);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
 }

src/main/java/com/glxp/api/dao/stat/StatCorpFlbmMapper.java

@@ -0,0 +1,15 @@
+package com.glxp.api.dao.stat;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.stat.StatCorpFlbmEntity;
+import com.glxp.api.req.stat.StatCorpInvRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface StatCorpFlbmMapper extends BaseMapper<StatCorpFlbmEntity> {
+
+    List<StatCorpFlbmEntity> filterList(StatCorpInvRequest statCorpInvRequest);
+
+}

src/main/java/com/glxp/api/entity/stat/StatCorpFlbmEntity.java

@@ -0,0 +1,41 @@
+package com.glxp.api.entity.stat;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "stat_corp_flbm")
+public class StatCorpFlbmEntity implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Integer id;
+
+    @TableField(value = "flmc")
+    private String flmc;
+
+    @TableField(value = "flbm")
+    private String flbm;
+
+    @TableField(value = "companyId")
+    private Integer companyId;
+
+    @TableField(value = "corpName")
+    private String corpName;
+
+    @TableField(value = "`count`")
+    private Integer count;
+
+    @TableField(value = "remark")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/entity/sup/UserRegisterEntity.java

@@ -157,6 +157,16 @@ public class UserRegisterEntity implements Serializable {
     @TableField(value = "fmobile")
     private String fmobile;
 
+    @ApiModelProperty(value = "省份代码")
+    @TableField(value = "provinceCode")
+    private String provinceCode;
+    @ApiModelProperty(value = "市代码")
+    @TableField(value = "cityCode")
+    private String cityCode;
+    @ApiModelProperty(value = "区代码")
+    @TableField(value = "areaCode")
+    private String areaCode;
+
 
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/req/stat/StatCorpFlbmRequest.java

@@ -0,0 +1,8 @@
+package com.glxp.api.req.stat;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class StatCorpFlbmRequest extends ListPageRequest {
+}

src/main/java/com/glxp/api/res/auth/registComPerResponse.java

@@ -117,5 +117,17 @@ public class registComPerResponse {
 
     private String corpCategory;
 
+    private Integer checkCount;
+
+    private Long companyId;
+
+
+    @TableField(value = "provinceCode")
+    private String provinceCode;
+    @TableField(value = "cityCode")
+    private String cityCode;
+    @TableField(value = "areaCode")
+    private String areaCode;
+
 
 }

src/main/java/com/glxp/api/service/stat/StatCorpFlbmService.java

@@ -0,0 +1,29 @@
+package com.glxp.api.service.stat;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.entity.stat.StatCorpInvEntity;
+import com.glxp.api.req.stat.StatCorpInvRequest;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.stat.StatCorpFlbmMapper;
+import com.glxp.api.entity.stat.StatCorpFlbmEntity;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class StatCorpFlbmService extends ServiceImpl<StatCorpFlbmMapper, StatCorpFlbmEntity> {
+
+    @Resource
+    StatCorpFlbmMapper statCorpFlbmMapper;
+
+    public List<StatCorpFlbmEntity> filterList(StatCorpInvRequest statCorpInvRequest) {
+        if (statCorpInvRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (statCorpInvRequest.getPage() - 1) * statCorpInvRequest.getLimit();
+        PageHelper.offsetPage(offset, statCorpInvRequest.getLimit());
+        return statCorpFlbmMapper.filterList(statCorpInvRequest);
+    }
+}

src/main/resources/mybatis/mapper/stat/StatCorpFlbmMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.stat.StatCorpFlbmMapper">
+    <resultMap id="BaseResultMap" type="com.glxp.api.entity.stat.StatCorpFlbmEntity">
+        <!--@mbg.generated-->
+        <!--@Table stat_corp_flbm-->
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="flmc" jdbcType="VARCHAR" property="flmc"/>
+        <result column="flbm" jdbcType="VARCHAR" property="flbm"/>
+        <result column="companyId" jdbcType="INTEGER" property="companyId"/>
+        <result column="corpName" jdbcType="VARCHAR" property="corpName"/>
+        <result column="count" jdbcType="INTEGER" property="count"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        id, flmc, flbm, companyId, corpName, `count`, remark
+    </sql>
+    <select id="filterList"
+            resultType="com.glxp.api.entity.stat.StatCorpFlbmEntity">
+        SELECT *
+        FROM stat_corp_flbm
+
+        <where>
+        </where>
+    </select>
+</mapper>

src/main/resources/mybatis/mapper/sup/UserRegisterMapper.xml

@@ -57,7 +57,8 @@
                user_company.id          as ucId,
                user_company.certCount,
                user_company.productCount,
-               user_company.corpCategory
+               user_company.corpCategory,
+               user_company.checkCount
 
         from user_company