单位管理添加字段

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/controller/UnitInfoController.java

@@ -15,6 +15,7 @@ package com.unis.basic.info.modular.unitInfo.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo;
 import com.unis.basic.info.modular.unitInfo.param.*;
 import com.unis.basic.info.modular.unitInfo.vo.BasicEnumVo;
 import com.unis.basic.info.modular.unitInfo.vo.UnitInfoV;
@@ -181,4 +182,17 @@ public class UnitInfoController {
     public CommonResult<List<Map<String, String>>> getAreaByParentId(@PathVariable("parentId") String parentId) {
         return CommonResult.data(unitInfoService.getAreaByParentId(parentId));
     }
+
+    /**
+     * 获取企业信息分区统计
+     *
+     * @author TS
+     * @date 2024/07/29 09:58
+     */
+    @ApiOperationSupport(order = 8)
+    @ApiOperation("获取企业信息分区统计")
+    @GetMapping("/basic.info/unitInfo/getCityUnitInfo")
+    public CommonResult<List<CiytUnitInfo>> getCityUnitInfo() {
+        return CommonResult.data(unitInfoService.getCityUnitInfo());
+    }
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/entity/CiytUnitInfo.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.basic.info.modular.unitInfo.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 分地区统计VO
+ *
+ * @author TS
+ * @date  2024/07/29 09:08
+ **/
+@Getter
+@Setter
+public class CiytUnitInfo {
+
+    @ApiModelProperty(value = "市区id", position = 1)
+    private String cityId;
+
+
+    @ApiModelProperty(value = "市区名称", position = 2)
+    private String cityName;
+
+    @ApiModelProperty(value = "企业数量", position = 3)
+    private Integer unitCount;
+
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/entity/UnitInfo.java

@@ -16,6 +16,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.checkerframework.checker.units.qual.C;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -161,6 +163,7 @@ public class UnitInfo {
     @ApiModelProperty(value = "纬度，以度数（十进制）表示", position = 31)
     private BigDecimal wd;
 
+
     /** 单位状态，1:正常，2:退出储备粮承储 */
     @ApiModelProperty(value = "单位状态，1:正常，2:退出储备粮承储", position = 32)
     private Integer dwzt;
@@ -185,4 +188,13 @@ public class UnitInfo {
     @ApiModelProperty(value = "注册地址-区", position = 37)
     private String zcdzArea;
 
-}
+    /** 电子扫描件*/
+    @ApiModelProperty(value = "电子扫描件", position = 38)
+    private String electronicScan;
+
+    /** 总仓容 */
+    @ApiModelProperty(value = "总仓容", position = 39)
+    private BigDecimal totalWarehouseCapacity;
+
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/mapper/UnitInfoMapper.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.unis.basic.info.modular.grainPriceCollectCitySum.entity.GrainPriceCollectCitySum;
+import com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo;
 import com.unis.basic.info.modular.unitInfo.entity.UnitInfo;
 import com.unis.basic.info.modular.unitInfo.vo.UnitInfoVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -43,4 +44,6 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
                                   @Param("fddbr") String fddbr);
 
     Map<String, Object> getDwGjjDate(String id);
+
+    List<CiytUnitInfo> getCityUnitInfo();
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/mapper/mapping/UnitInfoMapper.xml

@@ -18,7 +18,7 @@
     </select>
 
 
-    <select id="selectMyPage" resultType="com.unis.basic.info.modular.unitInfo.vo.UnitInfoVO">
+    <!--<select id="selectMyPage" resultType="com.unis.basic.info.modular.unitInfo.vo.UnitInfoVO">
         select t1.*, t2.DICT_LABEL dictLabel
         from biz_unit_info t1
         left join dev_dict t2 on t1.dwlx = t2.id
@@ -34,7 +34,7 @@
 
         order by t1.create_time desc
 
-    </select>
+    </select>-->
 
     <select id="getDwGjjDate" parameterType="java.lang.String" resultType="java.util.Map">
         SELECT
@@ -81,4 +81,18 @@
             biz_unit_info
         where id = #{id}
     </select>
+    <select id="getCityUnitInfo" resultType="com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo">
+      SELECT
+        d.ID AS cityId,
+        d.DICT_LABEL AS cityName,
+        count(c.dwdm) unitCount
+    FROM
+        province_all.dev_dict d
+    LEFT JOIN province_all.biz_unit_info c ON d.ID = c.zcdz_city
+    WHERE
+        d.PARENT_ID = '1781535965870915586'
+    GROUP BY
+        d.ID,
+        d.DICT_LABEL
+    </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/param/UnitInfoAddParam.java

@@ -237,4 +237,12 @@ public class UnitInfoAddParam {
     /** 注册地址-区  进行三级联查*/
     @ApiModelProperty(value = "注册地址-区", position = 37)
     private String zcdzArea;
+
+    /** 电子扫描件*/
+    @ApiModelProperty(value = "电子扫描件", position = 38)
+    private String electronicScan;
+
+    /** 总仓容 */
+    @ApiModelProperty(value = "总仓容", position = 39)
+    private BigDecimal totalWarehouseCapacity;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/param/UnitInfoEditParam.java

@@ -245,5 +245,12 @@ public class UnitInfoEditParam {
     @ApiModelProperty(value = "注册地址-区", position = 37)
     private String zcdzArea;
 
+    /** 电子扫描件*/
+    @ApiModelProperty(value = "电子扫描件", position = 38)
+    private String electronicScan;
+
+    /** 总仓容 */
+    @ApiModelProperty(value = "总仓容", position = 39)
+    private BigDecimal totalWarehouseCapacity;
 
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/service/UnitInfoService.java

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.unis.basic.info.modular.unitInfo.entity.BasicEnum;
+import com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo;
 import com.unis.basic.info.modular.unitInfo.entity.UnitInfo;
 import com.unis.basic.info.modular.unitInfo.param.UnitInfoAddParam;
 import com.unis.basic.info.modular.unitInfo.param.UnitInfoEditParam;
@@ -103,4 +104,10 @@ public interface UnitInfoService extends IService<UnitInfo> {
     public List<UnitInfoVO> TreeList();
 
     List<Map<String, String>> getAreaByParentId(String parentId);
+
+    /**
+     * 获取企业信息分区统计
+     * @return
+     */
+    List<CiytUnitInfo> getCityUnitInfo();
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/service/impl/UnitInfoServiceImpl.java

@@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.unis.basic.info.modular.mq.dto.jkEnum;
 import com.unis.basic.info.modular.mq.pub.RecPublishService;
 import com.unis.basic.info.modular.unitInfo.entity.BasicEnum;
+import com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo;
 import com.unis.basic.info.modular.unitInfo.mapper.EnumMapper;
 import com.unis.basic.info.modular.unitInfo.vo.BasicEnumVo;
 import com.unis.basic.info.modular.unitInfo.vo.UnitInfoV;
@@ -399,6 +400,16 @@ public class UnitInfoServiceImpl extends ServiceImpl<UnitInfoMapper, UnitInfo> i
         return enumMapper.getAreaByParentId(parentId);
     }
 
+    /**
+     * 获取企业信息分区统计
+     *
+     * @return
+     */
+    @Override
+    public List<CiytUnitInfo> getCityUnitInfo() {
+        return unitInfoMapper.getCityUnitInfo();
+    }
+
 
     /**
      * 国家局数据