11

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

@@ -13,13 +13,21 @@
 package com.chinaitop.depot.sqr.controller;
 
 
+import com.chinaitop.depot.sqr.model.BizSqrEnterpriseApply;
 import com.chinaitop.depot.sqr.service.BizSqrEnterpriseService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+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.RestController;
 
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 粮食储备-承储资格企业控制器
@@ -37,6 +45,34 @@ 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;
+//    }
+
+
+
+
+    /**
      * 添加粮食储备-承储资格企业
      *
      * @author ZeroLiYi

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

@@ -107,10 +107,18 @@
     </select>
     <select id="findById" resultType="Map" resultMap="BaseResultMap">
         SELECT
-            A.dwmc,A.id unitInfoId, A.dwdm,A.fddbr,A.dwlx,A.zcdz,A.cfs,A.ygs,A.DICT_LABEL,bgqa.*
+            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
         FROM
             province_all.biz_sqr_enterprise_apply bgqa
-                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 where bui.id =#{unitInfoId,jdbcType=VARCHAR})A  on bgqa.unit_info_id = A.id
+            left join province_all.biz_sqr_enterprise  bse on bgqa.sqr_enterprise_id =bse.id
+                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
+        <if test="unitInfoId != null and unitInfoId != ''">
+            where bui.id =#{unitInfoId,jdbcType=VARCHAR}
+        </if>
+
+                    )A  on bgqa.unit_info_id = A.id
         where bgqa.id=#{id,jdbcType=INTEGER} and bgqa.apply_type=#{applyType,jdbcType=INTEGER}
 
     </select>

src/main/java/com/chinaitop/depot/sqr/model/BizSqrEnterpriseApply.java

@@ -236,4 +236,6 @@ public class BizSqrEnterpriseApply {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+
 }