1

src/main/java/com/chinaitop/depot/sqr/controller/BizSqrEnterpriseController.java

@@ -56,15 +56,7 @@ public class BizSqrEnterpriseController {
      */
     @ApiOperation("下拉获取粮承储资格企业")
     @GetMapping("/TreeList")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
-            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
-            @ApiImplicitParam(name = "dwdm", value = "单位代码", paramType = "query"),
-            @ApiImplicitParam(name = "applyType", value = "申请类型", paramType = "query")
-
-    })
     public List<BizSqrEnterprise> TreeList() {
-
         List<BizSqrEnterprise> list = bizSqrEnterpriseService.TreeList();
         return list;
     }

src/main/java/com/chinaitop/depot/sqr/mapper/BizSqrEnterpriseMapper.xml

@@ -1,6 +1,39 @@
 <?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.chinaitop.depot.sqr.mapper.BizSqrEnterpriseMapper">
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.sqr.model.vo.BizSqrEnterpriseVO" >
+        <id column="id" property="id" jdbcType="VARCHAR" />
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+        <result column="create_user" property="createUser" jdbcType="VARCHAR" />
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+        <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
+
+        <result column="attachment" property="attachment" jdbcType="VARCHAR" />
+        <result column="unitInfoId" property="unitInfoId" jdbcType="VARCHAR" />
+
+        <result column="storage_expire_time" property="storageExpireTime" jdbcType="TIMESTAMP" />
+        <result column="full_time_staff_count" property="fullTimeStaffCount" jdbcType="INTEGER" />
+        <result column="certified_storekeeper_count" property="certifiedStorekeeperCount" jdbcType="INTEGER" />
+        <result column="certified_inspector_count" property="certifiedInspectorCount" jdbcType="INTEGER" />
+        <result column="warehouse_facility_situation" property="warehouseFacilitySituation" jdbcType="VARCHAR" />
+
+        <result column="status" property="status" jdbcType="INTEGER" />
+
+        <result column="dwmc" property="dwmc" jdbcType="VARCHAR" />
+        <result column="dwdm" property="dwdm" jdbcType="VARCHAR" />
+        <result column="fddbr" property="fddbr" jdbcType="VARCHAR" />
+        <result column="dwlx" property="dwlx" jdbcType="VARCHAR" />
+        <result column="zcdz" property="zcdz" jdbcType="VARCHAR" />
+        <result column="cfs" property="cfs" jdbcType="VARCHAR" />
+        <result column="ygs" property="ygs" jdbcType="INTEGER" />
+        <result column="DICT_LABEL" property="dictLabel" jdbcType="VARCHAR" />
+    </resultMap>
+
+
+
+
+
+
 
     <insert id="insert" keyProperty="id" useGeneratedKeys="true"  parameterType="com.chinaitop.depot.sqr.model.BizSqrEnterprise">
         insert into province_all.biz_sqr_enterprise(id,unit_info_id,full_time_staff_count,
@@ -30,17 +63,35 @@
         DELETE FROM province_all.biz_sqr_enterprise WHERE id = #{id,jdbcType=VARCHAR}
     </delete>
 
-    <select id="TreeList"  >
-        SELECT
-        bgqa.id,bui.id unitInfoId, bui.dwmc,bui.dwdm,bui.fddbr,bui.dwlx,bgqa.apply_status,bgqa.apply_type,bgq.audit_status
-        FROM
-        province_all.biz_sqr_enterprise_apply bgqa
-        LEFT JOIN province_all.biz_unit_info bui ON bgqa.unit_info_id = bui.id
-        LEFT JOIN province_all.biz_audit_request bgq ON bgqa.id = bgq.request_id
-        where bgqa.apply_type=#{applyType,jdbcType=INTEGER}
-        <if test="dwmc != null and dwmc != ''">
-            and bui.dwmc LIKE concat('%', #{dwmc}, '%')
-        </if>
+    <select id="TreeList"  resultMap="BaseResultMap">
+        SELECT A.dwmc,
+               A.id  unitInfoId,
+               A.dwdm,
+               A.fddbr,
+               A.dwlx,
+               A.zcdz,
+               A.cfs,
+               A.ygs,
+               A.DICT_LABEL,
+               bse.certified_storekeeper_count,
+               bse.certified_inspector_count,
+               bse.warehouse_facility_situation,
+               bse.full_time_staff_count,
+               bse.storage_expire_time,
+               bse.attachment attachment
+        FROM province_all.biz_sqr_enterprise bse
+                 LEFT JOIN (select bui.id,
+                             bui.dwmc,
+                             bui.dwdm,
+                             bui.fddbr,
+                             bui.dwlx,
+                             bui.zcdz,
+                             bui.cfs,
+                             bui.ygs,
+                             dict.DICT_LABEL
+                      from province_all.biz_unit_info bui
+                               left join province_all.dev_dict dict on bui.dwlx = dict.id
+        ) A ON bse.unit_info_id = A.id
 
     </select>
 

src/main/java/com/chinaitop/depot/sqr/model/vo/BizSqrEnterpriseVO.java

@@ -0,0 +1,121 @@
+package com.chinaitop.depot.sqr.model.vo;
+
+import com.chinaitop.depot.sqr.model.BizSqrEnterprise;
+import com.chinaitop.depot.sqr.model.BizSqrEnterpriseApply;
+import io.swagger.annotations.ApiModelProperty;
+
+public class BizSqrEnterpriseVO extends BizSqrEnterprise {
+
+    private String dwmc;
+    private String dwdm;
+    private String fddbr;
+    private String dwlx;
+
+    private String zcdz;
+    public Integer cfs;
+    public Integer ygs;
+
+    private String dictLabel;
+
+
+    /** 仓房设施设备情况 */
+    @ApiModelProperty(value = "仓房设施设备情况", position = 11)
+    private String warehouseFacilitySituation;
+
+    /** 附件 */
+    @ApiModelProperty(value = "附件", position = 12)
+    private String attachment;
+
+    /** 状态 0：保存状态；1：申请中；2：有效；3：过期； */
+    @ApiModelProperty(value = "状态 0：保存状态；1：申请中；2：有效；3：过期；", position = 13)
+    private Integer status;
+
+    public String getDwmc() {
+        return dwmc;
+    }
+
+    public void setDwmc(String dwmc) {
+        this.dwmc = dwmc;
+    }
+
+    public String getDwdm() {
+        return dwdm;
+    }
+
+    public void setDwdm(String dwdm) {
+        this.dwdm = dwdm;
+    }
+
+    public String getFddbr() {
+        return fddbr;
+    }
+
+    public void setFddbr(String fddbr) {
+        this.fddbr = fddbr;
+    }
+
+    public String getDwlx() {
+        return dwlx;
+    }
+
+    public void setDwlx(String dwlx) {
+        this.dwlx = dwlx;
+    }
+
+    public String getWarehouseFacilitySituation() {
+        return warehouseFacilitySituation;
+    }
+
+    public void setWarehouseFacilitySituation(String warehouseFacilitySituation) {
+        this.warehouseFacilitySituation = warehouseFacilitySituation;
+    }
+
+    public String getAttachment() {
+        return attachment;
+    }
+
+    public void setAttachment(String attachment) {
+        this.attachment = attachment;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getZcdz() {
+        return zcdz;
+    }
+
+    public String getDictLabel() {
+        return dictLabel;
+    }
+
+    public void setDictLabel(String dictLabel) {
+        this.dictLabel = dictLabel;
+    }
+
+    public void setZcdz(String zcdz) {
+        this.zcdz = zcdz;
+    }
+
+    public Integer getCfs() {
+        return cfs;
+    }
+
+    public void setCfs(Integer cfs) {
+        this.cfs = cfs;
+    }
+
+    public Integer getYgs() {
+        return ygs;
+    }
+
+    public void setYgs(Integer ygs) {
+        this.ygs = ygs;
+    }
+
+}