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<BmsEnterpriseBa
/**
* 作业台查询企业信息
*/
- List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest);
+ List<BmsEnterpriseBasicInfo> 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<BmsBigStrongAwardM
Map<String,String> 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<BmsBigStrongAwardM
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
- jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, jProjectService.getJsonString(p1.getFundingDetailList())));
+ jsonMap.put("otherJson",jProjectService.allJsonString(js2, js3, jProjectService.getJsonString(p1.getFundingDetailList())));
jsonMap.put("fileJson","{" +
'"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + p1.getDevelopmentPlan() + '"' +
"}");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java
index 02b5894..64ef162 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java
@@ -110,8 +110,6 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
Map<String,String> 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<BmsBrandingAwardMap
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
- jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
+ jsonMap.put("otherJson",jProjectService.allJsonString( js2, js3, "{}"));
jsonMap.put("fileJson", "{" +
'"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' +
"}");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java
index f616c30..4379ee6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java
@@ -111,8 +111,6 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
Map<String,String> 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<BmsCarri
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
- jsonMap.put("otherJson",jProjectService.allJsonString(js1, "{}", js3, "{}"));
+ jsonMap.put("otherJson",jProjectService.allJsonString("{}", js3, "{}"));
jsonMap.put("fileJson","{" +
'"' + "相关佐证资料" + '"' + ":" + '"' + p1.getSupportingMaterials() + '"' + ','+
'"' + "项目工商登记许可" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + ','+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java
index a0852b8..9f9675c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java
@@ -110,8 +110,6 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
Map<String,String> 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<BmsCreditManagem
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
- jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, "{}", "{}"));
+ jsonMap.put("otherJson",jProjectService.allJsonString( js2, "{}", "{}"));
jsonMap.put("fileJson","{" +
'"' + "项目方案" + '"' + ":" + '"' + p1.getProjectPlan() + '"' + ","+
'"' + "资金使用说明" + '"' + ":" + '"' + p1.getUsesFunds() + '"' + ","+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java
index 32d2994..dca03fb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java
@@ -108,8 +108,6 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
Map<String,String> 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<BmsIndust
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
- jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
+ jsonMap.put("otherJson",jProjectService.allJsonString( js2, js3, "{}"));
jsonMap.put("fileJson", "{" +
'"' + "证明材料" + '"' + ":" + '"' + p1.getMaterial() + '"' +
"}");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIntegrationIndustriesServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIntegrationIndustriesServiceImpl.java
index 4345de4..20d45c4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIntegrationIndustriesServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIntegrationIndustriesServiceImpl.java
@@ -109,8 +109,6 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
Map<String,String> 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<BmsIntegrat
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
- jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
+ jsonMap.put("otherJson",jProjectService.allJsonString(js2, js3, "{}"));
jsonMap.put("fileJson", "{" +
'"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' + ","+
'"' + "营业执照" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + ","+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsLogisticsDevelopmentAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsLogisticsDevelopmentAwardServiceImpl.java
index 504821f..1651f12 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsLogisticsDevelopmentAwardServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsLogisticsDevelopmentAwardServiceImpl.java
@@ -113,8 +113,6 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
Map<String,String> 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<BmsLogi
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
- jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, "{}", "{}"));
+ jsonMap.put("otherJson",jProjectService.allJsonString( js2, "{}", "{}"));
jsonMap.put("fileJson", "{" +
'"' + "荣誉证明文件" + '"' + ":" + '"' + p1.getHonorCertificate() + '"' + ","+
'"' + "平台名称" + '"' + ":" + '"' + p1.getPlatformName() + '"' + ","+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java
index fa2d0c3..8848fbc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java
@@ -108,8 +108,6 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
Map<String,String> 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<BmsMan
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
- jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, "{}", "{}"));
+ jsonMap.put("otherJson",jProjectService.allJsonString( js2, "{}", "{}"));
jsonMap.put("fileJson", "{" +
'"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
'"' + "购置设备发票清单及发票扫描件" + '"' + ":" + '"' + p1.getInvoice() + '"' + ","+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsOutQuitProductsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsOutQuitProductsServiceImpl.java
index df8b517..b1c5fba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsOutQuitProductsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsOutQuitProductsServiceImpl.java
@@ -98,8 +98,6 @@ public class BmsOutQuitProductsServiceImpl extends ServiceImpl<BmsOutQuitProduct
Map<String,String> 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<BmsOutQuitProduct
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
- jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
+ jsonMap.put("otherJson",jProjectService.allJsonString( js2, js3, "{}"));
jsonMap.put("fileJson", "{" +
'"' + "拟淘汰或退出生产工艺装备情况" + '"' + ":" + '"' + p1.getSpecifics() + '"' + "," +
'"' + "其他相关情况说明" + '"' + ":" + '"' + p1.getOtherSpecifics() + '"'+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsPlatformConstructionAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsPlatformConstructionAwardServiceImpl.java
index 4dbdd32..c367940 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsPlatformConstructionAwardServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsPlatformConstructionAwardServiceImpl.java
@@ -112,8 +112,6 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
Map<String,String> 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<BmsPlat
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
- jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
+ jsonMap.put("otherJson",jProjectService.allJsonString( js2, js3, "{}"));
jsonMap.put("fileJson", "{" +
'"' + "合作协议" + '"' + ":" + '"' + p1.getAgreement() + '"' +
"}");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProjectSettlementAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProjectSettlementAwardServiceImpl.java
index 18f3786..1ba685e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProjectSettlementAwardServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProjectSettlementAwardServiceImpl.java
@@ -134,8 +134,6 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
Map<String,String> 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<BmsProject
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
- jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, jProjectService.getJsonString(p1.getFundingDetailList())));
+ jsonMap.put("otherJson",jProjectService.allJsonString( js2, js3, jProjectService.getJsonString(p1.getFundingDetailList())));
jsonMap.put("fileJson", "{" +
'"' + "招商协议" + '"' + ":" + '"' + p1.getAgreement() + '"' + "," +
'"' + "验资报告" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + "," +
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsSceneOpeningAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsSceneOpeningAwardServiceImpl.java
index 9eec12f..0adf99c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsSceneOpeningAwardServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsSceneOpeningAwardServiceImpl.java
@@ -111,8 +111,6 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
Map<String,String> 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<BmsSceneOpening
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
- jsonMap.put("otherJson",jProjectService.allJsonString(js1, "{}", js3,"{}"));
+ jsonMap.put("otherJson",jProjectService.allJsonString( "{}", js3,"{}"));
jsonMap.put("fileJson", "{" +
'"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + p1.getMaterial() + '"' +
"}");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java
index dfd20c3..14f0ca1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java
@@ -147,6 +147,7 @@ public class JProjectController extends BaseController {
* @param jProject 实体对象
* @return 修改结果
*/
+ @PreAuthorize("@ss.hasAnyRoles('admin')")
@ApiOperation(value = "修改项目")
@PutMapping
public AjaxResult update(@RequestBody JProject jProject) {
@@ -159,6 +160,7 @@ public class JProjectController extends BaseController {
* @param id 主键
* @return 删除结果
*/
+ @PreAuthorize("@ss.hasAnyRoles('admin')")
@ApiOperation(value = "删除项目")
@DeleteMapping
public AjaxResult delete(@RequestParam("id") Long id) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java
index 1f1af57..ccd02e3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java
@@ -6,10 +6,12 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.jjh.declaration.regular.TimeChange;
+import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
import com.ruoyi.jjh.ent.entity.JSmartReminders;
import com.ruoyi.jjh.ent.entity.request.JSmartRemindersDq;
import com.ruoyi.jjh.ent.entity.request.JSmartRemindersNDq;
+import com.ruoyi.jjh.ent.service.JProjectService;
import com.ruoyi.jjh.ent.service.JSmartDeclarationService;
import com.ruoyi.jjh.ent.service.JSmartRemindersService;
import io.swagger.annotations.Api;
@@ -41,6 +43,7 @@ public class JSmartRemindersController extends BaseController {
@Resource
private JSmartDeclarationService jSmartDeclarationService;
+
@Resource
private TimeChange timeChange;
@@ -49,6 +52,7 @@ public class JSmartRemindersController extends BaseController {
*
* @return 所有数据
*/
+ @PreAuthorize("@ss.hasAnyRoles('admin')")
@ApiOperation(value = "定时器更新定期提醒数据（暂存）")
@GetMapping("/updateRegularReminders")
public AjaxResult updateRegularReminders() {
@@ -60,6 +64,7 @@ public class JSmartRemindersController extends BaseController {
*
* @return 所有数据
*/
+ @PreAuthorize("@ss.hasAnyRoles('admin')")
@ApiOperation(value = "定时器更新不定期提醒数据（暂存）")
@GetMapping("/updateNoRegularReminders")
public AjaxResult updateNoRegularReminders() {
@@ -137,7 +142,7 @@ public class JSmartRemindersController extends BaseController {
* @param jSmartReminders 查询实体
* @return 所有数据
*/
-// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "分页查询智能提醒规则数据", response = JSmartReminders.class)
@GetMapping
public AjaxResult selectAll(Page<JSmartReminders> 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<JSmartReminders> {
*/
Page<JSmartReminders> page(Page<JSmartReminders> page, @Param("req") JSmartReminders jSmartReminders);
- List<JSmartReminders> 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<JProject> {
String getJsonString(List<BmsFundingDetail> 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<JSmartReminders> {
*/
Long updateNdq(JSmartRemindersNDq ndq);
-// /**
-// * 企业端首页智能提醒查询所有数据
-// *
-// * @return 所有数据
-// */
-// List<SmartGetDeclaration> 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<JProjectMapper, JProject> 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<JSmartRemindersMappe
return ndq.getId();
}
+ /**
+ * 通过主键查询单条智能提醒规则数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @Override
+ public JSmartReminders selectOneSmart(Serializable id) {
+ return baseMapper.selectOneSmart(id);
+ }
+
// /**
// * 企业端首页智能提醒查询所有数据
// *
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index a48158d..1b307af 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -63,7 +63,7 @@ spring:
multi-statement-allow: true
#自己客户端地址
returnUrl: http://39.101.188.84:9999/demo/JinJiHu
-#returnUrl: http://192.168.0.114:80
+#returnUrl: http://192.168.0.114:81
#定时任务更新企业信息和联系人的开启
isTiming: false
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
index f1e58be..5fb8455 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
@@ -24,27 +24,6 @@
<result property="remark" column="remark"/>
</resultMap>
- <resultMap type="com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo"
- id="BmsDeclarationRecordsVoResult">
- <result property="id" column="id"/>
- <result property="jjhProjectId" column="jjh_project_id"/>
- <result property="projectName" column="project_name"/>
- <result property="projectId" column="project_id"/>
- <result property="enterpriseId" column="enterprise_id"/>
- <result property="level" column="level"/>
- <result property="year" column="year"/>
- <result property="type" column="type"/>
- <result property="road" column="road"/>
- <result property="responsibilityUnit" column="responsibility_unit"/>
- <result property="templateId" column="template_id"/>
- <result property="creditCode" column="credit_code"/>
- <result property="templateRecordId" column="template_record_id"/>
- <result property="detailId" column="detail_id"/>
- <result property="status" column="status"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
- <result property="enterpriseName" column="enterprise_name"/>
- </resultMap>
<sql id="selectBmsDeclarationRecordsVo">
select id,
@@ -55,67 +34,7 @@
from bms_declaration_records
</sql>
- <select id="selectBmsDeclarationRecordsList" parameterType="com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto"
- resultMap="BmsDeclarationRecordsVoResult">
- SELECT
- a.id,
- a.jjh_project_id,
- a.project_id,
- a.credit_code,
- a.enterprise_id,
- c.LEVEL,
- a.YEAR,
- c.type,
- a.template_record_id,
- a.template_id,
- c.responsibility_unit,
- a.detail_id,
- a.STATUS,
- a.is_deleted,
- a.create_by,
- a.create_time,
- a.update_by,
- a.update_time,
- a.remark,
- b.qymc as enterpriseName,
- f.road,
- f.enterprise_directory
- FROM
- bms_declaration_records AS a
- inner join bms_template_record f on a.template_record_id = f.id
- LEFT JOIN bms_template_info c on a.template_id = c.id
- LEFT JOIN bms_enterprise_basic_info b ON a.credit_code = b.tyshxydm
- left join sys_dict_data e on a.status = e.dict_value and e.dict_type='bms_approval_status'
- <where>
- <if test="enterpriseDirectory != null and enterpriseDirectory != ''">and f.enterprise_directory like
- concat('%', #{enterpriseDirectory},
- '%')
- </if>
- <if test="templateName != null and templateName != ''">and c.template_name like concat('%',
- #{templateName}, '%')
- </if>
- <if test="creditCode != null ">and a.credit_code = #{creditCode}</if>
- <if test="enterpriseId != null ">and a.enterprise_id = #{enterpriseId}</if>
- <if test="level != null ">and c.level = #{level}</if>
- <if test="year != null and year != ''">and year = #{year}</if>
- <if test="responsibilityUnit != null ">and c.responsibility_unit = #{responsibilityUnit}</if>
- <if test="status != null ">and a.status = #{status}</if>
- <if test="statusStr != null and statusStr.size>0">
- and a.status in
- <foreach collection="statusStr" item="item" separator="," open="(" close=")">
- #{item}
- </foreach>
- </if>
- <if test="statusChange == 0">
- and a.status in (0,10)
- </if>
- <if test="statusChange == 1">
- and a.status not in (0,10)
- </if>
- <if test="isDeleted != null ">and a.is_deleted = #{isDeleted}</if>
- </where>
- order by FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5),a.create_time desc, e.dict_sort desc
- </select>
+
<select id="selectBmsDeclarationRecordsById" parameterType="Long" resultMap="BmsDeclarationRecordsResult">
<include refid="selectBmsDeclarationRecordsVo"/>
@@ -304,6 +223,67 @@
left join bms_template_record f on a.template_record_id = f.id
where f.status != 3 and a.status = 0
</select>
+ <select id="selectBmsDeclarationRecordsList"
+ resultType="com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo">
+ SELECT
+ a.id,
+ a.jjh_project_id,
+ a.project_id,
+ a.credit_code,
+ b.id as enterpriseId,
+ c.LEVEL,
+ a.YEAR,
+ c.type,
+ a.template_record_id,
+ a.template_id,
+ c.responsibility_unit,
+ a.detail_id,
+ a.STATUS,
+ a.is_deleted,
+ a.create_by,
+ a.create_time,
+ a.update_by,
+ a.update_time,
+ a.remark,
+ b.qymc as enterpriseName,
+ f.road,
+ f.enterprise_directory
+ FROM
+ bms_declaration_records AS a
+ LEFT JOIN bms_enterprise_basic_info b ON a.credit_code = b.tyshxydm
+ inner join bms_template_record f on a.template_record_id = f.id
+ LEFT JOIN bms_template_info c on a.template_id = c.id
+ left join sys_dict_data e on a.status = e.dict_value and e.dict_type='bms_approval_status'
+ <where>
+ <if test="enterpriseDirectory != null and enterpriseDirectory != ''">and f.enterprise_directory like
+ concat('%', #{enterpriseDirectory},
+ '%')
+ </if>
+ <if test="templateName != null and templateName != ''">and c.template_name like concat('%',
+ #{templateName}, '%')
+ </if>
+ <if test="creditCode != null ">and a.credit_code = #{creditCode}</if>
+ <if test="enterpriseId != null ">and a.enterprise_id = #{enterpriseId}</if>
+ <if test="level != null ">and c.level = #{level}</if>
+ <if test="year != null and year != ''">and year = #{year}</if>
+ <if test="responsibilityUnit != null ">and c.responsibility_unit = #{responsibilityUnit}</if>
+ <if test="status != null ">and a.status = #{status}</if>
+ <if test="statusStr != null and statusStr.size>0">
+ and a.status in
+ <foreach collection="statusStr" item="item" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="statusChange == 0">
+ and a.status in (0,10)
+ </if>
+ <if test="statusChange == 1">
+ and a.status not in (0,10)
+ </if>
+ <if test="isDeleted != null ">and a.is_deleted = #{isDeleted}</if>
+ </where>
+ order by FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5),a.create_time desc, e.dict_sort desc
+ </select>
<insert id="insertBmsDeclarationRecords" parameterType="com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords"
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml
index a779e49..1be3722 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml
@@ -6,9 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="workSearch" resultType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo">
select * from bms_enterprise_basic_info
<where>
- <if test="enterpriseInfo != null and enterpriseInfo != ''">
- qymc like concat('%', #{enterpriseInfo}, '%')
- or tyshxydm like concat('%', #{enterpriseInfo}, '%')
+ <if test="req.enterpriseInfo != null and req.enterpriseInfo != ''">
+ qymc like concat('%', #{req.enterpriseInfo}, '%')
+ or tyshxydm like concat('%', #{req.enterpriseInfo}, '%')
</if>
</where>
</select>
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 id="page" resultType="com.ruoyi.jjh.ent.entity.JSmartReminders">
- select * from j_smart_reminders
+ select a.*,jp.project_name as projectName
+ from j_smart_reminders a
+ left join j_project jp on a.project_id = jp.id
<where>
<if test="req.rulesName != null and req.rulesName != '' ">
- and rules_name = #{req.rulesName}
+ and a.rules_name = #{req.rulesName}
</if>
</where>
- order by create_time desc
+ order by a.create_time desc
</select>
- <select id="selectWorkAll" resultType="com.ruoyi.jjh.ent.entity.JSmartReminders">
+ <select id="selectOneSmart" resultType="com.ruoyi.jjh.ent.entity.JSmartReminders">
+ 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}
</select>
</mapper>