获得单位信息及其下的库区信息

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/dwxx/DwxxController.java

@@ -99,4 +99,12 @@ public class DwxxController {
                         BeanUtils.toBean(list, DwxxRespVO.class));
     }
 
+    @GetMapping("/getDwAndKq")
+    @Operation(summary = "获得单位信息及其下的库区信息")
+    @Parameter(name = "tyxydm", description = "统一信用代码", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('coding:dwxx:getDwAndKq')")
+    public CommonResult<DwAndKqRespVO> getDwAndKq(@RequestParam("tyxydm") String tyxydm) {
+        return success(dwxxService.getDwAndKq(tyxydm));
+    }
+
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/dwxx/vo/DwAndKqRespVO.java

@@ -0,0 +1,117 @@
+package com.unis.module.coding.controller.admin.dwxx.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 单位信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class DwAndKqRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "30392")
+    private Long id;
+
+    @Schema(description = "单位名称")
+    private String dwmc;
+
+    @Schema(description = "统一信用代码")
+    private String tyxydm;
+
+    @Schema(description = "法定代表人")
+    private String fddbr;
+
+    @Schema(description = "身份证号")
+    private String sfzh;
+
+    @Schema(description = "联系方式")
+    private String lxfs;
+
+    @Schema(description = "注册日期")
+    private LocalDateTime zcrq;
+
+    @Schema(description = "邮政编码")
+    private String yzbm;
+
+    @Schema(description = "注册地址")
+    private String zcdz;
+
+    @Schema(description = "企业性质")
+    private String qyxz;
+
+    @Schema(description = "上传营业执照")
+    private String license;
+
+    @Schema(description = "单位下库区信息列表")
+    private List<Kq> kqList;
+
+    // 内部子类，包含单位下库区信息
+    @Data
+    @Schema(description = "单位下库区信息")
+    public static class Kq {
+        @Schema(description = "库区ID")
+        private Long kqId;
+
+        @Schema(description = "库区名称")
+        private String kqmc;
+
+        @Schema(description = "库区编码")
+        private String kqdm;
+
+        @Schema(description = "邮政编码")
+        private String yzbm;
+
+        @Schema(description = "省")
+        private String sheng;
+
+        @Schema(description = "市")
+        private String shi;
+
+        @Schema(description = "县")
+        private String xian;
+
+        @Schema(description = "省名称")
+        private String shengName;
+
+        @Schema(description = "市名称")
+        private String shiName;
+
+        @Schema(description = "县名称")
+        private String xianName;
+
+        @Schema(description = "具体地址")
+        private String jtdz;
+
+        @Schema(description = "库区负责人")
+        private String kqfzr;
+
+        @Schema(description = "联系电话")
+        private String lxdh;
+
+        @Schema(description = "占地面积")
+        private BigDecimal zdmj;
+
+        @Schema(description = "库区状态")
+        private String kqzt;
+
+        @Schema(description = "租仓参考价(元)")
+        private Integer zcckj;
+
+        @Schema(description = "委托保管参考价(元/吨)")
+        private Integer wtbgckj;
+
+        @Schema(description = "经度")
+        private BigDecimal jd;
+
+        @Schema(description = "纬度")
+        private BigDecimal wd;
+
+        @Schema(description = "上传库区图id")
+        private String resid;
+    }
+}

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/dwxx/DwxxMapper.java

@@ -38,4 +38,6 @@ public interface DwxxMapper extends BaseMapperX<DwxxDO> {
 
     List<StoreRespVO> getStoreListForNation(@Param("pageReqVO") StorePageReqVO pageReqVO);
     int deleteByDwId(@Param("id")Long id);
+
+    DwAndKqRespVO getDwAndKq(String tyxydm);
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxService.java

@@ -70,4 +70,6 @@ public interface DwxxService {
     DwxxDO getDwxxByKqBm();
 
     void deleteceshi(Long id);
+
+    DwAndKqRespVO getDwAndKq(String tyxydm);
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -14,6 +14,7 @@ import com.unis.framework.security.core.LoginUser;
 import com.unis.framework.security.core.util.AreaUtils;
 import com.unis.framework.security.core.util.SecurityFrameworkUtils;
 import com.unis.module.coding.controller.admin.delivery.vo.*;
+import com.unis.module.coding.controller.admin.dwxx.vo.DwAndKqRespVO;
 import com.unis.module.coding.controller.admin.dwxx.vo.DwxxPageReqVO;
 import com.unis.module.coding.controller.admin.dwxx.vo.DwxxSaveReqVO;
 import com.unis.module.coding.dal.dataobject.bank.BankDO;
@@ -935,4 +936,8 @@ public class DwxxServiceImpl implements DwxxService {
                 .orElse(null);
     }
 
+    @Override
+    public DwAndKqRespVO getDwAndKq(String tyxydm) {
+        return dwxxMapper.getDwAndKq(tyxydm);
+    }
 }

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dwxx/DwxxMapper.xml

@@ -3,97 +3,205 @@
 <mapper namespace="com.unis.module.coding.dal.mysql.dwxx.DwxxMapper">
 
      <select id="selectWrapperPage" parameterType="com.unis.module.coding.controller.admin.delivery.vo.DeliveryPageReqVO" resultType="com.unis.module.coding.controller.admin.delivery.vo.DeliveryRespVO">
-        select
-            ck.id kqId,
-            cd.id deptId,
-            SUBSTRING_INDEX(ck.SHENG, ',', 1) SHENG,
-            SUBSTRING_INDEX(SUBSTRING_INDEX(ck.SHENG, ',', 2), ',', -1) SHI,
-            SUBSTRING_INDEX(ck.SHENG, ',', -1) XIAN,
-            cd.TYXYDM,
-            cd.DWMC,
-            ck.KQMC,
-            TRUNC(ifnull(t1.sjcrNum, 0)) sjcrNum,
-            ifnull(t1.cfnum, 0) cfnum,
-            ifnull(t2.yxcfnum, 0) yxcfnum,
-            ck.xzqhdm
-        from  CODING_DWXX cd
-        left join coding_kqxx ck on ck.DWID=cd.id
-        left join
-        (
-                select
-                        cf.BASE_KQXX_ID,
-                        sum(cc.SJCR) sjcrNum,
-                        count(cf.BASE_CAXX_ID) cfnum,
-                        ck.xzqhdm
-                from
-                        CODING_CAXX cc
-                join CODING_FMXX cf on cc.id=cf.BASE_CAXX_ID
-                join CODING_KQXX ck on cc.KQID=ck.id
-                <where>
-                        cf.deleted=0
-                    and cf.lsxz='000'
-                    AND NOT EXISTS (SELECT 1  from  DELIVERY_CAXX dc   where dc.DELETED=0 AND  cc.id=dc.id)
-                    <if test="pageReqVO.cflx!=null and pageReqVO.cflx!=''">
-                        and cc.CFLX=#{pageReqVO.cflx}
-                    </if>
-                    <if test="pageReqVO.cfzt!=null and pageReqVO.cfzt!=''">
-                        and cc.CAZT=#{pageReqVO.cfzt}
-                    </if>
-                    <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
-                        and cc.SJCR between #{pageReqVO.cfStart} and #{pageReqVO.cfEnd}
-                    </if>
-                    <if test="(pageReqVO.cfStart == null or pageReqVO.cfStart == '') and pageReqVO.cfEnd != null and pageReqVO.cfEnd != ''">
-                        and cc.SJCR <![CDATA[<=]]>  #{pageReqVO.cfEnd}
-                    </if>
-                    <if test=" pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and (pageReqVO.cfEnd == null or pageReqVO.cfEnd == '') ">
-                        and cc.SJCR <![CDATA[>=]]>  #{pageReqVO.cfStart}
-                    </if>
-                </where>
-                group by cf.BASE_KQXX_ID
-        ) t1 on t1.BASE_KQXX_ID=ck.id
-        left join
-        (
-        select
-                cc.KQID,
-                count(cc.id) yxcfnum,
-                ck.xzqhdm
-        from  DELIVERY_KQXX ck
-        join  DELIVERY_CAXX cc on cc.KQID=ck.id
-        where cc.yxcf=1 and ck.deleted=0 and  cc.deleted=0
-        group by ck.id
-        ) t2 on t2.KQID=ck.id
-        <where>
-            cd.bz is null
-            and cd.qyxz!='10'
-            and cd.DELETED=0
-            <choose>
-                <when test=" (pageReqVO.cflx!=null and pageReqVO.cflx!='')
-                         or (pageReqVO.cfzt!=null and pageReqVO.cfzt!='')
-                         or (pageReqVO.cfStart!=null and pageReqVO.cfStart !='')
-                         or (pageReqVO.cfEnd!=null and pageReqVO.cfEnd !='') ">
-                    and t1.cfnum !=0
-                </when>
-                <otherwise>
-                   and  (t1.cfnum !=0  or t2.yxcfnum !=0)
-                </otherwise>
-            </choose>
-            <if test="pageReqVO.areaCode!=null and pageReqVO.areaCode!=''">
-                and ck.sheng like #{pageReqVO.areaCode}
-            </if>
-            <if test="pageReqVO.kqStart!=null and pageReqVO.kqEnd!=null ">
-                and IFNULL(t1.sjcrNum, 0)between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}
-            </if>
-            <if test="pageReqVO.kqStart!=null  and pageReqVO.kqEnd==null ">
-                and t1.sjcrNum <![CDATA[>=]]>  #{pageReqVO.kqStart}
-            </if>
-            <if test="pageReqVO.kqStart==null  and pageReqVO.kqEnd!=null ">
-                and t1.sjcrNum <![CDATA[<=]]>  #{pageReqVO.kqEnd}
-            </if>           
-            <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
-                and cd.DWMC like #{pageReqVO.dwmc}
-            </if>
-        </where>
-        order by cd.id desc
+         SELECT
+         cfxx.kqId,
+         cfxx.deptId,
+         cfxx.sheng sheng,
+         cfxx.shi shi,
+         cfxx.xian xian,
+         cfxx.TYXYDM,
+         cfxx.DWMC,
+         cfxx.KQMC,
+         SUM(cfxx.sjcrNum) sjcrNum,
+         SUM(cfxx.cfnum) cfnum,
+         SUM(cfxx.yxcfnum) yxcfnum,
+         cfxx.xzqhdm
+         FROM
+         (
+         select
+         ck.id kqId,
+         cd.id deptId,
+         SUBSTRING_INDEX(ck.SHENG, ',', 1) SHENG,
+         SUBSTRING_INDEX(SUBSTRING_INDEX(ck.SHENG, ',', 2), ',', -1) SHI,
+         SUBSTRING_INDEX(ck.SHENG, ',', -1) XIAN,
+         cd.TYXYDM,
+         cd.DWMC,
+         ck.KQMC,
+         TRUNC(ifnull(t1.sjcrNum, 0)) sjcrNum,
+         ifnull(t1.cfnum, 0) cfnum,
+         ifnull(t2.yxcfnum, 0) yxcfnum,
+         ck.xzqhdm
+         from  CODING_DWXX cd
+         left join coding_kqxx ck on ck.DWID=cd.id
+         left join
+         (
+         select
+         cf.BASE_KQXX_ID,
+         sum(cc.SJCR) sjcrNum,
+         count(cf.BASE_CAXX_ID) cfnum,
+         ck.xzqhdm
+         from
+         CODING_CAXX cc
+         join CODING_FMXX cf on cc.id=cf.BASE_CAXX_ID
+         join CODING_KQXX ck on cc.KQID=ck.id
+         <where>
+             cf.deleted=0
+             and cf.lsxz='000'
+             AND NOT EXISTS (SELECT 1  from  DELIVERY_CAXX dc   where dc.DELETED=0 AND  cc.id=dc.id)
+             <if test="pageReqVO.cflx!=null and pageReqVO.cflx!=''">
+                 and cc.CFLX=#{pageReqVO.cflx}
+             </if>
+             <if test="pageReqVO.cfzt!=null and pageReqVO.cfzt!=''">
+                 and cc.CAZT=#{pageReqVO.cfzt}
+             </if>
+             <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
+                 and cc.SJCR between #{pageReqVO.cfStart} and #{pageReqVO.cfEnd}
+             </if>
+             <if test="(pageReqVO.cfStart == null or pageReqVO.cfStart == '') and pageReqVO.cfEnd != null and pageReqVO.cfEnd != ''">
+                 and cc.SJCR <![CDATA[<=]]>  #{pageReqVO.cfEnd}
+             </if>
+             <if test=" pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and (pageReqVO.cfEnd == null or pageReqVO.cfEnd == '') ">
+                 and cc.SJCR <![CDATA[>=]]>  #{pageReqVO.cfStart}
+             </if>
+         </where>
+         group by cf.BASE_KQXX_ID
+         ) t1 on t1.BASE_KQXX_ID=ck.id
+         left join
+         (
+         select
+         cc.KQID,
+         count(cc.id) yxcfnum,
+         ck.xzqhdm
+         from  DELIVERY_KQXX ck
+         join  DELIVERY_CAXX cc on cc.KQID=ck.id
+         where cc.yxcf=1 and ck.deleted=0 and  cc.deleted=0
+         group by ck.id
+         ) t2 on t2.KQID=ck.id
+         <where>
+             cd.bz is null
+             and cd.qyxz!='10'
+             and cd.DELETED=0
+             <choose>
+                 <when test=" (pageReqVO.cflx!=null and pageReqVO.cflx!='')
+                     or (pageReqVO.cfzt!=null and pageReqVO.cfzt!='')
+                     or (pageReqVO.cfStart!=null and pageReqVO.cfStart !='')
+                     or (pageReqVO.cfEnd!=null and pageReqVO.cfEnd !='') ">
+                     and t1.cfnum !=0
+                 </when>
+                 <otherwise>
+                     and  (t1.cfnum !=0  or t2.yxcfnum !=0)
+                 </otherwise>
+             </choose>
+             <if test="pageReqVO.areaCode!=null and pageReqVO.areaCode!=''">
+                 and ck.sheng like #{pageReqVO.areaCode}
+             </if>
+             <if test="pageReqVO.kqStart!=null and pageReqVO.kqEnd!=null ">
+                 and IFNULL(t1.sjcrNum, 0)between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}
+             </if>
+             <if test="pageReqVO.kqStart!=null  and pageReqVO.kqEnd==null ">
+                 and t1.sjcrNum <![CDATA[>=]]>  #{pageReqVO.kqStart}
+             </if>
+             <if test="pageReqVO.kqStart==null  and pageReqVO.kqEnd!=null ">
+                 and t1.sjcrNum <![CDATA[<=]]>  #{pageReqVO.kqEnd}
+             </if>
+             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
+                 and cd.DWMC like #{pageReqVO.dwmc}
+             </if>
+         </where>
+         UNION ALL
+         SELECT
+         kq.id kqId,
+         dw.ID deptId,
+         kq.sheng_name sheng,
+         kq.shi_name shi,
+         kq.xian_name xian,
+         dw.TYXYDM,
+         dw.DWMC,
+         kq.KQMC,
+         TRUNC(IFNULL(t1.sjcrNum, 0)) sjcrNum,
+         IFNULL(t1.cfnum, 0) cfnum,
+         IFNULL(t2.yxcfnum, 0) yxcfnum,
+         IFNULL(kq.XIAN,IFNULL(kq.SHI,kq.SHENG)) xzqhdm
+         FROM
+         DELIVERY_KQXX kq
+         LEFT JOIN DELIVERY_DWXX dw ON kq.DWID = dw.ID
+         LEFT JOIN
+         (
+         select
+         cf.KQID,
+         sum(cf.SJCR) sjcrNum,
+         count(cf.id) cfnum
+         from
+         DELIVERY_CAXX cf
+         <where>
+             cf.deleted=0 AND cf.yxcf = 0  AND cf.SJLY = 0
+             <if test="pageReqVO.cflx!=null and pageReqVO.cflx!=''">
+                 and cf.CFLX=#{pageReqVO.cflx}
+             </if>
+             <if test="pageReqVO.cfzt!=null and pageReqVO.cfzt!=''">
+                 and cf.CAZT=#{pageReqVO.cfzt}
+             </if>
+             <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
+                 and cf.SJCR between #{pageReqVO.cfStart} and #{pageReqVO.cfEnd}
+             </if>
+             <if test="(pageReqVO.cfStart == null or pageReqVO.cfStart == '') and pageReqVO.cfEnd != null and pageReqVO.cfEnd != ''">
+                 and cf.SJCR <![CDATA[<=]]>  #{pageReqVO.cfEnd}
+             </if>
+             <if test=" pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and (pageReqVO.cfEnd == null or pageReqVO.cfEnd == '') ">
+                 and cf.SJCR <![CDATA[>=]]>  #{pageReqVO.cfStart}
+             </if>
+         </where>
+         group by cf.KQID
+         ) t1 on t1.KQID=kq.id
+         LEFT JOIN
+         (
+         select
+         cf.KQID,
+         count(cf.id) yxcfnum
+         from  DELIVERY_CAXX cf
+         where cf.yxcf=1 AND cf.deleted=0 AND cf.SJLY = 0
+         group by cf.KQID
+         ) t2 on t2.KQID=kq.id
+         <where>
+             kq.SJLY = 0
+             and dw.qyxz!='10'
+             and dw.DELETED=0
+             <choose>
+                 <when test=" (pageReqVO.cflx!=null and pageReqVO.cflx!='')
+	                 or (pageReqVO.cfzt!=null and pageReqVO.cfzt!='')
+	                 or (pageReqVO.cfStart!=null and pageReqVO.cfStart !='')
+	                 or (pageReqVO.cfEnd!=null and pageReqVO.cfEnd !='') ">
+                     and t1.cfnum !=0
+                 </when>
+                 <otherwise>
+                     and  (t1.cfnum !=0  or t2.yxcfnum !=0)
+                 </otherwise>
+             </choose>
+             <if test="pageReqVO.areaShi!=null and pageReqVO.areaShi!=''">
+                 and kq.SHI = #{pageReqVO.areaShi}
+             </if>
+             <if test="pageReqVO.areaSheng!=null and pageReqVO.areaSheng!=''">
+                 and kq.SHENG = #{pageReqVO.areaSheng}
+             </if>
+             <if test="pageReqVO.areaXian!=null and pageReqVO.areaXian!=''">
+                 and kq.XIAN = #{pageReqVO.areaXian}
+             </if>
+             <if test="pageReqVO.kqStart!=null and pageReqVO.kqEnd!=null ">
+                 and IFNULL(t1.sjcrNum, 0)between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}
+             </if>
+             <if test="pageReqVO.kqStart!=null  and pageReqVO.kqEnd==null ">
+                 and t1.sjcrNum <![CDATA[>=]]>  #{pageReqVO.kqStart}
+             </if>
+             <if test="pageReqVO.kqStart==null  and pageReqVO.kqEnd!=null ">
+                 and t1.sjcrNum <![CDATA[<=]]>  #{pageReqVO.kqEnd}
+             </if>
+             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
+                 and dw.DWMC like #{pageReqVO.dwmc}
+             </if>
+         </where>
+         ) cfxx
+         group by cfxx.kqId
+         order by cfxx.deptId desc
     </select>
 
      <select id="selectWrapperPageForSheng" parameterType="com.unis.module.coding.controller.admin.delivery.vo.DeliveryPageReqVO" resultType="com.unis.module.coding.controller.admin.delivery.vo.DeliveryRespVO">
@@ -342,6 +450,78 @@
     DELETE FROM DELIVERY_DWXX  where id = #{id}
 </delete>
 
+    <select id="getDwAndKq" resultMap="DwAndKqResultMap">
+        SELECT
+            dw.id,
+            dw.dwmc,
+            dw.tyxydm,
+            dw.fddbr,
+            dw.sfzh,
+            dw.lxfs,
+            dw.zcrq,
+            dw.yzbm,
+            dw.zcdz,
+            dw.qyxz,
+            dw.resid license,
+            kq.id kqId,
+            kq.KQMC,
+            kq.KQDM,
+            kq.YZBM,
+            kq.SHENG,
+            kq.SHI,
+            kq.XIAN,
+            kq.SHENG_NAME,
+            kq.SHI_NAME,
+            kq.XIAN_NAME,
+            kq.JTDZ,
+            kq.KQFZR,
+            kq.LXDH,
+            kq.ZDMJ,
+            kq.zcckj,
+            kq.wtbgckj,
+            kq.JD,
+            kq.WD,
+            kq.RESID
+        from
+            DELIVERY_DWXX dw
+                LEFT JOIN DELIVERY_KQXX kq on kq.DWID = dw.ID
+        WHERE dw.tyxydm = #{tyxydm}
+    </select>
 
+    <resultMap id="DwAndKqResultMap" type="com.unis.module.coding.controller.admin.dwxx.vo.DwAndKqRespVO">
+        <id property="id" column="id"/>
+        <result property="dwmc" column="dwmc"/>
+        <result property="tyxydm" column="tyxydm"/>
+        <result property="fddbr" column="fddbr"/>
+        <result property="sfzh" column="sfzh"/>
+        <result property="lxfs" column="lxfs"/>
+        <result property="zcrq" column="zcrq"/>
+        <result property="yzbm" column="yzbm"/>
+        <result property="zcdz" column="zcdz"/>
+        <result property="qyxz" column="qyxz"/>
+        <result property="license" column="license"/>
+        <collection property="kqList" ofType="com.unis.module.coding.controller.admin.dwxx.vo.DwAndKqRespVO$Kq">
+            <id property="kqId" column="kqId"/>
+            <result property="kqmc" column="kqmc"/>
+            <result property="kqdm" column="kqdm"/>
+            <result property="yzbm" column="yzbm"/>
+            <result property="sheng" column="sheng"/>
+            <result property="shi" column="shi"/>
+            <result property="xian" column="xian"/>
+            <result property="shengName" column="sheng_name"/>
+            <result property="shiName" column="shi_name"/>
+            <result property="xianName" column="xian_name"/>
+            <result property="jtdz" column="jtdz"/>
+            <result property="kqfzr" column="kqfzr"/>
+            <result property="lxdh" column="lxdh"/>
+            <result property="zdmj" column="zdmj"/>
+            <result property="kqzt" column="kqzt"/>
+            <result property="zcckj" column="zcckj"/>
+            <result property="wtbgckj" column="wtbgckj"/>
+            <result property="jd" column="jd"/>
+            <result property="wd" column="wd"/>
+            <result property="resid" column="resid"/>
+        </collection>
+    </resultMap>
 
 </mapper>