From a7cdc2572c89ce06c0866d2eab8b04e1c9115b2f Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Fri, 12 Jul 2024 14:42:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0json=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BmsEnterpriseDirectoryController.java | 7 ++++++- .../declaration/entity/BmsBigStrongAward.java | 11 ++++++++-- .../entity/BmsEnterpriseBasicInfo.java | 4 ++-- .../entity/BmsIntegrationIndustries.java | 6 +++++- .../entity/BmsOutQuitProducts.java | 18 +++++++++++++++-- .../entity/BmsSceneOpeningAward.java | 11 ++++++++-- .../impl/BmsBigStrongAwardServiceImpl.java | 5 +++++ .../BmsIntegrationIndustriesServiceImpl.java | 7 +++++++ .../impl/BmsOutQuitProductsServiceImpl.java | 19 ++++++++++++++++++ .../impl/BmsSceneOpeningAwardServiceImpl.java | 5 +++++ .../JEnterpriseContactController.java | 7 ++++++- .../request/JEnterpriseContactRequest.java | 12 +++++++++++ .../ent/mapper/JEnterpriseContactMapper.java | 20 +++++++++++++++++++ .../service/JEnterpriseContactService.java | 10 ++++++++++ .../service/impl/JEnterpriseContactImpl.java | 13 ++++++++++++ .../jjh/ent/JEnterpriseContactMapper.xml | 6 ++++++ .../mapper/jjh/ent/JMemorandumMapper.xml | 2 +- 17 files changed, 151 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseDirectoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseDirectoryController.java index c918558..ad5024a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseDirectoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseDirectoryController.java @@ -8,6 +8,8 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -27,6 +29,7 @@ import java.util.List; * @author farben * @date 2023-08-31 */ +@Api(tags = "企业名录") @RestController @RequestMapping("/system/enterpriseDirectory") public class BmsEnterpriseDirectoryController extends BaseController { @@ -37,6 +40,7 @@ public class BmsEnterpriseDirectoryController extends BaseController { * 查询企业名录列表 */ // @RequiresPermissions("system:enterpriseDirectory:list") + @ApiOperation(value = "查询企业名录列表") @GetMapping("/list") public TableDataInfo list(BmsEnterpriseDirectory bmsEnterpriseDirectory) { startPage(); @@ -48,9 +52,10 @@ public class BmsEnterpriseDirectoryController extends BaseController { * 导出企业名录列表 */ // @RequiresPermissions("system:enterpriseDirectory:export") + @ApiOperation(value = "导出企业名录列表") @Log(title = "企业名录", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, BmsEnterpriseDirectory bmsEnterpriseDirectory) { + public void export(HttpServletResponse response,@RequestBody BmsEnterpriseDirectory bmsEnterpriseDirectory) { List list = bmsEnterpriseDirectoryService.selectBmsEnterpriseDirectoryList(bmsEnterpriseDirectory); ExcelUtil util = new ExcelUtil(BmsEnterpriseDirectory.class); util.exportExcel(response, list, "企业名录数据"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBigStrongAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBigStrongAward.java index d4b42ce..7d5414a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBigStrongAward.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBigStrongAward.java @@ -53,10 +53,17 @@ public class BmsBigStrongAward extends BaseInfoEntity { * 园区其他经营奖励 */ @ApiModelProperty("园区其他经营奖励") - @JSONField(name = "园区其他经营奖励") - @Excel(name = "奖励说明") + @JSONField(serialize = false) + @Excel(name = "园区其他经营奖励",readConverterExp = "0=是,1=否") private String rewardDescription; + /** + * 园区其他经营奖励 + */ + @TableField(exist=false) + @JSONField(name = "园区其他经营奖励") + private String newRewardDescription; + /** * 成立时间 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java index 9669f61..cb0bd69 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java @@ -43,9 +43,9 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity { /** * 分类 1.规上 2规下 */ - @ApiModelProperty("分类 1.规上 2规下") + @ApiModelProperty("分类 1.规上服务业 2其他") @JSONField(serialize=false) - @Excel(name = "分类",readConverterExp = "1=规上,2=规下") + @Excel(name = "分类",readConverterExp = "1=规上服务业,2=其他") private Integer type; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIntegrationIndustries.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIntegrationIndustries.java index 0fa02ff..61024ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIntegrationIndustries.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIntegrationIndustries.java @@ -39,10 +39,14 @@ public class BmsIntegrationIndustries extends BaseInfoEntity { private Long enterpriseId; @ApiModelProperty("申报类型") - @JSONField(name = "申报类型") + @JSONField(serialize = false) @Excel(name = "申报类型", readConverterExp = "1=两业融合示范企业,2=制造业企业设立财务独立核算的制造服务业职能部门,3=制造业企业剥离服务业务成立独立的法人") private Integer declarationType; + @JSONField(name = "申报类型") + @TableField(exist=false) + private String newDeclarationType; + /** * 证明材料 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsOutQuitProducts.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsOutQuitProducts.java index 3e91ea0..066eb02 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsOutQuitProducts.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsOutQuitProducts.java @@ -48,10 +48,17 @@ public class BmsOutQuitProducts extends BaseInfoEntity { * 所属行业 1轻工 2纺织 3冶金 4化工 5建材 6机械加工 */ @ApiModelProperty("所属行业 1轻工 2纺织 3冶金 4化工 5建材 6机械加工") - @JSONField(name = "所属行业") + @JSONField(serialize = false) @Excel(name = "所属行业",readConverterExp = "1=轻工,2=纺织,3=冶金,4=化工,5=建材,6=机械加工") private Integer industry; + /** + * 所属行业 1轻工 2纺织 3冶金 4化工 5建材 6机械加工 + */ + @TableField(exist=false) + @JSONField(name = "所属行业") + private String newIndustry; + /** * 工作联系人 */ @@ -74,9 +81,16 @@ public class BmsOutQuitProducts extends BaseInfoEntity { */ @ApiModelProperty("类别 1 淘汰落后生产工艺装备 2 退出低端低效生产工艺装备") @Excel(name = "类别",readConverterExp = "1=淘汰落后生产工艺装备,2=退出低端低效生产工艺装备") - @JSONField(name = "类别") + @JSONField(serialize = false) private Integer type; + /** + * 类别 1 淘汰落后生产工艺装备 2 退出低端低效生产工艺装备 + */ + @JSONField(name = "类别") + @TableField(exist=false) + private String newType; + /** * 拟淘汰或退出生产工艺装备情况（和类别对应） */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsSceneOpeningAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsSceneOpeningAward.java index 6326e65..7414d1d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsSceneOpeningAward.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsSceneOpeningAward.java @@ -52,10 +52,17 @@ public class BmsSceneOpeningAward extends BaseInfoEntity { * 所属类型 */ @ApiModelProperty("所属类型") - @JSONField(name = "所属类型") - @Excel(name = "所属类型") + @JSONField(serialize=false) + @Excel(name = "所属类型",readConverterExp = "0=市场服务类,1=公共服务类") private Long type; + /** + * 所属类型 + */ + @JSONField(name = "所属类型") + @TableField(exist=false) + private String newType; + /** * 公示、发文证明、专家评分表 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java index 68f8d63..efe96bc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java @@ -120,6 +120,11 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl=1 & page.getSize() >=1){ + return success(jEnterpriseContactService.page(page, jEnterpriseContactRequest)); + }else { + return success(jEnterpriseContactService.page(jEnterpriseContactRequest)); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JEnterpriseContactRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JEnterpriseContactRequest.java index 9004def..c320653 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JEnterpriseContactRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JEnterpriseContactRequest.java @@ -25,4 +25,16 @@ public class JEnterpriseContactRequest { */ @ApiModelProperty("统一社会信用代码") private String enterpriseCode; + + /** + * 常用联系人姓名 + */ + @ApiModelProperty("常用联系人姓名") + private String contactName; + + /** + * 常用联系人职务 + */ + @ApiModelProperty("常用联系人职务") + private String contactOffice; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JEnterpriseContactMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JEnterpriseContactMapper.java index cd5d416..9397020 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JEnterpriseContactMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JEnterpriseContactMapper.java @@ -6,6 +6,8 @@ import com.ruoyi.jjh.ent.entity.JEnterpriseContact; import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 企业联系人（j_enterprise_contact）表数据层 * @author du @@ -13,5 +15,23 @@ import org.apache.ibatis.annotations.Param; */ public interface JEnterpriseContactMapper extends BaseMapper { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param jEnterpriseContactRequest 查询实体 + * @return 所有数据 + */ Page page(Page page,@Param("req") JEnterpriseContactRequest jEnterpriseContactRequest); + + + /** + * 分页查询所有数据 + * + * @param jEnterpriseContactRequest 查询实体 + * @return 所有数据 + */ + List page(@Param("req") JEnterpriseContactRequest jEnterpriseContactRequest); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JEnterpriseContactService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JEnterpriseContactService.java index 13051d9..322e144 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JEnterpriseContactService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JEnterpriseContactService.java @@ -7,6 +7,8 @@ import com.ruoyi.jjh.ent.entity.JPolicyFile; import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; import com.ruoyi.jjh.ent.entity.request.JPolicyFileRequest; +import java.util.List; + /** * 企业联系人（j_enterprise_contact）表业务层 * @author du @@ -22,4 +24,12 @@ public interface JEnterpriseContactService extends IService * @return 所有数据 */ Page page(Page page, JEnterpriseContactRequest jEnterpriseContactRequest); + + /** + * 分页查询所有数据 + * + * @param jEnterpriseContactRequest 查询实体 + * @return 所有数据 + */ + List page(JEnterpriseContactRequest jEnterpriseContactRequest); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JEnterpriseContactImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JEnterpriseContactImpl.java index b89978b..40071c9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JEnterpriseContactImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JEnterpriseContactImpl.java @@ -8,6 +8,8 @@ import com.ruoyi.jjh.ent.mapper.JEnterpriseContactMapper; import com.ruoyi.jjh.ent.service.JEnterpriseContactService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 企业联系人（j_enterprise_contact）表业务处理层 * @author du @@ -27,4 +29,15 @@ public class JEnterpriseContactImpl extends ServiceImpl page(Page page, JEnterpriseContactRequest jEnterpriseContactRequest) { return baseMapper.page(page, jEnterpriseContactRequest); } + + /** + * 分页查询所有数据 + * + * @param jEnterpriseContactRequest 查询实体 + * @return 所有数据 + */ + @Override + public List page(JEnterpriseContactRequest jEnterpriseContactRequest) { + return baseMapper.page(jEnterpriseContactRequest); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JEnterpriseContactMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JEnterpriseContactMapper.xml index b86d4ac..7b93cda 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JEnterpriseContactMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JEnterpriseContactMapper.xml @@ -13,6 +13,12 @@ and enterprise_code like concat('%',#{req.enterpriseCode},'%') + + and contact_name like concat('%',#{req.contactName},'%') + + + and contact_office like concat('%',#{req.contactOffice},'%') + order by create_time desc diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JMemorandumMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JMemorandumMapper.xml index 9813d52..5892dec 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JMemorandumMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JMemorandumMapper.xml @@ -23,7 +23,7 @@ type = #{req.type} and project_id = #{req.projectId} - and name like concat('%',#{req.name},'%') or keywords like concat('%',#{req.name},'%') + and (name like concat('%',#{req.name},'%') or keywords like concat('%',#{req.name},'%')) and create_time >= #{req.startTime}