From c8fdaa256c9b258d0440a4fa0d4118045982c2a3 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Thu, 4 Jul 2024 15:05:01 +0800 Subject: [PATCH] bugfix --- .../entity/BmsEnterpriseBasicInfo.java | 1 + .../mapper/BmsEnterpriseBasicInfoMapper.java | 2 +- .../impl/BmsBigStrongAwardServiceImpl.java | 5 +- .../impl/BmsBrandingAwardServiceImpl.java | 4 +- ...msCarrierConstructionAwardServiceImpl.java | 4 +- .../impl/BmsCreditManagementServiceImpl.java | 4 +- ...BmsIndustrialInternetAwardServiceImpl.java | 4 +- .../BmsIntegrationIndustriesServiceImpl.java | 4 +- ...sLogisticsDevelopmentAwardServiceImpl.java | 4 +- ...ManufacturingServicesAwardServiceImpl.java | 4 +- .../impl/BmsOutQuitProductsServiceImpl.java | 4 +- ...sPlatformConstructionAwardServiceImpl.java | 4 +- .../BmsProjectSettlementAwardServiceImpl.java | 4 +- .../impl/BmsSceneOpeningAwardServiceImpl.java | 4 +- .../ent/controller/JProjectController.java | 2 + .../controller/JSmartRemindersController.java | 19 ++- .../ruoyi/jjh/ent/entity/JSmartReminders.java | 6 + .../jjh/ent/mapper/JSmartRemindersMapper.java | 11 +- .../jjh/ent/service/JProjectService.java | 2 +- .../ent/service/JSmartRemindersService.java | 16 +- .../ent/service/impl/JProjectServiceImpl.java | 3 +- .../impl/JSmartRemindersServiceImpl.java | 12 ++ .../src/main/resources/application-druid.yml | 2 +- .../BmsDeclarationRecordsMapper.xml | 144 ++++++++---------- .../BmsEnterpriseBasicInfoMapper.xml | 6 +- .../mapper/jjh/ent/JSmartRemindersMapper.xml | 14 +- 26 files changed, 145 insertions(+), 144 deletions(-) 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 bfea5ea..2455f4c 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 @@ -37,6 +37,7 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity { /** * 有几个法人 */ + @JSONField(serialize=false) private Integer multiple; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java index 8166aef..c2124a6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java @@ -35,7 +35,7 @@ public interface BmsEnterpriseBasicInfoMapper extends BaseMapper workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest); + List workSearch(@Param("req") EnterpriseInfoWorkRequest enterpriseInfoWorkRequest); /** * 根据信用代码获取该企业id */ 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 93d5672..74cf2fb 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 @@ -130,8 +130,7 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl jsonMap = new HashMap<>(); //获取该申报记录的详情 DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id); - //申报的企业信息JSON - String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo()); + //在线申报信息JSON String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords()); //做大做强 @@ -142,7 +141,7 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl jsonMap = new HashMap<>(); //获取该申报记录的详情 DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id); - //申报的企业信息JSON - String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo()); //在线申报信息JSON String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords()); //品牌打造奖补 @@ -122,7 +120,7 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl jsonMap = new HashMap<>(); //获取该申报记录的详情 DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id); - //申报的企业信息JSON - String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo()); //载体建设奖补 BmsCarrierConstructionAward p1 = declarationRecordsVo.getBmsCarrierConstructionAward(); //载体建设奖补JSON @@ -121,7 +119,7 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl jsonMap = new HashMap<>(); //获取该申报记录的详情 DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id); - //申报的企业信息JSON - String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo()); //在线申报信息JSON String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords()); //信用管理奖补 @@ -122,7 +120,7 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl jsonMap = new HashMap<>(); //获取该申报记录的详情 DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id); - //申报的企业信息JSON - String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo()); //在线申报信息JSON String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords()); //5G+工业互联网奖补 @@ -120,7 +118,7 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl jsonMap = new HashMap<>(); //获取该申报记录的详情 DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id); - //申报的企业信息JSON - String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo()); //在线申报信息JSON String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords()); //两业融合奖补申请 @@ -121,7 +119,7 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl jsonMap = new HashMap<>(); //获取该申报记录的详情 DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id); - //申报的企业信息JSON - String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo()); //在线申报信息JSON String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords()); //物流发展奖补 @@ -125,7 +123,7 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl jsonMap = new HashMap<>(); //获取该申报记录的详情 DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id); - //申报的企业信息JSON - String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo()); //在线申报信息JSON String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords()); //制造服务业有效投入奖补 @@ -120,7 +118,7 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl jsonMap = new HashMap<>(); //获取该申报记录的详情 DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id); - //申报的企业信息JSON - String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo()); //在线申报信息JSON String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords()); //提交2024年度淘汰落后和退出低端低效产能装备清单 @@ -110,7 +108,7 @@ public class BmsOutQuitProductsServiceImpl extends ServiceImpl jsonMap = new HashMap<>(); //获取该申报记录的详情 DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id); - //申报的企业信息JSON - String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo()); //在线申报信息JSON String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords()); //平台建设奖补 @@ -124,7 +122,7 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl jsonMap = new HashMap<>(); //获取该申报记录的详情 DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id); - //申报的企业信息JSON - String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo()); //在线申报信息JSON String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords()); //落户奖补对象 @@ -146,7 +144,7 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl jsonMap = new HashMap<>(); //获取该申报记录的详情 DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id); - //申报的企业信息JSON - String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo()); //场景开放奖补 BmsSceneOpeningAward p1 = declarationRecordsVo.getBmsSceneOpeningAward(); //场景开放奖补JSON @@ -121,7 +119,7 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl page, JSmartReminders jSmartReminders) { @@ -151,11 +156,11 @@ public class JSmartRemindersController extends BaseController { * @param id 主键 * @return 单条数据 */ -// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "通过主键查询单条智能提醒规则数据", response = JSmartReminders.class) @GetMapping("{id}") - public AjaxResult selectOne(@PathVariable Serializable id) { - return success(jSmartRemindersService.getById(id)); + public AjaxResult selectOneSmart(@PathVariable Serializable id) { + return success(jSmartRemindersService.selectOneSmart(id)); } /** @@ -178,7 +183,7 @@ public class JSmartRemindersController extends BaseController { * @param dq 实体对象 * @return 修改结果 */ -// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "修改定期提醒数据") @PutMapping("/updateDq") public AjaxResult updateDq(@RequestBody @Valid JSmartRemindersDq dq) { @@ -191,7 +196,7 @@ public class JSmartRemindersController extends BaseController { * @param ndq 实体对象 * @return 修改结果 */ -// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "修改不定期提醒数据") @PutMapping("/updateNdq") public AjaxResult updateNdq(@RequestBody @Valid JSmartRemindersNDq ndq) { @@ -205,7 +210,7 @@ public class JSmartRemindersController extends BaseController { * @param id 主键结合 * @return 删除结果 */ -// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "删除数据") @DeleteMapping public AjaxResult delete(@RequestParam("id") Long id) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JSmartReminders.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JSmartReminders.java index 4846868..1c78a5e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JSmartReminders.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JSmartReminders.java @@ -71,6 +71,12 @@ public class JSmartReminders extends BaseInfoEntity { @ApiModelProperty("项目id") private Long projectId; + /** + * 项目名称 + */ + @TableField(exist = false) + @ApiModelProperty("项目名称") + private String projectName; /** * 提醒内容 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JSmartRemindersMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JSmartRemindersMapper.java index b4dd815..3b8f7f7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JSmartRemindersMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JSmartRemindersMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.jjh.ent.entity.JSmartReminders; import org.apache.ibatis.annotations.Param; +import java.io.Serializable; import java.util.List; /** @@ -24,6 +25,14 @@ public interface JSmartRemindersMapper extends BaseMapper { */ Page page(Page page, @Param("req") JSmartReminders jSmartReminders); - List selectWorkAll(); + + + /** + * 通过主键查询单条智能提醒规则数据 + * + * @param id 主键 + * @return 单条数据 + */ + JSmartReminders selectOneSmart(Serializable id); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java index e6fb573..071aa73 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java @@ -38,7 +38,7 @@ public interface JProjectService extends IService { String getJsonString(List obj); - String allJsonString(String a1,String a2,String a3,String a4); + String allJsonString(String a2,String a3,String a4); /** * 项目统一添加到项目库 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JSmartRemindersService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JSmartRemindersService.java index 0c87014..be8088b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JSmartRemindersService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JSmartRemindersService.java @@ -6,6 +6,8 @@ import com.ruoyi.jjh.ent.entity.JSmartReminders; import com.ruoyi.jjh.ent.entity.request.JSmartRemindersDq; import com.ruoyi.jjh.ent.entity.request.JSmartRemindersNDq; +import java.io.Serializable; + /** * 智能提醒（j_smart_reminders）表业务层 @@ -47,11 +49,13 @@ public interface JSmartRemindersService extends IService { */ Long updateNdq(JSmartRemindersNDq ndq); -// /** -// * 企业端首页智能提醒查询所有数据 -// * -// * @return 所有数据 -// */ -// List selectWorkAll(); + + /** + * 通过主键查询单条智能提醒规则数据 + * + * @param id 主键 + * @return 单条数据 + */ + JSmartReminders selectOneSmart(Serializable id); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java index cc8c224..186ccd6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java @@ -76,10 +76,9 @@ public class JProjectServiceImpl extends ServiceImpl i } @Override - public String allJsonString(String a1, String a2, String a3, String a4) { + public String allJsonString( String a2, String a3, String a4) { // 创建一个新的JSON对象，并将两个JSON对象合并到新对象中 JSONObject mergedObj = new JSONObject(); - mergedObj.putAll(JSONObject.parseObject(a1)); mergedObj.putAll(JSONObject.parseObject(a2)); mergedObj.putAll(JSONObject.parseObject(a3)); mergedObj.putAll(JSONObject.parseObject(a4)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartRemindersServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartRemindersServiceImpl.java index cb6583e..d245689 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartRemindersServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartRemindersServiceImpl.java @@ -13,6 +13,7 @@ import com.ruoyi.jjh.ent.service.JSmartRemindersService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.io.Serializable; import java.time.LocalDate; /** @@ -99,6 +100,17 @@ public class JSmartRemindersServiceImpl extends ServiceImpl - - - - - - - - - - - - - - - - - - - - select id, @@ -55,67 +34,7 @@ from bms_declaration_records - + + select * from bms_enterprise_basic_info - - qymc like concat('%', #{enterpriseInfo}, '%') - or tyshxydm like concat('%', #{enterpriseInfo}, '%') + + qymc like concat('%', #{req.enterpriseInfo}, '%') + or tyshxydm like concat('%', #{req.enterpriseInfo}, '%') diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartRemindersMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartRemindersMapper.xml index e0b95cd..b0c3d00 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartRemindersMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartRemindersMapper.xml @@ -6,15 +6,21 @@ - + select a.*,jp.project_name as projectName + from j_smart_reminders a + left join j_project jp on a.project_id = jp.id + where a.id=#{id}