suzhou-jichuang-lanhai
/
JinJiHuJava
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
wushunjie
杜函宇 10 months ago
parent d8213b2758
commit 6c2fee47bf
27 changed files with 396 additions and 319 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java
Unescape View File

@ -103,7 +103,7 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
*/ */
@JSONField(serialize = false) @JSONField(serialize = false)
@ApiModelProperty(value = "审批状态") @ApiModelProperty(value = "审批状态")
@Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
/** /**

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java
Unescape View File

@ -33,6 +33,6 @@ public class BmsBigStrongAwardUpdateDto extends BmsBigStrongAward implements Ser
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java
Unescape View File

@ -26,6 +26,6 @@ public class BmsBrandingAwardUpdateDto extends BmsBrandingAward {
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java
Unescape View File

@ -23,7 +23,7 @@ public class BmsCarrierConstructionAwardUpdateDto extends BmsCarrierConstruction
@Excel(name = "项目id") @Excel(name = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java
Unescape View File

@ -26,7 +26,7 @@ public class BmsCreditManagementUpdateDto extends BmsCreditManagement {
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

4
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java
Unescape View File

@ -49,8 +49,8 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
@ApiModelProperty(value = "模板名称") @ApiModelProperty(value = "模板名称")
private String templateName; private String templateName;
@ApiModelProperty(value = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
@Excel(name = "审批状态",readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @Excel(name = "审批状态",readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private List<Long> statusStr; private List<Long> statusStr;
@ApiModelProperty(value = "0=未填报,1=已填报") @ApiModelProperty(value = "0=未填报,1=已填报")

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java
Unescape View File

@ -27,7 +27,7 @@ public class BmsIndustrialInternetAwardUpdateDto extends BmsIndustrialInternetAw
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java
Unescape View File

@ -26,7 +26,7 @@ public class BmsIntegrationIndustriesUpdateDto extends BmsIntegrationIndustries
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java
Unescape View File

@ -25,7 +25,7 @@ public class BmsLogisticsDevelopmentAwardUpdateDto extends BmsLogisticsDevelopme
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java
Unescape View File

@ -26,6 +26,6 @@ public class BmsManufacturingServicesAwardUpdateDto extends BmsManufacturingServ
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsOutQuitProductsUpdateDto.java
Unescape View File

@ -20,6 +20,6 @@ public class BmsOutQuitProductsUpdateDto extends BmsOutQuitProducts {
private Long declarationRecordsId; private Long declarationRecordsId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java
Unescape View File

@ -26,6 +26,6 @@ public class BmsPlatformConstructionAwardUpdateDto extends BmsPlatformConstructi
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java
Unescape View File

@ -33,7 +33,7 @@ public class BmsProjectSettlementAwardUpdateDto extends BmsProjectSettlementAwar
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java
Unescape View File

@ -20,7 +20,7 @@ public class BmsSceneOpeningAwardUpdateDto extends BmsSceneOpeningAward {
@ApiModelProperty(value = "记录id") @ApiModelProperty(value = "记录id")
private Long declarationRecordsId; private Long declarationRecordsId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java
Unescape View File

@ -96,7 +96,7 @@ public class BmsDeclarationRecordsQueryVo implements Serializable {
private Long detailId; private Long detailId;
@ApiModelProperty(value = "审批状态") @ApiModelProperty(value = "审批状态")
@Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审驳回,9=终审不通过，10=退回修改") @Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审驳回,9=终审不通过，10=退回修改")
private Long status; private Long status;
} }

59
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java
Unescape View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward; import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsFundingDetailAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsFundingDetailAddDto;
@ -45,6 +46,9 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
@Resource @Resource
private IBmsTemplateInfoService iBmsTemplateInfoService; private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
/** /**
@ -109,33 +113,38 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
declarationRecords.setMatter("提交做大做强奖补申请"); declarationRecords.setMatter("提交做大做强奖补申请");
declarationRecords.setDetailId(bmsBigStrongAward.getId()); declarationRecords.setDetailId(bmsBigStrongAward.getId());
declarationRecords.setStatus(1L);
declarationRecords.setId(bmsBigStrongAwardAddDto.getDeclarationId()); declarationRecords.setId(bmsBigStrongAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords); //如果该申报任务是不需要审批的则修改状态为已填报
BmsTemplateRecord tes = iBmsTemplateRecordService.getById(iBmsDeclarationRecordsService.getById(bmsBigStrongAwardAddDto.getDeclarationId()).getTemplateRecordId());
if(tes.getIsApproval() == 0){
//获取某个在线记录id可以添加到项目库的数据 declarationRecords.setStatus(6L);
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsBigStrongAwardAddDto.getDeclarationId()); iBmsDeclarationRecordsService.updateById(declarationRecords);
addProject.setStatus(1); }else {
String jsonString = jProjectService.getJsonString(fundingInfoList); declarationRecords.setStatus(1L);
JSONObject mergedObj = new JSONObject(); iBmsDeclarationRecordsService.updateById(declarationRecords);
mergedObj.putAll(JSONObject.parseObject(jsonString)); //获取某个在线记录id可以添加到项目库的数据
if (bmsBigStrongAward.getIsGainRewards() == 0) { JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsBigStrongAwardAddDto.getDeclarationId());
bmsBigStrongAward.setNewRewardDescription("是"); addProject.setStatus(1);
} else { String jsonString = jProjectService.getJsonString(fundingInfoList);
bmsBigStrongAward.setNewRewardDescription("否"); JSONObject mergedObj = new JSONObject();
} mergedObj.putAll(JSONObject.parseObject(jsonString));
mergedObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(bmsBigStrongAward))); if (bmsBigStrongAward.getIsGainRewards() == 0) {
addProject.setOtherJson(mergedObj.toJSONString()); bmsBigStrongAward.setNewRewardDescription("是");
addProject.setFileJson("{" + } else {
'"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + bmsBigStrongAward.getDevelopmentPlan() + '"' + bmsBigStrongAward.setNewRewardDescription("否");
"}"); }
jProjectService.save(addProject); mergedObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(bmsBigStrongAward)));
declarationRecords.setJjhProjectId(addProject.getId()); addProject.setOtherJson(mergedObj.toJSONString());
iBmsDeclarationRecordsService.updateById(declarationRecords); addProject.setFileJson("{" +
// 申请审批 '"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + bmsBigStrongAward.getDevelopmentPlan() + '"' +
iCommonService.insertAuditRecord(declarationRecords.getId(), 0); "}");
jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
// 申请审批
iCommonService.insertAuditRecord(declarationRecords.getId(), 0);
}
return num; return num;
} }

47
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java
Unescape View File

@ -7,15 +7,13 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward; import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward;
import com.ruoyi.jjh.declaration.entity.BmsBrandingAward; import com.ruoyi.jjh.declaration.entity.BmsBrandingAward;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsBrandingAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsBrandingAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsBrandingAwardService; import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
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.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -46,6 +44,9 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
private IBmsTemplateInfoService iBmsTemplateInfoService; private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
/** /**
* 查询品牌打造奖补 * 查询品牌打造奖补
* *
@ -92,23 +93,29 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
declarationRecords.setMatter("提交品牌打造奖补申请"); declarationRecords.setMatter("提交品牌打造奖补申请");
declarationRecords.setDetailId(bmsBrandingAward.getId()); declarationRecords.setDetailId(bmsBrandingAward.getId());
declarationRecords.setStatus(1L);
declarationRecords.setId(bmsBrandingAwardAddDto.getDeclarationId()); declarationRecords.setId(bmsBrandingAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords); //如果该申报任务是不需要审批的则修改状态为已填报
BmsTemplateRecord tes = iBmsTemplateRecordService.getById(iBmsDeclarationRecordsService.getById(bmsBrandingAwardAddDto.getDeclarationId()).getTemplateRecordId());
if(tes.getIsApproval() == 0){
//获取某个在线记录id可以添加到项目库的数据 declarationRecords.setStatus(6L);
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsBrandingAwardAddDto.getDeclarationId()); iBmsDeclarationRecordsService.updateById(declarationRecords);
addProject.setStatus(1); }else {
addProject.setOtherJson(JSONObject.toJSONString(bmsBrandingAward)); iBmsDeclarationRecordsService.updateById(declarationRecords);
addProject.setFileJson("{" + declarationRecords.setStatus(1L);
'"' + "证明材料" + '"' + ":" + '"' +bmsBrandingAward.getEvidence()+ '"' + iBmsDeclarationRecordsService.updateById(declarationRecords);
"}"); //获取某个在线记录id可以添加到项目库的数据
jProjectService.save(addProject); JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsBrandingAwardAddDto.getDeclarationId());
declarationRecords.setJjhProjectId(addProject.getId()); addProject.setStatus(1);
iBmsDeclarationRecordsService.updateById(declarationRecords); addProject.setOtherJson(JSONObject.toJSONString(bmsBrandingAward));
// 审批状态 addProject.setFileJson("{" +
iCommonService.insertAuditRecord(declarationRecords.getId(),0); '"' + "证明材料" + '"' + ":" + '"' +bmsBrandingAward.getEvidence()+ '"' +
"}");
jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
// 审批状态
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }

51
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java
Unescape View File

@ -7,15 +7,13 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsBrandingAward; import com.ruoyi.jjh.declaration.entity.BmsBrandingAward;
import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward; import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsCarrierConstructionAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsCarrierConstructionAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsCarrierConstructionAwardService; import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
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.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -47,6 +45,9 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
private IBmsTemplateInfoService iBmsTemplateInfoService; private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
/** /**
* 查询载体建设奖补 * 查询载体建设奖补
* *
@ -94,25 +95,31 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
declarationRecords.setMatter("提交载体建设奖补申请"); declarationRecords.setMatter("提交载体建设奖补申请");
declarationRecords.setDetailId(bmsCarrierConstructionAward.getId()); declarationRecords.setDetailId(bmsCarrierConstructionAward.getId());
declarationRecords.setStatus(1L);
declarationRecords.setId(bmsCarrierConstructionAwardAddDto.getDeclarationId()); declarationRecords.setId(bmsCarrierConstructionAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords); //如果该申报任务是不需要审批的则修改状态为已填报
BmsTemplateRecord tes = iBmsTemplateRecordService.getById(iBmsDeclarationRecordsService.getById(bmsCarrierConstructionAwardAddDto.getDeclarationId()).getTemplateRecordId());
//获取某个在线记录id可以添加到项目库的数据 if(tes.getIsApproval() == 0){
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsCarrierConstructionAwardAddDto.getDeclarationId()); declarationRecords.setStatus(6L);
addProject.setStatus(1); iBmsDeclarationRecordsService.updateById(declarationRecords);
addProject.setOtherJson(JSONObject.toJSONString(bmsCarrierConstructionAward)); }else {
addProject.setFileJson("{" + declarationRecords.setStatus(1L);
'"' + "相关佐证资料" + '"' + ":" + '"' + bmsCarrierConstructionAward.getSupportingMaterials() + '"' + ','+ iBmsDeclarationRecordsService.updateById(declarationRecords);
'"' + "项目工商登记许可" + '"' + ":" + '"' + bmsCarrierConstructionAward.getBusinessLicense() + '"' + ','+ //获取某个在线记录id可以添加到项目库的数据
'"' + "消防验收报告" + '"' + ":" + '"' + bmsCarrierConstructionAward.getFireReport() + '"' + JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsCarrierConstructionAwardAddDto.getDeclarationId());
"}"); addProject.setStatus(1);
jProjectService.save(addProject); addProject.setOtherJson(JSONObject.toJSONString(bmsCarrierConstructionAward));
declarationRecords.setJjhProjectId(addProject.getId()); addProject.setFileJson("{" +
iBmsDeclarationRecordsService.updateById(declarationRecords); '"' + "相关佐证资料" + '"' + ":" + '"' + bmsCarrierConstructionAward.getSupportingMaterials() + '"' + ','+
'"' + "项目工商登记许可" + '"' + ":" + '"' + bmsCarrierConstructionAward.getBusinessLicense() + '"' + ','+
// 生成审核 '"' + "消防验收报告" + '"' + ":" + '"' + bmsCarrierConstructionAward.getFireReport() + '"' +
iCommonService.insertAuditRecord(declarationRecords.getId(),0); "}");
jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
// 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }

52
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java
Unescape View File

@ -7,15 +7,13 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsBrandingAward; import com.ruoyi.jjh.declaration.entity.BmsBrandingAward;
import com.ruoyi.jjh.declaration.entity.BmsCreditManagement; import com.ruoyi.jjh.declaration.entity.BmsCreditManagement;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsCreditManagementMapper; import com.ruoyi.jjh.declaration.mapper.BmsCreditManagementMapper;
import com.ruoyi.jjh.declaration.service.IBmsCreditManagementService; import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
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.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -47,6 +45,9 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
private IBmsTemplateInfoService iBmsTemplateInfoService; private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
/** /**
* 查询信用管理奖补 * 查询信用管理奖补
* *
@ -93,26 +94,31 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
declarationRecords.setMatter("提交信用管理奖补申请"); declarationRecords.setMatter("提交信用管理奖补申请");
declarationRecords.setDetailId(bmsCreditManagement.getId()); declarationRecords.setDetailId(bmsCreditManagement.getId());
declarationRecords.setStatus(1L);
declarationRecords.setId(bmsCreditManagementAddDto.getDeclarationId()); declarationRecords.setId(bmsCreditManagementAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords); //如果该申报任务是不需要审批的则修改状态为已填报
BmsTemplateRecord tes = iBmsTemplateRecordService.getById(iBmsDeclarationRecordsService.getById(bmsCreditManagementAddDto.getDeclarationId()).getTemplateRecordId());
if(tes.getIsApproval() == 0){
//获取某个在线记录id可以添加到项目库的数据 declarationRecords.setStatus(6L);
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsCreditManagementAddDto.getDeclarationId()); iBmsDeclarationRecordsService.updateById(declarationRecords);
addProject.setStatus(1); }else {
addProject.setOtherJson(JSONObject.toJSONString(bmsCreditManagement)); declarationRecords.setStatus(1L);
addProject.setFileJson("{" + iBmsDeclarationRecordsService.updateById(declarationRecords);
'"' + "项目方案" + '"' + ":" + '"' + bmsCreditManagement.getProjectPlan() + '"' + ","+ //获取某个在线记录id可以添加到项目库的数据
'"' + "资金使用说明" + '"' + ":" + '"' + bmsCreditManagement.getUsesFunds() + '"' + ","+ JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsCreditManagementAddDto.getDeclarationId());
'"' + "项目专项审计报告" + '"' + ":" + '"' + bmsCreditManagement.getAuditReport() + '"' + addProject.setStatus(1);
"}"); addProject.setOtherJson(JSONObject.toJSONString(bmsCreditManagement));
jProjectService.save(addProject); addProject.setFileJson("{" +
declarationRecords.setJjhProjectId(addProject.getId()); '"' + "项目方案" + '"' + ":" + '"' + bmsCreditManagement.getProjectPlan() + '"' + ","+
iBmsDeclarationRecordsService.updateById(declarationRecords); '"' + "资金使用说明" + '"' + ":" + '"' + bmsCreditManagement.getUsesFunds() + '"' + ","+
'"' + "项目专项审计报告" + '"' + ":" + '"' + bmsCreditManagement.getAuditReport() + '"' +
// 生成审核 "}");
iCommonService.insertAuditRecord(declarationRecords.getId(),0); jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
// 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }

49
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java
Unescape View File

@ -7,15 +7,13 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsBrandingAward; import com.ruoyi.jjh.declaration.entity.BmsBrandingAward;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward; import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsIndustrialInternetAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsIndustrialInternetAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.declaration.service.IBmsIndustrialInternetAwardService;
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.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -45,6 +43,9 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
/** /**
* 查询5G+工业互联网奖补 * 查询5G+工业互联网奖补
* *
@ -91,23 +92,31 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
declarationRecords.setMatter("提交5G+工业互联网奖补申请"); declarationRecords.setMatter("提交5G+工业互联网奖补申请");
declarationRecords.setDetailId(bmsIndustrialInternetAward.getId()); declarationRecords.setDetailId(bmsIndustrialInternetAward.getId());
declarationRecords.setStatus(1L);
declarationRecords.setId(bmsIndustrialInternetAwardAddDto.getDeclarationId()); declarationRecords.setId(bmsIndustrialInternetAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
//如果该申报任务是不需要审批的则修改状态为已填报
//获取某个在线记录id可以添加到项目库的数据 BmsTemplateRecord tes = iBmsTemplateRecordService.getById(iBmsDeclarationRecordsService.getById(bmsIndustrialInternetAwardAddDto.getDeclarationId()).getTemplateRecordId());
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsIndustrialInternetAwardAddDto.getDeclarationId()); if(tes.getIsApproval() == 0){
addProject.setStatus(1); declarationRecords.setStatus(6L);
addProject.setOtherJson(JSONObject.toJSONString(bmsIndustrialInternetAward)); iBmsDeclarationRecordsService.updateById(declarationRecords);
addProject.setFileJson("{" + }else {
'"' + "证明材料" + '"' + ":" + '"' + bmsIndustrialInternetAward.getMaterial() + '"' + declarationRecords.setStatus(1L);
"}"); iBmsDeclarationRecordsService.updateById(declarationRecords);
jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId()); //获取某个在线记录id可以添加到项目库的数据
iBmsDeclarationRecordsService.updateById(declarationRecords); JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsIndustrialInternetAwardAddDto.getDeclarationId());
addProject.setStatus(1);
// 生成审核 addProject.setOtherJson(JSONObject.toJSONString(bmsIndustrialInternetAward));
iCommonService.insertAuditRecord(declarationRecords.getId(),0); addProject.setFileJson("{" +
'"' + "证明材料" + '"' + ":" + '"' + bmsIndustrialInternetAward.getMaterial() + '"' +
"}");
jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
// 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }

78
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIntegrationIndustriesServiceImpl.java
Unescape View File

@ -4,18 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils; 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.BmsIndustrialInternetAward;
import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries;
import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward;
import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsIntegrationIndustriesMapper; import com.ruoyi.jjh.declaration.mapper.BmsIntegrationIndustriesMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.declaration.service.IBmsIntegrationIndustriesService;
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.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -46,6 +40,9 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
/** /**
* 查询两业融合奖补 * 查询两业融合奖补
* *
@ -93,37 +90,42 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
declarationRecords.setMatter("提交两业融合奖补申请"); declarationRecords.setMatter("提交两业融合奖补申请");
declarationRecords.setDetailId(bmsIntegrationIndustries.getId()); declarationRecords.setDetailId(bmsIntegrationIndustries.getId());
declarationRecords.setId(bmsIntegrationIndustriesAddDto.getDeclarationId()); declarationRecords.setId(bmsIntegrationIndustriesAddDto.getDeclarationId());
declarationRecords.setStatus(1L); //如果该申报任务是不需要审批的则修改状态为已填报
iBmsDeclarationRecordsService.updateById(declarationRecords); BmsTemplateRecord tes = iBmsTemplateRecordService.getById(iBmsDeclarationRecordsService.getById(bmsIntegrationIndustriesAddDto.getDeclarationId()).getTemplateRecordId());
if(tes.getIsApproval() == 0){
//获取某个在线记录id可以添加到项目库的数据 declarationRecords.setStatus(6L);
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsIntegrationIndustriesAddDto.getDeclarationId()); iBmsDeclarationRecordsService.updateById(declarationRecords);
addProject.setStatus(1); }else {
if(bmsIntegrationIndustries.getDeclarationType() == 1){ declarationRecords.setStatus(1L);
bmsIntegrationIndustries.setNewDeclarationType("两业融合示范企业"); iBmsDeclarationRecordsService.updateById(declarationRecords);
}else if(bmsIntegrationIndustries.getDeclarationType() == 2){ //获取某个在线记录id可以添加到项目库的数据
bmsIntegrationIndustries.setNewDeclarationType("制造业企业设立财务独立核算的制造服务业职能部门"); JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsIntegrationIndustriesAddDto.getDeclarationId());
}else if(bmsIntegrationIndustries.getDeclarationType() == 3){ addProject.setStatus(1);
bmsIntegrationIndustries.setNewDeclarationType("制造业企业剥离服务业务成立独立的法人"); if(bmsIntegrationIndustries.getDeclarationType() == 1){
bmsIntegrationIndustries.setNewDeclarationType("两业融合示范企业");
}else if(bmsIntegrationIndustries.getDeclarationType() == 2){
bmsIntegrationIndustries.setNewDeclarationType("制造业企业设立财务独立核算的制造服务业职能部门");
}else if(bmsIntegrationIndustries.getDeclarationType() == 3){
bmsIntegrationIndustries.setNewDeclarationType("制造业企业剥离服务业务成立独立的法人");
}
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);
// 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
} }
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);
// 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
return num; return num;
} }

55
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsLogisticsDevelopmentAwardServiceImpl.java
Unescape View File

@ -7,15 +7,13 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries; import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries;
import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward; import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsLogisticsDevelopmentAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsLogisticsDevelopmentAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.declaration.service.IBmsLogisticsDevelopmentAwardService;
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.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -49,6 +47,9 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
private IBmsTemplateInfoService iBmsTemplateInfoService; private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
/** /**
* 查询物流发展奖补 * 查询物流发展奖补
* *
@ -95,27 +96,33 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
// 新增申请记录 // 新增申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
declarationRecords.setMatter("提交物流发展奖补申请"); declarationRecords.setMatter("提交物流发展奖补申请");
declarationRecords.setStatus(1L);
declarationRecords.setDetailId(bmsLogisticsDevelopmentAward.getId());
declarationRecords.setId(bmsLogisticsDevelopmentAwardAddDto.getDeclarationId()); declarationRecords.setId(bmsLogisticsDevelopmentAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords); declarationRecords.setDetailId(bmsLogisticsDevelopmentAward.getId());
//如果该申报任务是不需要审批的则修改状态为已填报
//获取某个在线记录id可以添加到项目库的数据 BmsTemplateRecord tes = iBmsTemplateRecordService.getById(iBmsDeclarationRecordsService.getById(bmsLogisticsDevelopmentAwardAddDto.getDeclarationId()).getTemplateRecordId());
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsLogisticsDevelopmentAwardAddDto.getDeclarationId()); if(tes.getIsApproval() == 0){
addProject.setStatus(1); declarationRecords.setStatus(6L);
addProject.setOtherJson(JSONObject.toJSONString(bmsLogisticsDevelopmentAward)); iBmsDeclarationRecordsService.updateById(declarationRecords);
addProject.setFileJson( "{" + }else {
'"' + "荣誉证明文件" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getHonorCertificate() + '"' + ","+ declarationRecords.setStatus(1L);
'"' + "平台名称" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getPlatformName() + '"' + ","+ iBmsDeclarationRecordsService.updateById(declarationRecords);
'"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getFilingNotice() + '"' + ","+ //获取某个在线记录id可以添加到项目库的数据
'"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getAuditReport() + '"' + JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsLogisticsDevelopmentAwardAddDto.getDeclarationId());
"}"); addProject.setStatus(1);
jProjectService.save(addProject); addProject.setOtherJson(JSONObject.toJSONString(bmsLogisticsDevelopmentAward));
declarationRecords.setJjhProjectId(addProject.getId()); addProject.setFileJson( "{" +
iBmsDeclarationRecordsService.updateById(declarationRecords); '"' + "荣誉证明文件" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getHonorCertificate() + '"' + ","+
'"' + "平台名称" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getPlatformName() + '"' + ","+
// 生成审核 '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getFilingNotice() + '"' + ","+
iCommonService.insertAuditRecord(declarationRecords.getId(),0); '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + bmsLogisticsDevelopmentAward.getAuditReport() + '"' +
"}");
jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
// 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }

53
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java
Unescape View File

@ -7,15 +7,13 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward; import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward;
import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward; import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsManufacturingServicesAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsManufacturingServicesAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.declaration.service.IBmsManufacturingServicesAwardService;
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.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -45,6 +43,9 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
/** /**
* 查询制造服务业有效投入奖补 * 查询制造服务业有效投入奖补
* *
@ -91,27 +92,33 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
declarationRecords.setMatter("提交制造服务业有效投入奖补申请"); declarationRecords.setMatter("提交制造服务业有效投入奖补申请");
declarationRecords.setDetailId(bmsManufacturingServicesAward.getId()); declarationRecords.setDetailId(bmsManufacturingServicesAward.getId());
declarationRecords.setStatus(1L);
declarationRecords.setId(bmsManufacturingServicesAwardAddDto.getDeclarationId()); declarationRecords.setId(bmsManufacturingServicesAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords); //如果该申报任务是不需要审批的则修改状态为已填报
BmsTemplateRecord tes = iBmsTemplateRecordService.getById(iBmsDeclarationRecordsService.getById(bmsManufacturingServicesAwardAddDto.getDeclarationId()).getTemplateRecordId());
if(tes.getIsApproval() == 0){
declarationRecords.setStatus(6L);
iBmsDeclarationRecordsService.updateById(declarationRecords);
}else {
declarationRecords.setStatus(1L);
iBmsDeclarationRecordsService.updateById(declarationRecords);
//新增项目
//获取某个在线记录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);
//新增项目 // 生成审核
//获取某个在线记录id可以添加到项目库的数据 iCommonService.insertAuditRecord(declarationRecords.getId(),0);
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);
// 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
return num; return num;
} }

79
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsOutQuitProductsServiceImpl.java
Unescape View File

@ -12,10 +12,7 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsOutQuitProductsUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsOutQuitProductsMapper; import com.ruoyi.jjh.declaration.mapper.BmsOutQuitProductsMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.*;
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.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -44,6 +41,8 @@ public class BmsOutQuitProductsServiceImpl extends ServiceImpl<BmsOutQuitProduct
private IBmsTemplateInfoService iBmsTemplateInfoService; private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
/** /**
* 查询2024年度淘汰落后和退出低端低效产能装备清单列表 * 查询2024年度淘汰落后和退出低端低效产能装备清单列表
* *
@ -78,43 +77,49 @@ public class BmsOutQuitProductsServiceImpl extends ServiceImpl<BmsOutQuitProduct
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
declarationRecords.setMatter("提交2024年度淘汰落后和退出低端低效产能装备清单"); declarationRecords.setMatter("提交2024年度淘汰落后和退出低端低效产能装备清单");
declarationRecords.setDetailId(products.getId()); declarationRecords.setDetailId(products.getId());
declarationRecords.setStatus(1L);
declarationRecords.setId(bmsOutQuitProductsAddDto.getDeclarationId()); declarationRecords.setId(bmsOutQuitProductsAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords); //如果该申报任务是不需要审批的则修改状态为已填报
BmsTemplateRecord tes = iBmsTemplateRecordService.getById(iBmsDeclarationRecordsService.getById(bmsOutQuitProductsAddDto.getDeclarationId()).getTemplateRecordId());
if(tes.getIsApproval() == 0){
declarationRecords.setStatus(6L);
iBmsDeclarationRecordsService.updateById(declarationRecords);
}else {
declarationRecords.setStatus(1L);
iBmsDeclarationRecordsService.updateById(declarationRecords);
//获取某个在线记录id可以添加到项目库的数据
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsOutQuitProductsAddDto.getDeclarationId());
addProject.setStatus(1);
//获取某个在线记录id可以添加到项目库的数据 if(products.getIndustry() == 1){
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsOutQuitProductsAddDto.getDeclarationId()); products.setNewIndustry("轻工");
addProject.setStatus(1); }else if(products.getIndustry() == 2){
products.setNewIndustry("纺织");
}else if(products.getIndustry() == 3){
products.setNewIndustry("冶金");
}else if(products.getIndustry() == 4){
products.setNewIndustry("化工");
}else if(products.getIndustry() == 5){
products.setNewIndustry("建材");
}else if(products.getIndustry() == 6){
products.setNewIndustry("机械加工");
}
if(products.getType() == 1){
products.setNewType("淘汰落后生产工艺装备");
}else{
products.setNewType("退出低端低效生产工艺装备");
}
addProject.setOtherJson(JSONObject.toJSONString(products));
addProject.setFileJson( "{" +
'"' + "拟淘汰或退出生产工艺装备情况" + '"' + ":" + '"' + products.getSpecifics() + '"' + "," +
'"' + "其他相关情况说明" + '"' + ":" + '"' + products.getOtherSpecifics() + '"'+
"}");
jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
if(products.getIndustry() == 1){ // 生成审核
products.setNewIndustry("轻工"); iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}else if(products.getIndustry() == 2){
products.setNewIndustry("纺织");
}else if(products.getIndustry() == 3){
products.setNewIndustry("冶金");
}else if(products.getIndustry() == 4){
products.setNewIndustry("化工");
}else if(products.getIndustry() == 5){
products.setNewIndustry("建材");
}else if(products.getIndustry() == 6){
products.setNewIndustry("机械加工");
} }
if(products.getType() == 1){
products.setNewType("淘汰落后生产工艺装备");
}else{
products.setNewType("退出低端低效生产工艺装备");
}
addProject.setOtherJson(JSONObject.toJSONString(products));
addProject.setFileJson( "{" +
'"' + "拟淘汰或退出生产工艺装备情况" + '"' + ":" + '"' + products.getSpecifics() + '"' + "," +
'"' + "其他相关情况说明" + '"' + ":" + '"' + products.getOtherSpecifics() + '"'+
"}");
jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
// 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
return num; return num;
} }

49
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsPlatformConstructionAwardServiceImpl.java
Unescape View File

@ -4,18 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward; import com.ruoyi.jjh.declaration.entity.*;
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.BmsPlatformConstructionAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsPlatformConstructionAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsPlatformConstructionAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.declaration.service.IBmsPlatformConstructionAwardService;
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.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -48,6 +42,8 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
private IBmsTemplateInfoService iBmsTemplateInfoService; private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
/** /**
* 查询平台建设奖补 * 查询平台建设奖补
* *
@ -93,24 +89,31 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
// 新增申请记录 // 新增申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
declarationRecords.setMatter("提交平台建设奖补申请"); declarationRecords.setMatter("提交平台建设奖补申请");
declarationRecords.setStatus(1L);
declarationRecords.setDetailId(bmsPlatformConstructionAward.getId());
declarationRecords.setId(bmsPlatformConstructionAwardAddDto.getDeclarationId()); declarationRecords.setId(bmsPlatformConstructionAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords); declarationRecords.setDetailId(bmsPlatformConstructionAward.getId());
//如果该申报任务是不需要审批的则修改状态为已填报
BmsTemplateRecord tes = iBmsTemplateRecordService.getById(iBmsDeclarationRecordsService.getById(bmsPlatformConstructionAwardAddDto.getDeclarationId()).getTemplateRecordId());
if(tes.getIsApproval() == 0){
declarationRecords.setStatus(6L);
iBmsDeclarationRecordsService.updateById(declarationRecords);
}else {
declarationRecords.setStatus(1L);
iBmsDeclarationRecordsService.updateById(declarationRecords);
//获取某个在线记录id可以添加到项目库的数据 //获取某个在线记录id可以添加到项目库的数据
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsPlatformConstructionAwardAddDto.getDeclarationId()); JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsPlatformConstructionAwardAddDto.getDeclarationId());
addProject.setStatus(1); addProject.setStatus(1);
addProject.setOtherJson(JSONObject.toJSONString(bmsPlatformConstructionAward)); addProject.setOtherJson(JSONObject.toJSONString(bmsPlatformConstructionAward));
addProject.setFileJson( "{" + addProject.setFileJson( "{" +
'"' + "合作协议" + '"' + ":" + '"' + bmsPlatformConstructionAward.getAgreement() + '"' + '"' + "合作协议" + '"' + ":" + '"' + bmsPlatformConstructionAward.getAgreement() + '"' +
"}"); "}");
jProjectService.save(addProject); jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId()); declarationRecords.setJjhProjectId(addProject.getId());
iBmsDeclarationRecordsService.updateById(declarationRecords); iBmsDeclarationRecordsService.updateById(declarationRecords);
// 生成审核 // 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(),0); iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }

55
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProjectSettlementAwardServiceImpl.java
Unescape View File

@ -53,7 +53,8 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
private IBmsTemplateInfoService iBmsTemplateInfoService; private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
/** /**
* 查询项目落户奖补 * 查询项目落户奖补
* *
@ -113,30 +114,36 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
declarationRecords.setMatter("提交落户奖补申请"); declarationRecords.setMatter("提交落户奖补申请");
declarationRecords.setDetailId(projectSettlementAward.getId()); declarationRecords.setDetailId(projectSettlementAward.getId());
declarationRecords.setStatus(1L);
declarationRecords.setId(bmsProjectSettlementAwardAddDto.getDeclarationId()); declarationRecords.setId(bmsProjectSettlementAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords); //如果该申报任务是不需要审批的则修改状态为已填报
BmsTemplateRecord tes = iBmsTemplateRecordService.getById(iBmsDeclarationRecordsService.getById(bmsProjectSettlementAwardAddDto.getDeclarationId()).getTemplateRecordId());
//获取某个在线记录id可以添加到项目库的数据 if(tes.getIsApproval() == 0){
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsProjectSettlementAwardAddDto.getDeclarationId()); declarationRecords.setStatus(6L);
addProject.setStatus(1); iBmsDeclarationRecordsService.updateById(declarationRecords);
String jsonString = jProjectService.getJsonString(fundingDetailList); }else {
JSONObject mergedObj = new JSONObject(); declarationRecords.setStatus(1L);
mergedObj.putAll(JSONObject.parseObject(jsonString)); iBmsDeclarationRecordsService.updateById(declarationRecords);
mergedObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(projectSettlementAward))); //获取某个在线记录id可以添加到项目库的数据
addProject.setOtherJson(mergedObj.toJSONString()); JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsProjectSettlementAwardAddDto.getDeclarationId());
addProject.setFileJson("{" + addProject.setStatus(1);
'"' + "招商协议" + '"' + ":" + '"' + projectSettlementAward.getAgreement() + '"' + "," + String jsonString = jProjectService.getJsonString(fundingDetailList);
'"' + "验资报告" + '"' + ":" + '"' + projectSettlementAward.getBusinessLicense() + '"' + "," + JSONObject mergedObj = new JSONObject();
'"' + "营业执照" + '"' + ":" + '"' + projectSettlementAward.getOtherMaterials() + '"' + "," + mergedObj.putAll(JSONObject.parseObject(jsonString));
'"' + "其他证明材料" + '"' + ":" + '"' + projectSettlementAward.getReport() + '"' + mergedObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(projectSettlementAward)));
"}"); addProject.setOtherJson(mergedObj.toJSONString());
jProjectService.save(addProject); addProject.setFileJson("{" +
declarationRecords.setJjhProjectId(addProject.getId()); '"' + "招商协议" + '"' + ":" + '"' + projectSettlementAward.getAgreement() + '"' + "," +
iBmsDeclarationRecordsService.updateById(declarationRecords); '"' + "验资报告" + '"' + ":" + '"' + projectSettlementAward.getBusinessLicense() + '"' + "," +
'"' + "营业执照" + '"' + ":" + '"' + projectSettlementAward.getOtherMaterials() + '"' + "," +
// 生成审核 '"' + "其他证明材料" + '"' + ":" + '"' + projectSettlementAward.getReport() + '"' +
iCommonService.insertAuditRecord(declarationRecords.getId(), 0); "}");
jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
// 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(), 0);
}
return num; return num;
} }

56
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsSceneOpeningAwardServiceImpl.java
Unescape View File

@ -7,15 +7,13 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward; import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward;
import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward; import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsSceneOpeningAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsSceneOpeningAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.declaration.service.IBmsSceneOpeningAwardService;
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.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -48,6 +46,9 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
@Resource @Resource
private IBmsTemplateInfoService iBmsTemplateInfoService; private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
/** /**
* 查询场景开放奖补 * 查询场景开放奖补
* *
@ -93,29 +94,36 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
declarationRecords.setMatter("提交场景开放奖补申请"); declarationRecords.setMatter("提交场景开放奖补申请");
declarationRecords.setStatus(1L);
declarationRecords.setDetailId(bmsSceneOpeningAward.getId()); declarationRecords.setDetailId(bmsSceneOpeningAward.getId());
declarationRecords.setId(bmsSceneOpeningAwardAddDto.getDeclarationId()); declarationRecords.setId(bmsSceneOpeningAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
//如果该申报任务是不需要审批的则修改状态为已填报
//获取某个在线记录id可以添加到项目库的数据 BmsTemplateRecord tes = iBmsTemplateRecordService.getById(iBmsDeclarationRecordsService.getById(bmsSceneOpeningAwardAddDto.getDeclarationId()).getTemplateRecordId());
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsSceneOpeningAwardAddDto.getDeclarationId()); if(tes.getIsApproval() == 0){
addProject.setStatus(1); declarationRecords.setStatus(6L);
if(bmsSceneOpeningAward.getType() == 0){ iBmsDeclarationRecordsService.updateById(declarationRecords);
bmsSceneOpeningAward.setNewType("市场服务类"); }else {
}else{ declarationRecords.setStatus(1L);
bmsSceneOpeningAward.setNewType("公共服务类"); iBmsDeclarationRecordsService.updateById(declarationRecords);
//获取某个在线记录id可以添加到项目库的数据
JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsSceneOpeningAwardAddDto.getDeclarationId());
addProject.setStatus(1);
if(bmsSceneOpeningAward.getType() == 0){
bmsSceneOpeningAward.setNewType("市场服务类");
}else{
bmsSceneOpeningAward.setNewType("公共服务类");
}
addProject.setOtherJson(JSONObject.toJSONString(bmsSceneOpeningAward));
addProject.setFileJson("{" +
'"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + bmsSceneOpeningAward.getMaterial() + '"' +
"}");
jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
// 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
} }
addProject.setOtherJson(JSONObject.toJSONString(bmsSceneOpeningAward));
addProject.setFileJson("{" +
'"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + bmsSceneOpeningAward.getMaterial() + '"' +
"}");
jProjectService.save(addProject);
declarationRecords.setJjhProjectId(addProject.getId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
// 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
return num; return num;
} }

Write Preview
Loading…
Cancel
Save