bugfix

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java

@@ -108,7 +108,8 @@ public class BmsDeclarationRecordsController extends BaseController {
         if (!admin && b) {
             bmsDeclarationRecordsDto.setCreditCode(str);
         }
-        Page<BmsDeclarationRecordsQueryVo> bmsDeclarationRecordsQueryVoPage = bmsDeclarationRecordsService.selectBmsDeclarationRecordsList(page,bmsDeclarationRecordsDto);
+        Page<BmsDeclarationRecordsQueryVo> bmsDeclarationRecordsQueryVoPage = bmsDeclarationRecordsService.selectBmsDeclarationRecordsList(page
+        ,bmsDeclarationRecordsDto);
         return success(bmsDeclarationRecordsQueryVoPage);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java

@@ -111,6 +111,14 @@ public class BmsTemplateRecordController extends BaseController {
         return toAjax(bmsTemplateRecordService.insertBmsTemplateRecord(bmsTemplateRecordAddDto));
     }
 
+    /**
+     * 根据信用代码集合查询企业信息
+     */
+    @ApiOperation(value = "根据信用代码集合查询企业信息")
+    @PostMapping("/searchEntCodeToInfo")
+    public AjaxResult searchEntCodeToInfo(@RequestBody List<String> code) {
+        return success(bmsTemplateRecordService.searchEntCodeToInfo(code));
+    }
 
 //    /**
 //     * 修改在线模板

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java

@@ -26,9 +26,9 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
     @Excel(name = "申报任务标题")
     private String enterpriseDirectory;
 
-    private Integer pageSize;
-
-    private Integer pageNum;
+//    private Integer pageSize;
+//
+//    private Integer pageNum;
 
 
     @ApiModelProperty(value = "申报单位")

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateRecordMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
 import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
 import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto;
 import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo;
@@ -58,6 +59,12 @@ public interface BmsTemplateRecordMapper extends BaseMapper<BmsTemplateRecord> {
      */
     public Page<BmsTemplateRecordQueryVo> selectTemplateRecordVo(Page<BmsTemplateRecordQueryVo> page, @Param("req") BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
 
+
+    /**
+     * 根据信用代码集合查询企业信息
+     */
+    List<BmsEnterpriseDirectory> searchEntCodeToInfo(@Param("code") List<String> code);
+
 //    /**
 //     * 企业端选择表单模板列表
 //     * @param bmsTemplateQueryDto

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java

@@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
 import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
 import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto;
@@ -89,5 +90,8 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
      */
     public int deleteBmsTemplateRecordById(Long id);
 
-
+    /**
+     * 根据信用代码集合查询企业信息
+     */
+    List<BmsEnterpriseDirectory> searchEntCodeToInfo(List<String> code);
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java

@@ -360,5 +360,13 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
         return baseMapper.deleteBmsTemplateRecordById(id);
     }
 
+    /**
+     * 根据信用代码集合查询企业信息
+     */
+    @Override
+    public List<BmsEnterpriseDirectory> searchEntCodeToInfo(List<String> code) {
+        return baseMapper.searchEntCodeToInfo(code);
+    }
+
 
 }

ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml

@@ -118,5 +118,18 @@
             </where>
             order by a.create_time desc
     </select>
+    <select id="searchEntCodeToInfo" resultType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory">
+        SELECT qymc as enterpriseName,
+               tyshxydm as creditCode
+        FROM bms_enterprise_basic_info
+        <where>
+            <if test="code != null and code.size>0">
+                and tyshxydm in
+                <foreach collection="code" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
 </mapper>