11

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

@@ -13,6 +13,7 @@
 package com.chinaitop.depot.sqr.controller;
 
 
+import com.chinaitop.depot.sqr.model.BizSqrEnterprise;
 import com.chinaitop.depot.sqr.model.BizSqrEnterpriseApply;
 import com.chinaitop.depot.sqr.service.BizSqrEnterpriseService;
 import com.github.pagehelper.PageHelper;
@@ -23,6 +24,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 
@@ -35,6 +37,8 @@ import java.util.List;
  * @author ZeroLiYi
  * @date  2024/04/28 09:56
  */
+
+@RequestMapping(value="/sqrEnter")
 @Api(tags = "粮食储备-承储资格企业控制器")
 @RestController
 @Validated
@@ -50,24 +54,20 @@ public class BizSqrEnterpriseController {
      * @author ZeroLiYi
      * @date  2024/04/28 10:01
      */
-//    @ApiOperation("承储资格申请分页")
-//    @GetMapping("/page")
-//    @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 PageInfo<BizSqrEnterpriseApply> page(Integer pageNum, Integer pageSize, String dwdm, Integer applyType) {
-//
-//        if (pageNum!=null && pageSize!=null) {
-//            PageHelper.startPage(pageNum, pageSize);
-//        }
-//        List<BizSqrEnterpriseApply> list = bizGrQeApplyService.findByPage(dwdm,applyType);
-//        PageInfo<BizSqrEnterpriseApply> pageInfo = new PageInfo<BizSqrEnterpriseApply>(list);
-//        return pageInfo;
-//    }
+    @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/BizSqrEnterpriseApplyMapper.xml

@@ -11,7 +11,7 @@
     <result column="apply_type" property="applyType" jdbcType="INTEGER" />
     <result column="apply_status" property="applyStatus" jdbcType="INTEGER" />
     <result column="attachment" property="attachment" jdbcType="VARCHAR" />
-    <result column="unit_info_id" property="unitInfoId" jdbcType="VARCHAR" />
+    <result column="unitInfoId" property="unitInfoId" jdbcType="VARCHAR" />
 
     <result column="storage_expire_time" property="storageExpireTime" jdbcType="TIMESTAMP" />
     <result column="reissue_time" property="reissueTime" jdbcType="TIMESTAMP" />
@@ -109,7 +109,7 @@
         SELECT
             A.dwmc,A.id unitInfoId, A.dwdm,A.fddbr,A.dwlx,A.zcdz,A.cfs,A.ygs,A.DICT_LABEL,bgqa.apply_status,bgqa.apply_type,
                bse.certified_storekeeper_count ,bse.certified_inspector_count ,bse.warehouse_facility_situation ,
-               bse.full_time_staff_count ,bse.storage_expire_time ,bse.attachment attachment
+               bse.full_time_staff_count ,bse.storage_expire_time ,bse.attachment attachment,bgqa.sqr_enterprise_id
         FROM
             province_all.biz_sqr_enterprise_apply bgqa
             left join province_all.biz_sqr_enterprise  bse on bgqa.sqr_enterprise_id =bse.id

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

@@ -15,6 +15,8 @@ package com.chinaitop.depot.sqr.mapper;
 
 import com.chinaitop.depot.sqr.model.BizSqrEnterprise;
 
+import java.util.List;
+
 /**
  * 粮食储备-承储资格企业Mapper接口
  *
@@ -32,4 +34,6 @@ public interface BizSqrEnterpriseMapper {
     int insert(BizSqrEnterprise bizSqrEnterprise);
 
     int delete(String id);
+
+    List<BizSqrEnterprise> TreeList();
 }

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

@@ -30,4 +30,20 @@
         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>
+
+
+
 </mapper>

src/main/java/com/chinaitop/depot/sqr/service/BizSqrEnterpriseService.java

@@ -36,5 +36,7 @@ public interface BizSqrEnterpriseService {
 
     int delete(String id);
 
+    List<BizSqrEnterprise> TreeList();
+
 
 }

src/main/java/com/chinaitop/depot/sqr/service/impl/BizSqrEnterpriseServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 
 /**
@@ -48,6 +49,11 @@ public class BizSqrEnterpriseServiceImpl implements BizSqrEnterpriseService {
         return  bizSqrEnterpriseMapper.delete(id);
     }
 
+    @Override
+    public List<BizSqrEnterprise> TreeList() {
+
+        return bizSqrEnterpriseMapper.TreeList();
+    }
 
 
 }