diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java index 694a97f..1908874 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java +++ b/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 bmsDeclarationRecordsQueryVoPage = bmsDeclarationRecordsService.selectBmsDeclarationRecordsList(page,bmsDeclarationRecordsDto); + Page bmsDeclarationRecordsQueryVoPage = bmsDeclarationRecordsService.selectBmsDeclarationRecordsList(page + ,bmsDeclarationRecordsDto); return success(bmsDeclarationRecordsQueryVoPage); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java index 0216699..810b2bb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java +++ b/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 code) { + return success(bmsTemplateRecordService.searchEntCodeToInfo(code)); + } // /** // * 修改在线模板 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java index e4a8dd2..0358499 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java +++ b/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 = "申报单位") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateRecordMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateRecordMapper.java index d54c4e8..03d44cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateRecordMapper.java +++ b/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 { */ public Page selectTemplateRecordVo(Page page, @Param("req") BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto); + + /** + * 根据信用代码集合查询企业信息 + */ + List searchEntCodeToInfo(@Param("code") List code); + // /** // * 企业端选择表单模板列表 // * @param bmsTemplateQueryDto diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java index 7504833..b4e7689 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java +++ b/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 { */ public int deleteBmsTemplateRecordById(Long id); - + /** + * 根据信用代码集合查询企业信息 + */ + List searchEntCodeToInfo(List code); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java index f2e7423..be48eec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java @@ -360,5 +360,13 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl searchEntCodeToInfo(List code) { + return baseMapper.searchEntCodeToInfo(code); + } + } diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml index 79ebbca..9a048c5 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml @@ -118,5 +118,18 @@ order by a.create_time desc + \ No newline at end of file