From 7a2183de5a5a88e4ef849d022ca3bd02b3f9eb3f Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Fri, 24 May 2024 13:34:00 +0800 Subject: [PATCH] bugfix --- .../BmsDeclarationRecordsController.java | 1 + .../controller/BmsTemplateInfoController.java | 18 ++ .../BmsTemplateRecordController.java | 51 +++- .../declaration/entity/BmsApprovalInfo.java | 24 +- .../entity/BmsDeclarationRecords.java | 25 +- .../declaration/entity/BmsProcessInfo.java | 4 +- .../declaration/entity/BmsTemplateInfo.java | 139 ++++----- .../declaration/entity/BmsTemplateRecord.java | 19 +- .../ApprovalDeclarationRecordsQueryDto.java | 3 + .../entity/dto/BmsApprovalInfoUpdateDto.java | 7 +- .../entity/dto/BmsBigStrongAwardAddDto.java | 2 + .../dto/BmsBigStrongAwardUpdateDto.java | 2 +- .../entity/dto/BmsBrandingAwardAddDto.java | 3 + .../entity/dto/BmsBrandingAwardUpdateDto.java | 2 +- .../BmsCarrierConstructionAwardAddDto.java | 3 + .../BmsCarrierConstructionAwardUpdateDto.java | 2 +- .../entity/dto/BmsCreditManagementAddDto.java | 3 + .../dto/BmsCreditManagementUpdateDto.java | 2 +- .../entity/dto/BmsDeclarationRecordsDto.java | 21 +- .../dto/BmsEnterpriseBasicInfoAddDto.java | 4 +- .../dto/BmsIndustrialInternetAwardAddDto.java | 4 +- .../BmsIndustrialInternetAwardUpdateDto.java | 2 +- .../dto/BmsIntegrationIndustriesAddDto.java | 4 +- .../BmsIntegrationIndustriesUpdateDto.java | 2 +- .../BmsLogisticsDevelopmentAwardAddDto.java | 3 + ...BmsLogisticsDevelopmentAwardUpdateDto.java | 2 +- .../BmsManufacturingServicesAwardAddDto.java | 4 +- ...msManufacturingServicesAwardUpdateDto.java | 2 +- .../BmsPlatformConstructionAwardAddDto.java | 3 + ...BmsPlatformConstructionAwardUpdateDto.java | 2 +- .../dto/BmsProjectSettlementAwardAddDto.java | 2 + .../BmsProjectSettlementAwardUpdateDto.java | 2 +- .../dto/BmsSceneOpeningAwardAddDto.java | 3 + .../dto/BmsSceneOpeningAwardUpdateDto.java | 2 +- .../entity/dto/BmsTemplateRecordQueryDto.java | 7 +- .../dto/BmsTemplateRecordUpdateDto.java | 3 + .../vo/ApprovalDeclarationRecordsQueryVo.java | 33 ++- .../vo/BmsDeclarationRecordsQueryVo.java | 20 +- .../entity/vo/BmsTemplateRecordQueryVo.java | 24 +- .../entity/vo/BmsTemplateRecordVo.java | 2 + .../entity/vo/DeclarationRecordsVo.java | 2 + .../mapper/BmsDeclarationRecordsMapper.java | 6 + .../mapper/BmsTemplateRecordMapper.java | 5 +- .../jjh/declaration/regular/TimeChange.java | 77 +++++ .../IBmsDeclarationRecordsService.java | 8 + .../service/IBmsTemplateRecordService.java | 12 +- .../declaration/service/ICommonService.java | 3 + .../impl/BmsBigStrongAwardServiceImpl.java | 46 ++- .../impl/BmsBrandingAwardServiceImpl.java | 37 +-- ...msCarrierConstructionAwardServiceImpl.java | 35 +-- .../impl/BmsCreditManagementServiceImpl.java | 33 +-- .../BmsDeclarationRecordsServiceImpl.java | 48 +++- ...BmsIndustrialInternetAwardServiceImpl.java | 34 +-- .../BmsIntegrationIndustriesServiceImpl.java | 34 +-- ...sLogisticsDevelopmentAwardServiceImpl.java | 34 +-- ...ManufacturingServicesAwardServiceImpl.java | 34 +-- ...sPlatformConstructionAwardServiceImpl.java | 35 +-- .../BmsProjectSettlementAwardServiceImpl.java | 40 +-- .../impl/BmsSceneOpeningAwardServiceImpl.java | 37 +-- .../impl/BmsTemplateInfoServiceImpl.java | 11 +- .../impl/BmsTemplateRecordServiceImpl.java | 270 ++++++++++++++++-- .../service/impl/CommonServiceImpl.java | 38 ++- .../jjh/ent/service/JProjectService.java | 6 +- .../ent/service/impl/JProjectServiceImpl.java | 26 +- .../src/main/resources/application-druid.yml | 2 + .../BmsDeclarationRecordsMapper.xml | 87 +++--- .../jjh/declaration/BmsTemplateInfoMapper.xml | 30 +- .../declaration/BmsTemplateRecordMapper.xml | 36 ++- .../framework/config/MyMetaObjectHandler.java | 23 +- 69 files changed, 996 insertions(+), 554 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java index 0ae1261..15e1021 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java @@ -76,6 +76,7 @@ public class BmsDeclarationRecordsController extends BaseController { return getDataTable(list); } + @ApiOperation(value = "审批记录信息") @Log(title = "审批记录信息", businessType = BusinessType.UPDATE) @PutMapping("/approvalEdit") public AjaxResult approvalEdit(@RequestBody BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java index cc6d79e..62a7a9d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java @@ -9,6 +9,10 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo; import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService; +import com.ruoyi.jjh.ent.entity.JEnterpriseContact; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -30,6 +34,7 @@ import java.util.List; * @date 2023-08-25 */ @RestController +@Api(tags = "申报模板") @RequestMapping("/system/templateInfo") public class BmsTemplateInfoController extends BaseController { @Autowired @@ -40,12 +45,25 @@ public class BmsTemplateInfoController extends BaseController { */ // @RequiresPermissions("system:templateInfo:list") @GetMapping("/list") + @ApiOperation(value = "查询申报模板信息列表", response = BmsTemplateInfo.class) public TableDataInfo list(BmsTemplateInfo bmsTemplateInfo) { startPage(); List list = bmsTemplateInfoService.selectBmsTemplateInfoList(bmsTemplateInfo); return getDataTable(list); } + /** + * 新增项目时查询所有模板信息 + */ +// @RequiresPermissions("system:templateInfo:list") + @GetMapping("/allList") + @ApiOperation(value = "新增项目时查询所有模板信息", response = BmsTemplateInfoQueryVo.class) + public AjaxResult allList(BmsTemplateInfo bmsTemplateInfo) { + bmsTemplateInfo.setStatus(1); + bmsTemplateInfo.setIsDeleted(0); + return success(bmsTemplateInfoService.selectBmsTemplateInfoList(bmsTemplateInfo)); + } + /** * 导出申报模板信息列表 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java index 950fa06..f7904e3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java @@ -1,26 +1,24 @@ package com.ruoyi.jjh.declaration.controller; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto; import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo; import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; import org.springframework.beans.factory.annotation.Autowired; -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 org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -33,6 +31,7 @@ import java.util.List; */ @RestController @RequestMapping("/system/templateRecord") +@Api(tags = "在线模板记录") public class BmsTemplateRecordController extends BaseController { @Autowired private IBmsTemplateRecordService bmsTemplateRecordService; @@ -42,23 +41,41 @@ public class BmsTemplateRecordController extends BaseController { */ // @RequiresPermissions("system:templateRecord:list") @GetMapping("/list") - public TableDataInfo list(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) { - startPage(); - List list = bmsTemplateRecordService.selectBmsTemplateRecordList(bmsTemplateRecordQueryDto); - return getDataTable(list); + @ApiOperation(value = "查询在线模板记录列表",response = BmsTemplateRecordQueryVo.class) + public AjaxResult list(Page page,BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) { + return success(bmsTemplateRecordService.selectBmsTemplateRecordList(page,bmsTemplateRecordQueryDto)); } + /** + * 企业端选择表单模板列表 + * @param bmsTemplateQueryDto + * @return + */ + @ApiOperation(value = "企业端选择表单模板列表") @GetMapping("/templateNameList") public TableDataInfo templateNameList(BmsTemplateQueryDto bmsTemplateQueryDto){ List list = bmsTemplateRecordService.selectBmsTemplateNameList(bmsTemplateQueryDto); return getDataTable(list); } + + /** + * 补录 + * @param bmsTemplateRecordUpdateDto + * @return + */ + @ApiOperation(value = "补录") + @PostMapping ("/supplementation") + public AjaxResult supplementation(@RequestBody BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) { + return toAjax(bmsTemplateRecordService.supplementation(bmsTemplateRecordUpdateDto)); + } + /** * 导出在线模板列表 */ // @RequiresPermissions("system:templateRecord:export") @Log(title = "在线模板", businessType = BusinessType.EXPORT) + @ApiOperation(value = "导出在线模板列表") @PostMapping("/export") public void export(HttpServletResponse response, BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) { List list = bmsTemplateRecordService.selectBmsTemplateRecordList(bmsTemplateRecordQueryDto); @@ -69,6 +86,7 @@ public class BmsTemplateRecordController extends BaseController { /** * 获取在线模板详细信息 */ + @ApiOperation(value = "获取在线模板详细信息") // @RequiresPermissions("system:templateRecord:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -78,6 +96,7 @@ public class BmsTemplateRecordController extends BaseController { /** * 新增在线模板 */ + @ApiOperation(value = "新增在线模板") // @RequiresPermissions("system:templateRecord:add") @Log(title = "在线模板", businessType = BusinessType.INSERT) @PostMapping @@ -85,9 +104,12 @@ public class BmsTemplateRecordController extends BaseController { return toAjax(bmsTemplateRecordService.insertBmsTemplateRecord(bmsTemplateRecordAddDto)); } + + /** * 修改在线模板 */ + @ApiOperation(value = "修改在线模板") // @RequiresPermissions("system:templateRecord:edit") @Log(title = "在线模板", businessType = BusinessType.UPDATE) @PutMapping @@ -98,6 +120,7 @@ public class BmsTemplateRecordController extends BaseController { /** * 删除在线模板 */ + @ApiOperation(value = "删除在线模板") // @RequiresPermissions("system:templateRecord:remove") @Log(title = "在线模板", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsApprovalInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsApprovalInfo.java index 7cd4115..bd0d846 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsApprovalInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsApprovalInfo.java @@ -46,7 +46,7 @@ public class BmsApprovalInfo extends BaseInfoEntity { /** * 审批状态(0=待审核.1=审批通过,2=审批驳回) */ - @Excel(name = "审批状态(0=待审核.1=审批通过,2=审批驳回)") + @Excel(name = "审批状态(0=待审核.1=审批通过,2=审批驳回 3=退回修改)") private Integer approvalStatus; /** @@ -85,26 +85,4 @@ public class BmsApprovalInfo extends BaseInfoEntity { @Excel(name = "是否删除：0，未删除；1，已删除") private Integer isDeleted; - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("processId", getProcessId()) - .append("declarationRecordsId", getDeclarationRecordsId()) - .append("approvalById", getApprovalById()) - .append("approvalStatus", getApprovalStatus()) - .append("approvalOpinions", getApprovalOpinions()) - .append("approvalAttachment", getApprovalAttachment()) - .append("isReview", getIsReview()) - .append("isBeforeData", getIsBeforeData()) - .append("sort", getSort()) - .append("isDeleted", getIsDeleted()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java index 3c3c6ae..7bcd962 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java @@ -40,9 +40,9 @@ public class BmsDeclarationRecords extends BaseInfoEntity { /** * 项目名称 */ - @ApiModelProperty(value = "项目名称") - @Excel(name = "项目名称") - @JSONField(name = "项目名称") + @ApiModelProperty(value = "申报任务标题") + @Excel(name = "申报任务标题") + @JSONField(name = "申报任务标题") private String projectName; @JSONField(serialize = false) @@ -77,11 +77,18 @@ public class BmsDeclarationRecords extends BaseInfoEntity { private Long templateRecordId; /** - * 申报模版类型 + * 申报模版id */ @JSONField(serialize = false) - @ApiModelProperty(value = "申报模版类型") - private Integer declarationTemplateType; + @ApiModelProperty(value = "申报模版id") + private Integer templateId; + + /** + * 企业的统一社会信用代码 + */ + @JSONField(serialize = false) + @ApiModelProperty(value = "企业的统一社会信用代码") + private String creditCode; /** * 详情id：对应详情id @@ -96,7 +103,7 @@ public class BmsDeclarationRecords extends BaseInfoEntity { */ @JSONField(serialize = false) @ApiModelProperty(value = "审批状态") - @Excel(name = "审批状态", readConverterExp = "0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; /** @@ -106,8 +113,4 @@ public class BmsDeclarationRecords extends BaseInfoEntity { @ApiModelProperty(value = "是否删除：0，未删除；1，已删除") private Long isDeleted; - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("projectName", getProjectName()).append("projectId", getProjectId()).append("enterpriseId", getEnterpriseId()).append("year", getYear()).append("templateRecordId", getTemplateRecordId()).append("declarationTemplateType", getDeclarationTemplateType()).append("detailId", getDetailId()).append("status", getStatus()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java index c74e585..ef0230a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java @@ -33,9 +33,9 @@ public class BmsProcessInfo extends BaseInfoEntity { private Integer approvalType; /** - * 对应审批层级(0=初审,1=复审,2=专家评审,3=市级评审) + * 对应审批层级(0=初审,1=复审,2=上级评审) */ - @Excel(name = "对应审批层级(0=初审,1=复审,2=专家评审,3=市级评审)") + @Excel(name = "对应审批层级(0=初审,1=复审,2=上级评审)") private Integer approvalLevel; @Excel(name = "审批部门id") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateInfo.java index fe503b8..a2ede3f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateInfo.java @@ -2,11 +2,16 @@ package com.ruoyi.jjh.declaration.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; /** * 申报模板信息对象 bms_template_info @@ -14,6 +19,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author farben * @date 2023-08-25 */ +@Data public class BmsTemplateInfo extends BaseInfoEntity { private static final long serialVersionUID = 1L; @@ -38,19 +44,19 @@ public class BmsTemplateInfo extends BaseInfoEntity { @Excel(name = "级别 ", readConverterExp = "0=本级,1=省级") private Long level; - /** - * 产品领域 生产性服务业 现代服务业 新兴服务业 - */ - @ApiModelProperty(value = "产品领域 0:生产性服务业 1:现代服务业 2:新兴服务业") - @Excel(name = "产品领域", readConverterExp = "0=生产性服务业,1=现代服务业,2=新兴服务业") - private Long productArea; +// /** +// * 产品领域 生产性服务业 现代服务业 新兴服务业 (暂废弃) +// */ +// @ApiModelProperty(value = "产品领域 0:生产性服务业 1:现代服务业 2:新兴服务业") +// @Excel(name = "产品领域", readConverterExp = "0=生产性服务业,1=现代服务业,2=新兴服务业") +// private Long productArea; - /** - * 申报类型 0:/, 1:试点区域,2:龙头型,3:创新型 - */ - @ApiModelProperty(value = "申报类型 0:/, 1:试点区域,2:龙头型,3:创新型") - @Excel(name = "申报类型", readConverterExp = "0=/, 1=试点区域,2=龙头型,3=创新型") - private Long type; +// /** +// * 申报类型 0:/, 1:试点区域,2:龙头型,3:创新型 (暂废弃) +// */ +// @ApiModelProperty(value = "申报类型 0:/, 1:试点区域,2:龙头型,3:创新型") +// @Excel(name = "申报类型", readConverterExp = "0=/, 1=试点区域,2=龙头型,3=创新型") +// private Long type; /** * 表单说明 @@ -64,81 +70,56 @@ public class BmsTemplateInfo extends BaseInfoEntity { */ @ApiModelProperty(value = "责任单位 0：经发委:1：规建委:2：行审局:3：市监局") @Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局") - private Long responsibilityUnit; + private Integer responsibilityUnit; /** * 是否删除：0，未删除；1，已删除 */ @ApiModelProperty(value = "是否删除：0，未删除；1，已删除") @Excel(name = "是否删除", readConverterExp = "0=未删除,1=已删除") - private Long isDeleted; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getTemplateName() { - return templateName; - } - - public void setTemplateName(String templateName) { - this.templateName = templateName; - } - - public Long getLevel() { - return level; - } - - public void setLevel(Long level) { - this.level = level; - } - - public Long getProductArea() { - return productArea; - } - - public void setProductArea(Long productArea) { - this.productArea = productArea; - } - - public Long getType() { - return type; - } + private Integer isDeleted; - public void setType(Long type) { - this.type = type; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public Long getResponsibilityUnit() { - return responsibilityUnit; - } - - public void setResponsibilityUnit(Long responsibilityUnit) { - this.responsibilityUnit = responsibilityUnit; - } + /** + * 项目分类 + */ + /** + * 项目分类 + */ + @Excel(name = "项目分类", readConverterExp = "1=总部经济," + + "2=自主品牌先进技术研究院," + + "3=省现代服务业重点项目," + + "4=省市服务业领军企业," + + "5=省级现代服务业集聚区," + + "6=两业融合试点单位," + + "7=楼宇经济," + + "8=工业设计中心," + + "9=工业设计研究院," + + "10=服务型制造示范") + @ApiModelProperty("项目分类") + private Integer projectClassify; - public Long getIsDeleted() { - return isDeleted; - } + /** + * 模板有效期开始日期 + */ + @Excel(name = "模板有效期开始日期") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("模板有效期开始日期") + private LocalDate useStart; - public void setIsDeleted(Long isDeleted) { - this.isDeleted = isDeleted; - } + /** + * 模板有效期结束日期 + */ + @Excel(name = "模板有效期结束日期") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("模板有效期结束日期") + private LocalDate useEnd; - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("templateName", getTemplateName()).append("level", getLevel()).append("productArea", getProductArea()).append("type", getType()).append("notes", getNotes()).append("responsibilityUnit", getResponsibilityUnit()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); - } + /** + * 状态 0=过期,1=有效 + */ + @Excel(name = "状态 0=过期,1=有效" , readConverterExp = "0=过期,1=有效") + @ApiModelProperty("状态 0=过期,1=有效") + private Integer status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateRecord.java index 812aef4..cbd6a59 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateRecord.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateRecord.java @@ -10,7 +10,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.Size; -import java.util.Date; +import java.time.LocalDate; /** * 在线模板对象 bms_template_record @@ -36,10 +36,10 @@ public class BmsTemplateRecord extends BaseInfoEntity { private Long templateId; /** - * 企业名录分类 + * 申报任务标题 */ - @ApiModelProperty(value = "企业名录分类") - @Excel(name = "企业名录分类") + @ApiModelProperty(value = "申报任务标题") + @Excel(name = "申报任务标题") private String enterpriseDirectory; /** @@ -47,14 +47,14 @@ public class BmsTemplateRecord extends BaseInfoEntity { */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "开放开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date startTime; + private LocalDate startTime; /** * 开放结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "开放结束时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date endTime; + private LocalDate endTime; @Excel(name = "上传文件名称") private String fileName; @@ -72,4 +72,11 @@ public class BmsTemplateRecord extends BaseInfoEntity { @Size(max = 200, message = "说明的长度要小于 200") private String notes; + /** + * 状态 0=未开始 1=过期 2=有效 + */ + @Excel(name = "状态 0=未开始 1=过期 2=有效" , readConverterExp = "0=未开始,1=过期,2=有效") + @ApiModelProperty("状态 0=未开始 1=过期 2=有效") + private Integer status; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/ApprovalDeclarationRecordsQueryDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/ApprovalDeclarationRecordsQueryDto.java index 5452587..7cf00e2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/ApprovalDeclarationRecordsQueryDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/ApprovalDeclarationRecordsQueryDto.java @@ -21,6 +21,9 @@ public class ApprovalDeclarationRecordsQueryDto implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "申报任务标题") + private String enterpriseDirectory; + @ApiModelProperty(value = "事项") private String matter; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsApprovalInfoUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsApprovalInfoUpdateDto.java index f925a86..1ed49c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsApprovalInfoUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsApprovalInfoUpdateDto.java @@ -3,6 +3,8 @@ package com.ruoyi.jjh.declaration.entity.dto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -25,8 +27,9 @@ public class BmsApprovalInfoUpdateDto implements Serializable { @Excel(name = "申报记录id") private Long declarationRecordsId; - /** 审批状态(0=待审核.1=审批通过,2=审批驳回) */ - @Excel(name = "审批状态(0=待审核.1=审批通过,2=审批驳回)") +// /** 审批状态(0=待审核.1=审批通过,2=审批驳回) */ + @ApiModelProperty("审批状态(1=审批通过,2=审批驳回,3=初审退回修改)") + @Excel(name = "审批状态(1=审批通过,2=审批驳回,3=初审退回修改)") private Integer approvalStatus; /** 审批意见 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardAddDto.java index a9125ed..11cde71 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardAddDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardAddDto.java @@ -41,4 +41,6 @@ public class BmsBigStrongAwardAddDto extends BmsEnterpriseBasicInfoAddDto implem @Excel(name = "企业近3年发展情况及未来发展计划") private String developmentPlan; + @ApiModelProperty(value = "在线申报记录id") + private Long declarationId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java index c48054a..9104939 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java @@ -33,6 +33,6 @@ public class BmsBigStrongAwardUpdateDto extends BmsBigStrongAward implements Ser @ApiModelProperty(value = "项目id") private Long projectId; - @ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardAddDto.java index b96d8e5..fbfe88b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardAddDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardAddDto.java @@ -1,6 +1,7 @@ package com.ruoyi.jjh.declaration.entity.dto; import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -31,4 +32,6 @@ public class BmsBrandingAwardAddDto extends BmsEnterpriseBasicInfoAddDto impleme @Excel(name = "证明材料") private String evidence; + @ApiModelProperty(value = "在线申报记录id") + private Long declarationId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java index ec9dbb7..8cf0c3c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java @@ -26,6 +26,6 @@ public class BmsBrandingAwardUpdateDto extends BmsBrandingAward { @ApiModelProperty(value = "项目id") private Long projectId; - @ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardAddDto.java index e6c9ffd..2c9fd09 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardAddDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardAddDto.java @@ -1,6 +1,7 @@ package com.ruoyi.jjh.declaration.entity.dto; import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -42,4 +43,6 @@ public class BmsCarrierConstructionAwardAddDto extends BmsEnterpriseBasicInfoAdd @Excel(name = "消防验收报告") private String fireReport; + @ApiModelProperty(value = "在线申报记录id") + private Long declarationId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java index 3ff45b2..d3863b4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java @@ -23,7 +23,7 @@ public class BmsCarrierConstructionAwardUpdateDto extends BmsCarrierConstruction @Excel(name = "项目id") private Long projectId; - @ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementAddDto.java index 79c719d..16fbd47 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementAddDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementAddDto.java @@ -1,6 +1,7 @@ package com.ruoyi.jjh.declaration.entity.dto; import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -29,4 +30,6 @@ public class BmsCreditManagementAddDto extends BmsEnterpriseBasicInfoAddDto impl @Excel(name = "项目专项审计报告") private String auditReport; + @ApiModelProperty(value = "在线申报记录id") + private Long declarationId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java index 4d59d1d..a96336e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java @@ -26,7 +26,7 @@ public class BmsCreditManagementUpdateDto extends BmsCreditManagement { @ApiModelProperty(value = "项目id") private Long projectId; - @ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java index b72616f..d2e781f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java @@ -21,6 +21,12 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class BmsDeclarationRecordsDto extends BmsDeclarationRecords { + + @ApiModelProperty(value = "申报任务标题") + @Excel(name = "申报任务标题") + private String enterpriseDirectory; + + @ApiModelProperty(value = "申报单位") @Excel(name = "申报单位") private String enterpriseName; @@ -30,10 +36,10 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords { @Excel(name = "级别", readConverterExp = "0=本级,1=省级") private Long level; - /** 申报类型 0:/, 1:试点区域,2:龙头型,3:创新型 */ - @ApiModelProperty(value = "申报类型 0:/, 1:试点区域,2:龙头型,3:创新型") - @Excel(name = "申报类型", readConverterExp = "0=/,1=试点区域,2=龙头型,3=创新型") - private Long type; +// /** 申报类型 0:/, 1:试点区域,2:龙头型,3:创新型 */ +// @ApiModelProperty(value = "申报类型 0:/, 1:试点区域,2:龙头型,3:创新型") +// @Excel(name = "申报类型", readConverterExp = "0=/,1=试点区域,2=龙头型,3=创新型") +// private Long type; /** 责任单位 0：经发委:1：规建委:2：行审局:3：市监局 */ @ApiModelProperty(value = "责任单位 0：经发委:1：规建委:2：行审局:3：市监局") @@ -43,7 +49,10 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords { @ApiModelProperty(value = "模板名称") private String templateName; - @ApiModelProperty(value = "审批状态") - @Excel(name = "审批状态",readConverterExp = "0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @ApiModelProperty(value = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") + @Excel(name = "审批状态",readConverterExp = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private List statusStr; + + @ApiModelProperty(value = "0=未填报,1=已填报") + private Integer statusChange; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsEnterpriseBasicInfoAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsEnterpriseBasicInfoAddDto.java index d4bed3f..7b56909 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsEnterpriseBasicInfoAddDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsEnterpriseBasicInfoAddDto.java @@ -44,8 +44,8 @@ public class BmsEnterpriseBasicInfoAddDto implements Serializable { @ApiModelProperty(value = "申报时间") private Date fillingTime; - @ApiModelProperty(value = "申报模版类型") - private int declarationTemplateType; +// @ApiModelProperty(value = "申报模版类型") +// private int declarationTemplateType; @ApiModelProperty(value = "项目名称") private String projectName; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardAddDto.java index e90d644..1e363df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardAddDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardAddDto.java @@ -1,6 +1,7 @@ package com.ruoyi.jjh.declaration.entity.dto; import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -26,5 +27,6 @@ public class BmsIndustrialInternetAwardAddDto extends BmsEnterpriseBasicInfoAddD @Excel(name = "证明材料") private String material; - + @ApiModelProperty(value = "在线申报记录id") + private Long declarationId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java index 2064a9b..de425f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java @@ -27,7 +27,7 @@ public class BmsIndustrialInternetAwardUpdateDto extends BmsIndustrialInternetAw @ApiModelProperty(value = "项目id") private Long projectId; - @ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesAddDto.java index de726dc..a000b0e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesAddDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesAddDto.java @@ -1,6 +1,7 @@ package com.ruoyi.jjh.declaration.entity.dto; import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -56,5 +57,6 @@ public class BmsIntegrationIndustriesAddDto extends BmsEnterpriseBasicInfoAddDto /** 证明材料 */ @Excel(name = "证明材料") private String otherEvidence; - + @ApiModelProperty(value = "在线申报记录id") + private Long declarationId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java index 53b2724..84be646 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java @@ -26,7 +26,7 @@ public class BmsIntegrationIndustriesUpdateDto extends BmsIntegrationIndustries @ApiModelProperty(value = "项目id") private Long projectId; - @ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardAddDto.java index 762e219..32a42ee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardAddDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardAddDto.java @@ -1,6 +1,7 @@ package com.ruoyi.jjh.declaration.entity.dto; import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,4 +35,6 @@ public class BmsLogisticsDevelopmentAwardAddDto extends BmsEnterpriseBasicInfoA @Excel(name = "会计师事务所出具的企业财务报表审计报告") private String auditReport; + @ApiModelProperty(value = "在线申报记录id") + private Long declarationId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java index 6c169d8..7bde269 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java @@ -25,7 +25,7 @@ public class BmsLogisticsDevelopmentAwardUpdateDto extends BmsLogisticsDevelopme @ApiModelProperty(value = "项目id") private Long projectId; - @ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardAddDto.java index 0ac496c..ab16dd8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardAddDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardAddDto.java @@ -1,6 +1,7 @@ package com.ruoyi.jjh.declaration.entity.dto; import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,5 +35,6 @@ public class BmsManufacturingServicesAwardAddDto extends BmsEnterpriseBasicInfoA @Excel(name = "会计师事务所出具的企业财务报表审计报告") private String financialStatements; - + @ApiModelProperty(value = "在线申报记录id") + private Long declarationId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java index 7c1c469..f58e962 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java @@ -26,6 +26,6 @@ public class BmsManufacturingServicesAwardUpdateDto extends BmsManufacturingServ @ApiModelProperty(value = "项目id") private Long projectId; - @ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardAddDto.java index ce4b7b9..7016709 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardAddDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardAddDto.java @@ -1,6 +1,7 @@ package com.ruoyi.jjh.declaration.entity.dto; import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -26,4 +27,6 @@ public class BmsPlatformConstructionAwardAddDto extends BmsEnterpriseBasicInfoAd @Excel(name = "合作协议") private String agreement; + @ApiModelProperty(value = "在线申报记录id") + private Long declarationId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java index af8bab1..3ce7775 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java @@ -26,6 +26,6 @@ public class BmsPlatformConstructionAwardUpdateDto extends BmsPlatformConstructi @ApiModelProperty(value = "项目id") private Long projectId; - @ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardAddDto.java index 99d3b4d..6c1f094 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardAddDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardAddDto.java @@ -50,4 +50,6 @@ public class BmsProjectSettlementAwardAddDto extends BmsEnterpriseBasicInfoAddDt @ApiModelProperty(value = "营业执照") private String businessLicense; + @ApiModelProperty(value = "在线申报记录id") + private Long declarationId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java index add5903..3c020d4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java @@ -33,7 +33,7 @@ public class BmsProjectSettlementAwardUpdateDto extends BmsProjectSettlementAwar @ApiModelProperty(value = "项目id") private Long projectId; - @ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardAddDto.java index aefe2fa..116ae80 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardAddDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardAddDto.java @@ -1,6 +1,7 @@ package com.ruoyi.jjh.declaration.entity.dto; import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,4 +31,6 @@ public class BmsSceneOpeningAwardAddDto extends BmsEnterpriseBasicInfoAddDto imp @Excel(name = "公示、发文证明、专家评分表") private String material; + @ApiModelProperty(value = "在线申报记录id") + private Long declarationId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java index 0f5d23b..27247f3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java @@ -20,7 +20,7 @@ public class BmsSceneOpeningAwardUpdateDto extends BmsSceneOpeningAward { @ApiModelProperty(value = "记录id") private Long declarationRecordsId; - @ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") + @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; @ApiModelProperty(value = "项目id") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordQueryDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordQueryDto.java index e59429b..e73c9b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordQueryDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordQueryDto.java @@ -19,7 +19,7 @@ public class BmsTemplateRecordQueryDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "企业名录") + @ApiModelProperty(value = "申报任务标题") private String enterpriseDirectory; @ApiModelProperty(value = "模板id") @@ -49,4 +49,9 @@ public class BmsTemplateRecordQueryDto implements Serializable { @ApiModelProperty(value = "模板名称") private String templateName; + /** + * 状态 0=未开始 1=过期 2=有效 + */ + @ApiModelProperty("状态 0=未开始 1=过期 2=有效") + private Integer status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordUpdateDto.java index 45b4cb1..e3bf538 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordUpdateDto.java @@ -24,4 +24,7 @@ public class BmsTemplateRecordUpdateDto extends BmsTemplateRecord { @ApiModelProperty(value = "企业名录") private List enterpriseDirectoryList; + @ApiModelProperty(value = "是否所有") + private Integer isFrame; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/ApprovalDeclarationRecordsQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/ApprovalDeclarationRecordsQueryVo.java index 1f5e863..00b5072 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/ApprovalDeclarationRecordsQueryVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/ApprovalDeclarationRecordsQueryVo.java @@ -22,17 +22,26 @@ public class ApprovalDeclarationRecordsQueryVo implements Serializable { private Long id; + @ApiModelProperty(value = "申报任务标题") + private String enterpriseDirectory; + + @ApiModelProperty(value = "级别") + private Integer level; + + @ApiModelProperty(value = "责任单位") + private Integer responsibilityUnit; + @ApiModelProperty(value = "审批状态(0=待审核.1=审批通过,2=审批驳回)") private Integer approvalStatus; @ApiModelProperty(value = "事项") private String matter; - @ApiModelProperty(value = "项目名称") - private String projectName; - - @ApiModelProperty(value = "项目类型：也就是产品领域") - private Integer productArea; +// @ApiModelProperty(value = "项目名称") +// private String projectName; +// +// @ApiModelProperty(value = "项目类型：也就是产品领域") +// private Integer productArea; @ApiModelProperty(value = "申报单位") private String enterpriseName; @@ -40,17 +49,17 @@ public class ApprovalDeclarationRecordsQueryVo implements Serializable { @ApiModelProperty(value = "申报单位Id") private Long enterpriseId; - @ApiModelProperty(value = "扶持方式") - private Integer supportMethods; +// @ApiModelProperty(value = "扶持方式") +// private Integer supportMethods; @ApiModelProperty(value = "申请时间") private Date createTime; - @ApiModelProperty(value = "项目开始时间") - private Date startTime; - - @ApiModelProperty(value = "项目结束时间") - private Date endTime; +// @ApiModelProperty(value = "项目开始时间") +// private Date startTime; +// +// @ApiModelProperty(value = "项目结束时间") +// private Date endTime; @ApiModelProperty(value = "审核状态") private Integer status; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java index d6b7ee0..791fbc0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java @@ -22,6 +22,12 @@ public class BmsDeclarationRecordsQueryVo implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "申报任务标题") + private String enterpriseDirectory; + + @ApiModelProperty(value = "企业社会信用代码") + private String creditCode; + @ApiModelProperty(value = "id") private Long id; @@ -59,11 +65,11 @@ public class BmsDeclarationRecordsQueryVo implements Serializable { @Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局") private Long responsibilityUnit; - @ApiModelProperty(value = "申报表单") - @Excel(name = "申报表单", readConverterExp = "1=项目落户奖补企业申报模版,2=做大做强奖补企业申报模版,3=载体建设奖补企业申报模版" + + @ApiModelProperty(value = "申报模板") + @Excel(name = "申报模板", readConverterExp = "1=项目落户奖补企业申报模版,2=做大做强奖补企业申报模版,3=载体建设奖补企业申报模版" + ",4=平台建设奖补企业申报模版,5=品牌打造奖补企业申报模版,6=场景开放奖补企业申报模版,7=信用管理奖补企业申报模版" + ",8=5G+工业互联网奖补企业申报模版,9=制造服务业有效投入奖补企业申报模版,10=物流发展奖补企业申报模版") - private Long declarationTemplateType; + private Long templateId; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "申报时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @@ -76,17 +82,17 @@ public class BmsDeclarationRecordsQueryVo implements Serializable { @ApiModelProperty(value = "企业id") private Long enterpriseId; - @ApiModelProperty(value = "申报模板id") + @ApiModelProperty(value = "在线模板id") private Long templateRecordId; - @ApiModelProperty(value = "申报模板id") - private Long templateId; +// @ApiModelProperty(value = "申报模板id") +// private Long templateId; @ApiModelProperty(value = "详情id：对应详情id") private Long detailId; @ApiModelProperty(value = "审批状态") - @Excel(name = "审批状态", readConverterExp = "0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝") + @Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordQueryVo.java index c4fca42..00bdf1d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordQueryVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordQueryVo.java @@ -2,10 +2,13 @@ package com.ruoyi.jjh.declaration.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.time.LocalDate; import java.util.Date; /** @@ -14,6 +17,7 @@ import java.util.Date; * @author farben * @date 2023-08-25 */ +@ApiModel("申报模板信息对象") @Data public class BmsTemplateRecordQueryVo implements Serializable { @@ -22,7 +26,7 @@ public class BmsTemplateRecordQueryVo implements Serializable { @ApiModelProperty(value = "企业项目名录id") private Long templateRecordId; - @ApiModelProperty(value = "企业名录") + @ApiModelProperty(value = "申报任务标题") private String enterpriseDirectory; @ApiModelProperty(value = "模板类型") @@ -42,14 +46,16 @@ public class BmsTemplateRecordQueryVo implements Serializable { @ApiModelProperty(value = "上传文件名称") private String fileName; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") @Excel(name = "开放开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date startTime; + private LocalDate startTime; /** * 开放结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") @Excel(name = "开放结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date endTime; @@ -60,10 +66,20 @@ public class BmsTemplateRecordQueryVo implements Serializable { @Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局") private Long responsibilityUnit; + + @ApiModelProperty(value = "项目分类") + private Integer projectClassify; + @ApiModelProperty(value = "创建时间") private Date createTime; @ApiModelProperty(value = "创建人") private String createByName; + /** + * 状态 0=未开始 1=过期 2=有效 + */ + @Excel(name = "状态 0=未开始 1=过期 2=有效" , readConverterExp = "0=未开始,1=过期,2=有效") + @ApiModelProperty("状态 0=未开始 1=过期 2=有效") + private Integer status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordVo.java index 200f38b..a4fd2c7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordVo.java @@ -28,4 +28,6 @@ public class BmsTemplateRecordVo extends BmsTemplateRecord { @Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局") private Long responsibilityUnit; + @ApiModelProperty(value = "项目分类") + private Integer projectClassify; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/DeclarationRecordsVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/DeclarationRecordsVo.java index aaaaa83..ff70825 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/DeclarationRecordsVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/DeclarationRecordsVo.java @@ -30,6 +30,8 @@ import java.util.List; public class DeclarationRecordsVo implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "申报任务标题") + public String enterpriseDirectory; @ApiModelProperty(value = "审核信息") public List approvalInfoList; @ApiModelProperty(value = "申请记录") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsDeclarationRecordsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsDeclarationRecordsMapper.java index cd11464..c009515 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsDeclarationRecordsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsDeclarationRecordsMapper.java @@ -84,4 +84,10 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper selectDeclarationRecordsToIdList(@Param("list") List list); + + /** + * 根据企业id和模板id查询 + * @return + */ + List selectET(@Param("templateId") Long templateId, @Param("list") List list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateRecordMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateRecordMapper.java index 4e8f895..26d28fc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateRecordMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateRecordMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.jjh.declaration.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto; @@ -67,7 +68,9 @@ public interface BmsTemplateRecordMapper extends BaseMapper { */ public int deleteBmsTemplateRecordByIds(Long[] ids); - public List selectTemplateRecordVo(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto); + public List selectTemplateRecordVo(@Param("req") BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto); + + public Page selectTemplateRecordVo(Page page,@Param("req")BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto); public List selectTemplateRecordList(@Param("creditCode") String creditCode); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java new file mode 100644 index 0000000..a30962f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java @@ -0,0 +1,77 @@ +package com.ruoyi.jjh.declaration.regular; + +import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; +import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; +import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService; +import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; + +import javax.annotation.Resource; +import java.time.LocalDate; +import java.util.List; + +/** + * 定时任务 + * + * @author du + * @since 2024/5/20 10:59 + */ +@Configuration +@EnableScheduling +public class TimeChange { + /** + * 申报模板 + */ + @Resource + private IBmsTemplateInfoService bmsTemplateInfoService; + + /** + * 申报项目记录 + */ + @Resource + private IBmsTemplateRecordService bmsTemplateRecordService; + + + /** + * 根据每天的日期修改模板的状态 + */ + @Scheduled(cron = "1 0 0 * * *") + private void configureTasks() { + List list = bmsTemplateInfoService.list(); + LocalDate currentDate = LocalDate.now(); + for (BmsTemplateInfo items : list) { + LocalDate startDate = LocalDate.of(items.getUseStart().getYear(), items.getUseStart().getMonth(), items.getUseStart().getDayOfMonth()); + LocalDate endDate = LocalDate.of(items.getUseEnd().getYear(), items.getUseEnd().getMonth(), items.getUseEnd().getDayOfMonth()); + if (currentDate.isAfter(startDate) && currentDate.isBefore(endDate)) { + items.setStatus(1); + } else { + items.setStatus(0); + } + } + bmsTemplateInfoService.updateBatchById(list); + } + public void getTime(BmsTemplateRecord items){ + LocalDate currentDate = LocalDate.now(); + LocalDate startDate = LocalDate.of(items.getStartTime().getYear(), items.getStartTime().getMonth(), items.getStartTime().getDayOfMonth()); + LocalDate endDate = LocalDate.of(items.getEndTime().getYear(), items.getEndTime().getMonth(), items.getEndTime().getDayOfMonth()); + if(currentDate.isBefore(startDate)){ + items.setStatus(0); + } + if(currentDate.isAfter(endDate)){ + items.setStatus(1); + } + if (currentDate.isAfter(startDate) && currentDate.isBefore(endDate)) { + items.setStatus(2); + } + } + @Scheduled(cron = "1 0 0 * * *") + private void templateRecordChange() { + List list = bmsTemplateRecordService.list(); + for (BmsTemplateRecord items : list) { + getTime(items); + } + bmsTemplateRecordService.updateBatchById(list); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsDeclarationRecordsService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsDeclarationRecordsService.java index 4463392..99fb642 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsDeclarationRecordsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsDeclarationRecordsService.java @@ -2,6 +2,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.BmsEnterpriseDirectory; import com.ruoyi.jjh.declaration.entity.dto.*; import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo; @@ -44,6 +45,7 @@ public interface IBmsDeclarationRecordsService extends IService selectET(Long templateId,List list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java index dcca8b0..1a8a08f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java @@ -1,5 +1,6 @@ package com.ruoyi.jjh.declaration.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto; @@ -32,7 +33,9 @@ public interface IBmsTemplateRecordService extends IService { * @param bmsTemplateRecordQueryDto 在线模板 * @return 在线模板集合 */ - public List selectBmsTemplateRecordList(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto); + public Page selectBmsTemplateRecordList(Page page,BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto); + + public List selectBmsTemplateRecordList(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto); public List selectTemplateRecordList(String creditCode); @@ -68,4 +71,11 @@ public interface IBmsTemplateRecordService extends IService { * @return 结果 */ public int deleteBmsTemplateRecordById(Long id); + + /** + * 补录 + * @param bmsTemplateRecordAddDto + * @return + */ + int supplementation(BmsTemplateRecordUpdateDto bmsTemplateRecordAddDto); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/ICommonService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/ICommonService.java index ed6670e..c9308f4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/ICommonService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/ICommonService.java @@ -29,6 +29,9 @@ public interface ICommonService { public void insertAuditRecord(Long declarationRecordId,Integer approvalType); + public void updateAuditRecord(Long declarationRecordId,Integer approvalType); + + public void cleanProcessList(Long declarationRecordId); public List getUserIds(Long userId); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java index 153adc9..b75468b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java @@ -3,19 +3,14 @@ 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.BmsBigStrongAward; -import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; -import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; +import com.ruoyi.jjh.declaration.entity.*; 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.IBmsBigStrongAwardService; -import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; -import com.ruoyi.jjh.declaration.service.IBmsFundingDetailService; -import com.ruoyi.jjh.declaration.service.ICommonService; +import com.ruoyi.jjh.declaration.service.*; import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.service.JProjectService; import org.springframework.beans.factory.annotation.Autowired; @@ -49,6 +44,9 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl allJson = getAllJson(declarationRecords.getId()); + declarationRecords.setStatus(1L); + declarationRecords.setId(bmsBigStrongAwardAddDto.getDeclarationId()); + iBmsDeclarationRecordsService.updateById(declarationRecords); //新增项目 - JProject jP = new JProject(); - jP.setProjectYear(declarationRecords.getYear()); - jP.setProjectName(declarationRecords.getProjectName()); - jP.setDeclareUnit(allJson.get("declareUnit")); - jP.setProjectClassify(2); - jP.setStatus(1); - jP.setOtherJson(allJson.get("otherJson")); - jP.setFileJson(allJson.get("fileJson")); - jProjectService.saveProject(jP,declarationRecords.getId()); + declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsBigStrongAwardAddDto.getDeclarationId()))); + iBmsDeclarationRecordsService.updateById(declarationRecords); // 申请审批 - if (bmsBigStrongAwardAddDto.getStatus() == 1) { - // 审批状态 - iCommonService.insertAuditRecord(declarationRecords.getId(), 0); - } + iCommonService.insertAuditRecord(declarationRecords.getId(), 0); return num; } @@ -153,6 +138,9 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl allJson = getAllJson(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId()); //修改项目 jProjectService.updateTheJson(allJson); - // 审批状态 - iCommonService.insertAuditRecord(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId(), 0); + // 修改审批状态 + iCommonService.updateAuditRecord(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId(), 0); } } catch (Exception e) { e.printStackTrace(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java index dc238b3..8adbc7a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java @@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.mapper.BmsBrandingAwardMapper; import com.ruoyi.jjh.declaration.service.IBmsBrandingAwardService; 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.service.JProjectService; @@ -40,7 +41,8 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl allJson = getAllJson(declarationRecords.getId()); //新增项目 - JProject jP = new JProject(); - jP.setProjectYear(declarationRecords.getYear()); - jP.setProjectName(declarationRecords.getProjectName()); - jP.setDeclareUnit(allJson.get("declareUnit")); - jP.setProjectClassify(4); - jP.setStatus(1); - jP.setOtherJson(allJson.get("otherJson")); - jP.setFileJson(allJson.get("fileJson")); - jProjectService.saveProject(jP,declarationRecords.getId()); - - // 生成审核 - if (bmsBrandingAwardAddDto.getStatus()==1){ - // 审批状态 - iCommonService.insertAuditRecord(declarationRecords.getId(),0); - } + declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsBrandingAwardAddDto.getDeclarationId()))); + iBmsDeclarationRecordsService.updateById(declarationRecords); + + // 审批状态 + iCommonService.insertAuditRecord(declarationRecords.getId(),0); return num; } @@ -128,6 +118,9 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl allJson = getAllJson(bmsBrandingAwardUpdateDto.getDeclarationRecordsId()); jProjectService.updateTheJson(allJson); // 审批状态 - iCommonService.insertAuditRecord(bmsBrandingAwardUpdateDto.getDeclarationRecordsId(),0); + iCommonService.updateAuditRecord(bmsBrandingAwardUpdateDto.getDeclarationRecordsId(), 0); } }catch (Exception e){ e.printStackTrace(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java index ca40144..f65f2d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java @@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.mapper.BmsCarrierConstructionAwardMapper; import com.ruoyi.jjh.declaration.service.IBmsCarrierConstructionAwardService; 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.service.JProjectService; @@ -41,6 +42,8 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl allJson = getAllJson(declarationRecords.getId()); - + declarationRecords.setStatus(1L); + declarationRecords.setId(bmsCarrierConstructionAwardAddDto.getDeclarationId()); + iBmsDeclarationRecordsService.updateById(declarationRecords); //新增项目 - JProject jP = new JProject(); - jP.setProjectYear(declarationRecords.getYear()); - jP.setProjectName(declarationRecords.getProjectName()); - jP.setDeclareUnit(allJson.get("declareUnit")); - jP.setProjectClassify(2); - jP.setStatus(1); - jP.setOtherJson(allJson.get("otherJson")); - jP.setFileJson(allJson.get("fileJson")); - jProjectService.saveProject(jP,declarationRecords.getId()); - + declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsCarrierConstructionAwardAddDto.getDeclarationId()))); + iBmsDeclarationRecordsService.updateById(declarationRecords); // 生成审核 - if (bmsCarrierConstructionAwardAddDto.getStatus()==1){ - // 审批状态 - iCommonService.insertAuditRecord(declarationRecords.getId(),0); - } + iCommonService.insertAuditRecord(declarationRecords.getId(),0); return num; } @@ -129,6 +117,9 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl allJson = getAllJson(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId()); jProjectService.updateTheJson(allJson); // 审批状态 - iCommonService.insertAuditRecord(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId(),0); + iCommonService.updateAuditRecord(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId(), 0); } }catch (Exception e){ e.printStackTrace(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java index ae47c94..f20f4a9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java @@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.mapper.BmsCreditManagementMapper; import com.ruoyi.jjh.declaration.service.IBmsCreditManagementService; 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.service.JProjectService; @@ -41,6 +42,8 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl allJson = getAllJson(declarationRecords.getId()); + declarationRecords.setStatus(1L); + declarationRecords.setId(bmsCreditManagementAddDto.getDeclarationId()); + iBmsDeclarationRecordsService.updateById(declarationRecords); //新增项目 - JProject jP = new JProject(); - jP.setProjectYear(declarationRecords.getYear()); - jP.setProjectName(declarationRecords.getProjectName()); - jP.setDeclareUnit(allJson.get("declareUnit")); - jP.setProjectClassify(7); - jP.setStatus(1); - jP.setOtherJson(allJson.get("otherJson")); - jP.setFileJson(allJson.get("fileJson")); - jProjectService.saveProject(jP,declarationRecords.getId()); + declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsCreditManagementAddDto.getDeclarationId()))); + iBmsDeclarationRecordsService.updateById(declarationRecords); // 生成审核 - if (bmsCreditManagementAddDto.getStatus()==1){ - // 审批状态 - iCommonService.insertAuditRecord(declarationRecords.getId(),0); - } + iCommonService.insertAuditRecord(declarationRecords.getId(),0); return num; } @@ -128,6 +118,9 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl allJson = getAllJson(bmsCreditManagementUpdateDto.getDeclarationRecordsId()); jProjectService.updateTheJson(allJson); // 审批状态 - iCommonService.insertAuditRecord(bmsCreditManagementUpdateDto.getDeclarationRecordsId(),0); + iCommonService.updateAuditRecord(bmsCreditManagementUpdateDto.getDeclarationRecordsId(), 0); } }catch (Exception e){ e.printStackTrace(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java index c492074..d961bfd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.context.SecurityContextHolder; @@ -46,6 +47,9 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("credit_code", creditCode); + BmsEnterpriseBasicInfo one = iBmsEnterpriseBasicInfoService.getOne(queryWrapper); + declarationRecordsVo.setBmsEnterpriseBasicInfo(one); declarationRecordsVo.setApprovalInfoList(iBmsApprovalInfoService.getApprovalInfoList(id)); + + BmsTemplateRecord items = iBmsTemplateRecordService.getById(declarationRecords.getTemplateRecordId()); + //获取申报任务标题 + declarationRecordsVo.setEnterpriseDirectory( items.getEnterpriseDirectory() ); + return declarationRecordsVo; } @@ -236,22 +248,21 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl approvalInfoList = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, bmsApprovalInfoUpdateDto.getDeclarationRecordsId()).orderByDesc(BmsApprovalInfo::getSort).list(); // 更新审批记录 if (CollectionUtil.isNotEmpty(approvalInfoList)) { - approvalInfoList.forEach(x -> { - if (bmsProcessInfo.getId().equals(x.getProcessId()) && x.getApprovalStatus().equals(0)) { + for (BmsApprovalInfo x : approvalInfoList) { + if (bmsProcessInfo.getId().equals(x.getProcessId())) { // 更新审批记录 Integer sort = x.getSort(); bmsApprovalInfoUpdateDto.setId(x.getId()); -// bmsApprovalInfoUpdateDto.setSort(x.getSort()); BeanUtil.copyProperties(bmsApprovalInfoUpdateDto, x); x.setSort(sort); x.setApprovalById(SecurityUtils.getUserId()); x.setApprovalTime(DateUtils.getNowDate()); x.setIsReview(2); - iBmsApprovalInfoService.saveOrUpdate(x); + x.setApprovalStatus(bmsApprovalInfoUpdateDto.getApprovalStatus()); + iBmsApprovalInfoService.updateById(x); } - }); + } } - // 新增记录 if (bmsApprovalInfoUpdateDto.getApprovalStatus().equals(1)) { BmsProcessInfo bmsProcessInfo2 = new BmsProcessInfo(); @@ -284,10 +295,15 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl selectET(Long templateId, List list) { + return baseMapper.selectET(templateId,list); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java index aaa6b1f..d7a93a6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java @@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.mapper.BmsIndustrialInternetAwardMapper; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; 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.service.JProjectService; @@ -37,7 +38,8 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl allJson = getAllJson(declarationRecords.getId()); + declarationRecords.setStatus(1L); + declarationRecords.setId(bmsIndustrialInternetAwardAddDto.getDeclarationId()); + iBmsDeclarationRecordsService.updateById(declarationRecords); //新增项目 - JProject jP = new JProject(); - jP.setProjectYear(declarationRecords.getYear()); - jP.setProjectName(declarationRecords.getProjectName()); - jP.setDeclareUnit(allJson.get("declareUnit")); - jP.setProjectClassify(2); - jP.setStatus(1); - jP.setOtherJson(allJson.get("otherJson")); - jP.setFileJson(allJson.get("fileJson")); - jProjectService.saveProject(jP,declarationRecords.getId()); + declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsIndustrialInternetAwardAddDto.getDeclarationId()))); + iBmsDeclarationRecordsService.updateById(declarationRecords); // 生成审核 - if (bmsIndustrialInternetAwardAddDto.getStatus()==1){ - // 审批状态 - iCommonService.insertAuditRecord(declarationRecords.getId(),0); - } + iCommonService.insertAuditRecord(declarationRecords.getId(),0); return num; } @@ -127,6 +116,9 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl allJson = getAllJson(declarationRecords.getId()); + declarationRecords.setId(bmsIntegrationIndustriesAddDto.getDeclarationId()); + declarationRecords.setStatus(1L); + iBmsDeclarationRecordsService.updateById(declarationRecords); //新增项目 - JProject jP = new JProject(); - jP.setProjectYear(declarationRecords.getYear()); - jP.setProjectName(declarationRecords.getProjectName()); - jP.setDeclareUnit(allJson.get("declareUnit")); - jP.setProjectClassify(10); - jP.setStatus(1); - jP.setOtherJson(allJson.get("otherJson")); - jP.setFileJson(allJson.get("fileJson")); - jProjectService.saveProject(jP,declarationRecords.getId()); + declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsIntegrationIndustriesAddDto.getDeclarationId()))); + iBmsDeclarationRecordsService.updateById(declarationRecords); // 生成审核 - if (bmsIntegrationIndustriesAddDto.getStatus()==1){ - // 审批状态 - iCommonService.insertAuditRecord(declarationRecords.getId(),0); - } + iCommonService.insertAuditRecord(declarationRecords.getId(),0); return num; } @@ -128,6 +117,9 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl allJson = getAllJson(declarationRecords.getId()); - + declarationRecords.setId(bmsLogisticsDevelopmentAwardAddDto.getDeclarationId()); + iBmsDeclarationRecordsService.updateById(declarationRecords); //新增项目 - JProject jP = new JProject(); - jP.setProjectYear(declarationRecords.getYear()); - jP.setProjectName(declarationRecords.getProjectName()); - jP.setDeclareUnit(allJson.get("declareUnit")); - jP.setProjectClassify(9); - jP.setStatus(1); - jP.setOtherJson(allJson.get("otherJson")); - jP.setFileJson(allJson.get("fileJson")); - jProjectService.saveProject(jP,declarationRecords.getId()); + declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsLogisticsDevelopmentAwardAddDto.getDeclarationId()))); + iBmsDeclarationRecordsService.updateById(declarationRecords); // 生成审核 - if (bmsLogisticsDevelopmentAwardAddDto.getStatus()==1){ - // 审批状态 - iCommonService.insertAuditRecord(declarationRecords.getId(),0); - } + iCommonService.insertAuditRecord(declarationRecords.getId(),0); return num; } @@ -130,6 +119,9 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl allJson = getAllJson(declarationRecords.getId()); + declarationRecords.setStatus(1L); + declarationRecords.setId(bmsManufacturingServicesAwardAddDto.getDeclarationId()); + iBmsDeclarationRecordsService.updateById(declarationRecords); //新增项目 - JProject jP = new JProject(); - jP.setProjectYear(declarationRecords.getYear()); - jP.setProjectName(declarationRecords.getProjectName()); - jP.setDeclareUnit(allJson.get("declareUnit")); - jP.setProjectClassify(8); - jP.setStatus(1); - jP.setOtherJson(allJson.get("otherJson")); - jP.setFileJson(allJson.get("fileJson")); - jProjectService.saveProject(jP,declarationRecords.getId()); + declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsManufacturingServicesAwardAddDto.getDeclarationId()))); + iBmsDeclarationRecordsService.updateById(declarationRecords); // 生成审核 - if (bmsManufacturingServicesAwardAddDto.getStatus()==1){ - // 审批状态 - iCommonService.insertAuditRecord(declarationRecords.getId(),0); - } + iCommonService.insertAuditRecord(declarationRecords.getId(),0); return num; } @@ -127,6 +116,9 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl allJson = getAllJson(declarationRecords.getId()); + declarationRecords.setId(bmsPlatformConstructionAwardAddDto.getDeclarationId()); + iBmsDeclarationRecordsService.updateById(declarationRecords); //新增项目 - JProject jP = new JProject(); - jP.setProjectYear(declarationRecords.getYear()); - jP.setProjectName(declarationRecords.getProjectName()); - jP.setDeclareUnit(allJson.get("declareUnit")); - jP.setProjectClassify(3); - jP.setStatus(1); - jP.setOtherJson(allJson.get("otherJson")); - jP.setFileJson(allJson.get("fileJson")); - jProjectService.saveProject(jP,declarationRecords.getId()); - + declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsPlatformConstructionAwardAddDto.getDeclarationId()))); + iBmsDeclarationRecordsService.updateById(declarationRecords); // 生成审核 - if (bmsPlatformConstructionAwardAddDto.getStatus()==1){ - // 审批状态 - iCommonService.insertAuditRecord(declarationRecords.getId(),0); - } + iCommonService.insertAuditRecord(declarationRecords.getId(),0); return num; } @@ -132,6 +120,9 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl allJson = getAllJson(declarationRecords.getId()); + declarationRecords.setStatus(1L); + declarationRecords.setId(bmsProjectSettlementAwardAddDto.getDeclarationId()); + iBmsDeclarationRecordsService.updateById(declarationRecords); //新增项目 - JProject jP = new JProject(); - jP.setProjectYear(declarationRecords.getYear()); - jP.setProjectName(declarationRecords.getProjectName()); - jP.setDeclareUnit(allJson.get("declareUnit")); - jP.setProjectClassify(1); - jP.setStatus(1); - jP.setOtherJson(allJson.get("otherJson")); - jP.setFileJson(allJson.get("fileJson")); - jProjectService.saveProject(jP,declarationRecords.getId()); + declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsProjectSettlementAwardAddDto.getDeclarationId()))); + iBmsDeclarationRecordsService.updateById(declarationRecords); // 生成审核 - if (bmsProjectSettlementAwardAddDto.getStatus() == 1) { - // 审批状态 - iCommonService.insertAuditRecord(declarationRecords.getId(), 0); - } + iCommonService.insertAuditRecord(declarationRecords.getId(), 0); return num; } @@ -157,6 +142,9 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl allJson = getAllJson(declarationRecords.getId()); + declarationRecords.setId(bmsSceneOpeningAwardAddDto.getDeclarationId()); + iBmsDeclarationRecordsService.updateById(declarationRecords); //新增项目 - JProject jP = new JProject(); - jP.setProjectYear(declarationRecords.getYear()); - jP.setProjectName(declarationRecords.getProjectName()); - jP.setDeclareUnit(allJson.get("declareUnit")); - jP.setProjectClassify(6); - jP.setStatus(1); - jP.setOtherJson(allJson.get("otherJson")); - jP.setFileJson(allJson.get("fileJson")); - jProjectService.saveProject(jP,declarationRecords.getId()); - + declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsSceneOpeningAwardAddDto.getDeclarationId()))); + iBmsDeclarationRecordsService.updateById(declarationRecords); // 生成审核 - if (bmsSceneOpeningAwardAddDto.getStatus()==1){ - // 审批状态 - iCommonService.insertAuditRecord(declarationRecords.getId(),0); - } + iCommonService.insertAuditRecord(declarationRecords.getId(),0); return num; } @@ -127,6 +117,9 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl enterpriseDirectoryList = bmsTemplateInfo // .getEnterpriseDirectoryList(); // if (null != enterpriseDirectoryList && enterpriseDirectoryList.size()>0){ @@ -130,8 +131,8 @@ public class BmsTemplateInfoServiceImpl extends ServiceImpl selectBmsTemplateRecordList(Page page, BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) { + return baseMapper.selectTemplateRecordVo(page, bmsTemplateRecordQueryDto); + } + @Override public List selectTemplateRecordList(String creditCode) { return baseMapper.selectTemplateRecordList(creditCode); @@ -93,34 +113,106 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl enterpriseDirectoryList = bmsTemplateRecordAddDto - .getEnterpriseDirectoryList(); - if (null != enterpriseDirectoryList && enterpriseDirectoryList.size() > 0) { - enterpriseDirectoryList.forEach(x -> { - x.setTemplateRecordId(bmsTemplateRecordAddDto.getId()); - }); - enterpriseDirectoryService.saveOrUpdateBatch(enterpriseDirectoryList); + //新增的时候根据当前时间判断状态是否有效 + tiTimeChange.getTime(bmsTemplateRecordAddDto); + //添加在线模板 + num = baseMapper.insert(bmsTemplateRecordAddDto); + //前端excel企业名录集合 + List enterpriseDirectoryList = bmsTemplateRecordAddDto + .getEnterpriseDirectoryList(); + //要添加的在线申报记录 + List drlist = new ArrayList<>(); + //如果前端部分企业名录集合为空 + if (null != enterpriseDirectoryList && enterpriseDirectoryList.size() > 0) { +// //保存所有的信用代码 +// List codeList = new ArrayList<>(); +// for (BmsEnterpriseDirectory x : enterpriseDirectoryList) { +// codeList.add(x.getCreditCode()); +// } +// //根据信用代码去企业信息表里查找该企业，如果能找到并且该企业未填报过该模板 就添加企业id +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// lambdaQueryWrapper.in(BmsEnterpriseBasicInfo::getCreditCode, codeList); +// List list = iBmsEnterpriseBasicInfoService.list(lambdaQueryWrapper); + //如果能找到该企业就是集合不为空的话,并且长度和excel企业名录长度一致的话 +// if (!list.isEmpty() & list.size() == enterpriseDirectoryList.size()) { + //保存所有能在企业基础信息里面找的企业id +// List idList = new ArrayList<>(); +// list.forEach(a1 -> { +// idList.add(a1.getId()); + //保存在在线申报模板集合里面 +// }); + List codeList = new ArrayList<>(); + enterpriseDirectoryList.forEach(x -> { + codeList.add(x.getCreditCode()); + getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, x.getCreditCode(), bmsTemplateRecordAddDto.getTemplateId()); + x.setTemplateRecordId(bmsTemplateRecordAddDto.getId()); + }); + //在在线申报记录里面找到对于该模板和该企业的在线申报记录 + List bm = iBmsDeclarationRecordsService.selectET(bmsTemplateRecordAddDto.getTemplateId(), codeList); + //如果一条也没有找到就添加到企业名录表里呢 + if (bm.isEmpty()) { + enterpriseDirectoryService.saveBatch(enterpriseDirectoryList); } else { - List list = iBmsEnterpriseBasicInfoService.list(); - Collection copyList = new ArrayList<>(); - for (BmsEnterpriseBasicInfo items : list) { - BmsEnterpriseDirectory bms = new BmsEnterpriseDirectory(); - bms.setTemplateRecordId(bmsTemplateRecordAddDto.getId()); - bms.setEnterpriseName(items.getEnterpriseName()); - bms.setCreditCode(items.getCreditCode()); - copyList.add(bms); - } + //如果有的企业已经对该模板分配过申请任务的话就报错 + throw new ServiceException("某企业已经分配该模板任务"); + } +// }else { +// throw new ServiceException("某企业不在企业信息库"); +// } + } else { + List list = iBmsEnterpriseBasicInfoService.list(); + List copyList = new ArrayList<>(); + //保存所有的企业信用代码 + List idList = new ArrayList<>(); + for (BmsEnterpriseBasicInfo items : list) { + BmsEnterpriseDirectory bms = new BmsEnterpriseDirectory(); + bms.setTemplateRecordId(bmsTemplateRecordAddDto.getId()); + bms.setEnterpriseName(items.getEnterpriseName()); + bms.setCreditCode(items.getCreditCode()); + idList.add(items.getCreditCode()); + copyList.add(bms); + getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, items.getCreditCode(), bmsTemplateRecordAddDto.getTemplateId()); + } + List bm = iBmsDeclarationRecordsService.selectET(bmsTemplateRecordAddDto.getTemplateId(), idList); + if (bm.isEmpty()) { enterpriseDirectoryService.saveBatch(copyList); + } else { + throw new ServiceException("某企业已经分配该模板任务"); } - } catch (Exception e) { - e.printStackTrace(); } + iBmsDeclarationRecordsService.saveBatch(drlist); return num; } +// /** +// * 假如给该企业已经加了申报任务指定申报模板，就不能再给这个企业加该申报模板的申报任务（所有的企业） +// * +// * @param list +// */ +// private void judgement(List bm, List list) { +// List str1 = new ArrayList<>(); +// bm.forEach(x -> { +// list.forEach(y -> { +// if (Objects.equals(x.getEnterpriseId(), y.getId())) { +// str1.add(y.getEnterpriseName()); +// } +// }); +// }); +// throw new ServiceException(StringUtils.join(str1, ",") + "已经分配该模板任务"); +// } + + private void getDeclarationRecordsList(BmsTemplateRecord bmsTemplateRecordAddDto, List drlist, String creditCode, Long items) { + BmsDeclarationRecords drItems = new BmsDeclarationRecords(); + drItems.setProjectName(bmsTemplateRecordAddDto.getEnterpriseDirectory()); + drItems.setYear(String.valueOf(Year.now().getValue())); + drItems.setCreditCode(creditCode); + drItems.setTemplateRecordId(bmsTemplateRecordAddDto.getId()); + drItems.setStatus(0L); + drItems.setTemplateId(Math.toIntExact(items)); + drItems.setIsDeleted(0L); + drlist.add(drItems); + } + /** * 修改在线模板 * @@ -130,8 +222,8 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("template_record_id", bmsTemplateRecordUpdateDto.getId()); @@ -169,4 +261,130 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl drlist = new ArrayList<>(); + //获取前端传递的企业名录列表 + List enterpriseDirectoryList = bmsTemplateRecordUpdateDto + .getEnterpriseDirectoryList(); + //先去查找企业名录中对应该在线模板的相关企业 + List list = enterpriseDirectoryService.lambdaQuery() + .eq(BmsEnterpriseDirectory::getTemplateRecordId, bmsTemplateRecordUpdateDto.getId()).list(); + //首先部分企业和所有企业去区分 + if (bmsTemplateRecordUpdateDto.getIsFrame() == 0) { + enterpriseDirectoryList = new ArrayList<>(); + //企业信息表里所有企业 + List allList = iBmsEnterpriseBasicInfoService.list(); + //将信息表的所有企业添加到名录表 + for (BmsEnterpriseBasicInfo x : allList) { + BmsEnterpriseDirectory bmsEnterpriseDirectory = new BmsEnterpriseDirectory(); + bmsEnterpriseDirectory.setCreditCode(x.getCreditCode()); + bmsEnterpriseDirectory.setEnterpriseName(x.getEnterpriseName()); + enterpriseDirectoryList.add(bmsEnterpriseDirectory); + } + } + //java有两个list实体类集合 如果a集合某条数据里面的name和b里面某条数据的name相等 就去除a的该条数据 + enterpriseDirectoryList.removeIf(entityA -> list.stream().anyMatch(entityB -> entityB.getCreditCode().equals(entityA.getCreditCode()))); + enterpriseDirectoryList.forEach(x->{ + x.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId()); + getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getTemplateId()); + }); + + //去在线申报记录找已经填报过的企业 +// QueryWrapper query = new QueryWrapper<>(); +// query.eq("template_record_id", bmsTemplateRecordUpdateDto.getId()) +// .ne("status", 0) +// .isNotNull("detail_id"); +// List deRList = iBmsDeclarationRecordsService.list(query); + //存储已经填报过的所有企业信用代码 +// List deIdList = new ArrayList<>(); +// for (BmsDeclarationRecords items : deRList) { +// BmsEnterpriseDirectory bmsEnterpriseDirectory = new BmsEnterpriseDirectory(); +// bmsEnterpriseDirectory.setCreditCode(items.getCreditCode()); +// deIdList.add(bmsEnterpriseDirectory); +// } + + + + // 创建存放所有数据的map +// Map map = new HashMap<>(); +// // 合并俩个集合 +// list.addAll(enterpriseDirectoryList); +// // 遍历合并后的集合存放到map里 +// list.forEach(t -> { +// map.putIfAbsent(t.getCreditCode(), t); +// }); +// // 这是将excel和企业名录去重之后的企业 +// List mergeList = new ArrayList<>(map.values()); +// +// List code = new ArrayList<>(); +// mergeList.forEach(x->{ +// code.add(x.getCreditCode()); +// x.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId()); +// getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getTemplateId()); +// }); + +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.in("credit_code", code); +// queryWrapper.eq("template_record_id", bmsTemplateRecordUpdateDto.getId()); +// queryWrapper.eq("status", 0); +// queryWrapper.isNull("detail_id"); +// iBmsDeclarationRecordsService.remove(queryWrapper); + //新增到企业名录 + enterpriseDirectoryService.saveBatch(enterpriseDirectoryList); + //最后新添加进在线申报记录 + iBmsDeclarationRecordsService.saveBatch(drlist); + +// //再去在线申报记录里面查找相关企业的在线申报记录 +// List bm = iBmsDeclarationRecordsService.selectET(bmsTemplateRecordUpdateDto.getId(), idList); +// //保存要删除的在线申报记录id集合 +// List deIdList = new ArrayList<>(); +// //去查看这些申报记录里面未填报的企业 +// bm.forEach(x->{ +// if(x.getStatus() == 0){ +// getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getId()); +// deIdList.add(x.getId()); +// } +// }); +// //删除这些分配的在线申报记录 +// iBmsDeclarationRecordsService.removeBatchByIds(deIdList); + + return num; + } + + /** + * 暂省略（和企业信息表做对比） + * + * @param enterpriseDirectoryList + * @return + */ + private List filterEnterprise(List enterpriseDirectoryList) { + //保存所有的信用代码 + List codeList = new ArrayList<>(); + for (BmsEnterpriseDirectory x : enterpriseDirectoryList) { + codeList.add(x.getCreditCode()); + } + //根据信用代码去企业信息表里查找该企业，如果能找到并且该企业未填报过该模板 就添加企业id + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(BmsEnterpriseBasicInfo::getCreditCode, codeList); + return iBmsEnterpriseBasicInfoService.list(lambdaQueryWrapper); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java index 617cd58..e18412a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java @@ -149,11 +149,14 @@ public class CommonServiceImpl implements ICommonService { if (BeanUtil.isEmpty(templateRecord)) { throw new ServiceException("该申请已经错过时间"); } - List list = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getEnterpriseId, enterpriseInfo.getId()).eq(BmsDeclarationRecords::getTemplateRecordId, templateRecord.getId()).list(); - if (CollectionUtil.isNotEmpty(list)) { - throw new ServiceException("该企业已经申请，请勿重复申请！"); - } - + //查看该企业是否已经填报过 + BmsTemplateRecord templateRecordOne = iBmsTemplateRecordService.getById(templateRecordId); + List list = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getEnterpriseId, enterpriseInfo.getId()).eq(BmsDeclarationRecords::getTemplateId, templateRecordOne.getTemplateId()).list(); + list.forEach(x->{ + if(x.getDetailId() != null){ + throw new ServiceException("该企业已经申请，请勿重复申请！"); + } + }); } /** @@ -198,14 +201,18 @@ public class CommonServiceImpl implements ICommonService { if (declarationTemplateType == 1) { // 项目落户奖补 BmsProjectSettlementAwardQueryVo settlementAwardQueryVo = iBmsProjectSettlementAwardService.selectBmsProjectSettlementAwardById(detailId); - List list = iBmsFundingDetailService.lambdaQuery().eq(BmsFundingDetail::getDetailId, settlementAwardQueryVo.getId()).list(); - settlementAwardQueryVo.setFundingDetailList(list); + if(detailId!=null){ + List list = iBmsFundingDetailService.lambdaQuery().eq(BmsFundingDetail::getDetailId, settlementAwardQueryVo.getId()).list(); + settlementAwardQueryVo.setFundingDetailList(list); + } declarationRecordsVo.setBmsProjectSettlementAwardQueryVo(settlementAwardQueryVo); } else if (declarationTemplateType == 2) { // 做大做强奖补 BmsBigStrongAwardQueryVo bmsBigStrongAwardQueryVo = iBmsBigStrongAwardService.selectBmsBigStrongAwardById(detailId); - List list = iBmsFundingDetailService.lambdaQuery().eq(BmsFundingDetail::getDetailId, bmsBigStrongAwardQueryVo.getId()).list(); - bmsBigStrongAwardQueryVo.setFundingDetailList(list); + if(detailId!=null){ + List list = iBmsFundingDetailService.lambdaQuery().eq(BmsFundingDetail::getDetailId, bmsBigStrongAwardQueryVo.getId()).list(); + bmsBigStrongAwardQueryVo.setFundingDetailList(list); + } declarationRecordsVo.setBmsBigStrongAwardQueryVo(bmsBigStrongAwardQueryVo); } else if (declarationTemplateType == 3) { // 载体建设奖补 @@ -288,6 +295,19 @@ public class CommonServiceImpl implements ICommonService { }); } } + @Override + @Transactional(rollbackFor = Exception.class) + public void updateAuditRecord(Long declarationRecordId, Integer approvalType) { + List list = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, declarationRecordId).list(); + if (CollectionUtil.isNotEmpty(list)) { + list.forEach(x -> { + BmsApprovalInfo bmsApprovalInfo = new BmsApprovalInfo(); + bmsApprovalInfo.setId(x.getId()); + bmsApprovalInfo.setApprovalStatus(0); + iBmsApprovalInfoService.updateById(bmsApprovalInfo); + }); + } + } /** * 新增审批记录 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java index bfb6600..b34677d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java @@ -40,7 +40,11 @@ public interface JProjectService extends IService { String allJsonString(String a1,String a2,String a3,String a4); - void saveProject(JProject jp,Long id); + /** + * 项目统一添加到项目库 + * @param allJson + */ + Long saveProject(Map allJson); void updateTheJson( Map allJson); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java index 7582224..dd2ca3f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java @@ -7,6 +7,7 @@ import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService; import com.ruoyi.jjh.ent.mapper.JProjectMapper; import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.service.JProjectService; @@ -29,6 +30,9 @@ public class JProjectServiceImpl extends ServiceImpl i @Resource private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + + @Resource + private IBmsTemplateInfoService iBmsTemplateInfoService; /** * 分页查询所有数据 * @@ -75,15 +79,25 @@ public class JProjectServiceImpl extends ServiceImpl i return mergedObj.toJSONString(); } + /** + * 项目统一添加到项目库 + * @param allJson + */ @Override - public void saveProject(JProject jp, Long id) { - this.save(jp); - BmsDeclarationRecords n1 = new BmsDeclarationRecords(); - n1.setId(id); - n1.setJjhProjectId(jp.getId()); - iBmsDeclarationRecordsService.updateById(n1); + public Long saveProject(Map allJson) { + JProject jP = new JProject(); + 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 allJson) { //修改项目 diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 56d0819..71a9323 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,8 +6,10 @@ spring: druid: # 主库数据源 master: +# url: jdbc:mysql://localhost:3306/jingji_hu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://39.101.188.84:3307/jingji_hu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root +# password: root password: Admin123@ # 从库数据源 slave: diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml index 5df603c..f74cf88 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml @@ -11,8 +11,9 @@ - + + @@ -35,7 +36,8 @@ - + + @@ -49,7 +51,7 @@ project_name, project_id, matter, - enterprise_id,jjh_project_id, year, template_record_id, declaration_template_type, detail_id, status, is_deleted, create_by, create_time, update_by, update_time, remark + enterprise_id,jjh_project_id,credit_code, year, template_record_id,template_id, detail_id, status, is_deleted, create_by, create_time, update_by, update_time, remark from bms_declaration_records @@ -58,16 +60,15 @@ SELECT a.id, a.jjh_project_id, - d.project_name, a.project_id, + a.credit_code, a.enterprise_id, c.LEVEL, a.YEAR, c.type, a.template_record_id, - c.id as template_id, + a.template_id, c.responsibility_unit, - a.declaration_template_type, a.detail_id, a.STATUS, a.is_deleted, @@ -77,29 +78,27 @@ a.update_time, a.remark, b.enterprise_name, - f.road + f.road, + f.enterprise_directory FROM bms_declaration_records AS a inner join bms_template_record f on a.template_record_id = f.id - LEFT JOIN bms_enterprise_basic_info b ON a.enterprise_id = b.id - LEFT JOIN bms_template_info c on a.declaration_template_type = c.id - LEFT JOIN bms_project_info d on a.project_id = d.id + LEFT JOIN bms_template_info c on a.template_id = c.id + LEFT JOIN bms_enterprise_basic_info b ON a.credit_code = b.credit_code left join sys_dict_data e on a.status = e.dict_value and e.dict_type='bms_approval_status' - - and a.project_name like concat('%', #{projectName}, + and f.enterprise_directory like + concat('%', #{enterpriseDirectory}, '%') and c.template_name like concat('%', #{templateName}, '%') + and a.credit_code = #{creditCode} and a.enterprise_id = #{enterpriseId} and c.level = #{level} and year = #{year} - and c.type = #{type} and c.responsibility_unit = #{responsibilityUnit} - and a.declaration_template_type = #{declarationTemplateType} - and a.status = #{status} and a.status in @@ -107,6 +106,12 @@ #{item} + + and a.status = 0 + + + and a.status != 0 + and a.is_deleted = #{isDeleted} order by a.create_time desc, e.dict_sort desc @@ -121,28 +126,26 @@ SELECT d.approval_status, a.matter, - b.project_name, - b.product_area, c.enterprise_name, c.id as enterpriseId, - b.support_methods, - b.start_time, - b.end_time, a.create_time, a.`status`, a.template_record_id, a.detail_id, a.id as declarationRecordsId, e.template_id, + e.enterprise_directory, + i.level, + i.responsibility_unit, d.approval_time FROM bms_declaration_records a - INNER JOIN bms_project_info b ON a.project_id = b.id - INNER JOIN bms_enterprise_basic_info c ON a.enterprise_id = c.id + INNER JOIN bms_enterprise_basic_info c ON a.credit_code = c.credit_code INNER JOIN bms_template_record e on a.template_record_id = e.id + INNER JOIN bms_template_info i on e.template_id = i.id INNER JOIN bms_approval_info d on a.id=d.declaration_records_id and is_before_data = 0 - and b.project_name like concat('%', #{projectName}, + and e.enterprise_directory like concat('%', #{enterpriseDirectory}, '%') and c.enterprise_name like concat('%', @@ -182,16 +185,14 @@ resultType="com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo"> SELECT a.id, - d.project_name, a.project_id, a.enterprise_id, c.LEVEL, a.YEAR, c.type, a.template_record_id, - c.id as template_id, + a.template_id, c.responsibility_unit, - a.declaration_template_type, a.detail_id, a.STATUS, a.is_deleted, @@ -206,8 +207,7 @@ bms_declaration_records AS a inner join bms_template_record f on a.template_record_id = f.id LEFT JOIN bms_enterprise_basic_info b ON a.enterprise_id = b.id - LEFT JOIN bms_template_info c on a.declaration_template_type = c.id - LEFT JOIN bms_project_info d on a.project_id = d.id + LEFT JOIN bms_template_info c on a.template_id = c.id left join sys_dict_data e on a.status = e.dict_value and e.dict_type='bms_approval_status' and a.status != 0 @@ -222,8 +222,6 @@ and year = #{year} and c.type = #{type} and c.responsibility_unit = #{responsibilityUnit} - and a.declaration_template_type = #{declarationTemplateType} - and a.status in @@ -251,16 +249,14 @@ resultType="com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo"> SELECT a.id, - d.project_name, a.project_id, a.enterprise_id, c.LEVEL, a.YEAR, c.type, a.template_record_id, - c.id as template_id, + a.template_id, c.responsibility_unit, - a.declaration_template_type, a.detail_id, a.STATUS, a.is_deleted, @@ -275,8 +271,6 @@ bms_declaration_records AS a inner join bms_template_record f on a.template_record_id = f.id LEFT JOIN bms_enterprise_basic_info b ON a.enterprise_id = b.id - LEFT JOIN bms_template_info c on a.declaration_template_type = c.id - LEFT JOIN bms_project_info d on a.project_id = d.id left join sys_dict_data e on a.status = e.dict_value and e.dict_type='bms_approval_status' @@ -287,11 +281,27 @@ + insert into bms_declaration_records + credit_code, + template_id, project_name, project_id, matter, @@ -299,7 +309,6 @@ template_record_id, year, detail_id, - declaration_template_type, status, is_deleted, create_by, @@ -309,6 +318,8 @@ remark, + #{creditCode}, + #{templateId}, #{projectName}, #{projectId}, #{matter}, @@ -316,7 +327,6 @@ #{templateRecordId}, #{year}, #{detailId}, - #{declarationTemplateType}, #{status}, #{isDeleted}, #{createBy}, @@ -330,6 +340,7 @@ update bms_declaration_records + template_id = #{templateId}, project_name = #{projectName}, project_id = #{projectId}, matter = #{matter}, @@ -337,7 +348,6 @@ template_record_id = #{templateRecordId}, year = #{year}, detail_id = #{detailId}, - declaration_template_type = #{declarationTemplateType}, status = #{status}, is_deleted = #{isDeleted}, create_by = #{createBy}, @@ -345,6 +355,7 @@ update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + credit_code = #{creditCode}, where id = #{id} diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateInfoMapper.xml index 9e030d8..7f0c000 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateInfoMapper.xml @@ -8,8 +8,6 @@ - - @@ -18,6 +16,10 @@ + + + + @@ -29,6 +31,10 @@ notes, responsibility_unit, is_deleted, + project_classify, + use_start, + use_end, + status, create_by, create_time, update_by, @@ -65,12 +71,10 @@ and a.template_name like concat('%', #{templateName}, '%') - and a.level = #{level} - and a.product_area = #{productArea} - and a.type = #{type} - and a.notes = #{notes} + and a.project_classify = #{projectClassify} and a.responsibility_unit = #{responsibilityUnit} - and a.is_deleted = #{isDeleted} + and a.status = #{status} + and is_deleted = #{isDeleted} @@ -95,6 +99,10 @@ update_by, update_time, remark, + project_classify, + use_start, + use_end, + status, #{id}, @@ -110,6 +118,10 @@ #{updateBy}, #{updateTime}, #{remark}, + #{projectClassify}, + #{useStart}, + #{useEnd}, + #{status}, @@ -128,6 +140,10 @@ update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + project_classify = #{projectClassify}, + use_start = #{useStart}, + use_end = #{useEnd}, + status = #{status}, where id = #{id} diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml index 7e7ecf3..82e2453 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml @@ -18,6 +18,7 @@ + @@ -29,6 +30,7 @@ file_name, road, notes, + status, create_by, create_time, update_by, @@ -50,6 +52,7 @@ and road = #{road} and file_name = #{fileName} and notes = #{notes} + and status = #{status} @@ -74,6 +77,7 @@ update_by, update_time, remark, + status, #{templateId}, @@ -88,6 +92,7 @@ #{updateBy}, #{updateTime}, #{remark}, + #{status}, @@ -106,6 +111,7 @@ update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + status = #{status}, where id = #{id} @@ -127,7 +133,9 @@ resultType="com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo"> SELECT a.id as templateRecordId, + a.status, a.enterprise_directory, + b.project_classify, b.id as templateId, b.template_name, b.LEVEL, @@ -144,21 +152,21 @@ INNER JOIN bms_template_info b ON a.template_id = b.id INNER JOIN sys_user c ON b.create_by = c.user_id - and a.enterprise_directory like - concat('%', #{enterpriseDirectory}, '%') + and a.enterprise_directory like + concat('%', #{req.enterpriseDirectory}, '%') - and b.id = #{templateId} - - and date_format(a.create_time ,'%y%m%d') >= date_format(#{startTime},'%y%m%d') + and b.id = #{req.templateId} + + and date_format(a.create_time ,'%y%m%d') >= date_format(#{req.startTime},'%y%m%d') - - and date_format(a.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + + and date_format(a.create_time,'%y%m%d') <= date_format(#{req.endTime},'%y%m%d') - and a.road = #{road} - and b.level = #{level} - and b.responsibility_unit = #{responsibilityUnit} - and b.template_name like concat('%', - #{templateName}, '%') + and a.road = #{req.road} + and b.level = #{req.level} + and b.responsibility_unit = #{req.responsibilityUnit} + and b.template_name like concat('%', + #{req.templateName}, '%') order by a.create_time desc @@ -172,12 +180,14 @@ a.file_name, a.road, a.notes, + a.status, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, - b.responsibility_unit + b.responsibility_unit, + b.project_classify FROM bms_template_record a INNER JOIN bms_template_info b ON a.template_id = b.id where a.id = #{id} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java index 176a778..075c02d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java @@ -22,9 +22,15 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { // 获取当前登录用户 - LoginUser loginUser = SecurityUtils.getLoginUser(); - String userName = loginUser.getUsername(); - Long userId = SecurityUtils.getUserId(); + + String userName = null; + Long userId = null; + try { + LoginUser loginUser = SecurityUtils.getLoginUser(); + userName = loginUser.getUsername(); + userId = SecurityUtils.getUserId(); + } catch (Exception ignored) { + } if (!Objects.equals(userName, "")) { this.strictInsertFill(metaObject, "createBy", String.class, userName); } @@ -37,9 +43,14 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void updateFill(MetaObject metaObject) { // 获取当前登录用户 - LoginUser loginUser = SecurityUtils.getLoginUser(); - String userName = loginUser.getUsername(); - Long userId = SecurityUtils.getUserId(); + String userName = null; + Long userId = null; + try { + LoginUser loginUser = SecurityUtils.getLoginUser(); + userName = loginUser.getUsername(); + userId = SecurityUtils.getUserId(); + } catch (Exception ignored) { + } if (userId!=null) { this.strictUpdateFill(metaObject, "updateId", Long.class, userId); }