11个模板同步项目库

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

@@ -11,6 +11,8 @@ import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto;
 import com.ruoyi.jjh.declaration.service.IBmsBigStrongAwardService;
+import com.ruoyi.jjh.ent.entity.JProject;
+import com.ruoyi.jjh.ent.service.JProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -39,6 +42,8 @@ public class BmsBigStrongAwardController extends BaseController {
     @Autowired
     private IBmsBigStrongAwardService bmsBigStrongAwardService;
 
+    @Resource
+    private JProjectService jProjectService;
     /**
      * 查询做大做强奖详情列表
      */
@@ -99,7 +104,13 @@ public class BmsBigStrongAwardController extends BaseController {
     @Log(title = "修改做大做强奖（只做修改，不做逻辑）", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     public AjaxResult update(@RequestBody BmsBigStrongAward bmsBigStrongAward) {
-        return toAjax(bmsBigStrongAwardService.updateById(bmsBigStrongAward));
+        bmsBigStrongAwardService.updateById(bmsBigStrongAward);
+        JProject jps = new JProject();
+        jps.setId(bmsBigStrongAward.getJjhProjectId());
+        jps.setFileJson("{" +
+                '"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + bmsBigStrongAward.getDevelopmentPlan() + '"' +
+                "}");
+        return toAjax(jProjectService.updateById(jps));
     }
 
     /**

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

@@ -1,28 +1,23 @@
 package com.ruoyi.jjh.declaration.controller;
 
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.jjh.declaration.entity.BmsBrandingAward;
-import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardUpdateDto;
 import com.ruoyi.jjh.declaration.service.IBmsBrandingAwardService;
+import com.ruoyi.jjh.ent.entity.JProject;
+import com.ruoyi.jjh.ent.service.JProjectService;
 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.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -39,6 +34,8 @@ public class BmsBrandingAwardController extends BaseController {
     @Autowired
     private IBmsBrandingAwardService bmsBrandingAwardService;
 
+    @Resource
+    private JProjectService jProjectService;
     /**
      * 查询品牌打造奖补列表
      */
@@ -99,7 +96,14 @@ public class BmsBrandingAwardController extends BaseController {
     @Log(title = "修改品牌打造奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     public AjaxResult update(@RequestBody BmsBrandingAward bmsBrandingAward) {
-        return toAjax(bmsBrandingAwardService.updateById(bmsBrandingAward));
+        bmsBrandingAwardService.updateById(bmsBrandingAward);
+        JProject jp = new JProject();
+        jp.setId(bmsBrandingAward.getJjhProjectId());
+        jp.setFileJson("{" +
+                '"' + "证明材料" + '"' + ":" + '"' + bmsBrandingAward.getEvidence() + '"' +
+                "}");
+
+        return toAjax(jProjectService.updateById(jp));
     }
 
     /**

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

@@ -11,6 +11,8 @@ import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardUpdateDto;
 import com.ruoyi.jjh.declaration.service.IBmsCarrierConstructionAwardService;
+import com.ruoyi.jjh.ent.entity.JProject;
+import com.ruoyi.jjh.ent.service.JProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -39,6 +42,8 @@ public class BmsCarrierConstructionAwardController extends BaseController {
     @Autowired
     private IBmsCarrierConstructionAwardService bmsCarrierConstructionAwardService;
 
+    @Resource
+    private JProjectService jProjectService;
     /**
      * 查询载体建设奖补列表
      */
@@ -99,7 +104,15 @@ public class BmsCarrierConstructionAwardController extends BaseController {
     @Log(title = "修改载体建设奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     public AjaxResult update(@RequestBody BmsCarrierConstructionAward bmsCarrierConstructionAward) {
-        return toAjax(bmsCarrierConstructionAwardService.updateById(bmsCarrierConstructionAward));
+        bmsCarrierConstructionAwardService.updateById(bmsCarrierConstructionAward);
+        JProject jp = new JProject();
+        jp.setId(bmsCarrierConstructionAward.getJjhProjectId());
+        jp.setFileJson("{" +
+                '"' + "相关佐证资料" + '"' + ":" + '"' + bmsCarrierConstructionAward.getSupportingMaterials() + '"' + ','+
+                '"' + "项目工商登记许可" + '"' + ":" + '"' + bmsCarrierConstructionAward.getBusinessLicense() + '"' + ','+
+                '"' + "消防验收报告" + '"' + ":" + '"' + bmsCarrierConstructionAward.getFireReport() + '"' +
+                "}");
+        return toAjax(jProjectService.updateById(jp));
     }
     /**
      * 删除载体建设奖补

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

@@ -11,6 +11,8 @@ import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementUpdateDto;
 import com.ruoyi.jjh.declaration.service.IBmsCreditManagementService;
+import com.ruoyi.jjh.ent.entity.JProject;
+import com.ruoyi.jjh.ent.service.JProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiOperation;
@@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -40,6 +43,9 @@ public class BmsCreditManagementController extends BaseController {
     @Autowired
     private IBmsCreditManagementService bmsCreditManagementService;
 
+
+    @Resource
+    private JProjectService jProjectService;
     /**
      * 查询信用管理奖补列表
      */
@@ -100,7 +106,15 @@ public class BmsCreditManagementController extends BaseController {
     @Log(title = "修改信用管理奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     public AjaxResult update(@RequestBody BmsCreditManagement bmsCreditManagement) {
-        return toAjax(bmsCreditManagementService.updateById(bmsCreditManagement));
+        bmsCreditManagementService.updateById(bmsCreditManagement);
+        JProject jp = new JProject();
+        jp.setId(bmsCreditManagement.getJjhProjectId());
+        jp.setFileJson("{" +
+                '"' + "项目方案" + '"' + ":" + '"' + bmsCreditManagement.getProjectPlan() + '"' + ","+
+                '"' + "资金使用说明" + '"' + ":" + '"' + bmsCreditManagement.getUsesFunds() + '"' + ","+
+                '"' + "项目专项审计报告" + '"' + ":" + '"' + bmsCreditManagement.getAuditReport() + '"' + ","+
+                "}");
+        return toAjax(jProjectService.updateById(jp));
     }
 
     /**

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

@@ -52,6 +52,12 @@ public class BmsDeclarationRecordsController extends BaseController {
     @Value("${ruoyi.profile}")
     private String fileAddress;
 
+    @Value("${server.port}")
+    private String port;
+
+    @Value("${server.servlet.context-path}")
+    private String path;
+
     @Resource
     private BmsDeclarationRecordsMapper bmsDeclarationRecordsMapper;
     /**
@@ -79,6 +85,7 @@ public class BmsDeclarationRecordsController extends BaseController {
     /**
      * 查询在线申报记录列表
      */
+    @ApiOperation(value = "查询在线申报记录列表")
 //    @RequiresPermissions("system:declarationRecords:list")
     @GetMapping("/list")
     public TableDataInfo list(BmsDeclarationRecordsDto bmsDeclarationRecordsDto) {
@@ -105,7 +112,7 @@ public class BmsDeclarationRecordsController extends BaseController {
             for (String s : splitList) {
                 // 下载文件
                 try {
-                    HttpUtil.downloadFile(s, itemsFileName);
+                    HttpUtil.downloadFile("http://localhost:"+ port + s, itemsFileName);
                 } catch (Exception e) {
                     throw new RuntimeException(itemsFileName+"某文件下载失败");
                 }

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

@@ -10,6 +10,8 @@ import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardUpdateDto;
 import com.ruoyi.jjh.declaration.service.IBmsIndustrialInternetAwardService;
+import com.ruoyi.jjh.ent.entity.JProject;
+import com.ruoyi.jjh.ent.service.JProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -38,6 +41,8 @@ public class BmsIndustrialInternetAwardController extends BaseController {
     @Autowired
     private IBmsIndustrialInternetAwardService bmsIndustrialInternetAwardService;
 
+    @Resource
+    private JProjectService jProjectService;
     /**
      * 查询5G+工业互联网奖补列表
      */
@@ -98,7 +103,13 @@ public class BmsIndustrialInternetAwardController extends BaseController {
     @Log(title = "修改5G+工业互联网奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     public AjaxResult update(@RequestBody BmsIndustrialInternetAward bmsIndustrialInternetAward) {
-        return toAjax(bmsIndustrialInternetAwardService.updateById(bmsIndustrialInternetAward));
+        bmsIndustrialInternetAwardService.updateById(bmsIndustrialInternetAward);
+        JProject jp = new JProject();
+        jp.setId(bmsIndustrialInternetAward.getJjhProjectId());
+        jp.setFileJson("{" +
+                '"' + "证明材料" + '"' + ":" + '"' + bmsIndustrialInternetAward.getMaterial() + '"' +
+                "}");
+        return toAjax(jProjectService.updateById(jp));
     }
 
     /**

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

@@ -11,6 +11,8 @@ import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesUpdateDto;
 import com.ruoyi.jjh.declaration.service.IBmsIntegrationIndustriesService;
+import com.ruoyi.jjh.ent.entity.JProject;
+import com.ruoyi.jjh.ent.service.JProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -39,6 +42,8 @@ public class BmsIntegrationIndustriesController extends BaseController {
     @Autowired
     private IBmsIntegrationIndustriesService bmsIntegrationIndustriesService;
 
+    @Resource
+    private JProjectService jProjectService;
     /**
      * 查询两业融合奖补列表
      */
@@ -99,7 +104,22 @@ public class BmsIntegrationIndustriesController extends BaseController {
     @Log(title = "修改两业融合奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     public AjaxResult update(@RequestBody BmsIntegrationIndustries bmsIntegrationIndustries) {
-        return toAjax(bmsIntegrationIndustriesService.updateById(bmsIntegrationIndustries));
+        bmsIntegrationIndustriesService.updateById(bmsIntegrationIndustries);
+        JProject jp = new JProject();
+        jp.setId(bmsIntegrationIndustries.getJjhProjectId());
+        jp.setFileJson( "{" +
+                '"' + "证明材料" + '"' + ":" + '"' + bmsIntegrationIndustries.getEvidence() + '"' + ","+
+                '"' + "营业执照" + '"' + ":" + '"' + bmsIntegrationIndustries.getBusinessLicense() + '"' + ","+
+                '"' + "完税证明" + '"' + ":" + '"' + bmsIntegrationIndustries.getTaxPaymentCertificate() + '"' + ","+
+                '"' + "审计报告" + '"' + ":" + '"' + bmsIntegrationIndustries.getAuditReport() + '"' + ","+
+                '"' + "股权架构图" + '"' + ":" + '"' + bmsIntegrationIndustries.getEquityStructureChart() + '"' + ","+
+                '"' + "项目申报报告" + '"' + ":" + '"' + bmsIntegrationIndustries.getDeclarationReport() + '"' + ","+
+                '"' + "独立核算相关证明" + '"' + ":" + '"' + bmsIntegrationIndustries.getIndependentAccounting() + '"' + ","+
+                '"' + "验资报告" + '"' + ":" + '"' + bmsIntegrationIndustries.getCapitalVerificationReport()+ '"' + ","+
+                '"' + "其他证明材料" + '"' + ":" + '"' + bmsIntegrationIndustries.getOtherEvidence() + '"' +
+                "}");
+
+        return toAjax(jProjectService.updateById(jp));
     }
     /**
      * 删除两业融合奖补

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

@@ -11,6 +11,8 @@ import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardUpdateDto;
 import com.ruoyi.jjh.declaration.service.IBmsLogisticsDevelopmentAwardService;
+import com.ruoyi.jjh.ent.entity.JProject;
+import com.ruoyi.jjh.ent.service.JProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -39,6 +42,8 @@ public class BmsLogisticsDevelopmentAwardController extends BaseController {
     @Autowired
     private IBmsLogisticsDevelopmentAwardService bmsLogisticsDevelopmentAwardService;
 
+    @Resource
+    private JProjectService jProjectService;
     /**
      * 查询物流发展奖补列表
      */
@@ -98,8 +103,18 @@ public class BmsLogisticsDevelopmentAwardController extends BaseController {
 //    @RequiresPermissions("system:industrialInternetAward:edit")
     @Log(title = "修改物流发展奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
-    public AjaxResult update(@RequestBody BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward) {
+    public AjaxResult update(@RequestBody BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward)
-        return toAjax(bmsLogisticsDevelopmentAwardService.updateById(bmsLogisticsDevelopmentAward));
+    {
+        bmsLogisticsDevelopmentAwardService.updateById(bmsLogisticsDevelopmentAward);
+        JProject jp = new JProject();
+        jp.setId(bmsLogisticsDevelopmentAward.getJjhProjectId());
+        jp.setFileJson(        "{" +
+                '"' + "荣誉证明文件" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getHonorCertificate() + '"' + ","+
+                '"' + "平台名称" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getPlatformName() + '"' + ","+
+                '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getFilingNotice() + '"' + ","+
+                '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getAuditReport() + '"' +
+                "}");
+        return toAjax(jProjectService.updateById(jp));
     }
     /**
      * 删除物流发展奖补

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

@@ -11,6 +11,8 @@ import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardUpdateDto;
 import com.ruoyi.jjh.declaration.service.IBmsManufacturingServicesAwardService;
+import com.ruoyi.jjh.ent.entity.JProject;
+import com.ruoyi.jjh.ent.service.JProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -39,6 +42,8 @@ public class BmsManufacturingServicesAwardController extends BaseController {
     @Autowired
     private IBmsManufacturingServicesAwardService bmsManufacturingServicesAwardService;
 
+    @Resource
+    private JProjectService jProjectService;
     /**
      * 查询制造服务业有效投入奖补列表
      */
@@ -98,7 +103,16 @@ public class BmsManufacturingServicesAwardController extends BaseController {
     @Log(title = "修改制造服务业有效投入奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     public AjaxResult update(@RequestBody BmsManufacturingServicesAward bmsManufacturingServicesAward) {
-        return toAjax(bmsManufacturingServicesAwardService.updateById(bmsManufacturingServicesAward));
+        bmsManufacturingServicesAwardService.updateById(bmsManufacturingServicesAward);
+        JProject jp = new JProject();
+        jp.setId(bmsManufacturingServicesAward.getJjhProjectId());
+        jp.setFileJson("{" +
+                '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + bmsManufacturingServicesAward.getFilingNotice() + '"' + ","+
+                '"' + "购置设备发票清单及发票扫描件" + '"' + ":" + '"' + bmsManufacturingServicesAward.getInvoice() + '"' + ","+
+                '"' + "会计师事务所出具的企业申报项目购置设备情况的专项审计报告" + '"' + ":" + '"' + bmsManufacturingServicesAward.getAuditReport() + '"' + ","+
+                '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + bmsManufacturingServicesAward.getFinancialStatements() + '"' + ","+
+                "}");
+        return toAjax(jProjectService.updateById(jp));
     }
     /**
      * 删除制造服务业有效投入奖补

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

@@ -11,6 +11,8 @@ import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardUpdateDto;
 import com.ruoyi.jjh.declaration.service.IBmsPlatformConstructionAwardService;
+import com.ruoyi.jjh.ent.entity.JProject;
+import com.ruoyi.jjh.ent.service.JProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -39,6 +42,8 @@ public class BmsPlatformConstructionAwardController extends BaseController {
     @Autowired
     private IBmsPlatformConstructionAwardService bmsPlatformConstructionAwardService;
 
+    @Resource
+    private JProjectService jProjectService;
     /**
      * 查询平台建设奖补列表
      */
@@ -99,7 +104,13 @@ public class BmsPlatformConstructionAwardController extends BaseController {
     @Log(title = "修改平台建设奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     public AjaxResult update(@RequestBody BmsPlatformConstructionAward bmsPlatformConstructionAward) {
-        return toAjax(bmsPlatformConstructionAwardService.updateById(bmsPlatformConstructionAward));
+        bmsPlatformConstructionAwardService.updateById(bmsPlatformConstructionAward);
+        JProject jp = new JProject();
+        jp.setId(bmsPlatformConstructionAward.getJjhProjectId());
+        jp.setFileJson("{" +
+                '"' + "合作协议" + '"' + ":" + '"' + bmsPlatformConstructionAward.getAgreement() + '"' +
+                "}");
+        return toAjax(jProjectService.updateById(jp));
     }
 
     /**

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

@@ -11,6 +11,8 @@ import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardUpdateDto;
 import com.ruoyi.jjh.declaration.service.IBmsProjectSettlementAwardService;
+import com.ruoyi.jjh.ent.entity.JProject;
+import com.ruoyi.jjh.ent.service.JProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -39,6 +42,8 @@ public class BmsProjectSettlementAwardController extends BaseController {
     @Autowired
     private IBmsProjectSettlementAwardService bmsProjectSettlementAwardService;
 
+    @Resource
+    private JProjectService jProjectService;
     /**
      * 查询项目落户奖补列表
      */
@@ -99,7 +104,17 @@ public class BmsProjectSettlementAwardController extends BaseController {
     @Log(title = "修改项目落户奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     public AjaxResult update(@RequestBody BmsProjectSettlementAward bmsProjectSettlementAward) {
-        return toAjax(bmsProjectSettlementAwardService.updateById(bmsProjectSettlementAward));
+        bmsProjectSettlementAwardService.updateById(bmsProjectSettlementAward);
+        String str1 = "{" +
+                '"' + "招商协议" + '"' + ":" + '"' + bmsProjectSettlementAward.getAgreement() + '"' + "," +
+                '"' + "验资报告" + '"' + ":" + '"' + bmsProjectSettlementAward.getBusinessLicense() + '"' + "," +
+                '"' + "营业执照" + '"' + ":" + '"' + bmsProjectSettlementAward.getOtherMaterials() + '"' + "," +
+                '"' + "其他证明材料" + '"' + ":" + '"' + bmsProjectSettlementAward.getReport() + '"'  +
+                "}";
+        JProject jps = new JProject();
+        jps.setId(bmsProjectSettlementAward.getJjhProjectId());
+        jps.setFileJson(str1);
+        return toAjax(jProjectService.updateById(jps));
     }
 
     /**

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

@@ -11,6 +11,8 @@ import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardUpdateDto;
 import com.ruoyi.jjh.declaration.service.IBmsSceneOpeningAwardService;
+import com.ruoyi.jjh.ent.entity.JProject;
+import com.ruoyi.jjh.ent.service.JProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -39,6 +42,9 @@ public class BmsSceneOpeningAwardController extends BaseController {
     @Autowired
     private IBmsSceneOpeningAwardService bmsSceneOpeningAwardService;
 
+
+    @Resource
+    private JProjectService jProjectService;
     /**
      * 查询场景开放奖补列表
      */
@@ -99,7 +105,13 @@ public class BmsSceneOpeningAwardController extends BaseController {
     @Log(title = "修改场景开放奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     public AjaxResult update(@RequestBody BmsSceneOpeningAward bmsSceneOpeningAward) {
-        return toAjax(bmsSceneOpeningAwardService.updateById(bmsSceneOpeningAward));
+        bmsSceneOpeningAwardService.updateById(bmsSceneOpeningAward);
+        JProject jp = new JProject();
+        jp.setId(bmsSceneOpeningAward.getJjhProjectId());
+        jp.setFileJson("{" +
+                '"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + bmsSceneOpeningAward.getMaterial() + '"' +
+                "}");
+        return toAjax(jProjectService.updateById(jp));
     }
 
     /**

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

@@ -2,12 +2,14 @@ package com.ruoyi.jjh.declaration.entity;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.jjh.common.entity.BaseInfoEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -20,6 +22,7 @@ import java.util.Date;
  * @date 2023-08-25
  */
 @ApiModel("做大做强奖详情对象")
+@Data
 public class BmsBigStrongAward extends BaseInfoEntity {
     private static final long serialVersionUID = 1L;
 
@@ -79,76 +82,7 @@ public class BmsBigStrongAward extends BaseInfoEntity {
     @Excel(name = "是否删除：0，未删除；1，已删除")
     private Long isDeleted;
 
-    public Long getId() {
+    @TableField(exist=false)
-        return id;
+    @ApiModelProperty(value = "项目库Id")
-    }
+    private Long jjhProjectId;;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(Long enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public int getIsGainRewards() {
-        return isGainRewards;
-    }
-
-    public void setIsGainRewards(int isGainRewards) {
-        this.isGainRewards = isGainRewards;
-    }
-
-    public Date getEstablishTime() {
-        return establishTime;
-    }
-
-    public void setEstablishTime(Date establishTime) {
-        this.establishTime = establishTime;
-    }
-
-    public String getDevelopmentPlan() {
-        return developmentPlan;
-    }
-
-    public void setDevelopmentPlan(String developmentPlan) {
-        this.developmentPlan = developmentPlan;
-    }
-
-    public String getRewardDescription() {
-        return rewardDescription;
-    }
-
-    public void setRewardDescription(String rewardDescription) {
-        this.rewardDescription = rewardDescription;
-    }
-
-    public Long getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(Long isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("enterpriseId", getEnterpriseId())
-                .append("isGainRewards", getIsGainRewards())
-                .append("establishTime", getEstablishTime())
-                .append("developmentPlan", getDevelopmentPlan())
-                .append("isDeleted", getIsDeleted())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
 }

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

@@ -2,11 +2,13 @@ package com.ruoyi.jjh.declaration.entity;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.jjh.common.entity.BaseInfoEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -16,6 +18,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author farben
  * @date 2023-08-25
  */
+@Data
 @ApiModel("品牌打造奖补对象")
 public class BmsBrandingAward extends BaseInfoEntity {
     private static final long serialVersionUID = 1L;
@@ -67,68 +70,7 @@ public class BmsBrandingAward extends BaseInfoEntity {
     @Excel(name = "是否删除：0，未删除；1，已删除")
     private Long isDeleted;
 
-    public Long getId() {
+    @TableField(exist=false)
-        return id;
+    @ApiModelProperty(value = "项目库Id")
-    }
+    private Long jjhProjectId;;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(Long enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public String getHonorsReceived() {
-        return honorsReceived;
-    }
-
-    public void setHonorsReceived(String honorsReceived) {
-        this.honorsReceived = honorsReceived;
-    }
-
-    public Long getLevel() {
-        return level;
-    }
-
-    public void setLevel(Long level) {
-        this.level = level;
-    }
-
-    public String getEvidence() {
-        return evidence;
-    }
-
-    public void setEvidence(String evidence) {
-        this.evidence = evidence;
-    }
-
-    public Long getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(Long isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("enterpriseId", getEnterpriseId())
-                .append("honorsReceived", getHonorsReceived())
-                .append("level", getLevel())
-                .append("evidence", getEvidence())
-                .append("isDeleted", getIsDeleted())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.entity;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.jjh.common.entity.BaseInfoEntity;
@@ -81,5 +82,7 @@ public class BmsCarrierConstructionAward extends BaseInfoEntity {
     @Excel(name = "是否删除：0，未删除；1，已删除")
     private Long isDeleted;
 
-
+    @TableField(exist=false)
+    @ApiModelProperty(value = "项目库Id")
+    private Long jjhProjectId;;
 }

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

@@ -1,12 +1,14 @@
 package com.ruoyi.jjh.declaration.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.jjh.common.entity.BaseInfoEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -16,6 +18,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author farben
  * @date 2023-09-04
  */
+@Data
 @ApiModel("信用管理奖补对象")
 public class BmsCreditManagement extends BaseInfoEntity {
     private static final long serialVersionUID = 1L;
@@ -49,63 +52,8 @@ public class BmsCreditManagement extends BaseInfoEntity {
     @Excel(name = "是否删除：0，未删除；1，已删除")
     private Long isDeleted;
 
-    public void setId(Long id){
-        this.id = id;
-    }
 
-    public Long getId(){
+    @TableField(exist=false)
-        return id;
+    @ApiModelProperty(value = "项目库Id")
-    }
+    private Long jjhProjectId;;
-    public void setEnterpriseId(Long enterpriseId){
-        this.enterpriseId = enterpriseId;
-    }
-
-    public Long getEnterpriseId(){
-        return enterpriseId;
-    }
-    public void setProjectPlan(String projectPlan){
-        this.projectPlan = projectPlan;
-    }
-
-    public String getProjectPlan(){
-        return projectPlan;
-    }
-    public void setUsesFunds(String usesFunds){
-        this.usesFunds = usesFunds;
-    }
-
-    public String getUsesFunds(){
-        return usesFunds;
-    }
-    public void setAuditReport(String auditReport){
-        this.auditReport = auditReport;
-    }
-
-    public String getAuditReport(){
-        return auditReport;
-    }
-    public void setIsDeleted(Long isDeleted){
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted(){
-        return isDeleted;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("enterpriseId", getEnterpriseId())
-            .append("projectPlan", getProjectPlan())
-            .append("usesFunds", getUsesFunds())
-            .append("auditReport", getAuditReport())
-            .append("isDeleted", getIsDeleted())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

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

@@ -2,11 +2,13 @@ package com.ruoyi.jjh.declaration.entity;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.jjh.common.entity.BaseInfoEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -16,10 +18,15 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author farben
  * @date 2023-08-25
  */
+@Data
 @ApiModel("5G+工业互联网奖补对象")
 public class BmsIndustrialInternetAward extends BaseInfoEntity {
     private static final long serialVersionUID = 1L;
 
+
+    @TableField(exist=false)
+    @ApiModelProperty(value = "项目库Id")
+    private Long jjhProjectId;;
     /**
      * 主键id
      */
@@ -60,48 +67,4 @@ public class BmsIndustrialInternetAward extends BaseInfoEntity {
     @Excel(name = "是否删除：0，未删除；1，已删除")
     private Long isDeleted;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(Long enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public String getHonoraryName() {
-        return honoraryName;
-    }
-
-    public void setHonoraryName(String honoraryName) {
-        this.honoraryName = honoraryName;
-    }
-
-    public String getMaterial() {
-        return material;
-    }
-
-    public void setMaterial(String material) {
-        this.material = material;
-    }
-
-    public Long getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(Long isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("enterpriseId", getEnterpriseId()).append("honoraryName", getHonoraryName()).append("material", getMaterial()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString();
-    }
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.entity;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.jjh.common.entity.BaseInfoEntity;
@@ -122,4 +123,7 @@ public class BmsIntegrationIndustries extends BaseInfoEntity {
     @Excel(name = "是否删除：0，未删除；1，已删除")
     private Long isDeleted;
 
+    @TableField(exist=false)
+    @ApiModelProperty(value = "项目库Id")
+    private Long jjhProjectId;;
 }

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

@@ -1,11 +1,13 @@
 package com.ruoyi.jjh.declaration.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.jjh.common.entity.BaseInfoEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -15,10 +17,15 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author farben
  * @date 2023-08-25
  */
+@Data
 @ApiModel("物流发展奖补对象")
 public class BmsLogisticsDevelopmentAward extends BaseInfoEntity {
     private static final long serialVersionUID = 1L;
 
+
+    @TableField(exist=false)
+    @ApiModelProperty(value = "项目库Id")
+    private Long jjhProjectId;;
     /**
      * 主键id
      */
@@ -67,64 +74,5 @@ public class BmsLogisticsDevelopmentAward extends BaseInfoEntity {
     @Excel(name = "是否删除：0，未删除；1，已删除")
     private Long isDeleted;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(Long enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public String getHonorCertificate() {
-        return honorCertificate;
-    }
-
-    public void setHonorCertificate(String honorCertificate) {
-        this.honorCertificate = honorCertificate;
-    }
-
-    public String getPlatformName() {
-        return platformName;
-    }
-
-    public void setPlatformName(String platformName) {
-        this.platformName = platformName;
-    }
-
-    public String getFilingNotice() {
-        return filingNotice;
-    }
-
-    public void setFilingNotice(String filingNotice) {
-        this.filingNotice = filingNotice;
-    }
-
-    public String getAuditReport() {
-        return auditReport;
-    }
-
-    public void setAuditReport(String auditReport) {
-        this.auditReport = auditReport;
-    }
-
-    public Long getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(Long isDeleted) {
-        this.isDeleted = isDeleted;
-    }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("enterpriseId", getEnterpriseId()).append("honorCertificate", getHonorCertificate()).append("platformName", getPlatformName()).append("filingNotice", getFilingNotice()).append("auditReport", getAuditReport()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString();
-    }
 }

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

@@ -2,11 +2,13 @@ package com.ruoyi.jjh.declaration.entity;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.jjh.common.entity.BaseInfoEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -16,10 +18,14 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author farben
  * @date 2023-08-25
  */
+@Data
 @ApiModel("制造服务业有效投入奖补对象")
 public class BmsManufacturingServicesAward extends BaseInfoEntity {
     private static final long serialVersionUID = 1L;
 
+    @TableField(exist=false)
+    @ApiModelProperty(value = "项目库Id")
+    private Long jjhProjectId;;
     /**
      * 主键id
      */
@@ -75,64 +81,5 @@ public class BmsManufacturingServicesAward extends BaseInfoEntity {
     @Excel(name = "是否删除：0，未删除；1，已删除")
     private Long isDeleted;
 
-    public Long getId() {
-        return id;
-    }
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(Long enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public String getFilingNotice() {
-        return filingNotice;
-    }
-
-    public void setFilingNotice(String filingNotice) {
-        this.filingNotice = filingNotice;
-    }
-
-    public String getInvoice() {
-        return invoice;
-    }
-
-    public void setInvoice(String invoice) {
-        this.invoice = invoice;
-    }
-
-    public String getAuditReport() {
-        return auditReport;
-    }
-
-    public void setAuditReport(String auditReport) {
-        this.auditReport = auditReport;
-    }
-
-    public String getFinancialStatements() {
-        return financialStatements;
-    }
-
-    public void setFinancialStatements(String financialStatements) {
-        this.financialStatements = financialStatements;
-    }
-
-    public Long getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(Long isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("enterpriseId", getEnterpriseId()).append("filingNotice", getFilingNotice()).append("invoice", getInvoice()).append("auditReport", getAuditReport()).append("financialStatements", getFinancialStatements()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).toString();
-    }
 }

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

@@ -2,11 +2,13 @@ package com.ruoyi.jjh.declaration.entity;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.jjh.common.entity.BaseInfoEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -16,6 +18,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author farben
  * @date 2023-08-25
  */
+@Data
 @ApiModel("平台建设奖补对象")
 public class BmsPlatformConstructionAward extends BaseInfoEntity {
     private static final long serialVersionUID = 1L;
@@ -59,45 +62,9 @@ public class BmsPlatformConstructionAward extends BaseInfoEntity {
     @Excel(name = "是否删除：0，未删除；1，已删除")
     private Long isDeleted;
 
-    public Long getId() {
+    @TableField(exist=false)
-        return id;
+    @ApiModelProperty(value = "项目库Id")
-    }
+    private Long jjhProjectId;;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(Long enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public String getPlatformName() {
-        return platformName;
-    }
-
-    public void setPlatformName(String platformName) {
-        this.platformName = platformName;
-    }
-
-    public String getAgreement() {
-        return agreement;
-    }
-
-    public void setAgreement(String agreement) {
-        this.agreement = agreement;
-    }
-
-    public Long getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(Long isDeleted) {
-        this.isDeleted = isDeleted;
-    }
 
     @Override
     public String toString() {

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

@@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.entity;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
@@ -100,6 +101,10 @@ public class BmsProjectSettlementAward extends BaseInfoEntity {
     @Excel(name = "是否删除：0，未删除；1，已删除")
     private Long isDeleted;
 
+    @TableField(exist=false)
+    @ApiModelProperty(value = "项目库Id")
+    private Long jjhProjectId;;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("enterpriseId", getEnterpriseId()).append("establishTime", getEstablishTime()).append("employeeNum", getEmployeeNum()).append("agreement", getAgreement()).append("report", getReport()).append("businessLicense", getBusinessLicense()).append("otherMaterials", getOtherMaterials()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).toString();

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

@@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.entity;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.jjh.common.entity.BaseInfoEntity;
@@ -71,6 +72,9 @@ public class BmsSceneOpeningAward extends BaseInfoEntity {
     @Excel(name = "是否删除：0，未删除；1，已删除")
     private Long isDeleted;
 
+    @TableField(exist=false)
+    @ApiModelProperty(value = "项目库Id")
+    private Long jjhProjectId;;
 
     @Override
     public String toString() {

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java

@@ -25,6 +25,9 @@ public class BmsDeclarationRecordsQueryVo implements Serializable {
     @ApiModelProperty(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "项目库Id")
+    private Long jjhProjectId;
+
     @ApiModelProperty(value = "项目名称")
     @Excel(name = "项目名称")
     private String projectName;

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

@@ -7,6 +7,7 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto;
 import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 做大做强奖详情Service接口
@@ -39,6 +40,11 @@ public interface IBmsBigStrongAwardService extends IService<BmsBigStrongAward> {
      */
     public int insertBmsBigStrongAward(BmsBigStrongAwardAddDto bmsBigStrongAwardAddDto);
 
+    /**
+     * otherJson
+     */
+    Map<String,String> getAllJson(Long id);
+
     /**
      * 修改做大做强奖详情
      * 

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

@@ -6,6 +6,7 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardUpdateDto;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 品牌打造奖补Service接口
@@ -38,6 +39,11 @@ public interface IBmsBrandingAwardService extends IService<BmsBrandingAward> {
      */
     public int insertBmsBrandingAward(BmsBrandingAwardAddDto bmsBrandingAwardAddDto);
 
+    /**
+     * otherJson
+     */
+    Map<String,String> getAllJson(Long id);
+
     /**
      * 修改品牌打造奖补
      * 

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

@@ -6,6 +6,7 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardUpdateDto;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 载体建设奖补Service接口
@@ -38,6 +39,11 @@ public interface IBmsCarrierConstructionAwardService extends IService<BmsCarrier
      */
     public int insertBmsCarrierConstructionAward(BmsCarrierConstructionAwardAddDto bmsCarrierConstructionAwardAddDto);
 
+    /**
+     * otherJson
+     */
+    Map<String,String> getAllJson(Long id);
+
     /**
      * 修改载体建设奖补
      * 

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

@@ -6,6 +6,7 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementUpdateDto;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 信用管理奖补Service接口
@@ -38,6 +39,11 @@ public interface IBmsCreditManagementService extends IService<BmsCreditManagemen
      */
     public int insertBmsCreditManagement(BmsCreditManagementAddDto bmsCreditManagementAddDto);
 
+
+    /**
+     * otherJson
+     */
+    Map<String,String> getAllJson(Long id);
     /**
      * 修改信用管理奖补
      * 

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

@@ -6,6 +6,7 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardUpdateDto;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 5G+工业互联网奖补Service接口
@@ -38,6 +39,11 @@ public interface IBmsIndustrialInternetAwardService extends IService<BmsIndustri
      */
     public int insertBmsIndustrialInternetAward(BmsIndustrialInternetAwardAddDto bmsIndustrialInternetAwardAddDto);
 
+    /**
+     * otherJson
+     */
+    Map<String,String> getAllJson(Long id);
+
     /**
      * 修改5G+工业互联网奖补
      * 

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

@@ -6,6 +6,7 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesUpdateDto;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 两业融合奖补Service接口
@@ -38,6 +39,11 @@ public interface IBmsIntegrationIndustriesService extends IService<BmsIntegratio
      */
     public int insertBmsIntegrationIndustries(BmsIntegrationIndustriesAddDto bmsIntegrationIndustriesAddDto);
 
+    /**
+     * otherJson
+     */
+    Map<String,String> getAllJson(Long id);
+
     /**
      * 修改两业融合奖补
      * 

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

@@ -6,6 +6,7 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardUpdateDto;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 物流发展奖补Service接口
@@ -38,6 +39,12 @@ public interface IBmsLogisticsDevelopmentAwardService extends IService<BmsLogist
      */
     public int insertBmsLogisticsDevelopmentAward(BmsLogisticsDevelopmentAwardAddDto bmsLogisticsDevelopmentAwardAddDto);
 
+
+
+    /**
+     * otherJson
+     */
+    Map<String,String> getAllJson(Long id);
     /**
      * 修改物流发展奖补
      * 

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

@@ -6,6 +6,7 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardUpdateDto;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 制造服务业有效投入奖补Service接口
@@ -38,6 +39,11 @@ public interface IBmsManufacturingServicesAwardService extends IService<BmsManuf
      */
     public int insertBmsManufacturingServicesAward(BmsManufacturingServicesAwardAddDto bmsManufacturingServicesAwardAddDto);
 
+    /**
+     * otherJson
+     */
+    Map<String,String> getAllJson(Long id);
+
     /**
      * 修改制造服务业有效投入奖补
      * 

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

@@ -6,6 +6,7 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardUpdateDto;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 平台建设奖补Service接口
@@ -38,6 +39,11 @@ public interface IBmsPlatformConstructionAwardService extends IService<BmsPlatfo
      */
     public int insertBmsPlatformConstructionAward(BmsPlatformConstructionAwardAddDto bmsPlatformConstructionAwardAddDto);
 
+    /**
+     * otherJson
+     */
+    Map<String,String> getAllJson(Long id);
+
     /**
      * 修改平台建设奖补
      * 

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

@@ -7,6 +7,7 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardUpdateDto;
 import com.ruoyi.jjh.declaration.entity.vo.BmsProjectSettlementAwardQueryVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目落户奖补Service接口
@@ -39,6 +40,10 @@ public interface IBmsProjectSettlementAwardService extends IService<BmsProjectSe
      */
     public int insertBmsProjectSettlementAward(BmsProjectSettlementAwardAddDto bmsProjectSettlementAwardAddDto);
 
+    /**
+     * otherJson
+     */
+    Map<String,String> getAllJson(Long id);
     /**
      * 修改项目落户奖补
      * 

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

@@ -6,6 +6,7 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardUpdateDto;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 场景开放奖补Service接口
@@ -38,6 +39,11 @@ public interface IBmsSceneOpeningAwardService extends IService<BmsSceneOpeningAw
      */
     public int insertBmsSceneOpeningAward(BmsSceneOpeningAwardAddDto bmsSceneOpeningAwardAddDto);
 
+    /**
+     * otherJson
+     */
+    Map<String,String> getAllJson(Long id);
+
     /**
      * 修改场景开放奖补
      * 

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

@@ -10,7 +10,6 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsFundingDetailAddDto;
 import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
-import com.ruoyi.jjh.declaration.entity.vo.BmsProjectSettlementAwardQueryVo;
 import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
 import com.ruoyi.jjh.declaration.mapper.BmsBigStrongAwardMapper;
 import com.ruoyi.jjh.declaration.service.IBmsBigStrongAwardService;
@@ -26,7 +25,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 做大做强奖详情Service业务层处理
@@ -115,30 +116,17 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
         declarationRecords.setEnterpriseId(enterpriseId);
         iBmsDeclarationRecordsService.save(declarationRecords);
 
-        //获取该申报记录的详情
+        Map<String, String> allJson = getAllJson(declarationRecords.getId());
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
-        //申报的企业信息JSON
-        String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //做大做强
-        BmsBigStrongAwardQueryVo p1 = declarationRecordsVo.getBmsBigStrongAwardQueryVo();
-        //做大做强对象JSON
-        String js3 = JSONObject.toJSONString(p1);
-        String str = jProjectService.allJsonString(js1, js2, js3, jProjectService.getJsonString(p1.getFundingDetailList()));
-        String str1 = "{" +
-                '"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + p1.getDevelopmentPlan() + '"' +
-                "}";
 
         //新增项目
         JProject jP = new JProject();
         jP.setProjectYear(declarationRecords.getYear());
         jP.setProjectName(declarationRecords.getProjectName());
-        jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jP.setDeclareUnit(allJson.get("declareUnit"));
         jP.setProjectClassify(2);
         jP.setStatus(1);
-        jP.setOtherJson(str);
+        jP.setOtherJson(allJson.get("otherJson"));
-        jP.setFileJson(str1);
+        jP.setFileJson(allJson.get("fileJson"));
         jProjectService.saveProject(jP,declarationRecords.getId());
 
         // 申请审批
@@ -150,6 +138,29 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
         return num;
     }
 
+    @Override
+    public Map<String,String> getAllJson(Long id) {
+        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());
+        //做大做强
+        BmsBigStrongAwardQueryVo p1 = declarationRecordsVo.getBmsBigStrongAwardQueryVo();
+        //做大做强对象JSON
+        String js3 = JSONObject.toJSONString(p1);
+        jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, jProjectService.getJsonString(p1.getFundingDetailList())));
+        jsonMap.put("fileJson","{" +
+                '"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + p1.getDevelopmentPlan() + '"' +
+                "}");
+        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
+        return jsonMap;
+    }
+
+
 
     /**
      * 修改做大做强奖详情
@@ -170,6 +181,9 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
             iBmsFundingDetailService.saveOrUpdateBatch(fundingDetailList);
             // 申请审批
             if (bmsBigStrongAwardUpdateDto.getStatus() == 1) {
+                Map<String, String> allJson = getAllJson(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId());
+                //修改项目
+                jProjectService.updateTheJson(allJson);
                 // 审批状态
                 iCommonService.insertAuditRecord(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -21,7 +21,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 品牌打造奖补Service业务层处理
@@ -90,30 +92,17 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
         declarationRecords.setDetailId(bmsBrandingAward.getId());
         iBmsDeclarationRecordsService.save(declarationRecords);
 
-        //获取该申报记录的详情
+        Map<String, String> allJson = getAllJson(declarationRecords.getId());
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
-        //申报的企业信息JSON
-        String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //品牌打造奖补
-        BmsBrandingAward p1 = declarationRecordsVo.getBmsBrandingAward();
-        //品牌打造奖补JSON
-        String js3 = JSONObject.toJSONString(p1);
-        String str = jProjectService.allJsonString(js1, js2, js3, "{}");
-        String str1 = "{" +
-                '"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' +
-                "}";
 
         //新增项目
         JProject jP = new JProject();
         jP.setProjectYear(declarationRecords.getYear());
         jP.setProjectName(declarationRecords.getProjectName());
-        jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jP.setDeclareUnit(allJson.get("declareUnit"));
         jP.setProjectClassify(4);
         jP.setStatus(1);
-        jP.setOtherJson(str);
+        jP.setOtherJson(allJson.get("otherJson"));
-        jP.setFileJson(str1);
+        jP.setFileJson(allJson.get("fileJson"));
         jProjectService.saveProject(jP,declarationRecords.getId());
 
         // 生成审核
@@ -124,6 +113,28 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
         return num;
     }
 
+    @Override
+    public Map<String, String> getAllJson(Long id) {
+        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());
+        //品牌打造奖补
+        BmsBrandingAward p1 = declarationRecordsVo.getBmsBrandingAward();
+        //品牌打造奖补JSON
+        String js3 = JSONObject.toJSONString(p1);
+        jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
+        jsonMap.put("fileJson", "{" +
+                '"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' +
+                "}");
+        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
+        return jsonMap;
+    }
+
     /**
      * 修改品牌打造奖补
      * 
@@ -143,6 +154,8 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
             num = baseMapper.updateBmsBrandingAward(bmsBrandingAwardUpdateDto);
             // 申请审批
             if (bmsBrandingAwardUpdateDto.getStatus()==1){
+                Map<String, String> allJson = getAllJson(bmsBrandingAwardUpdateDto.getDeclarationRecordsId());
+                jProjectService.updateTheJson(allJson);
                 // 审批状态
                 iCommonService.insertAuditRecord(bmsBrandingAwardUpdateDto.getDeclarationRecordsId(),0);
             }

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

@@ -21,7 +21,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 载体建设奖补Service业务层处理
@@ -91,30 +93,18 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
         declarationRecords.setDetailId(bmsCarrierConstructionAward.getId());
         iBmsDeclarationRecordsService.save(declarationRecords);
 
-        //获取该申报记录的详情
+        Map<String, String> allJson = getAllJson(declarationRecords.getId());
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
+
-        //申报的企业信息JSON
-        String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
-        //载体建设奖补
-        BmsCarrierConstructionAward p1 = declarationRecordsVo.getBmsCarrierConstructionAward();
-        //载体建设奖补JSON
-        String js3 = JSONObject.toJSONString(p1);
-        String str = jProjectService.allJsonString(js1, "{}", js3, "{}");
-        String str1 = "{" +
-                '"' + "相关佐证资料" + '"' + ":" + '"' + p1.getSupportingMaterials() + '"' + ','+
-                '"' + "项目工商登记许可" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + ','+
-                '"' + "消防验收报告" + '"' + ":" + '"' + p1.getFireReport() + '"' +
-                "}";
 
         //新增项目
         JProject jP = new JProject();
         jP.setProjectYear(declarationRecords.getYear());
         jP.setProjectName(declarationRecords.getProjectName());
-        jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jP.setDeclareUnit(allJson.get("declareUnit"));
         jP.setProjectClassify(2);
         jP.setStatus(1);
-        jP.setOtherJson(str);
+        jP.setOtherJson(allJson.get("otherJson"));
-        jP.setFileJson(str1);
+        jP.setFileJson(allJson.get("fileJson"));
         jProjectService.saveProject(jP,declarationRecords.getId());
 
 
@@ -126,6 +116,28 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
         return num;
     }
 
+    @Override
+    public Map<String, String> getAllJson(Long id) {
+        Map<String,String> jsonMap = new HashMap<>();
+        //获取该申报记录的详情
+        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id);
+        //申报的企业信息JSON
+        String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
+        //载体建设奖补
+        BmsCarrierConstructionAward p1 = declarationRecordsVo.getBmsCarrierConstructionAward();
+        //载体建设奖补JSON
+        String js3 = JSONObject.toJSONString(p1);
+        jsonMap.put("otherJson",jProjectService.allJsonString(js1, "{}", js3, "{}"));
+        jsonMap.put("fileJson","{" +
+                '"' + "相关佐证资料" + '"' + ":" + '"' + p1.getSupportingMaterials() + '"' + ','+
+                '"' + "项目工商登记许可" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + ','+
+                '"' + "消防验收报告" + '"' + ":" + '"' + p1.getFireReport() + '"' +
+                "}");
+        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
+        return jsonMap;
+    }
+
     /**
      * 修改载体建设奖补
      * 
@@ -144,6 +156,8 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
             num = baseMapper.updateBmsCarrierConstructionAward(bmsCarrierConstructionAwardUpdateDto);
             // 申请审批
             if (bmsCarrierConstructionAwardUpdateDto.getStatus()==1){
+                Map<String, String> allJson = getAllJson(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId());
+                jProjectService.updateTheJson(allJson);
                 // 审批状态
                 iCommonService.insertAuditRecord(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId(),0);
             }

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

@@ -21,7 +21,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 信用管理奖补Service业务层处理
@@ -90,32 +92,17 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
         declarationRecords.setDetailId(bmsCreditManagement.getId());
         iBmsDeclarationRecordsService.save(declarationRecords);
 
-        //获取该申报记录的详情
+        Map<String, String> allJson = getAllJson(declarationRecords.getId());
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
-        //申报的企业信息JSON
-        String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //信用管理奖补
-        BmsCreditManagement p1 = declarationRecordsVo.getBmsCreditManagement();
-        //信用管理奖补JSON
-//        String js3 = JSONObject.toJSONString(p1);
-        String str = jProjectService.allJsonString(js1, js2, "{}", "{}");
-        String str1 = "{" +
-                '"' + "项目方案" + '"' + ":" + '"' + p1.getProjectPlan() + '"' + ","+
-                '"' + "资金使用说明" + '"' + ":" + '"' + p1.getUsesFunds() + '"' + ","+
-                '"' + "项目专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
-                "}";
 
         //新增项目
         JProject jP = new JProject();
         jP.setProjectYear(declarationRecords.getYear());
         jP.setProjectName(declarationRecords.getProjectName());
-        jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jP.setDeclareUnit(allJson.get("declareUnit"));
         jP.setProjectClassify(7);
         jP.setStatus(1);
-        jP.setOtherJson(str);
+        jP.setOtherJson(allJson.get("otherJson"));
-        jP.setFileJson(str1);
+        jP.setFileJson(allJson.get("fileJson"));
         jProjectService.saveProject(jP,declarationRecords.getId());
 
         // 生成审核
@@ -126,6 +113,30 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
         return num;
     }
 
+    @Override
+    public Map<String, String> getAllJson(Long id) {
+        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());
+        //信用管理奖补
+        BmsCreditManagement p1 = declarationRecordsVo.getBmsCreditManagement();
+        //信用管理奖补JSON
+//        String js3 = JSONObject.toJSONString(p1);
+        jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, "{}", "{}"));
+        jsonMap.put("fileJson","{" +
+                '"' + "项目方案" + '"' + ":" + '"' + p1.getProjectPlan() + '"' + ","+
+                '"' + "资金使用说明" + '"' + ":" + '"' + p1.getUsesFunds() + '"' + ","+
+                '"' + "项目专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
+                "}");
+        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
+        return jsonMap;
+    }
+
     /**
      * 修改信用管理奖补
      * 
@@ -145,6 +156,8 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
             num =  baseMapper.updateBmsCreditManagement(bmsCreditManagementUpdateDto);
             // 申请审批
             if (bmsCreditManagementUpdateDto.getStatus()==1){
+                Map<String, String> allJson = getAllJson(bmsCreditManagementUpdateDto.getDeclarationRecordsId());
+                jProjectService.updateTheJson(allJson);
                 // 审批状态
                 iCommonService.insertAuditRecord(bmsCreditManagementUpdateDto.getDeclarationRecordsId(),0);
             }

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

@@ -21,7 +21,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 5G+工业互联网奖补Service业务层处理
@@ -89,31 +91,17 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
         declarationRecords.setDetailId(bmsIndustrialInternetAward.getId());
         iBmsDeclarationRecordsService.save(declarationRecords);
 
-
+        Map<String, String> allJson = getAllJson(declarationRecords.getId());
-        //获取该申报记录的详情
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
-        //申报的企业信息JSON
-        String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //5G+工业互联网奖补
-        BmsIndustrialInternetAward p1 = declarationRecordsVo.getBmsIndustrialInternetAward();
-        //5G+工业互联网奖补JSON
-        String js3 = JSONObject.toJSONString(p1);
-        String str = jProjectService.allJsonString(js1, js2, js3, "{}");
-        String str1 = "{" +
-                '"' + "证明材料" + '"' + ":" + '"' + p1.getMaterial() + '"' +
-                "}";
 
         //新增项目
         JProject jP = new JProject();
         jP.setProjectYear(declarationRecords.getYear());
         jP.setProjectName(declarationRecords.getProjectName());
-        jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jP.setDeclareUnit(allJson.get("declareUnit"));
         jP.setProjectClassify(2);
         jP.setStatus(1);
-        jP.setOtherJson(str);
+        jP.setOtherJson(allJson.get("otherJson"));
-        jP.setFileJson(str1);
+        jP.setFileJson(allJson.get("fileJson"));
         jProjectService.saveProject(jP,declarationRecords.getId());
 
         // 生成审核
@@ -124,6 +112,28 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
         return num;
     }
 
+    @Override
+    public Map<String, String> getAllJson(Long id) {
+        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+工业互联网奖补
+        BmsIndustrialInternetAward p1 = declarationRecordsVo.getBmsIndustrialInternetAward();
+        //5G+工业互联网奖补JSON
+        String js3 = JSONObject.toJSONString(p1);
+        jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
+        jsonMap.put("fileJson", "{" +
+                '"' + "证明材料" + '"' + ":" + '"' + p1.getMaterial() + '"' +
+                "}");
+        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
+        return jsonMap;
+    }
+
     /**
      * 修改5G+工业互联网奖补
      * 
@@ -143,6 +153,9 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
             num = baseMapper.updateBmsIndustrialInternetAward(bmsIndustrialInternetAwardUpdateDto);
             // 申请审批
             if (bmsIndustrialInternetAwardUpdateDto.getStatus()==1){
+                Map<String, String> allJson = getAllJson(bmsIndustrialInternetAwardUpdateDto.getDeclarationRecordsId());
+                //修改项目
+                jProjectService.updateTheJson(allJson);
                 // 审批状态
                 iCommonService.insertAuditRecord(bmsIndustrialInternetAwardUpdateDto.getDeclarationRecordsId(),0);
             }

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

@@ -21,7 +21,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 两业融合奖补Service业务层处理
@@ -90,8 +92,32 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
         declarationRecords.setDetailId(bmsIntegrationIndustries.getId());
         iBmsDeclarationRecordsService.save(declarationRecords);
 
+        Map<String, String> allJson = getAllJson(declarationRecords.getId());
+
+        //新增项目
+        JProject jP = new JProject();
+        jP.setProjectYear(declarationRecords.getYear());
+        jP.setProjectName(declarationRecords.getProjectName());
+        jP.setDeclareUnit(allJson.get("declareUnit"));
+        jP.setProjectClassify(10);
+        jP.setStatus(1);
+        jP.setOtherJson(allJson.get("otherJson"));
+        jP.setFileJson(allJson.get("fileJson"));
+        jProjectService.saveProject(jP,declarationRecords.getId());
+
+        // 生成审核
+        if (bmsIntegrationIndustriesAddDto.getStatus()==1){
+            // 审批状态
+            iCommonService.insertAuditRecord(declarationRecords.getId(),0);
+        }
+        return num;
+    }
+
+    @Override
+    public Map<String, String> getAllJson(Long id) {
+        Map<String,String> jsonMap = new HashMap<>();
         //获取该申报记录的详情
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
+        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id);
         //申报的企业信息JSON
         String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
         //在线申报信息JSON
@@ -100,8 +126,8 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
         BmsIntegrationIndustries p1 = declarationRecordsVo.getBmsIntegrationIndustries();
         //两业融合奖补申请JSON
         String js3 = JSONObject.toJSONString(p1);
-        String str = jProjectService.allJsonString(js1, js2, js3, "{}");
+        jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
-        String str1 = "{" +
+        jsonMap.put("fileJson", "{" +
                 '"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' + ","+
                 '"' + "营业执照" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + ","+
                 '"' + "完税证明" + '"' + ":" + '"' + p1.getTaxPaymentCertificate() + '"' + ","+
@@ -111,25 +137,10 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
                 '"' + "独立核算相关证明" + '"' + ":" + '"' + p1.getIndependentAccounting() + '"' + ","+
                 '"' + "验资报告" + '"' + ":" + '"' + p1.getCapitalVerificationReport()+ '"' + ","+
                 '"' + "其他证明材料" + '"' + ":" + '"' + p1.getOtherEvidence() + '"' +
-                "}";
+                "}");
-
+        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
-        //新增项目
+        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        JProject jP = new JProject();
+        return jsonMap;
-        jP.setProjectYear(declarationRecords.getYear());
-        jP.setProjectName(declarationRecords.getProjectName());
-        jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
-        jP.setProjectClassify(10);
-        jP.setStatus(1);
-        jP.setOtherJson(str);
-        jP.setFileJson(str1);
-        jProjectService.saveProject(jP,declarationRecords.getId());
-
-        // 生成审核
-        if (bmsIntegrationIndustriesAddDto.getStatus()==1){
-            // 审批状态
-            iCommonService.insertAuditRecord(declarationRecords.getId(),0);
-        }
-        return num;
     }
 
     /**
@@ -151,6 +162,9 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
             num = baseMapper.updateBmsIntegrationIndustries(bmsIntegrationIndustriesUpdateDto);
             // 申请审批
             if (bmsIntegrationIndustriesUpdateDto.getStatus()==1){
+                Map<String, String> allJson = getAllJson(bmsIntegrationIndustriesUpdateDto.getDeclarationRecordsId());
+                //修改项目
+                jProjectService.updateTheJson(allJson);
                 // 审批状态
                 iCommonService.insertAuditRecord(bmsIntegrationIndustriesUpdateDto.getDeclarationRecordsId(),0);
             }

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

@@ -21,7 +21,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 物流发展奖补Service业务层处理
@@ -91,33 +93,18 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
         declarationRecords.setDetailId(bmsLogisticsDevelopmentAward.getId());
         iBmsDeclarationRecordsService.save(declarationRecords);
 
-        //获取该申报记录的详情
+        Map<String, String> allJson = getAllJson(declarationRecords.getId());
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
+
-        //申报的企业信息JSON
-        String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //物流发展奖补
-        BmsLogisticsDevelopmentAward p1  = declarationRecordsVo.getBmsLogisticsDevelopmentAward();
-        //物流发展奖补JSON
-//        String js3 = JSONObject.toJSONString(p1);
-        String str = jProjectService.allJsonString(js1, js2, "{}", "{}");
-        String str1 = "{" +
-                '"' + "荣誉证明文件" + '"' + ":" + '"' + p1.getHonorCertificate() + '"' + ","+
-                '"' + "平台名称" + '"' + ":" + '"' + p1.getPlatformName() + '"' + ","+
-                '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
-                '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' +
-                "}";
 
         //新增项目
         JProject jP = new JProject();
         jP.setProjectYear(declarationRecords.getYear());
         jP.setProjectName(declarationRecords.getProjectName());
-        jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jP.setDeclareUnit(allJson.get("declareUnit"));
         jP.setProjectClassify(9);
         jP.setStatus(1);
-        jP.setOtherJson(str);
+        jP.setOtherJson(allJson.get("otherJson"));
-        jP.setFileJson(str1);
+        jP.setFileJson(allJson.get("fileJson"));
         jProjectService.saveProject(jP,declarationRecords.getId());
 
         // 生成审核
@@ -128,6 +115,31 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
         return num;
     }
 
+    @Override
+    public Map<String, String> getAllJson(Long id) {
+        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());
+        //物流发展奖补
+        BmsLogisticsDevelopmentAward p1  = declarationRecordsVo.getBmsLogisticsDevelopmentAward();
+        //物流发展奖补JSON
+//        String js3 = JSONObject.toJSONString(p1);
+        jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, "{}", "{}"));
+        jsonMap.put("fileJson", "{" +
+                '"' + "荣誉证明文件" + '"' + ":" + '"' + p1.getHonorCertificate() + '"' + ","+
+                '"' + "平台名称" + '"' + ":" + '"' + p1.getPlatformName() + '"' + ","+
+                '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
+                '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' +
+                "}");
+        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
+        return jsonMap;
+    }
+
     /**
      * 修改物流发展奖补
      * 
@@ -149,6 +161,9 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
             num = baseMapper.updateBmsLogisticsDevelopmentAward(bmsLogisticsDevelopmentAwardUpdateDto);
             // 申请审批
             if (bmsLogisticsDevelopmentAwardUpdateDto.getStatus()==1){
+                Map<String, String> allJson = getAllJson(bmsLogisticsDevelopmentAwardUpdateDto.getDeclarationRecordsId());
+                //修改项目
+                jProjectService.updateTheJson(allJson);
                 // 审批状态
                 iCommonService.insertAuditRecord(bmsLogisticsDevelopmentAwardUpdateDto.getDeclarationRecordsId(),0);
             }

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

@@ -21,7 +21,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 制造服务业有效投入奖补Service业务层处理
@@ -89,33 +91,17 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
         declarationRecords.setDetailId(bmsManufacturingServicesAward.getId());
         iBmsDeclarationRecordsService.save(declarationRecords);
 
-        //获取该申报记录的详情
+        Map<String, String> allJson = getAllJson(declarationRecords.getId());
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
-        //申报的企业信息JSON
-        String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //制造服务业有效投入奖补
-        BmsManufacturingServicesAward p1 = declarationRecordsVo.getBmsManufacturingServicesAward();
-        //制造服务业有效投入奖补JSON
-//        String js3 = JSONObject.toJSONString(p1);
-        String str = jProjectService.allJsonString(js1, js2, "{}", "{}");
-        String str1 = "{" +
-                '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
-                '"' + "购置设备发票清单及发票扫描件" + '"' + ":" + '"' + p1.getInvoice() + '"' + ","+
-                '"' + "会计师事务所出具的企业申报项目购置设备情况的专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
-                '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getFinancialStatements() + '"' + ","+
-                "}";
 
         //新增项目
         JProject jP = new JProject();
         jP.setProjectYear(declarationRecords.getYear());
         jP.setProjectName(declarationRecords.getProjectName());
-        jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jP.setDeclareUnit(allJson.get("declareUnit"));
         jP.setProjectClassify(8);
         jP.setStatus(1);
-        jP.setOtherJson(str);
+        jP.setOtherJson(allJson.get("otherJson"));
-        jP.setFileJson(str1);
+        jP.setFileJson(allJson.get("fileJson"));
         jProjectService.saveProject(jP,declarationRecords.getId());
 
         // 生成审核
@@ -126,6 +112,31 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
         return num;
     }
 
+    @Override
+    public Map<String, String> getAllJson(Long id) {
+        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());
+        //制造服务业有效投入奖补
+        BmsManufacturingServicesAward p1 = declarationRecordsVo.getBmsManufacturingServicesAward();
+        //制造服务业有效投入奖补JSON
+//        String js3 = JSONObject.toJSONString(p1);
+        jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, "{}", "{}"));
+        jsonMap.put("fileJson", "{" +
+                '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
+                '"' + "购置设备发票清单及发票扫描件" + '"' + ":" + '"' + p1.getInvoice() + '"' + ","+
+                '"' + "会计师事务所出具的企业申报项目购置设备情况的专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
+                '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getFinancialStatements() + '"' + ","+
+                "}");
+        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
+        return jsonMap;
+    }
+
     /**
      * 修改制造服务业有效投入奖补
      * 
@@ -145,6 +156,9 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
             num =  baseMapper.updateBmsManufacturingServicesAward(bmsManufacturingServicesAwardUpdateDto);
             // 申请审批
             if (bmsManufacturingServicesAwardUpdateDto.getStatus()==1){
+                Map<String, String> allJson = getAllJson(bmsManufacturingServicesAwardUpdateDto.getDeclarationRecordsId());
+                //修改项目
+                jProjectService.updateTheJson(allJson);
                 // 审批状态
                 iCommonService.insertAuditRecord(bmsManufacturingServicesAwardUpdateDto.getDeclarationRecordsId(),0);
             }

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

@@ -22,7 +22,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 平台建设奖补Service业务层处理
@@ -92,30 +94,17 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
         declarationRecords.setDetailId(bmsPlatformConstructionAward.getId());
         iBmsDeclarationRecordsService.save(declarationRecords);
 
-        //获取该申报记录的详情
+        Map<String, String> allJson = getAllJson(declarationRecords.getId());
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
-        //申报的企业信息JSON
-        String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //平台建设奖补
-        BmsPlatformConstructionAward p1 = declarationRecordsVo.getBmsPlatformConstructionAward();
-        //平台建设奖补json
-        String js3 = JSONObject.toJSONString(p1);
-        String str = jProjectService.allJsonString(js1, js2, js3, "{}");
-        String str1 = "{" +
-                '"' + "合作协议" + '"' + ":" + '"' + p1.getAgreement() + '"' +
-                "}";
 
         //新增项目
         JProject jP = new JProject();
         jP.setProjectYear(declarationRecords.getYear());
         jP.setProjectName(declarationRecords.getProjectName());
-        jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jP.setDeclareUnit(allJson.get("declareUnit"));
         jP.setProjectClassify(3);
         jP.setStatus(1);
-        jP.setOtherJson(str);
+        jP.setOtherJson(allJson.get("otherJson"));
-        jP.setFileJson(str1);
+        jP.setFileJson(allJson.get("fileJson"));
         jProjectService.saveProject(jP,declarationRecords.getId());
 
 
@@ -127,6 +116,29 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
         return num;
     }
 
+
+    @Override
+    public Map<String, String> getAllJson(Long id) {
+        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());
+        //平台建设奖补
+        BmsPlatformConstructionAward p1 = declarationRecordsVo.getBmsPlatformConstructionAward();
+        //平台建设奖补json
+        String js3 = JSONObject.toJSONString(p1);
+        jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
+        jsonMap.put("fileJson", "{" +
+                '"' + "合作协议" + '"' + ":" + '"' + p1.getAgreement() + '"' +
+                "}");
+        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
+        return jsonMap;
+    }
+
     /**
      * 修改平台建设奖补
      * 
@@ -148,6 +160,9 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
             num = baseMapper.updateBmsPlatformConstructionAward(bmsPlatformConstructionAwardUpdateDto);
             // 申请审批
             if (bmsPlatformConstructionAwardUpdateDto.getStatus()==1){
+                Map<String, String> allJson = getAllJson(bmsPlatformConstructionAwardUpdateDto.getDeclarationRecordsId());
+                //修改项目
+                jProjectService.updateTheJson(allJson);
                 // 审批状态
                 iCommonService.insertAuditRecord(bmsPlatformConstructionAwardUpdateDto.getDeclarationRecordsId(),0);
             }

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

@@ -121,32 +121,17 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
         declarationRecords.setDetailId(projectSettlementAward.getId());
         iBmsDeclarationRecordsService.save(declarationRecords);
 
-        //获取该申报记录的详情
+        Map<String, String> allJson = getAllJson(declarationRecords.getId());
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
+
-        //申报的企业信息JSON
-        String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //落户奖补对象
-        BmsProjectSettlementAwardQueryVo p1 = declarationRecordsVo.getBmsProjectSettlementAwardQueryVo();
-        //落户奖补对象JSON
-        String js3 = JSONObject.toJSONString(p1);
-        String str = jProjectService.allJsonString(js1, js2, js3, jProjectService.getJsonString(p1.getFundingDetailList()));
-        String str1 = "{" +
-                '"' + "招商协议" + '"' + ":" + '"' + p1.getAgreement() + '"' + "," +
-                '"' + "验资报告" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + "," +
-                '"' + "营业执照" + '"' + ":" + '"' + p1.getOtherMaterials() + '"' + "," +
-                '"' + "其他证明材料" + '"' + ":" + '"' + p1.getReport() + '"'  +
-                "}";
         //新增项目
         JProject jP = new JProject();
         jP.setProjectYear(declarationRecords.getYear());
         jP.setProjectName(declarationRecords.getProjectName());
-        jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jP.setDeclareUnit(allJson.get("declareUnit"));
         jP.setProjectClassify(1);
         jP.setStatus(1);
-        jP.setOtherJson(str);
+        jP.setOtherJson(allJson.get("otherJson"));
-        jP.setFileJson(str1);
+        jP.setFileJson(allJson.get("fileJson"));
         jProjectService.saveProject(jP,declarationRecords.getId());
 
         // 生成审核
@@ -157,6 +142,31 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
         return num;
     }
 
+    @Override
+    public Map<String, String> getAllJson(Long id) {
+        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());
+        //落户奖补对象
+        BmsProjectSettlementAwardQueryVo p1 = declarationRecordsVo.getBmsProjectSettlementAwardQueryVo();
+        //落户奖补对象JSON
+        String js3 = JSONObject.toJSONString(p1);
+        jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, jProjectService.getJsonString(p1.getFundingDetailList())));
+        jsonMap.put("fileJson", "{" +
+                '"' + "招商协议" + '"' + ":" + '"' + p1.getAgreement() + '"' + "," +
+                '"' + "验资报告" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + "," +
+                '"' + "营业执照" + '"' + ":" + '"' + p1.getOtherMaterials() + '"' + "," +
+                '"' + "其他证明材料" + '"' + ":" + '"' + p1.getReport() + '"'  +
+                "}");
+        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
+        return jsonMap;
+    }
+
     /**
      * 修改项目落户奖补
      *
@@ -177,6 +187,9 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
             iBmsFundingDetailService.saveOrUpdateBatch(fundingDetailList);
             // 申请审批
             if (bmsProjectSettlementAwardUpdateDto.getStatus() == 1) {
+                Map<String, String> allJson = getAllJson(bmsProjectSettlementAwardUpdateDto.getDeclarationRecordsId());
+                //修改项目
+                jProjectService.updateTheJson(allJson);
                 // 审批状态
                 iCommonService.insertAuditRecord(bmsProjectSettlementAwardUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -21,7 +21,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 场景开放奖补Service业务层处理
@@ -90,28 +92,17 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
         declarationRecords.setDetailId(bmsSceneOpeningAward.getId());
         iBmsDeclarationRecordsService.save(declarationRecords);
 
-        //获取该申报记录的详情
+        Map<String, String> allJson = getAllJson(declarationRecords.getId());
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
-        //申报的企业信息JSON
-        String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
-        //场景开放奖补
-        BmsSceneOpeningAward p1 = declarationRecordsVo.getBmsSceneOpeningAward();
-        //场景开放奖补JSON
-        String js3 = JSONObject.toJSONString(p1);
-        String str = jProjectService.allJsonString(js1, "{}", js3,"{}");
-        String str1 = "{" +
-                '"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + p1.getMaterial() + '"' +
-                "}";
 
         //新增项目
         JProject jP = new JProject();
         jP.setProjectYear(declarationRecords.getYear());
         jP.setProjectName(declarationRecords.getProjectName());
-        jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jP.setDeclareUnit(allJson.get("declareUnit"));
         jP.setProjectClassify(6);
         jP.setStatus(1);
-        jP.setOtherJson(str);
+        jP.setOtherJson(allJson.get("otherJson"));
-        jP.setFileJson(str1);
+        jP.setFileJson(allJson.get("fileJson"));
         jProjectService.saveProject(jP,declarationRecords.getId());
 
 
@@ -123,6 +114,26 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
         return num;
     }
 
+    @Override
+    public Map<String, String> getAllJson(Long id) {
+        Map<String,String> jsonMap = new HashMap<>();
+        //获取该申报记录的详情
+        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id);
+        //申报的企业信息JSON
+        String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
+        //场景开放奖补
+        BmsSceneOpeningAward p1 = declarationRecordsVo.getBmsSceneOpeningAward();
+        //场景开放奖补JSON
+        String js3 = JSONObject.toJSONString(p1);
+        jsonMap.put("otherJson",jProjectService.allJsonString(js1, "{}", js3,"{}"));
+        jsonMap.put("fileJson", "{" +
+                '"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + p1.getMaterial() + '"' +
+                "}");
+        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
+        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
+        return jsonMap;
+    }
+
     /**
      * 修改场景开放奖补
      * 
@@ -142,6 +153,9 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
             num=baseMapper.updateBmsSceneOpeningAward(bmsSceneOpeningAwardUpdateDto);
             // 申请审批
             if (bmsSceneOpeningAwardUpdateDto.getStatus()==1){
+                Map<String, String> allJson = getAllJson(bmsSceneOpeningAwardUpdateDto.getDeclarationRecordsId());
+                //修改项目
+                jProjectService.updateTheJson(allJson);
                 // 审批状态
                 iCommonService.insertAuditRecord(bmsSceneOpeningAwardUpdateDto.getDeclarationRecordsId(),0);
             }

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java

@@ -8,6 +8,7 @@ import com.ruoyi.jjh.ent.entity.JProject;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -40,5 +41,7 @@ public interface JProjectService extends IService<JProject> {
     String allJsonString(String a1,String a2,String a3,String a4);
 
     void saveProject(JProject jp,Long id);
+
+    void updateTheJson( Map<String, String> allJson);
 }
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目表(JProject)表服务实现类
@@ -82,5 +83,16 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
         n1.setJjhProjectId(jp.getId());
         iBmsDeclarationRecordsService.updateById(n1);
     }
+
+    @Override
+    public void updateTheJson(Map<String, String> allJson) {
+        //修改项目
+        JProject jP = new JProject();
+        jP.setId(Long.valueOf(allJson.get("jjhProjectId")));
+        jP.setStatus(1);
+        jP.setOtherJson(allJson.get("otherJson"));
+        jP.setFileJson(allJson.get("fileJson"));
+        baseMapper.updateById(jP);
+    }
 }
 

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

@@ -26,6 +26,7 @@
     <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"/>
@@ -48,7 +49,7 @@
                project_name,
                project_id,
                matter,
-               enterprise_id, year, template_record_id, declaration_template_type, detail_id, status, is_deleted, create_by, create_time, update_by, update_time, remark
+               enterprise_id,jjh_project_id, year, template_record_id, declaration_template_type, detail_id, status, is_deleted, create_by, create_time, update_by, update_time, remark
         from bms_declaration_records
     </sql>
 
@@ -56,6 +57,7 @@
             resultMap="BmsDeclarationRecordsVoResult">
         SELECT
         a.id,
+        a.jjh_project_id,
         d.project_name,
         a.project_id,
         a.enterprise_id,
@@ -107,7 +109,7 @@
             </if>
             <if test="isDeleted != null ">and a.is_deleted = #{isDeleted}</if>
         </where>
-        order by e.dict_sort desc,a.update_time desc,a.create_time desc
+        order by a.create_time desc, e.dict_sort desc
     </select>
 
     <select id="selectBmsDeclarationRecordsById" parameterType="Long" resultMap="BmsDeclarationRecordsResult">

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -115,7 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
-//                .antMatchers("/jjh/**").permitAll()
+                .antMatchers("/system/**").permitAll()
 //                .antMatchers("/common/**").permitAll()