BUGFIX

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

@@ -40,6 +40,15 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
     @JSONField(serialize=false)
     private Integer multiple;
 
+    /**
+     * 分类 1.规上 2规下
+     */
+    @ApiModelProperty("分类 1.规上 2规下")
+    @JSONField(serialize=false)
+    @Excel(name = "分类",readConverterExp = "1=规上,2=规下")
+    private Integer type;
+
+
     /**
      * 源主键
      */

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

@@ -44,19 +44,35 @@ public class BmsTemplateInfo extends BaseInfoEntity {
     @Excel(name = "级别 ", readConverterExp = "0=本级,1=省级")
     private Long level;
 
-//    /**
+
-//     * 产品领域 生产性服务业  现代服务业  新兴服务业 (暂废弃)
+    /**
-//     */
+     * 项目大类 1.总部经济 2自主品牌先进技术研究院 3省现代服务业重点项目 4省市服务业领军企业
-//    @ApiModelProperty(value = "产品领域 0:生产性服务业  1:现代服务业  2:新兴服务业")
+     * 5.省级现代服务业集聚区 6两业融合试点单位 7楼宇经济 8工业设计中心 9工业设计研究院 10服务型制造示范
-//    @Excel(name = "产品领域", readConverterExp = "0=生产性服务业,1=现代服务业,2=新兴服务业")
+     */
-//    private Long productArea;
+    @ApiModelProperty(value = "项目大类 1.总部经济 2自主品牌先进技术研究院 3省现代服务业重点项目 4省市服务业领军企业 5.省级现代服务业集聚区 6两业融合试点单位 7楼宇经济 8工业设计中心 9工业设计研究院 10服务型制造示范")
-
+    @Excel(name = "项目大类 ", readConverterExp = "1=总部经济,2=自主品牌先进技术研究院,3=省现代服务业重点项目,4=省市服务业领军企业," +
-//    /**
+            "5=省级现代服务业集聚区,6=两业融合试点单位,7=楼宇经济,8=工业设计中心,9=工业设计研究院,10=服务型制造示范")
-//     * 申报类型 0:/, 1:试点区域,2:龙头型,3:创新型 (暂废弃)
+    private Integer projectBigType;
-//     */
+
-//    @ApiModelProperty(value = "申报类型 0:/, 1:试点区域,2:龙头型,3:创新型")
+    /**
-//    @Excel(name = "申报类型", readConverterExp = "0=/, 1=试点区域,2=龙头型,3=创新型")
+     * 项目中类
-//    private Long type;
+     */
+    @ApiModelProperty(value = "项目中类 1=总部企业,2=自主品牌先进技术研究院,3=省现代服务业重点项目,4=省市服务业领军企业," +
+            "            5=省级现代服务业集聚区,6=两业融合试点单位,7=楼宇经济,8=工业设计中心,9=工业设计研究院,10=服务型制造企业,11=服务型制造平台,12=服务型制造示范项目")
+    @Excel(name = "项目中类 ", readConverterExp = "1=总部企业,2=自主品牌先进技术研究院,3=省现代服务业重点项目,4=省市服务业领军企业," +
+            "5=省级现代服务业集聚区,6=两业融合试点单位,7=楼宇经济,8=工业设计中心,9=工业设计研究院,10=服务型制造企业,11=服务型制造平台,12=服务型制造示范项目")
+    private Integer projectMiddleType;
+
+    /**
+     * 项目小类
+     */
+    @ApiModelProperty(value = "项目小类")
+    @Excel(name = "项目小类 ", readConverterExp = "1=省级总部,2=市级总部,3=区级总部,4=自主品牌先进技术研究院,5=省现代服务业重点项目,6=省级服务业领军," +
+            "7=市级服务业领军，8=省级现代服务业集聚区,9=两业融合试点单位,10=楼宇经济,11=国家级工业设计中心,12=省级工业设计中心,13=市级工业设计中心," +
+            "14=工业设计研究院,15=国家级服务型制造企业,16=省级服务型制造企业,17=市级服务型制造企业,18=区级服务型制造企业,19=国家级服务型制造平台,20=省服务型制造平台," +
+            "21=市级服务型制造平台,22=国家级示范项目,23=省级示范项目")
+    private Integer projectSmallType;
+
 
     /**
      * 表单说明
@@ -79,25 +95,6 @@ public class BmsTemplateInfo extends BaseInfoEntity {
     @Excel(name = "是否删除", readConverterExp = "0=未删除,1=已删除")
     private Integer isDeleted;
 
-    /**
-     * 项目分类
-     */
-    /**
-     * 项目分类
-     */
-    @Excel(name = "项目分类", readConverterExp = "1=总部经济," +
-            "2=自主品牌先进技术研究院," +
-            "3=省现代服务业重点项目," +
-            "4=省市服务业领军企业," +
-            "5=省级现代服务业集聚区," +
-            "6=两业融合试点单位," +
-            "7=楼宇经济," +
-            "8=工业设计中心," +
-            "9=工业设计研究院," +
-            "10=服务型制造示范")
-    @ApiModelProperty("项目分类")
-    private Integer projectClassify;
-
     /**
      * 模板有效期开始日期
      */

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

@@ -67,7 +67,7 @@ public class BmsTemplateRecordQueryVo implements Serializable {
     private Long responsibilityUnit;
 
 
-    @ApiModelProperty(value = "项目分类")
+    @ApiModelProperty(value = "项目小类")
     private Integer projectClassify;
 
     @ApiModelProperty(value = "创建时间")

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

@@ -28,6 +28,6 @@ public class BmsTemplateRecordVo extends BmsTemplateRecord {
     @Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局")
     private Long responsibilityUnit;
 
-    @ApiModelProperty(value = "项目分类")
+    @ApiModelProperty(value = "项目小类")
     private Integer projectClassify;
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsDeclarationRecordsMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
 import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto;
+import com.ruoyi.jjh.ent.entity.JProject;
 import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
 import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo;
 import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo;
@@ -98,4 +99,10 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
      * @return
      */
     List<JSmartDeclaration> allNoLimited();
+
+    /**
+     * 获取某个在线记录id可以添加到项目库的数据
+     * @return
+     */
+    JProject getAddProject(Long id);
 }

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

@@ -40,10 +40,6 @@ 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

@@ -39,10 +39,6 @@ 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

@@ -39,10 +39,6 @@ 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

@@ -40,10 +40,6 @@ 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/IBmsDeclarationRecordsService.java

@@ -3,6 +3,7 @@ package com.ruoyi.jjh.declaration.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
 import com.ruoyi.jjh.declaration.entity.dto.*;
+import com.ruoyi.jjh.ent.entity.JProject;
 import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
 import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo;
 import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo;
@@ -108,4 +109,11 @@ public interface IBmsDeclarationRecordsService extends IService<BmsDeclarationRe
      * @return
      */
     List<JSmartDeclaration> allNoLimited();
+
+
+    /**
+     * 获取某个在线记录id可以添加到项目库的数据
+     * @return
+     */
+    JProject getAddProject(Long id);
 }

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

@@ -39,10 +39,7 @@ 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

@@ -39,10 +39,7 @@ 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

@@ -40,11 +40,6 @@ 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

@@ -39,10 +39,7 @@ 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/IBmsOutQuitProductsService.java

@@ -36,10 +36,7 @@ public interface IBmsOutQuitProductsService extends IService<BmsOutQuitProducts>
      */
      int insertBmsOutQuitProducts(BmsOutQuitProductsAddDto bmsOutQuitProductsAddDto);
 
-    /**
+
-     * otherJson
-     */
-    Map<String,String> getAllJson(Long id);
 
     /**
      * 修改2024年度淘汰落后和退出低端低效产能装备清单

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

@@ -39,10 +39,6 @@ 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

@@ -40,10 +40,6 @@ 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

@@ -39,10 +39,7 @@ 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

@@ -3,12 +3,13 @@ package com.ruoyi.jjh.declaration.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.jjh.declaration.entity.*;
+import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward;
+import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
+import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
 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.DeclarationRecordsVo;
 import com.ruoyi.jjh.declaration.mapper.BmsBigStrongAwardMapper;
 import com.ruoyi.jjh.declaration.service.*;
 import com.ruoyi.jjh.ent.entity.JProject;
@@ -19,11 +20,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.time.Year;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 做大做强奖详情Service业务层处理
@@ -115,42 +113,27 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
         declarationRecords.setId(bmsBigStrongAwardAddDto.getDeclarationId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
-        //新增项目
-        declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsBigStrongAwardAddDto.getDeclarationId())));
-        iBmsDeclarationRecordsService.updateById(declarationRecords);
 
+        //获取某个在线记录id可以添加到项目库的数据
+        JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsBigStrongAwardAddDto.getDeclarationId());
+        addProject.setStatus(1);
+        String jsonString = jProjectService.getJsonString(fundingInfoList);
+        JSONObject mergedObj = new JSONObject();
+        mergedObj.putAll(JSONObject.parseObject(jsonString));
+        mergedObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(bmsBigStrongAward)));
+        addProject.setOtherJson(mergedObj.toJSONString());
+        addProject.setFileJson("{" +
+                '"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + bmsBigStrongAward.getDevelopmentPlan() + '"' +
+                "}");
+        jProjectService.save(addProject);
+        declarationRecords.setJjhProjectId(addProject.getId());
+        iBmsDeclarationRecordsService.updateById(declarationRecords);
         // 申请审批
         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(id);
-
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //做大做强
-        BmsBigStrongAwardQueryVo p1 = declarationRecordsVo.getBmsBigStrongAwardQueryVo();
-        //做大做强对象JSON
-        String js3 = JSONObject.toJSONString(p1);
-        jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
-        jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
-        jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
-        jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
-        jsonMap.put("otherJson",jProjectService.allJsonString(js2, js3, jProjectService.getJsonString(p1.getFundingDetailList())));
-        jsonMap.put("fileJson","{" +
-                '"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + p1.getDevelopmentPlan() + '"' +
-                "}");
-        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
-        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        return jsonMap;
-    }
-
-
 
     /**
      * 修改做大做强奖详情
@@ -173,9 +156,20 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
             iBmsFundingDetailService.saveOrUpdateBatch(fundingDetailList);
             // 申请审批
             if (bmsBigStrongAwardUpdateDto.getStatus() == 1) {
-                Map<String, String> allJson = getAllJson(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId());
+                JProject jP = new JProject();
+                BmsBigStrongAward bmsBigStrongAward = new BmsBigStrongAward();
+                BeanUtil.copyProperties(bmsBigStrongAwardUpdateDto, bmsBigStrongAward);
+                jP.setId(iBmsDeclarationRecordsService.getById(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId()).getJjhProjectId());
+                jP.setStatus(1);
+                JSONObject mergedObj = new JSONObject();
+                mergedObj.putAll(JSONObject.parseObject(jProjectService.getJsonString(fundingDetailList)));
+                mergedObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(bmsBigStrongAward)));
+                jP.setOtherJson(mergedObj.toJSONString());
+                jP.setFileJson("{" +
+                        '"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + bmsBigStrongAward.getDevelopmentPlan() + '"' +
+                        "}");
                 //修改项目
-                jProjectService.updateTheJson(allJson);
+                jProjectService.updateById(jP);
                 // 修改审批状态
                 iCommonService.updateAuditRecord(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward;
 import com.ruoyi.jjh.declaration.entity.BmsBrandingAward;
 import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
 import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardAddDto;
@@ -96,39 +97,21 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
 
-        //新增项目
+        //获取某个在线记录id可以添加到项目库的数据
-        declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsBrandingAwardAddDto.getDeclarationId())));
+        JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsBrandingAwardAddDto.getDeclarationId());
+        addProject.setStatus(1);
+        addProject.setOtherJson(JSONObject.toJSONString(bmsBrandingAward));
+        addProject.setFileJson("{" +
+                '"' + "证明材料" + '"' + ":" + '"' +bmsBrandingAward.getEvidence()+ '"' +
+                "}");
+        jProjectService.save(addProject);
+        declarationRecords.setJjhProjectId(addProject.getId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
-
         // 审批状态
         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(id);
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //品牌打造奖补
-        BmsBrandingAward p1 = declarationRecordsVo.getBmsBrandingAward();
-        //品牌打造奖补JSON
-        String js3 = JSONObject.toJSONString(p1);
-        jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
-        jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
-        jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
-        jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
-        jsonMap.put("otherJson",jProjectService.allJsonString( js2, js3, "{}"));
-        jsonMap.put("fileJson", "{" +
-                '"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' +
-                "}");
-        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
-        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        return jsonMap;
-    }
-
     /**
      * 修改品牌打造奖补
      * 
@@ -149,8 +132,17 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
             num = baseMapper.updateBmsBrandingAward(bmsBrandingAwardUpdateDto);
             // 申请审批
             if (bmsBrandingAwardUpdateDto.getStatus()==1){
-                Map<String, String> allJson = getAllJson(bmsBrandingAwardUpdateDto.getDeclarationRecordsId());
+                JProject jP = new JProject();
-                jProjectService.updateTheJson(allJson);
+                BmsBrandingAward bmsBrandingAward =new BmsBrandingAward();
+                BeanUtil.copyProperties(bmsBrandingAwardUpdateDto, bmsBrandingAward);
+                jP.setId(iBmsDeclarationRecordsService.getById(bmsBrandingAwardUpdateDto.getDeclarationRecordsId()).getJjhProjectId());
+                jP.setStatus(1);
+                jP.setOtherJson(JSONObject.toJSONString(bmsBrandingAward));
+                jP.setFileJson("{" +
+                        '"' + "证明材料" + '"' + ":" + '"' + bmsBrandingAward.getEvidence() + '"' +
+                        "}");
+                //修改项目
+                jProjectService.updateById(jP);
                 // 审批状态
                 iCommonService.updateAuditRecord(bmsBrandingAwardUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.jjh.declaration.entity.BmsBrandingAward;
 import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward;
 import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
 import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardAddDto;
@@ -97,8 +98,17 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
         declarationRecords.setId(bmsCarrierConstructionAwardAddDto.getDeclarationId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
-        //新增项目
+        //获取某个在线记录id可以添加到项目库的数据
-        declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsCarrierConstructionAwardAddDto.getDeclarationId())));
+        JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsCarrierConstructionAwardAddDto.getDeclarationId());
+        addProject.setStatus(1);
+        addProject.setOtherJson(JSONObject.toJSONString(bmsCarrierConstructionAward));
+        addProject.setFileJson("{" +
+                '"' + "相关佐证资料" + '"' + ":" + '"' + bmsCarrierConstructionAward.getSupportingMaterials() + '"' + ','+
+                '"' + "项目工商登记许可" + '"' + ":" + '"' + bmsCarrierConstructionAward.getBusinessLicense() + '"' + ','+
+                '"' + "消防验收报告" + '"' + ":" + '"' + bmsCarrierConstructionAward.getFireReport() + '"' +
+                "}");
+        jProjectService.save(addProject);
+        declarationRecords.setJjhProjectId(addProject.getId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
         // 生成审核
@@ -106,30 +116,6 @@ 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);
-        //载体建设奖补
-        BmsCarrierConstructionAward p1 = declarationRecordsVo.getBmsCarrierConstructionAward();
-        //载体建设奖补JSON
-        String js3 = JSONObject.toJSONString(p1);
-        jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
-        jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
-        jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
-        jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
-        jsonMap.put("otherJson",jProjectService.allJsonString("{}", js3, "{}"));
-        jsonMap.put("fileJson","{" +
-                '"' + "相关佐证资料" + '"' + ":" + '"' + p1.getSupportingMaterials() + '"' + ','+
-                '"' + "项目工商登记许可" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + ','+
-                '"' + "消防验收报告" + '"' + ":" + '"' + p1.getFireReport() + '"' +
-                "}");
-        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
-        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        return jsonMap;
-    }
-
     /**
      * 修改载体建设奖补
      * 
@@ -150,8 +136,19 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
             num = baseMapper.updateBmsCarrierConstructionAward(bmsCarrierConstructionAwardUpdateDto);
             // 申请审批
             if (bmsCarrierConstructionAwardUpdateDto.getStatus()==1){
-                Map<String, String> allJson = getAllJson(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId());
+                JProject jP = new JProject();
-                jProjectService.updateTheJson(allJson);
+                BmsCarrierConstructionAward bmsCarrierConstructionAward =new BmsCarrierConstructionAward();
+                BeanUtil.copyProperties(bmsCarrierConstructionAwardUpdateDto, bmsCarrierConstructionAward);
+                jP.setId(iBmsDeclarationRecordsService.getById(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId()).getJjhProjectId());
+                jP.setStatus(1);
+                jP.setOtherJson(JSONObject.toJSONString(bmsCarrierConstructionAward));
+                jP.setFileJson("{" +
+                        '"' + "相关佐证资料" + '"' + ":" + '"' + bmsCarrierConstructionAward.getSupportingMaterials() + '"' + ','+
+                        '"' + "项目工商登记许可" + '"' + ":" + '"' + bmsCarrierConstructionAward.getBusinessLicense() + '"' + ','+
+                        '"' + "消防验收报告" + '"' + ":" + '"' + bmsCarrierConstructionAward.getFireReport() + '"' +
+                        "}");
+                //修改项目
+                jProjectService.updateById(jP);
                 // 审批状态
                 iCommonService.updateAuditRecord(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.jjh.declaration.entity.BmsBrandingAward;
 import com.ruoyi.jjh.declaration.entity.BmsCreditManagement;
 import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
 import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementAddDto;
@@ -96,8 +97,18 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
         declarationRecords.setId(bmsCreditManagementAddDto.getDeclarationId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
-        //新增项目
+
-        declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsCreditManagementAddDto.getDeclarationId())));
+        //获取某个在线记录id可以添加到项目库的数据
+        JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsCreditManagementAddDto.getDeclarationId());
+        addProject.setStatus(1);
+        addProject.setOtherJson(JSONObject.toJSONString(bmsCreditManagement));
+        addProject.setFileJson("{" +
+                '"' + "项目方案" + '"' + ":" + '"' + bmsCreditManagement.getProjectPlan() + '"' + ","+
+                '"' + "资金使用说明" + '"' + ":" + '"' + bmsCreditManagement.getUsesFunds() + '"' + ","+
+                '"' + "项目专项审计报告" + '"' + ":" + '"' + bmsCreditManagement.getAuditReport() + '"' +
+                "}");
+        jProjectService.save(addProject);
+        declarationRecords.setJjhProjectId(addProject.getId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
         // 生成审核
@@ -105,32 +116,6 @@ 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 js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //信用管理奖补
-        BmsCreditManagement p1 = declarationRecordsVo.getBmsCreditManagement();
-        //信用管理奖补JSON
-//        String js3 = JSONObject.toJSONString(p1);
-        jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
-        jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
-        jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
-        jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
-        jsonMap.put("otherJson",jProjectService.allJsonString( js2, "{}", "{}"));
-        jsonMap.put("fileJson","{" +
-                '"' + "项目方案" + '"' + ":" + '"' + p1.getProjectPlan() + '"' + ","+
-                '"' + "资金使用说明" + '"' + ":" + '"' + p1.getUsesFunds() + '"' + ","+
-                '"' + "项目专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' +
-                "}");
-        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
-        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        return jsonMap;
-    }
-
     /**
      * 修改信用管理奖补
      * 
@@ -151,8 +136,19 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
             num =  baseMapper.updateBmsCreditManagement(bmsCreditManagementUpdateDto);
             // 申请审批
             if (bmsCreditManagementUpdateDto.getStatus()==1){
-                Map<String, String> allJson = getAllJson(bmsCreditManagementUpdateDto.getDeclarationRecordsId());
+                JProject jP = new JProject();
-                jProjectService.updateTheJson(allJson);
+                BmsCreditManagement bmsCreditManagement =new BmsCreditManagement();
+                BeanUtil.copyProperties(bmsCreditManagementUpdateDto, bmsCreditManagement);
+                jP.setId(iBmsDeclarationRecordsService.getById(bmsCreditManagementUpdateDto.getDeclarationRecordsId()).getJjhProjectId());
+                jP.setStatus(1);
+                jP.setOtherJson(JSONObject.toJSONString(bmsCreditManagement));
+                jP.setFileJson("{" +
+                        '"' + "项目方案" + '"' + ":" + '"' + bmsCreditManagement.getProjectPlan() + '"' + ","+
+                        '"' + "资金使用说明" + '"' + ":" + '"' + bmsCreditManagement.getUsesFunds() + '"' + ","+
+                        '"' + "项目专项审计报告" + '"' + ":" + '"' + bmsCreditManagement.getAuditReport() + '"' +
+                        "}");
+                //修改项目
+                jProjectService.updateById(jP);
                 // 审批状态
                 iCommonService.updateAuditRecord(bmsCreditManagementUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -711,4 +711,13 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
     public List<JSmartDeclaration> allNoLimited() {
         return baseMapper.allNoLimited();
     }
+
+    /**
+     * 获取某个在线记录id可以添加到项目库的数据
+     * @return
+     */
+    @Override
+    public JProject getAddProject(Long id) {
+        return baseMapper.getAddProject(id);
+    }
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.jjh.declaration.entity.BmsBrandingAward;
 import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
 import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardAddDto;
@@ -94,8 +95,15 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
         declarationRecords.setId(bmsIndustrialInternetAwardAddDto.getDeclarationId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
-        //新增项目
+        //获取某个在线记录id可以添加到项目库的数据
-        declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsIndustrialInternetAwardAddDto.getDeclarationId())));
+        JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsIndustrialInternetAwardAddDto.getDeclarationId());
+        addProject.setStatus(1);
+        addProject.setOtherJson(JSONObject.toJSONString(bmsIndustrialInternetAward));
+        addProject.setFileJson("{" +
+                '"' + "证明材料" + '"' + ":" + '"' + bmsIndustrialInternetAward.getMaterial() + '"' +
+                "}");
+        jProjectService.save(addProject);
+        declarationRecords.setJjhProjectId(addProject.getId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
         // 生成审核
@@ -103,29 +111,7 @@ 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 js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //5G+工业互联网奖补
-        BmsIndustrialInternetAward p1 = declarationRecordsVo.getBmsIndustrialInternetAward();
-        //5G+工业互联网奖补JSON
-        String js3 = JSONObject.toJSONString(p1);
-        jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
-        jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
-        jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
-        jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
-        jsonMap.put("otherJson",jProjectService.allJsonString( js2, js3, "{}"));
-        jsonMap.put("fileJson", "{" +
-                '"' + "证明材料" + '"' + ":" + '"' + p1.getMaterial() + '"' +
-                "}");
-        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
-        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        return jsonMap;
-    }
 
     /**
      * 修改5G+工业互联网奖补
@@ -147,9 +133,17 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
             num = baseMapper.updateBmsIndustrialInternetAward(bmsIndustrialInternetAwardUpdateDto);
             // 申请审批
             if (bmsIndustrialInternetAwardUpdateDto.getStatus()==1){
-                Map<String, String> allJson = getAllJson(bmsIndustrialInternetAwardUpdateDto.getDeclarationRecordsId());
+                JProject jP = new JProject();
+                BmsIndustrialInternetAward bs =new BmsIndustrialInternetAward();
+                BeanUtil.copyProperties(bmsIndustrialInternetAwardUpdateDto, bs);
+                jP.setId(iBmsDeclarationRecordsService.getById(bmsIndustrialInternetAwardUpdateDto.getDeclarationRecordsId()).getJjhProjectId());
+                jP.setStatus(1);
+                jP.setOtherJson(JSONObject.toJSONString(bs));
+                jP.setFileJson("{" +
+                        '"' + "证明材料" + '"' + ":" + '"' + bs.getMaterial() + '"' +
+                        "}");
                 //修改项目
-                jProjectService.updateTheJson(allJson);
+                jProjectService.updateById(jP);
                 // 审批状态
                 iCommonService.updateAuditRecord(bmsIndustrialInternetAwardUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
+import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward;
 import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries;
 import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesAddDto;
@@ -95,8 +96,23 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
         declarationRecords.setStatus(1L);
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
-        //新增项目
+        //获取某个在线记录id可以添加到项目库的数据
-        declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsIntegrationIndustriesAddDto.getDeclarationId())));
+        JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsIntegrationIndustriesAddDto.getDeclarationId());
+        addProject.setStatus(1);
+        addProject.setOtherJson(JSONObject.toJSONString(bmsIntegrationIndustries));
+        addProject.setFileJson("{" +
+                '"' + "证明材料" + '"' + ":" + '"' + bmsIntegrationIndustries.getEvidence() + '"' + ","+
+                '"' + "营业执照" + '"' + ":" + '"' + bmsIntegrationIndustries.getBusinessLicense() + '"' + ","+
+                '"' + "完税证明" + '"' + ":" + '"' + bmsIntegrationIndustries.getTaxPaymentCertificate() + '"' + ","+
+                '"' + "审计报告" + '"' + ":" + '"' + bmsIntegrationIndustries.getAuditReport() + '"' + ","+
+                '"' + "股权架构图" + '"' + ":" + '"' + bmsIntegrationIndustries.getEquityStructureChart() + '"' + ","+
+                '"' + "项目申报报告" + '"' + ":" + '"' + bmsIntegrationIndustries.getDeclarationReport() + '"' + ","+
+                '"' + "独立核算相关证明" + '"' + ":" + '"' + bmsIntegrationIndustries.getIndependentAccounting() + '"' + ","+
+                '"' + "验资报告" + '"' + ":" + '"' + bmsIntegrationIndustries.getCapitalVerificationReport()+ '"' + ","+
+                '"' + "其他证明材料" + '"' + ":" + '"' + bmsIntegrationIndustries.getOtherEvidence() + '"' +
+                "}");
+        jProjectService.save(addProject);
+        declarationRecords.setJjhProjectId(addProject.getId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
         // 生成审核
@@ -104,38 +120,6 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
         return num;
     }
 
-    @Override
-    public Map<String, String> getAllJson(Long id) {
-        Map<String,String> jsonMap = new HashMap<>();
-        //获取该申报记录的详情
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id);
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //两业融合奖补申请
-        BmsIntegrationIndustries p1 = declarationRecordsVo.getBmsIntegrationIndustries();
-        //两业融合奖补申请JSON
-        String js3 = JSONObject.toJSONString(p1);
-        jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
-        jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
-        jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
-        jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
-        jsonMap.put("otherJson",jProjectService.allJsonString(js2, js3, "{}"));
-        jsonMap.put("fileJson", "{" +
-                '"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' + ","+
-                '"' + "营业执照" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + ","+
-                '"' + "完税证明" + '"' + ":" + '"' + p1.getTaxPaymentCertificate() + '"' + ","+
-                '"' + "审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
-                '"' + "股权架构图" + '"' + ":" + '"' + p1.getEquityStructureChart() + '"' + ","+
-                '"' + "项目申报报告" + '"' + ":" + '"' + p1.getDeclarationReport() + '"' + ","+
-                '"' + "独立核算相关证明" + '"' + ":" + '"' + p1.getIndependentAccounting() + '"' + ","+
-                '"' + "验资报告" + '"' + ":" + '"' + p1.getCapitalVerificationReport()+ '"' + ","+
-                '"' + "其他证明材料" + '"' + ":" + '"' + p1.getOtherEvidence() + '"' +
-                "}");
-        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
-        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        return jsonMap;
-    }
-
     /**
      * 修改两业融合奖补
      * 
@@ -156,9 +140,25 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
             num = baseMapper.updateBmsIntegrationIndustries(bmsIntegrationIndustriesUpdateDto);
             // 申请审批
             if (bmsIntegrationIndustriesUpdateDto.getStatus()==1){
-                Map<String, String> allJson = getAllJson(bmsIntegrationIndustriesUpdateDto.getDeclarationRecordsId());
+                JProject jP = new JProject();
+                BmsIntegrationIndustries p1 =new BmsIntegrationIndustries();
+                BeanUtil.copyProperties(bmsIntegrationIndustriesUpdateDto, p1);
+                jP.setId(iBmsDeclarationRecordsService.getById(bmsIntegrationIndustriesUpdateDto.getDeclarationRecordsId()).getJjhProjectId());
+                jP.setStatus(1);
+                jP.setOtherJson(JSONObject.toJSONString(p1));
+                jP.setFileJson("{" +
+                        '"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' + ","+
+                        '"' + "营业执照" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + ","+
+                        '"' + "完税证明" + '"' + ":" + '"' + p1.getTaxPaymentCertificate() + '"' + ","+
+                        '"' + "审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
+                        '"' + "股权架构图" + '"' + ":" + '"' + p1.getEquityStructureChart() + '"' + ","+
+                        '"' + "项目申报报告" + '"' + ":" + '"' + p1.getDeclarationReport() + '"' + ","+
+                        '"' + "独立核算相关证明" + '"' + ":" + '"' + p1.getIndependentAccounting() + '"' + ","+
+                        '"' + "验资报告" + '"' + ":" + '"' + p1.getCapitalVerificationReport()+ '"' + ","+
+                        '"' + "其他证明材料" + '"' + ":" + '"' + p1.getOtherEvidence() + '"' +
+                        "}");
                 //修改项目
-                jProjectService.updateTheJson(allJson);
+                jProjectService.updateById(jP);
                 // 审批状态
                 iCommonService.updateAuditRecord(bmsIntegrationIndustriesUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
+import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries;
 import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardUpdateDto;
@@ -99,8 +100,18 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
         declarationRecords.setId(bmsLogisticsDevelopmentAwardAddDto.getDeclarationId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
-        //新增项目
+        //获取某个在线记录id可以添加到项目库的数据
-        declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsLogisticsDevelopmentAwardAddDto.getDeclarationId())));
+        JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsLogisticsDevelopmentAwardAddDto.getDeclarationId());
+        addProject.setStatus(1);
+        addProject.setOtherJson(JSONObject.toJSONString(bmsLogisticsDevelopmentAward));
+        addProject.setFileJson( "{" +
+                '"' + "荣誉证明文件" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getHonorCertificate() + '"' + ","+
+                '"' + "平台名称" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getPlatformName() + '"' + ","+
+                '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getFilingNotice() + '"' + ","+
+                '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getAuditReport() + '"' +
+                "}");
+        jProjectService.save(addProject);
+        declarationRecords.setJjhProjectId(addProject.getId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
         // 生成审核
@@ -108,33 +119,6 @@ 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 js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //物流发展奖补
-        BmsLogisticsDevelopmentAward p1  = declarationRecordsVo.getBmsLogisticsDevelopmentAward();
-        //物流发展奖补JSON
-//        String js3 = JSONObject.toJSONString(p1);
-        jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
-        jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
-        jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
-        jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
-        jsonMap.put("otherJson",jProjectService.allJsonString( js2, "{}", "{}"));
-        jsonMap.put("fileJson", "{" +
-                '"' + "荣誉证明文件" + '"' + ":" + '"' + p1.getHonorCertificate() + '"' + ","+
-                '"' + "平台名称" + '"' + ":" + '"' + p1.getPlatformName() + '"' + ","+
-                '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
-                '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' +
-                "}");
-        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
-        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        return jsonMap;
-    }
-
     /**
      * 修改物流发展奖补
      * 
@@ -154,9 +138,20 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
             num = baseMapper.updateBmsLogisticsDevelopmentAward(bmsLogisticsDevelopmentAwardUpdateDto);
             // 申请审批
             if (bmsLogisticsDevelopmentAwardUpdateDto.getStatus()==1){
-                Map<String, String> allJson = getAllJson(bmsLogisticsDevelopmentAwardUpdateDto.getDeclarationRecordsId());
+                JProject jP = new JProject();
+                BmsLogisticsDevelopmentAward p1 =new BmsLogisticsDevelopmentAward();
+                BeanUtil.copyProperties(bmsLogisticsDevelopmentAwardUpdateDto, p1);
+                jP.setId(iBmsDeclarationRecordsService.getById(bmsLogisticsDevelopmentAwardUpdateDto.getDeclarationRecordsId()).getJjhProjectId());
+                jP.setStatus(1);
+                jP.setOtherJson(JSONObject.toJSONString(p1));
+                jP.setFileJson( "{" +
+                        '"' + "荣誉证明文件" + '"' + ":" + '"' + p1.getHonorCertificate() + '"' + ","+
+                        '"' + "平台名称" + '"' + ":" + '"' + p1.getPlatformName() + '"' + ","+
+                        '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
+                        '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' +
+                        "}");
                 //修改项目
-                jProjectService.updateTheJson(allJson);
+                jProjectService.updateById(jP);
                 // 审批状态
                 iCommonService.updateAuditRecord(bmsLogisticsDevelopmentAwardUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
+import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward;
 import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardUpdateDto;
@@ -95,7 +96,18 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
         //新增项目
-        declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsManufacturingServicesAwardAddDto.getDeclarationId())));
+        //获取某个在线记录id可以添加到项目库的数据
+        JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsManufacturingServicesAwardAddDto.getDeclarationId());
+        addProject.setStatus(1);
+        addProject.setOtherJson(JSONObject.toJSONString(bmsManufacturingServicesAward));
+        addProject.setFileJson( "{" +
+                '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + bmsManufacturingServicesAward.getFilingNotice() + '"' + ","+
+                '"' + "购置设备发票清单及发票扫描件" + '"' + ":" + '"' + bmsManufacturingServicesAward.getInvoice() + '"' + ","+
+                '"' + "会计师事务所出具的企业申报项目购置设备情况的专项审计报告" + '"' + ":" + '"' + bmsManufacturingServicesAward.getAuditReport() + '"' + ","+
+                '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + bmsManufacturingServicesAward.getFinancialStatements() + '"' +
+                "}");
+        jProjectService.save(addProject);
+        declarationRecords.setJjhProjectId(addProject.getId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
         // 生成审核
@@ -103,33 +115,6 @@ 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 js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //制造服务业有效投入奖补
-        BmsManufacturingServicesAward p1 = declarationRecordsVo.getBmsManufacturingServicesAward();
-        //制造服务业有效投入奖补JSON
-//        String js3 = JSONObject.toJSONString(p1);
-        jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
-        jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
-        jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
-        jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
-        jsonMap.put("otherJson",jProjectService.allJsonString( js2, "{}", "{}"));
-        jsonMap.put("fileJson", "{" +
-                '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
-                '"' + "购置设备发票清单及发票扫描件" + '"' + ":" + '"' + p1.getInvoice() + '"' + ","+
-                '"' + "会计师事务所出具的企业申报项目购置设备情况的专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
-                '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getFinancialStatements() + '"' +
-                "}");
-        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
-        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        return jsonMap;
-    }
-
     /**
      * 修改制造服务业有效投入奖补
      * 
@@ -150,9 +135,20 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
             num =  baseMapper.updateBmsManufacturingServicesAward(bmsManufacturingServicesAwardUpdateDto);
             // 申请审批
             if (bmsManufacturingServicesAwardUpdateDto.getStatus()==1){
-                Map<String, String> allJson = getAllJson(bmsManufacturingServicesAwardUpdateDto.getDeclarationRecordsId());
+                JProject jP = new JProject();
+                BmsManufacturingServicesAward p1 =new BmsManufacturingServicesAward();
+                BeanUtil.copyProperties(bmsManufacturingServicesAwardUpdateDto, p1);
+                jP.setId(iBmsDeclarationRecordsService.getById(bmsManufacturingServicesAwardUpdateDto.getDeclarationRecordsId()).getJjhProjectId());
+                jP.setStatus(1);
+                jP.setOtherJson(JSONObject.toJSONString(p1));
+                jP.setFileJson( "{" +
+                        '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
+                        '"' + "购置设备发票清单及发票扫描件" + '"' + ":" + '"' + p1.getInvoice() + '"' + ","+
+                        '"' + "会计师事务所出具的企业申报项目购置设备情况的专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
+                        '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getFinancialStatements() + '"' +
+                        "}");
                 //修改项目
-                jProjectService.updateTheJson(allJson);
+                jProjectService.updateById(jP);
                 // 审批状态
                 iCommonService.updateAuditRecord(bmsManufacturingServicesAwardUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -4,10 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
+import com.ruoyi.jjh.declaration.entity.*;
-import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward;
-import com.ruoyi.jjh.declaration.entity.BmsOutQuitProducts;
-import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsOutQuitProductsAddDto;
@@ -19,6 +16,7 @@ import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
 import com.ruoyi.jjh.declaration.service.IBmsOutQuitProductsService;
 import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
 import com.ruoyi.jjh.declaration.service.ICommonService;
+import com.ruoyi.jjh.ent.entity.JProject;
 import com.ruoyi.jjh.ent.service.JProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -84,8 +82,16 @@ public class BmsOutQuitProductsServiceImpl extends ServiceImpl<BmsOutQuitProduct
         declarationRecords.setId(bmsOutQuitProductsAddDto.getDeclarationId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
-        //新增项目
+        //获取某个在线记录id可以添加到项目库的数据
-        declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsOutQuitProductsAddDto.getDeclarationId())));
+        JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsOutQuitProductsAddDto.getDeclarationId());
+        addProject.setStatus(1);
+        addProject.setOtherJson(JSONObject.toJSONString(products));
+        addProject.setFileJson( "{" +
+                '"' + "拟淘汰或退出生产工艺装备情况" + '"' + ":" + '"' + products.getSpecifics() + '"' + "," +
+                '"' + "其他相关情况说明" + '"' + ":" + '"' + products.getOtherSpecifics() + '"'+
+                "}");
+        jProjectService.save(addProject);
+        declarationRecords.setJjhProjectId(addProject.getId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
         // 生成审核
@@ -93,31 +99,6 @@ public class BmsOutQuitProductsServiceImpl extends ServiceImpl<BmsOutQuitProduct
         return num;
     }
 
-    @Override
-    public Map<String, String> getAllJson(Long id) {
-        Map<String,String> jsonMap = new HashMap<>();
-        //获取该申报记录的详情
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id);
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //提交2024年度淘汰落后和退出低端低效产能装备清单
-        BmsOutQuitProducts p1 = declarationRecordsVo.getBmsOutQuitProducts();
-        //提交2024年度淘汰落后和退出低端低效产能装备清单json
-        String js3 = JSONObject.toJSONString(p1);
-        jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
-        jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
-        jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
-        jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
-        jsonMap.put("otherJson",jProjectService.allJsonString( js2, js3, "{}"));
-        jsonMap.put("fileJson", "{" +
-                '"' + "拟淘汰或退出生产工艺装备情况" + '"' + ":" + '"' + p1.getSpecifics() + '"' + "," +
-                '"' + "其他相关情况说明" + '"' + ":" + '"' + p1.getOtherSpecifics() + '"'+
-                "}");
-        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
-        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        return jsonMap;
-    }
-
     @Override
     public int updateBmsOutQuitProducts(BmsOutQuitProductsUpdateDto bmsOutQuitProductsUpdateDto) {
         int num = 0;
@@ -130,9 +111,18 @@ public class BmsOutQuitProductsServiceImpl extends ServiceImpl<BmsOutQuitProduct
             num = baseMapper.updateById(bmsOutQuitProductsUpdateDto);
             // 申请审批
             if (bmsOutQuitProductsUpdateDto.getStatus()==1){
-                Map<String, String> allJson = getAllJson(bmsOutQuitProductsUpdateDto.getDeclarationRecordsId());
+                JProject jP = new JProject();
+                BmsOutQuitProducts p1 =new BmsOutQuitProducts();
+                BeanUtil.copyProperties(bmsOutQuitProductsUpdateDto, p1);
+                jP.setId(iBmsDeclarationRecordsService.getById(bmsOutQuitProductsUpdateDto.getDeclarationRecordsId()).getJjhProjectId());
+                jP.setStatus(1);
+                jP.setOtherJson(JSONObject.toJSONString(p1));
+                jP.setFileJson("{" +
+                        '"' + "拟淘汰或退出生产工艺装备情况" + '"' + ":" + '"' + p1.getSpecifics() + '"' + "," +
+                        '"' + "其他相关情况说明" + '"' + ":" + '"' + p1.getOtherSpecifics() + '"'+
+                        "}");
                 //修改项目
-                jProjectService.updateTheJson(allJson);
+                jProjectService.updateById(jP);
                 // 审批状态
                 iCommonService.updateAuditRecord(bmsOutQuitProductsUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward;
 import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
+import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward;
 import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardUpdateDto;
@@ -97,8 +98,15 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
         declarationRecords.setId(bmsPlatformConstructionAwardAddDto.getDeclarationId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
-        //新增项目
+        //获取某个在线记录id可以添加到项目库的数据
-        declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsPlatformConstructionAwardAddDto.getDeclarationId())));
+        JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsPlatformConstructionAwardAddDto.getDeclarationId());
+        addProject.setStatus(1);
+        addProject.setOtherJson(JSONObject.toJSONString(bmsPlatformConstructionAward));
+        addProject.setFileJson( "{" +
+                '"' + "合作协议" + '"' + ":" + '"' + bmsPlatformConstructionAward.getAgreement() + '"' +
+                "}");
+        jProjectService.save(addProject);
+        declarationRecords.setJjhProjectId(addProject.getId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
         // 生成审核
@@ -107,30 +115,6 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
     }
 
 
-    @Override
-    public Map<String, String> getAllJson(Long id) {
-        Map<String,String> jsonMap = new HashMap<>();
-        //获取该申报记录的详情
-        DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id);
-        //在线申报信息JSON
-        String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //平台建设奖补
-        BmsPlatformConstructionAward p1 = declarationRecordsVo.getBmsPlatformConstructionAward();
-        //平台建设奖补json
-        String js3 = JSONObject.toJSONString(p1);
-        jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
-        jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
-        jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
-        jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
-        jsonMap.put("otherJson",jProjectService.allJsonString( js2, js3, "{}"));
-        jsonMap.put("fileJson", "{" +
-                '"' + "合作协议" + '"' + ":" + '"' + p1.getAgreement() + '"' +
-                "}");
-        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
-        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        return jsonMap;
-    }
-
     /**
      * 修改平台建设奖补
      * 
@@ -150,9 +134,17 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
             num = baseMapper.updateBmsPlatformConstructionAward(bmsPlatformConstructionAwardUpdateDto);
             // 申请审批
             if (bmsPlatformConstructionAwardUpdateDto.getStatus()==1){
-                Map<String, String> allJson = getAllJson(bmsPlatformConstructionAwardUpdateDto.getDeclarationRecordsId());
+                JProject jP = new JProject();
+                BmsPlatformConstructionAward p1 =new BmsPlatformConstructionAward();
+                BeanUtil.copyProperties(bmsPlatformConstructionAwardUpdateDto, p1);
+                jP.setId(iBmsDeclarationRecordsService.getById(bmsPlatformConstructionAwardUpdateDto.getDeclarationRecordsId()).getJjhProjectId());
+                jP.setStatus(1);
+                jP.setOtherJson(JSONObject.toJSONString(p1));
+                jP.setFileJson("{" +
+                        '"' + "合作协议" + '"' + ":" + '"' + p1.getAgreement() + '"' +
+                        "}");
                 //修改项目
-                jProjectService.updateTheJson(allJson);
+                jProjectService.updateById(jP);
                 // 审批状态
                 iCommonService.updateAuditRecord(bmsPlatformConstructionAwardUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -4,10 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
+import com.ruoyi.jjh.declaration.entity.*;
-import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
-import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
-import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsFundingDetailAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardUpdateDto;
@@ -120,8 +117,22 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
         declarationRecords.setId(bmsProjectSettlementAwardAddDto.getDeclarationId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
-        //新增项目
+        //获取某个在线记录id可以添加到项目库的数据
-        declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsProjectSettlementAwardAddDto.getDeclarationId())));
+        JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsProjectSettlementAwardAddDto.getDeclarationId());
+        addProject.setStatus(1);
+        String jsonString = jProjectService.getJsonString(fundingDetailList);
+        JSONObject mergedObj = new JSONObject();
+        mergedObj.putAll(JSONObject.parseObject(jsonString));
+        mergedObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(projectSettlementAward)));
+        addProject.setOtherJson(mergedObj.toJSONString());
+        addProject.setFileJson("{" +
+                '"' + "招商协议" + '"' + ":" + '"' + projectSettlementAward.getAgreement() + '"' + "," +
+                '"' + "验资报告" + '"' + ":" + '"' + projectSettlementAward.getBusinessLicense() + '"' + "," +
+                '"' + "营业执照" + '"' + ":" + '"' + projectSettlementAward.getOtherMaterials() + '"' + "," +
+                '"' + "其他证明材料" + '"' + ":" + '"' + projectSettlementAward.getReport() + '"'  +
+                "}");
+        jProjectService.save(addProject);
+        declarationRecords.setJjhProjectId(addProject.getId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
         // 生成审核
@@ -129,33 +140,6 @@ 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 js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
-        //落户奖补对象
-        BmsProjectSettlementAwardQueryVo p1 = declarationRecordsVo.getBmsProjectSettlementAwardQueryVo();
-        //落户奖补对象JSON
-        String js3 = JSONObject.toJSONString(p1);
-        jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
-        jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
-        jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
-        jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
-        jsonMap.put("otherJson",jProjectService.allJsonString( js2, js3, jProjectService.getJsonString(p1.getFundingDetailList())));
-        jsonMap.put("fileJson", "{" +
-                '"' + "招商协议" + '"' + ":" + '"' + p1.getAgreement() + '"' + "," +
-                '"' + "验资报告" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + "," +
-                '"' + "营业执照" + '"' + ":" + '"' + p1.getOtherMaterials() + '"' + "," +
-                '"' + "其他证明材料" + '"' + ":" + '"' + p1.getReport() + '"'  +
-                "}");
-        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
-        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        return jsonMap;
-    }
-
     /**
      * 修改项目落户奖补
      *
@@ -177,9 +161,23 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
             iBmsFundingDetailService.saveOrUpdateBatch(fundingDetailList);
             // 申请审批
             if (bmsProjectSettlementAwardUpdateDto.getStatus() == 1) {
-                Map<String, String> allJson = getAllJson(bmsProjectSettlementAwardUpdateDto.getDeclarationRecordsId());
+                JProject jP = new JProject();
+                BmsProjectSettlementAward p1 = new BmsProjectSettlementAward();
+                BeanUtil.copyProperties(bmsProjectSettlementAwardUpdateDto, p1);
+                jP.setId(iBmsDeclarationRecordsService.getById(bmsProjectSettlementAwardUpdateDto.getDeclarationRecordsId()).getJjhProjectId());
+                jP.setStatus(1);
+                JSONObject mergedObj = new JSONObject();
+                mergedObj.putAll(JSONObject.parseObject(jProjectService.getJsonString(fundingDetailList)));
+                mergedObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(p1)));
+                jP.setOtherJson(mergedObj.toJSONString());
+                jP.setFileJson("{" +
+                        '"' + "招商协议" + '"' + ":" + '"' + p1.getAgreement() + '"' + "," +
+                        '"' + "验资报告" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + "," +
+                        '"' + "营业执照" + '"' + ":" + '"' + p1.getOtherMaterials() + '"' + "," +
+                        '"' + "其他证明材料" + '"' + ":" + '"' + p1.getReport() + '"'  +
+                        "}");
                 //修改项目
-                jProjectService.updateTheJson(allJson);
+                jProjectService.updateById(jP);
                 // 审批状态
                 iCommonService.updateAuditRecord(bmsProjectSettlementAwardUpdateDto.getDeclarationRecordsId(), 0);
             }

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
+import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward;
 import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward;
 import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardAddDto;
 import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardUpdateDto;
@@ -97,8 +98,15 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
         declarationRecords.setId(bmsSceneOpeningAwardAddDto.getDeclarationId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
-        //新增项目
+        //获取某个在线记录id可以添加到项目库的数据
-        declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsSceneOpeningAwardAddDto.getDeclarationId())));
+        JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsSceneOpeningAwardAddDto.getDeclarationId());
+        addProject.setStatus(1);
+        addProject.setOtherJson(JSONObject.toJSONString(bmsSceneOpeningAward));
+        addProject.setFileJson("{" +
+                '"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + bmsSceneOpeningAward.getMaterial() + '"' +
+                "}");
+        jProjectService.save(addProject);
+        declarationRecords.setJjhProjectId(addProject.getId());
         iBmsDeclarationRecordsService.updateById(declarationRecords);
 
         // 生成审核
@@ -106,28 +114,6 @@ 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);
-        //场景开放奖补
-        BmsSceneOpeningAward p1 = declarationRecordsVo.getBmsSceneOpeningAward();
-        //场景开放奖补JSON
-        String js3 = JSONObject.toJSONString(p1);
-        jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
-        jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
-        jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
-        jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
-        jsonMap.put("otherJson",jProjectService.allJsonString( "{}", js3,"{}"));
-        jsonMap.put("fileJson", "{" +
-                '"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + p1.getMaterial() + '"' +
-                "}");
-        jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
-        jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
-        return jsonMap;
-    }
-
     /**
      * 修改场景开放奖补
      * 
@@ -148,9 +134,17 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
             num=baseMapper.updateBmsSceneOpeningAward(bmsSceneOpeningAwardUpdateDto);
             // 申请审批
             if (bmsSceneOpeningAwardUpdateDto.getStatus()==1){
-                Map<String, String> allJson = getAllJson(bmsSceneOpeningAwardUpdateDto.getDeclarationRecordsId());
+                JProject jP = new JProject();
+                BmsSceneOpeningAward bs =new BmsSceneOpeningAward();
+                BeanUtil.copyProperties(bmsSceneOpeningAwardUpdateDto, bs);
+                jP.setId(iBmsDeclarationRecordsService.getById(bmsSceneOpeningAwardUpdateDto.getDeclarationRecordsId()).getJjhProjectId());
+                jP.setStatus(1);
+                jP.setOtherJson(JSONObject.toJSONString(bs));
+                jP.setFileJson( "{" +
+                        '"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + bs.getMaterial() + '"' +
+                        "}");
                 //修改项目
-                jProjectService.updateTheJson(allJson);
+                jProjectService.updateById(jP);
                 // 审批状态
                 iCommonService.updateAuditRecord(bmsSceneOpeningAwardUpdateDto.getDeclarationRecordsId(), 0);
             }

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java

@@ -51,7 +51,7 @@ public class JProjectController extends BaseController {
 //    public AjaxResult changeTyshxydm() {
 //        return success(jProjectService.changeTyshxydm());
 //    }
-
+//
 //    /**
 //     * 改变项目中的英文括号
 //     *
@@ -189,22 +189,29 @@ public class JProjectController extends BaseController {
     /**
      * 导入下载的excel模板和参数项目数据
      */
-    @PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')")
+//    @PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')")
     @ApiOperation(value = "导入下载的excel模板和参数项目数据")
+    @PostMapping(value = "/importTemplateProject", consumes = "multipart/form-data")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectClassify", value = "项目分类", required = true),
+            @ApiImplicitParam(name = "projectBigType", value = "项目大类", required = true),
-            @ApiImplicitParam(name = "projectYear", value = "年份", required = true),
+            @ApiImplicitParam(name = "projectMiddleType", value = "项目中类", required = true),
+            @ApiImplicitParam(name = "projectSmallType", value = "项目小类", required = true),
     })
-    @PostMapping(value = "/importTemplateProject", consumes = "multipart/form-data")
     public AjaxResult importTemplateProject(@RequestPart("file") MultipartFile file,
-                                            @RequestParam("projectClassify") String projectClassify
+                                            @RequestParam("projectBigType") Integer projectBigType,
-    ) throws Exception {
+                                            @RequestParam("projectMiddleType") Integer projectMiddleType,
+                                            @RequestParam("projectSmallType") Integer projectSmallType) throws Exception {
         ProjectValueUtil<JProject> util = new ProjectValueUtil<>(JProject.class);
-        List<JProject> proList = util.importExcel(file.getInputStream(), projectClassify);
+        List<JProject> proList = util.importExcel(file.getInputStream());
         StringBuilder successMsg = new StringBuilder();
         if (proList == null || proList.isEmpty()) {
             throw new ServiceException("项目导入数据不能为空");
         } else {
+            proList.forEach(x -> {
+                x.setProjectBigType(projectBigType);
+                x.setProjectMiddleType(projectMiddleType);
+                x.setProjectSmallType(projectSmallType);
+            });
             jProjectService.saveBatch(proList);
             successMsg.append("导入成功");
         }

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java

@@ -6,12 +6,10 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.jjh.declaration.regular.TimeChange;
-import com.ruoyi.jjh.ent.entity.JProject;
 import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
 import com.ruoyi.jjh.ent.entity.JSmartReminders;
 import com.ruoyi.jjh.ent.entity.request.JSmartRemindersDq;
 import com.ruoyi.jjh.ent.entity.request.JSmartRemindersNDq;
-import com.ruoyi.jjh.ent.service.JProjectService;
 import com.ruoyi.jjh.ent.service.JSmartDeclarationService;
 import com.ruoyi.jjh.ent.service.JSmartRemindersService;
 import io.swagger.annotations.Api;
@@ -173,6 +171,11 @@ public class JSmartRemindersController extends BaseController {
     @ApiOperation(value = "新增定期提醒数据（政务端和企业端）")
     @PostMapping
     public AjaxResult insertDs(@RequestBody @Valid JSmartRemindersDq jSmartRemindersDq) {
+        if(jSmartRemindersDq.getProjectId()!=null){
+            jSmartRemindersDq.setAlertType(4);
+        }else {
+            jSmartRemindersDq.setAlertType(1);
+        }
         return success(jSmartRemindersService.add(jSmartRemindersDq));
     }
 
@@ -187,7 +190,11 @@ public class JSmartRemindersController extends BaseController {
     @ApiOperation(value = "修改定期提醒数据")
     @PostMapping("/updateDq")
     public AjaxResult updateDq(@RequestBody @Valid JSmartRemindersDq dq) {
+        if(dq.getAlertType() == 1 || dq.getAlertType()==4){
             return success(jSmartRemindersService.updateDq(dq));
+        }else {
+            throw new ServiceException("请选择正确类型!");
+        }
     }
 
     /**
@@ -200,7 +207,11 @@ public class JSmartRemindersController extends BaseController {
     @ApiOperation(value = "修改不定期提醒数据")
     @PostMapping("/updateNdq")
     public AjaxResult updateNdq(@RequestBody @Valid JSmartRemindersNDq ndq) {
+        if(ndq.getAlertType()==2 || ndq.getAlertType()==3){
             return success(jSmartRemindersService.updateNdq(ndq));
+        }else {
+            throw new ServiceException("请选择正确类型!");
+        }
     }
 
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/HomeRequestSmart.java

@@ -33,9 +33,9 @@ public class HomeRequestSmart {
 
 
     /**
-     * 申报记录名称
+     * 项目小类名称
      */
-    @ApiModelProperty("申报记录名称")
+    @ApiModelProperty("项目小类名称")
     private String declarationName;
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProject.java

@@ -28,42 +28,47 @@ public class JProject{
     @ApiModelProperty("Id")
     private Long id;
 
+
     /**
-     * 项目名称
+     * 项目大类 1.总部经济 2自主品牌先进技术研究院 3省现代服务业重点项目 4省市服务业领军企业
+     * 5.省级现代服务业集聚区 6两业融合试点单位 7楼宇经济 8工业设计中心 9工业设计研究院 10服务型制造示范
      */
-    @Excel(name = "项目名称")
+    @ApiModelProperty(value = "项目大类 1.总部经济 2自主品牌先进技术研究院 3省现代服务业重点项目 4省市服务业领军企业 5.省级现代服务业集聚区 6两业融合试点单位 7楼宇经济 8工业设计中心 9工业设计研究院 10服务型制造示范")
-    @ApiModelProperty("项目名称")
+    @Excel(name = "项目大类", readConverterExp = "1=总部经济,2=自主品牌先进技术研究院,3=省现代服务业重点项目,4=省市服务业领军企业," +
-    private String projectName;
+            "5=省级现代服务业集聚区,6=两业融合试点单位,7=楼宇经济,8=工业设计中心,9=工业设计研究院,10=服务型制造示范")
+    private Integer projectBigType;
 
+    /**
+     * 项目中类
+     */
+    @ApiModelProperty(value = "项目中类 1=总部企业,2=自主品牌先进技术研究院,3=省现代服务业重点项目,4=省市服务业领军企业," +
+            "            5=省级现代服务业集聚区,6=两业融合试点单位,7=楼宇经济,8=工业设计中心,9=工业设计研究院,10=服务型制造企业,11=服务型制造平台,12=服务型制造示范项目")
+    @Excel(name = "项目中类", readConverterExp = "1=总部企业,2=自主品牌先进技术研究院,3=省现代服务业重点项目,4=省市服务业领军企业," +
+            "5=省级现代服务业集聚区,6=两业融合试点单位,7=楼宇经济,8=工业设计中心,9=工业设计研究院,10=服务型制造企业,11=服务型制造平台,12=服务型制造示范项目")
+    private Integer projectMiddleType;
 
     /**
-     * 项目分类
+     * 项目小类
      */
-    @Excel(name = "项目分类", readConverterExp = "1=总部经济," +
+    @ApiModelProperty(value = "项目小类")
-            "2=自主品牌先进技术研究院," +
+    @Excel(name = "项目小类", readConverterExp = "1=省级总部,2=市级总部,3=区级总部,4=自主品牌先进技术研究院,5=省现代服务业重点项目,6=省级服务业领军," +
-            "3=省现代服务业重点项目," +
+            "7=市级服务业领军,8=省级现代服务业集聚区,9=两业融合试点单位,10=楼宇经济,11=国家级工业设计中心,12=省级工业设计中心,13=市级工业设计中心," +
-            "4=省市服务业领军企业," +
+            "14=工业设计研究院,15=国家级服务型制造企业,16=省级服务型制造企业,17=市级服务型制造企业,18=区级服务型制造企业,19=国家级服务型制造平台,20=省服务型制造平台," +
-            "5=省级现代服务业集聚区," +
+            "21=市级服务型制造平台,22=国家级示范项目,23=省级示范项目")
-            "6=两业融合试点单位," +
+    private Integer projectSmallType;
-            "7=楼宇经济," +
-            "8=工业设计中心," +
-            "9=工业设计研究院," +
-            "10=服务型制造示范")
-    @ApiModelProperty("项目分类")
-    private Integer projectClassify;
 
     /**
-     * 申报单位
+     * 企业名称
      */
-    @Excel(name = "申报单位")
+    @Excel(name = "企业名称")
-    @ApiModelProperty("申报单位")
+    @ApiModelProperty("企业名称")
     private String declareUnit;
 
     /**
-     * 企业信用代码
+     * 统一社会信用代码
      */
-    @Excel(name = "企业信用代码")
+    @Excel(name = "统一社会信用代码")
-    @ApiModelProperty("企业信用代码")
+    @ApiModelProperty("统一社会信用代码")
     private String creditCode;
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JSmartReminders.java

@@ -54,9 +54,9 @@ public class JSmartReminders extends BaseInfoEntity {
     private LocalDateTime alertTime;
 
     /**
-     * 提醒分类 1.申报任务即将结束(企业) 2项目即将建设完成(政务)
+     * 提醒分类 1.全局自定义通知  2.申报任务即将结束(企业) 3.项目即将建设完成(政务) 4.项目自定义通知
      */
-    @ApiModelProperty("提醒分类 1.申报任务即将结束(企业) 2项目即将建设完成(政务)")
+    @ApiModelProperty("提醒分类 1.全局自定义通知  2.申报任务即将结束(企业) 3.项目即将建设完成(政务) 4.项目自定义通知")
     private Integer alertType;
 
     /**
@@ -72,11 +72,11 @@ public class JSmartReminders extends BaseInfoEntity {
     private Long projectId;
 
     /**
-     * 项目名称
+     * 项目小类
      */
     @TableField(exist = false)
-    @ApiModelProperty("项目名称")
+    @ApiModelProperty("项目小类")
-    private String projectName;
+    private String projectSmallType;
 
     /**
      * 提醒内容

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JProjectExcel.java

@@ -10,24 +10,24 @@ import lombok.Data;
  */
 @Data
 public class JProjectExcel {
+
     /**
-     * 项目名称
+     * 企业名称
      */
-    @Excel(name = "项目名称")
+    @Excel(name = "企业名称")
-    @ApiModelProperty("项目名称")
+    @ApiModelProperty("企业名称")
-    private String projectName;
+    private String declareUnit;
 
     /**
-     * 申报单位
+     * 统一社会信用代码
      */
-    @Excel(name = "申报单位")
+    @Excel(name = "统一社会信用代码")
-    @ApiModelProperty("申报单位")
+    @ApiModelProperty("统一社会信用代码")
-    private String declareUnit;
+    private String creditCode;
 
     /**
      * 年份
      */
     @Excel(name = "年份")
-    @ApiModelProperty("年份")
     private String projectYear;
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JSmartRemindersDq.java

@@ -42,6 +42,14 @@ public class JSmartRemindersDq {
     @ApiModelProperty("提醒对象 1.企业用户 2政务用户")
     private Integer alertRecipients;
 
+
+    /**
+     * 提醒分类 1.全局自定义通知  2.申报任务即将结束(企业) 3.项目即将建设完成(政务) 4.项目自定义通知
+     */
+    @ApiModelProperty("提醒分类 1.全局自定义通知  2.申报任务即将结束(企业) 3.项目即将建设完成(政务) 4.项目自定义通知")
+    private Integer alertType;
+
+
     /**
      * 提醒方式 1.定时提醒 2.不定时提醒
      */
@@ -69,5 +77,5 @@ public class JSmartRemindersDq {
      * 项目id 非必传
      */
     @ApiModelProperty("项目id 非必传")
-    private String projectId;
+    private Integer projectId;
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JSmartRemindersNDq.java

@@ -47,10 +47,10 @@ public class JSmartRemindersNDq {
     private Integer alertManner;
 
     /**
-     * 提醒分类 1.申报任务即将结束(企业) 2项目即将建设完成(政务)
+     * 提醒分类  2.申报任务即将结束(企业) 3.项目即将建设完成(政务)
      */
     @NotNull
-    @ApiModelProperty("提醒分类 1.申报任务即将结束(企业) 2项目即将建设完成(政务)")
+    @ApiModelProperty("提醒分类  2.申报任务即将结束(企业) 3.项目即将建设完成(政务)")
     private Integer alertType;
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectMapper.java

@@ -40,6 +40,5 @@ public interface JProjectMapper extends BaseMapper<JProject> {
 
     List<JProject> selectAll(@Param("name") String name);
 
-    List<JProject> selectAl1l();
 }
 

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

@@ -38,15 +38,8 @@ public interface JProjectService extends IService<JProject> {
 
     String getJsonString(List<BmsFundingDetail> obj);
 
-    String allJsonString(String a2,String a3,String a4);
 
-    /**
-     * 项目统一添加到项目库
-     * @param allJson
-     */
-    Long saveProject(Map<String, String> allJson);
 
-    void updateTheJson( Map<String, String> allJson);
 
     /**
      * 作业台查询所有项目
@@ -57,8 +50,6 @@ public interface JProjectService extends IService<JProject> {
     List<JProject> selectAll(String jProject);
 
 
-    List<JProject> selectAl1l();
-
     /**
      * 改变没有信用代码的项目
      * @return

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

@@ -75,63 +75,13 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
         return String.valueOf(str);
     }
 
-    @Override
-    public String allJsonString( String a2, String a3, String a4) {
-        // 创建一个新的JSON对象，并将两个JSON对象合并到新对象中
-        JSONObject mergedObj = new JSONObject();
-        mergedObj.putAll(JSONObject.parseObject(a2));
-        mergedObj.putAll(JSONObject.parseObject(a3));
-        mergedObj.putAll(JSONObject.parseObject(a4));
-        return mergedObj.toJSONString();
-    }
-
-    /**
-     * 项目统一添加到项目库
-     * @param allJson
-     */
-    @Override
-    public Long saveProject(Map<String, String> allJson) {
-        JProject jP = new JProject();
-        jP.setCreditCode(allJson.get("credit_code"));
-        jP.setProjectYear(allJson.get("year"));
-        jP.setProjectName(allJson.get("projectName"));
-        jP.setDeclareUnit(allJson.get("declareUnit"));
-        jP.setProjectClassify(iBmsTemplateInfoService.getById(allJson.get("templateId")).getProjectClassify());
-        jP.setStatus(1);
-        jP.setOtherJson(allJson.get("otherJson"));
-        jP.setFileJson(allJson.get("fileJson"));
-        this.save(jP);
-        return jP.getId();
-    }
-
-
-    @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);
-    }
 
     @Override
     public List<JProject> selectAll(String jProject) {
         return baseMapper.selectAll(jProject);
     }
 
-    @Override
+
-    public List<JProject> selectAl1l() {
-        List<JProject> lists = baseMapper.selectAl1l();
-        for (JProject items : lists) {
-            JSONObject mergedObj = JSONObject.parseObject(items.getOtherJson());
-            if(mergedObj.get("统一社会信用代码")!=null){
-                items.setProjectName(String.valueOf(mergedObj.get("统一社会信用代码")));
-            }
-        }
-        return lists;
-    }
 
     /**
      * 改变没有信用代码的项目
@@ -142,7 +92,7 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
         List<BmsEnterpriseBasicInfo> listE = iBmsEnterpriseBasicInfoService.list();
         //获取项目库信用代码为空的企业
         QueryWrapper<JProject> queryWrapper = new QueryWrapper<>();
-        queryWrapper.isNull("credit_code");
+        queryWrapper.eq("credit_code","");
         List<JProject> listJ= this.list(queryWrapper);
         listJ.forEach(x->{
             listE.forEach(y->{

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -1,19 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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 com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -24,6 +10,14 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 数据字典信息
@@ -32,18 +26,22 @@ import com.ruoyi.system.service.ISysDictTypeService;
  */
 @RestController
 @RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
+public class SysDictDataController extends BaseController {
-{
     @Autowired
     private ISysDictDataService dictDataService;
 
     @Autowired
     private ISysDictTypeService dictTypeService;
 
+    @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
+    @GetMapping("/getAllList")
+    public AjaxResult getAllList(SysDictData dictData) {
+        return success(dictDataService.selectDictDataList(dictData));
+    }
+
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysDictData dictData)
+    public TableDataInfo list(SysDictData dictData) {
-    {
         startPage();
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         return getDataTable(list);
@@ -52,8 +50,7 @@ public class SysDictDataController extends BaseController
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysDictData dictData)
+    public void export(HttpServletResponse response, SysDictData dictData) {
-    {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
         util.exportExcel(response, list, "字典数据");
@@ -64,8 +61,7 @@ public class SysDictDataController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictCode}")
-    public AjaxResult getInfo(@PathVariable Long dictCode)
+    public AjaxResult getInfo(@PathVariable Long dictCode) {
-    {
         return success(dictDataService.selectDictDataById(dictCode));
     }
 
@@ -73,11 +69,9 @@ public class SysDictDataController extends BaseController
      * 根据字典类型查询字典数据信息
      */
     @GetMapping(value = "/type/{dictType}")
-    public AjaxResult dictType(@PathVariable String dictType)
+    public AjaxResult dictType(@PathVariable String dictType) {
-    {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
-        if (StringUtils.isNull(data))
+        if (StringUtils.isNull(data)) {
-        {
             data = new ArrayList<SysDictData>();
         }
         return success(data);
@@ -89,8 +83,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDictData dict)
+    public AjaxResult add(@Validated @RequestBody SysDictData dict) {
-    {
         dict.setCreateBy(getUsername());
         return toAjax(dictDataService.insertDictData(dict));
     }
@@ -101,8 +94,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
+    public AjaxResult edit(@Validated @RequestBody SysDictData dict) {
-    {
         dict.setUpdateBy(getUsername());
         return toAjax(dictDataService.updateDictData(dict));
     }
@@ -113,8 +105,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @PostMapping("/{dictCodes}")
-    public AjaxResult remove(@PathVariable Long[] dictCodes)
+    public AjaxResult remove(@PathVariable Long[] dictCodes) {
-    {
         dictDataService.deleteDictDataByIds(dictCodes);
         return success();
     }

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

@@ -284,6 +284,21 @@
         </where>
         order by FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5),a.create_time desc, e.dict_sort desc
     </select>
+    <select id="getAddProject" resultType="com.ruoyi.jjh.ent.entity.JProject">
+        SELECT
+            c.qymc as declareUnit,
+            a.credit_code as creditCode,
+            a.`year` as projectYear,
+            b.project_big_type as projectBigType,
+            b.project_middle_type as projectMiddleType,
+            b.project_small_type as projectSmallType
+        FROM
+            bms_declaration_records a
+                left JOIN bms_template_info b ON a.template_id = b.id
+                left JOIN bms_enterprise_basic_info c ON a.credit_code = c.tyshxydm
+        WHERE
+            a.id = #{id}
+    </select>
 
 
     <insert id="insertBmsDeclarationRecords" parameterType="com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords"

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

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="page" resultType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo">
         select * from bms_enterprise_basic_info
         <where>
+            <if test="req.type != null  and req.type != ''"> and type = #{req.type}</if>
             <if test="req.qymc != null  and req.qymc != ''"> and qymc like concat('%', #{req.qymc}, '%')</if>
             <if test="req.tyshxydm != null  and req.tyshxydm != ''"> and tyshxydm = #{req.tyshxydm}</if>
             <if test="req.isDeleted != null "> and is_deleted = #{req.isDeleted}</if>

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

@@ -71,7 +71,7 @@
             <if test="templateName != null  and templateName != ''">and a.template_name like concat('%',
                 #{templateName}, '%')
             </if>
-            <if test="projectClassify != null ">and a.project_classify = #{projectClassify}</if>
+            <if test="projectSmallType != null ">and a.project_small_type = #{projectSmallType}</if>
             <if test="responsibilityUnit != null ">and a.responsibility_unit = #{responsibilityUnit}</if>
             <if test="status != null ">and a.status = #{status}</if>
             <if test="isDeleted != null ">and is_deleted = #{isDeleted}</if>

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

@@ -136,7 +136,7 @@
         a.id as templateRecordId,
         a.status,
         a.enterprise_directory,
-        b.project_classify,
+        b.project_small_type as projectClassify,
         b.id as templateId,
         b.template_name,
         b.LEVEL,
@@ -188,7 +188,7 @@
                a.update_time,
                a.remark,
                b.responsibility_unit,
-               b.project_classify
+               b.project_small_type as projectClassify
         FROM bms_template_record a
                  INNER JOIN bms_template_info b ON a.template_id = b.id
         where a.id = #{id}

ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml

@@ -10,11 +10,14 @@
             <if test="req.creditCode != null and req.creditCode != '' ">
                  and credit_code = #{req.creditCode}
             </if>
-            <if test="req.projectName != null and req.projectName != '' ">
+            <if test="req.projectBigType != null and req.projectBigType != '' ">
-                 and project_name like concat('%',#{req.projectName},'%')
+                and project_big_type = #{req.projectBigType}
             </if>
-            <if test="req.projectClassify != null and req.projectClassify != '' ">
+            <if test="req.projectMiddleType != null and req.projectMiddleType != '' ">
-                and project_classify = #{req.projectClassify}
+                and project_middle_type = #{req.projectMiddleType}
+            </if>
+            <if test="req.projectSmallType != null and req.projectSmallType != '' ">
+                and project_small_type = #{req.projectSmallType}
             </if>
             <if test="req.declareUnit != null and req.declareUnit != '' ">
                 and declare_unit like concat('%',#{req.declareUnit},'%')
@@ -57,16 +60,9 @@
         <where>
             <if test="name != null and name != '' ">
                 and credit_code like concat('%',#{name},'%')
-                 or project_name like concat('%',#{name},'%')
                  or declare_unit like concat('%',#{name},'%')
             </if>
         </where>
         order by create_time desc ,project_year desc
     </select>
-    <select id="selectAl1l" resultType="com.ruoyi.jjh.ent.entity.JProject">
-        SELECT b.declare_unit,b.other_json
-        FROM j_project b
-        WHERE b.declare_unit COLLATE utf8mb4_general_ci NOT IN
-              (SELECT a.enterprise_name COLLATE utf8mb4_general_ci FROM bms_enterprise_basic_info a);
-    </select>
 </mapper>

ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartDeclarationMapper.xml

@@ -34,7 +34,7 @@
         SELECT
         a.id as id,
         a.smart_reminders_id as smartRemindersId,
-        b.project_name as declarationName,
+        b.project_small_type as declarationName,
         a.is_read as isRead,
         a.tyshxydm as tyshxydm,
         c.alert_recipients as alertRecipients,

ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartRemindersMapper.xml

@@ -6,19 +6,22 @@
 
 
     <select id="page" resultType="com.ruoyi.jjh.ent.entity.JSmartReminders">
-        select a.*,jp.project_name as projectName
+        select a.*,jp.project_small_type as projectSmallType
         from j_smart_reminders  a
         left join j_project jp on a.project_id = jp.id
         <where>
             <if test="req.rulesName != null and req.rulesName != '' ">
                 and a.rules_name = #{req.rulesName}
             </if>
+            <if test="req.alertType != null and req.alertType != '' ">
+                and a.alert_type = #{req.alertType}
+            </if>
         </where>
         order by a.create_time desc
     </select>
 
     <select id="selectOneSmart" resultType="com.ruoyi.jjh.ent.entity.JSmartReminders">
-        select a.*,jp.project_name as projectName
+        select a.*,jp.project_small_type as projectSmallType
         from j_smart_reminders  a
                  left join j_project jp on a.project_id = jp.id
         where a.id=#{id}

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ProjectExcelUtil.java

@@ -469,9 +469,6 @@ public class ProjectExcelUtil<T> {
                     fieldsMap.put(column, objects);
                 }
             }
-            if (fieldsMap.size() != 4) {
-                throw new ServiceException("请导入正确的项目数据");
-            }
             for (int i = titleNum + 1; i <= rows; i++) {
                 // 从第2行开始取数据,默认第一行是表头.
                 Row row = sheet.getRow(i);

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ProjectValueUtil.java

@@ -403,10 +403,10 @@ public class ProjectValueUtil<T> {
      * @param is 输入流
      * @return 转换后集合
      */
-    public List<T> importExcel(InputStream is, String projectClassify) {
+    public List<T> importExcel(InputStream is) {
         List<T> list = null;
         try {
-            list = importExcel(is, 0, projectClassify);
+            list = importExcel(is, 0);
         } catch (Exception e) {
             log.error("导入Excel异常{}", e.getMessage());
             throw new UtilException(e.getMessage());
@@ -423,8 +423,8 @@ public class ProjectValueUtil<T> {
      * @param titleNum 标题占用行数
      * @return 转换后集合
      */
-    public List<T> importExcel(InputStream is, int titleNum, String projectClassify) throws Exception {
+    public List<T> importExcel(InputStream is, int titleNum) throws Exception {
-        return importExcel(StringUtils.EMPTY, is, titleNum, projectClassify);
+        return importExcel(StringUtils.EMPTY, is, titleNum);
     }
 
     /**
@@ -435,7 +435,7 @@ public class ProjectValueUtil<T> {
      * @param is        输入流
      * @return 转换后集合
      */
-    public List<T> importExcel(String sheetName, InputStream is, int titleNum, String projectClassify) throws Exception {
+    public List<T> importExcel(String sheetName, InputStream is, int titleNum) throws Exception {
         this.type = Type.IMPORT;
         this.wb = WorkbookFactory.create(is);
         List<T> list = new ArrayList<T>();
@@ -551,7 +551,6 @@ public class ProjectValueUtil<T> {
                         ReflectUtils.invokeSetter(entity, propertyName, val);
                     }
                 }
-                ReflectUtils.invokeSetter(entity, "projectClassify", projectClassify);
                 ReflectUtils.invokeSetter(entity, "status", 5);
                 cellMap.entrySet().removeIf(entry -> hasStr.contains(entry.getKey()));
                 StringBuilder str = new StringBuilder();