dongdingding
杜函宇 11 months ago
parent fcc1c4f7af
commit 7a2183de5a

@ -76,6 +76,7 @@ public class BmsDeclarationRecordsController extends BaseController {
return getDataTable(list); return getDataTable(list);
} }
@ApiOperation(value = "审批记录信息")
@Log(title = "审批记录信息", businessType = BusinessType.UPDATE) @Log(title = "审批记录信息", businessType = BusinessType.UPDATE)
@PutMapping("/approvalEdit") @PutMapping("/approvalEdit")
public AjaxResult approvalEdit(@RequestBody BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) { public AjaxResult approvalEdit(@RequestBody BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) {

@ -9,6 +9,10 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService; 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -30,6 +34,7 @@ import java.util.List;
* @date 2023-08-25 * @date 2023-08-25
*/ */
@RestController @RestController
@Api(tags = "申报模板")
@RequestMapping("/system/templateInfo") @RequestMapping("/system/templateInfo")
public class BmsTemplateInfoController extends BaseController { public class BmsTemplateInfoController extends BaseController {
@Autowired @Autowired
@ -40,12 +45,25 @@ public class BmsTemplateInfoController extends BaseController {
*/ */
// @RequiresPermissions("system:templateInfo:list") // @RequiresPermissions("system:templateInfo:list")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation(value = "查询申报模板信息列表", response = BmsTemplateInfo.class)
public TableDataInfo list(BmsTemplateInfo bmsTemplateInfo) { public TableDataInfo list(BmsTemplateInfo bmsTemplateInfo) {
startPage(); startPage();
List<BmsTemplateInfoQueryVo> list = bmsTemplateInfoService.selectBmsTemplateInfoList(bmsTemplateInfo); List<BmsTemplateInfoQueryVo> list = bmsTemplateInfoService.selectBmsTemplateInfoList(bmsTemplateInfo);
return getDataTable(list); 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));
}
/** /**
* *
*/ */

@ -1,26 +1,24 @@
package com.ruoyi.jjh.declaration.controller; 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.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType; 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.BmsTemplateQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo;
import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService; 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
@ -33,6 +31,7 @@ import java.util.List;
*/ */
@RestController @RestController
@RequestMapping("/system/templateRecord") @RequestMapping("/system/templateRecord")
@Api(tags = "在线模板记录")
public class BmsTemplateRecordController extends BaseController { public class BmsTemplateRecordController extends BaseController {
@Autowired @Autowired
private IBmsTemplateRecordService bmsTemplateRecordService; private IBmsTemplateRecordService bmsTemplateRecordService;
@ -42,23 +41,41 @@ public class BmsTemplateRecordController extends BaseController {
*/ */
// @RequiresPermissions("system:templateRecord:list") // @RequiresPermissions("system:templateRecord:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) { @ApiOperation(value = "查询在线模板记录列表",response = BmsTemplateRecordQueryVo.class)
startPage(); public AjaxResult list(Page<BmsTemplateRecordQueryVo> page,BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) {
List<BmsTemplateRecordQueryVo> list = bmsTemplateRecordService.selectBmsTemplateRecordList(bmsTemplateRecordQueryDto); return success(bmsTemplateRecordService.selectBmsTemplateRecordList(page,bmsTemplateRecordQueryDto));
return getDataTable(list);
} }
/**
*
* @param bmsTemplateQueryDto
* @return
*/
@ApiOperation(value = "企业端选择表单模板列表")
@GetMapping("/templateNameList") @GetMapping("/templateNameList")
public TableDataInfo templateNameList(BmsTemplateQueryDto bmsTemplateQueryDto){ public TableDataInfo templateNameList(BmsTemplateQueryDto bmsTemplateQueryDto){
List<BmsTemplateRecordQueryVo> list = bmsTemplateRecordService.selectBmsTemplateNameList(bmsTemplateQueryDto); List<BmsTemplateRecordQueryVo> list = bmsTemplateRecordService.selectBmsTemplateNameList(bmsTemplateQueryDto);
return getDataTable(list); 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") // @RequiresPermissions("system:templateRecord:export")
@Log(title = "在线模板", businessType = BusinessType.EXPORT) @Log(title = "在线模板", businessType = BusinessType.EXPORT)
@ApiOperation(value = "导出在线模板列表")
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) { public void export(HttpServletResponse response, BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) {
List<BmsTemplateRecordQueryVo> list = bmsTemplateRecordService.selectBmsTemplateRecordList(bmsTemplateRecordQueryDto); List<BmsTemplateRecordQueryVo> list = bmsTemplateRecordService.selectBmsTemplateRecordList(bmsTemplateRecordQueryDto);
@ -69,6 +86,7 @@ public class BmsTemplateRecordController extends BaseController {
/** /**
* 线 * 线
*/ */
@ApiOperation(value = "获取在线模板详细信息")
// @RequiresPermissions("system:templateRecord:query") // @RequiresPermissions("system:templateRecord:query")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) { public AjaxResult getInfo(@PathVariable("id") Long id) {
@ -78,6 +96,7 @@ public class BmsTemplateRecordController extends BaseController {
/** /**
* 线 * 线
*/ */
@ApiOperation(value = "新增在线模板")
// @RequiresPermissions("system:templateRecord:add") // @RequiresPermissions("system:templateRecord:add")
@Log(title = "在线模板", businessType = BusinessType.INSERT) @Log(title = "在线模板", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
@ -85,9 +104,12 @@ public class BmsTemplateRecordController extends BaseController {
return toAjax(bmsTemplateRecordService.insertBmsTemplateRecord(bmsTemplateRecordAddDto)); return toAjax(bmsTemplateRecordService.insertBmsTemplateRecord(bmsTemplateRecordAddDto));
} }
/** /**
* 线 * 线
*/ */
@ApiOperation(value = "修改在线模板")
// @RequiresPermissions("system:templateRecord:edit") // @RequiresPermissions("system:templateRecord:edit")
@Log(title = "在线模板", businessType = BusinessType.UPDATE) @Log(title = "在线模板", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
@ -98,6 +120,7 @@ public class BmsTemplateRecordController extends BaseController {
/** /**
* 线 * 线
*/ */
@ApiOperation(value = "删除在线模板")
// @RequiresPermissions("system:templateRecord:remove") // @RequiresPermissions("system:templateRecord:remove")
@Log(title = "在线模板", businessType = BusinessType.DELETE) @Log(title = "在线模板", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")

@ -46,7 +46,7 @@ public class BmsApprovalInfo extends BaseInfoEntity {
/** /**
* (0=.1=,2=) * (0=.1=,2=)
*/ */
@Excel(name = "审批状态(0=待审核.1=审批通过,2=审批驳回)") @Excel(name = "审批状态(0=待审核.1=审批通过,2=审批驳回 3=退回修改)")
private Integer approvalStatus; private Integer approvalStatus;
/** /**
@ -85,26 +85,4 @@ public class BmsApprovalInfo extends BaseInfoEntity {
@Excel(name = "是否删除0未删除1已删除") @Excel(name = "是否删除0未删除1已删除")
private Integer isDeleted; 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();
}
} }

@ -40,9 +40,9 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
/** /**
* *
*/ */
@ApiModelProperty(value = "项目名称") @ApiModelProperty(value = "申报任务标题")
@Excel(name = "项目名称") @Excel(name = "申报任务标题")
@JSONField(name = "项目名称") @JSONField(name = "申报任务标题")
private String projectName; private String projectName;
@JSONField(serialize = false) @JSONField(serialize = false)
@ -77,11 +77,18 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
private Long templateRecordId; private Long templateRecordId;
/** /**
* * id
*/ */
@JSONField(serialize = false) @JSONField(serialize = false)
@ApiModelProperty(value = "申报模版类型") @ApiModelProperty(value = "申报模版id")
private Integer declarationTemplateType; private Integer templateId;
/**
*
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "企业的统一社会信用代码")
private String creditCode;
/** /**
* idid * idid
@ -96,7 +103,7 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
*/ */
@JSONField(serialize = false) @JSONField(serialize = false)
@ApiModelProperty(value = "审批状态") @ApiModelProperty(value = "审批状态")
@Excel(name = "审批状态", readConverterExp = "0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") @Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
private Long status; private Long status;
/** /**
@ -106,8 +113,4 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
@ApiModelProperty(value = "是否删除0未删除1已删除") @ApiModelProperty(value = "是否删除0未删除1已删除")
private Long isDeleted; 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();
}
} }

@ -33,9 +33,9 @@ public class BmsProcessInfo extends BaseInfoEntity {
private Integer approvalType; private Integer approvalType;
/** /**
* (0=,1=,2=,3=) * (0=,1=,2=)
*/ */
@Excel(name = "对应审批层级(0=初审,1=复审,2=专家评审,3=市级评审)") @Excel(name = "对应审批层级(0=初审,1=复审,2=级评审)")
private Integer approvalLevel; private Integer approvalLevel;
@Excel(name = "审批部门id") @Excel(name = "审批部门id")

@ -2,11 +2,16 @@ package com.ruoyi.jjh.declaration.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity; import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
/** /**
* bms_template_info * bms_template_info
@ -14,6 +19,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @author farben * @author farben
* @date 2023-08-25 * @date 2023-08-25
*/ */
@Data
public class BmsTemplateInfo extends BaseInfoEntity { public class BmsTemplateInfo extends BaseInfoEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -38,19 +44,19 @@ public class BmsTemplateInfo extends BaseInfoEntity {
@Excel(name = "级别 ", readConverterExp = "0=本级,1=省级") @Excel(name = "级别 ", readConverterExp = "0=本级,1=省级")
private Long level; private Long level;
/** // /**
* // * 产品领域 生产性服务业 现代服务业 新兴服务业 (暂废弃)
*/ // */
@ApiModelProperty(value = "产品领域 0:生产性服务业 1:现代服务业 2:新兴服务业") // @ApiModelProperty(value = "产品领域 0:生产性服务业 1:现代服务业 2:新兴服务业")
@Excel(name = "产品领域", readConverterExp = "0=生产性服务业,1=现代服务业,2=新兴服务业") // @Excel(name = "产品领域", readConverterExp = "0=生产性服务业,1=现代服务业,2=新兴服务业")
private Long productArea; // private Long productArea;
/** // /**
* 0:/, 1:,2:,3: // * 申报类型 0:/, 1:试点区域,2:龙头型,3:创新型 (暂废弃)
*/ // */
@ApiModelProperty(value = "申报类型 0:/, 1:试点区域,2:龙头型,3:创新型") // @ApiModelProperty(value = "申报类型 0:/, 1:试点区域,2:龙头型,3:创新型")
@Excel(name = "申报类型", readConverterExp = "0=/, 1=试点区域,2=龙头型,3=创新型") // @Excel(name = "申报类型", readConverterExp = "0=/, 1=试点区域,2=龙头型,3=创新型")
private Long type; // private Long type;
/** /**
* *
@ -64,81 +70,56 @@ public class BmsTemplateInfo extends BaseInfoEntity {
*/ */
@ApiModelProperty(value = "责任单位 0经发委:1规建委:2行审局:3市监局") @ApiModelProperty(value = "责任单位 0经发委:1规建委:2行审局:3市监局")
@Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局") @Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局")
private Long responsibilityUnit; private Integer responsibilityUnit;
/** /**
* 01 * 01
*/ */
@ApiModelProperty(value = "是否删除0未删除1已删除") @ApiModelProperty(value = "是否删除0未删除1已删除")
@Excel(name = "是否删除", readConverterExp = "0=未删除,1=已删除") @Excel(name = "是否删除", readConverterExp = "0=未删除,1=已删除")
private Long isDeleted; private Integer 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;
}
public void setType(Long type) { /**
this.type = type; *
} */
/**
public String getNotes() { *
return notes; */
} @Excel(name = "项目分类", readConverterExp = "1=总部经济," +
"2=自主品牌先进技术研究院," +
public void setNotes(String notes) { "3=省现代服务业重点项目," +
this.notes = notes; "4=省市服务业领军企业," +
} "5=省级现代服务业集聚区," +
"6=两业融合试点单位," +
public Long getResponsibilityUnit() { "7=楼宇经济," +
return responsibilityUnit; "8=工业设计中心," +
} "9=工业设计研究院," +
"10=服务型制造示范")
public void setResponsibilityUnit(Long responsibilityUnit) { @ApiModelProperty("项目分类")
this.responsibilityUnit = responsibilityUnit; 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() { * 0=,1=
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(); */
} @Excel(name = "状态 0=过期,1=有效" , readConverterExp = "0=过期,1=有效")
@ApiModelProperty("状态 0=过期,1=有效")
private Integer status;
} }

@ -10,7 +10,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.util.Date; import java.time.LocalDate;
/** /**
* 线 bms_template_record * 线 bms_template_record
@ -36,10 +36,10 @@ public class BmsTemplateRecord extends BaseInfoEntity {
private Long templateId; private Long templateId;
/** /**
* *
*/ */
@ApiModelProperty(value = "企业名录分类") @ApiModelProperty(value = "申报任务标题")
@Excel(name = "企业名录分类") @Excel(name = "申报任务标题")
private String enterpriseDirectory; private String enterpriseDirectory;
/** /**
@ -47,14 +47,14 @@ public class BmsTemplateRecord extends BaseInfoEntity {
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开放开始时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开放开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime; private LocalDate startTime;
/** /**
* *
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开放结束时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开放结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime; private LocalDate endTime;
@Excel(name = "上传文件名称") @Excel(name = "上传文件名称")
private String fileName; private String fileName;
@ -72,4 +72,11 @@ public class BmsTemplateRecord extends BaseInfoEntity {
@Size(max = 200, message = "说明的长度要小于 200") @Size(max = 200, message = "说明的长度要小于 200")
private String notes; private String notes;
/**
* 0= 1= 2=
*/
@Excel(name = "状态 0=未开始 1=过期 2=有效" , readConverterExp = "0=未开始,1=过期,2=有效")
@ApiModelProperty("状态 0=未开始 1=过期 2=有效")
private Integer status;
} }

@ -21,6 +21,9 @@ public class ApprovalDeclarationRecordsQueryDto implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "申报任务标题")
private String enterpriseDirectory;
@ApiModelProperty(value = "事项") @ApiModelProperty(value = "事项")
private String matter; private String matter;

@ -3,6 +3,8 @@ package com.ruoyi.jjh.declaration.entity.dto;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -25,8 +27,9 @@ public class BmsApprovalInfoUpdateDto implements Serializable {
@Excel(name = "申报记录id") @Excel(name = "申报记录id")
private Long declarationRecordsId; private Long declarationRecordsId;
/** 审批状态(0=待审核.1=审批通过,2=审批驳回) */ // /** 审批状态(0=待审核.1=审批通过,2=审批驳回) */
@Excel(name = "审批状态(0=待审核.1=审批通过,2=审批驳回)") @ApiModelProperty("审批状态(1=审批通过,2=审批驳回,3=初审退回修改)")
@Excel(name = "审批状态(1=审批通过,2=审批驳回,3=初审退回修改)")
private Integer approvalStatus; private Integer approvalStatus;
/** 审批意见 */ /** 审批意见 */

@ -41,4 +41,6 @@ public class BmsBigStrongAwardAddDto extends BmsEnterpriseBasicInfoAddDto implem
@Excel(name = "企业近3年发展情况及未来发展计划") @Excel(name = "企业近3年发展情况及未来发展计划")
private String developmentPlan; private String developmentPlan;
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
} }

@ -33,6 +33,6 @@ public class BmsBigStrongAwardUpdateDto extends BmsBigStrongAward implements Ser
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
private Long status; private Long status;
} }

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.entity.dto; package com.ruoyi.jjh.declaration.entity.dto;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -31,4 +32,6 @@ public class BmsBrandingAwardAddDto extends BmsEnterpriseBasicInfoAddDto impleme
@Excel(name = "证明材料") @Excel(name = "证明材料")
private String evidence; private String evidence;
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
} }

@ -26,6 +26,6 @@ public class BmsBrandingAwardUpdateDto extends BmsBrandingAward {
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
private Long status; private Long status;
} }

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.entity.dto; package com.ruoyi.jjh.declaration.entity.dto;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -42,4 +43,6 @@ public class BmsCarrierConstructionAwardAddDto extends BmsEnterpriseBasicInfoAdd
@Excel(name = "消防验收报告") @Excel(name = "消防验收报告")
private String fireReport; private String fireReport;
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
} }

@ -23,7 +23,7 @@ public class BmsCarrierConstructionAwardUpdateDto extends BmsCarrierConstruction
@Excel(name = "项目id") @Excel(name = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
private Long status; private Long status;
} }

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.entity.dto; package com.ruoyi.jjh.declaration.entity.dto;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -29,4 +30,6 @@ public class BmsCreditManagementAddDto extends BmsEnterpriseBasicInfoAddDto impl
@Excel(name = "项目专项审计报告") @Excel(name = "项目专项审计报告")
private String auditReport; private String auditReport;
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
} }

@ -26,7 +26,7 @@ public class BmsCreditManagementUpdateDto extends BmsCreditManagement {
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
private Long status; private Long status;
} }

@ -21,6 +21,12 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class BmsDeclarationRecordsDto extends BmsDeclarationRecords { public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
@ApiModelProperty(value = "申报任务标题")
@Excel(name = "申报任务标题")
private String enterpriseDirectory;
@ApiModelProperty(value = "申报单位") @ApiModelProperty(value = "申报单位")
@Excel(name = "申报单位") @Excel(name = "申报单位")
private String enterpriseName; private String enterpriseName;
@ -30,10 +36,10 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
@Excel(name = "级别", readConverterExp = "0=本级,1=省级") @Excel(name = "级别", readConverterExp = "0=本级,1=省级")
private Long level; private Long level;
/** 申报类型 0:/, 1:试点区域,2:龙头型,3:创新型 */ // /** 申报类型 0:/, 1:试点区域,2:龙头型,3:创新型 */
@ApiModelProperty(value = "申报类型 0:/, 1:试点区域,2:龙头型,3:创新型") // @ApiModelProperty(value = "申报类型 0:/, 1:试点区域,2:龙头型,3:创新型")
@Excel(name = "申报类型", readConverterExp = "0=/,1=试点区域,2=龙头型,3=创新型") // @Excel(name = "申报类型", readConverterExp = "0=/,1=试点区域,2=龙头型,3=创新型")
private Long type; // private Long type;
/** 责任单位 0经发委:1规建委:2行审局:3市监局 */ /** 责任单位 0经发委:1规建委:2行审局:3市监局 */
@ApiModelProperty(value = "责任单位 0经发委:1规建委:2行审局:3市监局") @ApiModelProperty(value = "责任单位 0经发委:1规建委:2行审局:3市监局")
@ -43,7 +49,10 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
@ApiModelProperty(value = "模板名称") @ApiModelProperty(value = "模板名称")
private String templateName; private String templateName;
@ApiModelProperty(value = "审批状态") @ApiModelProperty(value = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
@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 List<Long> statusStr; private List<Long> statusStr;
@ApiModelProperty(value = "0=未填报,1=已填报")
private Integer statusChange;
} }

@ -44,8 +44,8 @@ public class BmsEnterpriseBasicInfoAddDto implements Serializable {
@ApiModelProperty(value = "申报时间") @ApiModelProperty(value = "申报时间")
private Date fillingTime; private Date fillingTime;
@ApiModelProperty(value = "申报模版类型") // @ApiModelProperty(value = "申报模版类型")
private int declarationTemplateType; // private int declarationTemplateType;
@ApiModelProperty(value = "项目名称") @ApiModelProperty(value = "项目名称")
private String projectName; private String projectName;

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.entity.dto; package com.ruoyi.jjh.declaration.entity.dto;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -26,5 +27,6 @@ public class BmsIndustrialInternetAwardAddDto extends BmsEnterpriseBasicInfoAddD
@Excel(name = "证明材料") @Excel(name = "证明材料")
private String material; private String material;
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
} }

@ -27,7 +27,7 @@ public class BmsIndustrialInternetAwardUpdateDto extends BmsIndustrialInternetAw
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
private Long status; private Long status;
} }

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.entity.dto; package com.ruoyi.jjh.declaration.entity.dto;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -56,5 +57,6 @@ public class BmsIntegrationIndustriesAddDto extends BmsEnterpriseBasicInfoAddDto
/** 证明材料 */ /** 证明材料 */
@Excel(name = "证明材料") @Excel(name = "证明材料")
private String otherEvidence; private String otherEvidence;
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
} }

@ -26,7 +26,7 @@ public class BmsIntegrationIndustriesUpdateDto extends BmsIntegrationIndustries
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
private Long status; private Long status;
} }

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.entity.dto; package com.ruoyi.jjh.declaration.entity.dto;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -34,4 +35,6 @@ public class BmsLogisticsDevelopmentAwardAddDto extends BmsEnterpriseBasicInfoA
@Excel(name = "会计师事务所出具的企业财务报表审计报告") @Excel(name = "会计师事务所出具的企业财务报表审计报告")
private String auditReport; private String auditReport;
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
} }

@ -25,7 +25,7 @@ public class BmsLogisticsDevelopmentAwardUpdateDto extends BmsLogisticsDevelopme
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
private Long status; private Long status;
} }

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.entity.dto; package com.ruoyi.jjh.declaration.entity.dto;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -34,5 +35,6 @@ public class BmsManufacturingServicesAwardAddDto extends BmsEnterpriseBasicInfoA
@Excel(name = "会计师事务所出具的企业财务报表审计报告") @Excel(name = "会计师事务所出具的企业财务报表审计报告")
private String financialStatements; private String financialStatements;
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
} }

@ -26,6 +26,6 @@ public class BmsManufacturingServicesAwardUpdateDto extends BmsManufacturingServ
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
private Long status; private Long status;
} }

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.entity.dto; package com.ruoyi.jjh.declaration.entity.dto;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -26,4 +27,6 @@ public class BmsPlatformConstructionAwardAddDto extends BmsEnterpriseBasicInfoAd
@Excel(name = "合作协议") @Excel(name = "合作协议")
private String agreement; private String agreement;
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
} }

@ -26,6 +26,6 @@ public class BmsPlatformConstructionAwardUpdateDto extends BmsPlatformConstructi
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
private Long status; private Long status;
} }

@ -50,4 +50,6 @@ public class BmsProjectSettlementAwardAddDto extends BmsEnterpriseBasicInfoAddDt
@ApiModelProperty(value = "营业执照") @ApiModelProperty(value = "营业执照")
private String businessLicense; private String businessLicense;
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
} }

@ -33,7 +33,7 @@ public class BmsProjectSettlementAwardUpdateDto extends BmsProjectSettlementAwar
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
private Long status; private Long status;
} }

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.entity.dto; package com.ruoyi.jjh.declaration.entity.dto;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -30,4 +31,6 @@ public class BmsSceneOpeningAwardAddDto extends BmsEnterpriseBasicInfoAddDto imp
@Excel(name = "公示、发文证明、专家评分表") @Excel(name = "公示、发文证明、专家评分表")
private String material; private String material;
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
} }

@ -20,7 +20,7 @@ public class BmsSceneOpeningAwardUpdateDto extends BmsSceneOpeningAward {
@ApiModelProperty(value = "记录id") @ApiModelProperty(value = "记录id")
private Long declarationRecordsId; private Long declarationRecordsId;
@ApiModelProperty(value = "审批状态:0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过10=退回修改")
private Long status; private Long status;
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")

@ -19,7 +19,7 @@ public class BmsTemplateRecordQueryDto implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "企业名录") @ApiModelProperty(value = "申报任务标题")
private String enterpriseDirectory; private String enterpriseDirectory;
@ApiModelProperty(value = "模板id") @ApiModelProperty(value = "模板id")
@ -49,4 +49,9 @@ public class BmsTemplateRecordQueryDto implements Serializable {
@ApiModelProperty(value = "模板名称") @ApiModelProperty(value = "模板名称")
private String templateName; private String templateName;
/**
* 0= 1= 2=
*/
@ApiModelProperty("状态 0=未开始 1=过期 2=有效")
private Integer status;
} }

@ -24,4 +24,7 @@ public class BmsTemplateRecordUpdateDto extends BmsTemplateRecord {
@ApiModelProperty(value = "企业名录") @ApiModelProperty(value = "企业名录")
private List<BmsEnterpriseDirectory> enterpriseDirectoryList; private List<BmsEnterpriseDirectory> enterpriseDirectoryList;
@ApiModelProperty(value = "是否所有")
private Integer isFrame;
} }

@ -22,17 +22,26 @@ public class ApprovalDeclarationRecordsQueryVo implements Serializable {
private Long id; private Long id;
@ApiModelProperty(value = "申报任务标题")
private String enterpriseDirectory;
@ApiModelProperty(value = "级别")
private Integer level;
@ApiModelProperty(value = "责任单位")
private Integer responsibilityUnit;
@ApiModelProperty(value = "审批状态(0=待审核.1=审批通过,2=审批驳回)") @ApiModelProperty(value = "审批状态(0=待审核.1=审批通过,2=审批驳回)")
private Integer approvalStatus; private Integer approvalStatus;
@ApiModelProperty(value = "事项") @ApiModelProperty(value = "事项")
private String matter; private String matter;
@ApiModelProperty(value = "项目名称") // @ApiModelProperty(value = "项目名称")
private String projectName; // private String projectName;
//
@ApiModelProperty(value = "项目类型:也就是产品领域") // @ApiModelProperty(value = "项目类型:也就是产品领域")
private Integer productArea; // private Integer productArea;
@ApiModelProperty(value = "申报单位") @ApiModelProperty(value = "申报单位")
private String enterpriseName; private String enterpriseName;
@ -40,17 +49,17 @@ public class ApprovalDeclarationRecordsQueryVo implements Serializable {
@ApiModelProperty(value = "申报单位Id") @ApiModelProperty(value = "申报单位Id")
private Long enterpriseId; private Long enterpriseId;
@ApiModelProperty(value = "扶持方式") // @ApiModelProperty(value = "扶持方式")
private Integer supportMethods; // private Integer supportMethods;
@ApiModelProperty(value = "申请时间") @ApiModelProperty(value = "申请时间")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "项目开始时间") // @ApiModelProperty(value = "项目开始时间")
private Date startTime; // private Date startTime;
//
@ApiModelProperty(value = "项目结束时间") // @ApiModelProperty(value = "项目结束时间")
private Date endTime; // private Date endTime;
@ApiModelProperty(value = "审核状态") @ApiModelProperty(value = "审核状态")
private Integer status; private Integer status;

@ -22,6 +22,12 @@ public class BmsDeclarationRecordsQueryVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "申报任务标题")
private String enterpriseDirectory;
@ApiModelProperty(value = "企业社会信用代码")
private String creditCode;
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
private Long id; private Long id;
@ -59,11 +65,11 @@ public class BmsDeclarationRecordsQueryVo implements Serializable {
@Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局") @Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局")
private Long responsibilityUnit; private Long responsibilityUnit;
@ApiModelProperty(value = "申报表单") @ApiModelProperty(value = "申报模板")
@Excel(name = "申报表单", readConverterExp = "1=项目落户奖补企业申报模版,2=做大做强奖补企业申报模版,3=载体建设奖补企业申报模版" + @Excel(name = "申报模板", readConverterExp = "1=项目落户奖补企业申报模版,2=做大做强奖补企业申报模版,3=载体建设奖补企业申报模版" +
",4=平台建设奖补企业申报模版,5=品牌打造奖补企业申报模版,6=场景开放奖补企业申报模版,7=信用管理奖补企业申报模版" + ",4=平台建设奖补企业申报模版,5=品牌打造奖补企业申报模版,6=场景开放奖补企业申报模版,7=信用管理奖补企业申报模版" +
",8=5G+工业互联网奖补企业申报模版,9=制造服务业有效投入奖补企业申报模版,10=物流发展奖补企业申报模版") ",8=5G+工业互联网奖补企业申报模版,9=制造服务业有效投入奖补企业申报模版,10=物流发展奖补企业申报模版")
private Long declarationTemplateType; private Long templateId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "申报时间", width = 30, dateFormat = "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") @ApiModelProperty(value = "企业id")
private Long enterpriseId; private Long enterpriseId;
@ApiModelProperty(value = "申报模板id") @ApiModelProperty(value = "在线模板id")
private Long templateRecordId; private Long templateRecordId;
@ApiModelProperty(value = "申报模板id") // @ApiModelProperty(value = "申报模板id")
private Long templateId; // private Long templateId;
@ApiModelProperty(value = "详情id对应详情id") @ApiModelProperty(value = "详情id对应详情id")
private Long detailId; private Long detailId;
@ApiModelProperty(value = "审批状态") @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; private Long status;
} }

@ -2,10 +2,13 @@ package com.ruoyi.jjh.declaration.entity.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date; import java.util.Date;
/** /**
@ -14,6 +17,7 @@ import java.util.Date;
* @author farben * @author farben
* @date 2023-08-25 * @date 2023-08-25
*/ */
@ApiModel("申报模板信息对象")
@Data @Data
public class BmsTemplateRecordQueryVo implements Serializable { public class BmsTemplateRecordQueryVo implements Serializable {
@ -22,7 +26,7 @@ public class BmsTemplateRecordQueryVo implements Serializable {
@ApiModelProperty(value = "企业项目名录id") @ApiModelProperty(value = "企业项目名录id")
private Long templateRecordId; private Long templateRecordId;
@ApiModelProperty(value = "企业名录") @ApiModelProperty(value = "申报任务标题")
private String enterpriseDirectory; private String enterpriseDirectory;
@ApiModelProperty(value = "模板类型") @ApiModelProperty(value = "模板类型")
@ -42,14 +46,16 @@ public class BmsTemplateRecordQueryVo implements Serializable {
@ApiModelProperty(value = "上传文件名称") @ApiModelProperty(value = "上传文件名称")
private String fileName; 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") @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") @Excel(name = "开放结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime; private Date endTime;
@ -60,10 +66,20 @@ public class BmsTemplateRecordQueryVo implements Serializable {
@Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局") @Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局")
private Long responsibilityUnit; private Long responsibilityUnit;
@ApiModelProperty(value = "项目分类")
private Integer projectClassify;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private String createByName; private String createByName;
/**
* 0= 1= 2=
*/
@Excel(name = "状态 0=未开始 1=过期 2=有效" , readConverterExp = "0=未开始,1=过期,2=有效")
@ApiModelProperty("状态 0=未开始 1=过期 2=有效")
private Integer status;
} }

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

@ -30,6 +30,8 @@ import java.util.List;
public class DeclarationRecordsVo implements Serializable { public class DeclarationRecordsVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "申报任务标题")
public String enterpriseDirectory;
@ApiModelProperty(value = "审核信息") @ApiModelProperty(value = "审核信息")
public List<BmsApprovalInfoQueryVo> approvalInfoList; public List<BmsApprovalInfoQueryVo> approvalInfoList;
@ApiModelProperty(value = "申请记录") @ApiModelProperty(value = "申请记录")

@ -84,4 +84,10 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
public int updateProjectNameById(@Param("id") Long id, @Param("projectName")String projectName,@Param("projectId")Long projectId); public int updateProjectNameById(@Param("id") Long id, @Param("projectName")String projectName,@Param("projectId")Long projectId);
List<BmsDeclarationRecordsQueryVo> selectDeclarationRecordsToIdList(@Param("list") List<Long> list); List<BmsDeclarationRecordsQueryVo> selectDeclarationRecordsToIdList(@Param("list") List<Long> list);
/**
* idid
* @return
*/
List<BmsDeclarationRecords> selectET(@Param("templateId") Long templateId, @Param("list") List<String> list);
} }

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.mapper; package com.ruoyi.jjh.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto;
@ -67,7 +68,9 @@ public interface BmsTemplateRecordMapper extends BaseMapper<BmsTemplateRecord> {
*/ */
public int deleteBmsTemplateRecordByIds(Long[] ids); public int deleteBmsTemplateRecordByIds(Long[] ids);
public List<BmsTemplateRecordQueryVo> selectTemplateRecordVo(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto); public List<BmsTemplateRecordQueryVo> selectTemplateRecordVo(@Param("req") BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
public Page<BmsTemplateRecordQueryVo> selectTemplateRecordVo(Page<BmsTemplateRecordQueryVo> page,@Param("req")BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
public List<BmsTemplateRecordQueryVo> selectTemplateRecordList(@Param("creditCode") String creditCode); public List<BmsTemplateRecordQueryVo> selectTemplateRecordList(@Param("creditCode") String creditCode);

@ -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<BmsTemplateInfo> 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<BmsTemplateRecord> list = bmsTemplateRecordService.list();
for (BmsTemplateRecord items : list) {
getTime(items);
}
bmsTemplateRecordService.updateBatchById(list);
}
}

@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; 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.dto.*;
import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo; import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo;
@ -44,6 +45,7 @@ public interface IBmsDeclarationRecordsService extends IService<BmsDeclarationRe
public int updateApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto); public int updateApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto);
/** /**
* 线 * 线
* *
@ -105,4 +107,10 @@ public interface IBmsDeclarationRecordsService extends IService<BmsDeclarationRe
* id使 * id使
*/ */
String getAllFile(Long args,Long id); String getAllFile(Long args,Long id);
/**
* idid
* @return
*/
List<BmsDeclarationRecords> selectET(Long templateId,List<String> list);
} }

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.service; package com.ruoyi.jjh.declaration.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto;
@ -32,7 +33,9 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
* @param bmsTemplateRecordQueryDto 线 * @param bmsTemplateRecordQueryDto 线
* @return 线 * @return 线
*/ */
public List<BmsTemplateRecordQueryVo> selectBmsTemplateRecordList(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto); public Page<BmsTemplateRecordQueryVo> selectBmsTemplateRecordList(Page<BmsTemplateRecordQueryVo> page,BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
public List<BmsTemplateRecordQueryVo> selectBmsTemplateRecordList(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
public List<BmsTemplateRecordQueryVo> selectTemplateRecordList(String creditCode); public List<BmsTemplateRecordQueryVo> selectTemplateRecordList(String creditCode);
@ -68,4 +71,11 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
* @return * @return
*/ */
public int deleteBmsTemplateRecordById(Long id); public int deleteBmsTemplateRecordById(Long id);
/**
*
* @param bmsTemplateRecordAddDto
* @return
*/
int supplementation(BmsTemplateRecordUpdateDto bmsTemplateRecordAddDto);
} }

@ -29,6 +29,9 @@ public interface ICommonService {
public void insertAuditRecord(Long declarationRecordId,Integer approvalType); public void insertAuditRecord(Long declarationRecordId,Integer approvalType);
public void updateAuditRecord(Long declarationRecordId,Integer approvalType);
public void cleanProcessList(Long declarationRecordId); public void cleanProcessList(Long declarationRecordId);
public List<Long> getUserIds(Long userId); public List<Long> getUserIds(Long userId);

@ -3,19 +3,14 @@ package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward; import com.ruoyi.jjh.declaration.entity.*;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsFundingDetailAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsFundingDetailAddDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsBigStrongAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsBigStrongAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsBigStrongAwardService; import com.ruoyi.jjh.declaration.service.*;
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.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -49,6 +44,9 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
@Autowired @Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
/** /**
@ -109,33 +107,20 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
}); });
// 批量新增资金信息 // 批量新增资金信息
iBmsFundingDetailService.saveOrUpdateBatch(fundingInfoList); iBmsFundingDetailService.saveOrUpdateBatch(fundingInfoList);
// 新增申请记录 // 修改在线申报记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
BeanUtil.copyProperties(bmsBigStrongAwardAddDto, declarationRecords);
declarationRecords.setMatter("提交做大做强奖补申请"); declarationRecords.setMatter("提交做大做强奖补申请");
declarationRecords.setDetailId(bmsBigStrongAward.getId()); declarationRecords.setDetailId(bmsBigStrongAward.getId());
declarationRecords.setEnterpriseId(enterpriseId); declarationRecords.setStatus(1L);
declarationRecords.setYear(String.valueOf(Year.now().getValue())); declarationRecords.setId(bmsBigStrongAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.save(declarationRecords); iBmsDeclarationRecordsService.updateById(declarationRecords);
Map<String, String> allJson = getAllJson(declarationRecords.getId());
//新增项目 //新增项目
JProject jP = new JProject(); declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsBigStrongAwardAddDto.getDeclarationId())));
jP.setProjectYear(declarationRecords.getYear()); iBmsDeclarationRecordsService.updateById(declarationRecords);
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());
// 申请审批 // 申请审批
if (bmsBigStrongAwardAddDto.getStatus() == 1) { iCommonService.insertAuditRecord(declarationRecords.getId(), 0);
// 审批状态
iCommonService.insertAuditRecord(declarationRecords.getId(), 0);
}
return num; return num;
} }
@ -153,6 +138,9 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
BmsBigStrongAwardQueryVo p1 = declarationRecordsVo.getBmsBigStrongAwardQueryVo(); BmsBigStrongAwardQueryVo p1 = declarationRecordsVo.getBmsBigStrongAwardQueryVo();
//做大做强对象JSON //做大做强对象JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, jProjectService.getJsonString(p1.getFundingDetailList()))); jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, jProjectService.getJsonString(p1.getFundingDetailList())));
jsonMap.put("fileJson","{" + jsonMap.put("fileJson","{" +
'"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + p1.getDevelopmentPlan() + '"' + '"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + p1.getDevelopmentPlan() + '"' +
@ -186,8 +174,8 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
Map<String, String> allJson = getAllJson(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId()); Map<String, String> allJson = getAllJson(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId());
//修改项目 //修改项目
jProjectService.updateTheJson(allJson); jProjectService.updateTheJson(allJson);
// 审批状态 // 修改审批状态
iCommonService.insertAuditRecord(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId(), 0); iCommonService.updateAuditRecord(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId(), 0);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsBrandingAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsBrandingAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsBrandingAwardService; import com.ruoyi.jjh.declaration.service.IBmsBrandingAwardService;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; 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.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
@ -40,7 +41,8 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
@Autowired @Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
/** /**
@ -87,31 +89,19 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
// 新增申请记录 // 新增申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
BeanUtil.copyProperties(bmsBrandingAwardAddDto,declarationRecords);
declarationRecords.setMatter("提交品牌打造奖补申请"); declarationRecords.setMatter("提交品牌打造奖补申请");
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsBrandingAward.getId()); declarationRecords.setDetailId(bmsBrandingAward.getId());
declarationRecords.setYear(String.valueOf(Year.now().getValue())); declarationRecords.setStatus(1L);
iBmsDeclarationRecordsService.save(declarationRecords); declarationRecords.setId(bmsBrandingAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
Map<String, String> allJson = getAllJson(declarationRecords.getId());
//新增项目 //新增项目
JProject jP = new JProject(); declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsBrandingAwardAddDto.getDeclarationId())));
jP.setProjectYear(declarationRecords.getYear()); iBmsDeclarationRecordsService.updateById(declarationRecords);
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(allJson.get("declareUnit")); // 审批状态
jP.setProjectClassify(4); iCommonService.insertAuditRecord(declarationRecords.getId(),0);
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);
}
return num; return num;
} }
@ -128,6 +118,9 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
BmsBrandingAward p1 = declarationRecordsVo.getBmsBrandingAward(); BmsBrandingAward p1 = declarationRecordsVo.getBmsBrandingAward();
//品牌打造奖补JSON //品牌打造奖补JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}")); jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
jsonMap.put("fileJson", "{" + jsonMap.put("fileJson", "{" +
'"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' + '"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' +
@ -159,7 +152,7 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
Map<String, String> allJson = getAllJson(bmsBrandingAwardUpdateDto.getDeclarationRecordsId()); Map<String, String> allJson = getAllJson(bmsBrandingAwardUpdateDto.getDeclarationRecordsId());
jProjectService.updateTheJson(allJson); jProjectService.updateTheJson(allJson);
// 审批状态 // 审批状态
iCommonService.insertAuditRecord(bmsBrandingAwardUpdateDto.getDeclarationRecordsId(),0); iCommonService.updateAuditRecord(bmsBrandingAwardUpdateDto.getDeclarationRecordsId(), 0);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsCarrierConstructionAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsCarrierConstructionAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsCarrierConstructionAwardService; import com.ruoyi.jjh.declaration.service.IBmsCarrierConstructionAwardService;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; 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.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
@ -41,6 +42,8 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
@Autowired @Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
/** /**
@ -88,33 +91,18 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
// 新增申请记录 // 新增申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
BeanUtil.copyProperties(bmsCarrierConstructionAwardAddDto,declarationRecords);
declarationRecords.setMatter("提交载体建设奖补申请"); declarationRecords.setMatter("提交载体建设奖补申请");
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsCarrierConstructionAward.getId()); declarationRecords.setDetailId(bmsCarrierConstructionAward.getId());
declarationRecords.setYear(String.valueOf(Year.now().getValue())); declarationRecords.setStatus(1L);
iBmsDeclarationRecordsService.save(declarationRecords); declarationRecords.setId(bmsCarrierConstructionAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
Map<String, String> allJson = getAllJson(declarationRecords.getId());
//新增项目 //新增项目
JProject jP = new JProject(); declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsCarrierConstructionAwardAddDto.getDeclarationId())));
jP.setProjectYear(declarationRecords.getYear()); iBmsDeclarationRecordsService.updateById(declarationRecords);
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());
// 生成审核 // 生成审核
if (bmsCarrierConstructionAwardAddDto.getStatus()==1){ iCommonService.insertAuditRecord(declarationRecords.getId(),0);
// 审批状态
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }
@ -129,6 +117,9 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
BmsCarrierConstructionAward p1 = declarationRecordsVo.getBmsCarrierConstructionAward(); BmsCarrierConstructionAward p1 = declarationRecordsVo.getBmsCarrierConstructionAward();
//载体建设奖补JSON //载体建设奖补JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
jsonMap.put("otherJson",jProjectService.allJsonString(js1, "{}", js3, "{}")); jsonMap.put("otherJson",jProjectService.allJsonString(js1, "{}", js3, "{}"));
jsonMap.put("fileJson","{" + jsonMap.put("fileJson","{" +
'"' + "相关佐证资料" + '"' + ":" + '"' + p1.getSupportingMaterials() + '"' + ','+ '"' + "相关佐证资料" + '"' + ":" + '"' + p1.getSupportingMaterials() + '"' + ','+
@ -161,7 +152,7 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
Map<String, String> allJson = getAllJson(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId()); Map<String, String> allJson = getAllJson(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId());
jProjectService.updateTheJson(allJson); jProjectService.updateTheJson(allJson);
// 审批状态 // 审批状态
iCommonService.insertAuditRecord(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId(),0); iCommonService.updateAuditRecord(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId(), 0);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsCreditManagementMapper; import com.ruoyi.jjh.declaration.mapper.BmsCreditManagementMapper;
import com.ruoyi.jjh.declaration.service.IBmsCreditManagementService; import com.ruoyi.jjh.declaration.service.IBmsCreditManagementService;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; 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.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
@ -41,6 +42,8 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
@Autowired @Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
/** /**
@ -87,31 +90,18 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
// 新增申请记录 // 新增申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
BeanUtil.copyProperties(bmsCreditManagementAddDto,declarationRecords);
declarationRecords.setMatter("提交信用管理奖补申请"); declarationRecords.setMatter("提交信用管理奖补申请");
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsCreditManagement.getId()); declarationRecords.setDetailId(bmsCreditManagement.getId());
declarationRecords.setYear(String.valueOf(Year.now().getValue())); declarationRecords.setStatus(1L);
iBmsDeclarationRecordsService.save(declarationRecords); declarationRecords.setId(bmsCreditManagementAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
Map<String, String> allJson = getAllJson(declarationRecords.getId());
//新增项目 //新增项目
JProject jP = new JProject(); declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsCreditManagementAddDto.getDeclarationId())));
jP.setProjectYear(declarationRecords.getYear()); iBmsDeclarationRecordsService.updateById(declarationRecords);
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());
// 生成审核 // 生成审核
if (bmsCreditManagementAddDto.getStatus()==1){ iCommonService.insertAuditRecord(declarationRecords.getId(),0);
// 审批状态
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }
@ -128,6 +118,9 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
BmsCreditManagement p1 = declarationRecordsVo.getBmsCreditManagement(); BmsCreditManagement p1 = declarationRecordsVo.getBmsCreditManagement();
//信用管理奖补JSON //信用管理奖补JSON
// String js3 = JSONObject.toJSONString(p1); // String js3 = JSONObject.toJSONString(p1);
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, "{}", "{}")); jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, "{}", "{}"));
jsonMap.put("fileJson","{" + jsonMap.put("fileJson","{" +
'"' + "项目方案" + '"' + ":" + '"' + p1.getProjectPlan() + '"' + ","+ '"' + "项目方案" + '"' + ":" + '"' + p1.getProjectPlan() + '"' + ","+
@ -161,7 +154,7 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
Map<String, String> allJson = getAllJson(bmsCreditManagementUpdateDto.getDeclarationRecordsId()); Map<String, String> allJson = getAllJson(bmsCreditManagementUpdateDto.getDeclarationRecordsId());
jProjectService.updateTheJson(allJson); jProjectService.updateTheJson(allJson);
// 审批状态 // 审批状态
iCommonService.insertAuditRecord(bmsCreditManagementUpdateDto.getDeclarationRecordsId(),0); iCommonService.updateAuditRecord(bmsCreditManagementUpdateDto.getDeclarationRecordsId(), 0);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; 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.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.context.SecurityContextHolder; import com.ruoyi.common.context.SecurityContextHolder;
@ -46,6 +47,9 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
@Autowired @Autowired
private IBmsFieldInfoService iBmsFieldInfoService; private IBmsFieldInfoService iBmsFieldInfoService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
@Autowired @Autowired
private IBmsFileInfoService iBmsFileInfoService; private IBmsFileInfoService iBmsFileInfoService;
@ -132,18 +136,26 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
DeclarationRecordsVo declarationRecordsVo = new DeclarationRecordsVo(); DeclarationRecordsVo declarationRecordsVo = new DeclarationRecordsVo();
declarationRecordsVo.setBmsDeclarationRecords(declarationRecords); declarationRecordsVo.setBmsDeclarationRecords(declarationRecords);
// 在线模板记录id // 在线模板记录id
int declarationTemplateType = declarationRecords.getDeclarationTemplateType(); int declarationTemplateType = declarationRecords.getTemplateId();
// 详情id // 详情id
Long detailId = declarationRecords.getDetailId(); Long detailId = declarationRecords.getDetailId();
// 企业id // 企业的统一社会信用代码
Long enterpriseId = declarationRecords.getEnterpriseId(); String creditCode = declarationRecords.getCreditCode();
// 获取详情数据 // 获取详情数据
iCommonService.getData(declarationTemplateType, detailId, declarationRecordsVo); iCommonService.getData(declarationTemplateType, detailId, declarationRecordsVo);
//企业基本信息 //企业基本信息
declarationRecordsVo.setBmsEnterpriseBasicInfo(iBmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoById(enterpriseId)); QueryWrapper<BmsEnterpriseBasicInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("credit_code", creditCode);
BmsEnterpriseBasicInfo one = iBmsEnterpriseBasicInfoService.getOne(queryWrapper);
declarationRecordsVo.setBmsEnterpriseBasicInfo(one);
declarationRecordsVo.setApprovalInfoList(iBmsApprovalInfoService.getApprovalInfoList(id)); declarationRecordsVo.setApprovalInfoList(iBmsApprovalInfoService.getApprovalInfoList(id));
BmsTemplateRecord items = iBmsTemplateRecordService.getById(declarationRecords.getTemplateRecordId());
//获取申报任务标题
declarationRecordsVo.setEnterpriseDirectory( items.getEnterpriseDirectory() );
return declarationRecordsVo; return declarationRecordsVo;
} }
@ -236,22 +248,21 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
List<BmsApprovalInfo> approvalInfoList = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, bmsApprovalInfoUpdateDto.getDeclarationRecordsId()).orderByDesc(BmsApprovalInfo::getSort).list(); List<BmsApprovalInfo> approvalInfoList = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, bmsApprovalInfoUpdateDto.getDeclarationRecordsId()).orderByDesc(BmsApprovalInfo::getSort).list();
// 更新审批记录 // 更新审批记录
if (CollectionUtil.isNotEmpty(approvalInfoList)) { if (CollectionUtil.isNotEmpty(approvalInfoList)) {
approvalInfoList.forEach(x -> { for (BmsApprovalInfo x : approvalInfoList) {
if (bmsProcessInfo.getId().equals(x.getProcessId()) && x.getApprovalStatus().equals(0)) { if (bmsProcessInfo.getId().equals(x.getProcessId())) {
// 更新审批记录 // 更新审批记录
Integer sort = x.getSort(); Integer sort = x.getSort();
bmsApprovalInfoUpdateDto.setId(x.getId()); bmsApprovalInfoUpdateDto.setId(x.getId());
// bmsApprovalInfoUpdateDto.setSort(x.getSort());
BeanUtil.copyProperties(bmsApprovalInfoUpdateDto, x); BeanUtil.copyProperties(bmsApprovalInfoUpdateDto, x);
x.setSort(sort); x.setSort(sort);
x.setApprovalById(SecurityUtils.getUserId()); x.setApprovalById(SecurityUtils.getUserId());
x.setApprovalTime(DateUtils.getNowDate()); x.setApprovalTime(DateUtils.getNowDate());
x.setIsReview(2); x.setIsReview(2);
iBmsApprovalInfoService.saveOrUpdate(x); x.setApprovalStatus(bmsApprovalInfoUpdateDto.getApprovalStatus());
iBmsApprovalInfoService.updateById(x);
} }
}); }
} }
// 新增记录 // 新增记录
if (bmsApprovalInfoUpdateDto.getApprovalStatus().equals(1)) { if (bmsApprovalInfoUpdateDto.getApprovalStatus().equals(1)) {
BmsProcessInfo bmsProcessInfo2 = new BmsProcessInfo(); BmsProcessInfo bmsProcessInfo2 = new BmsProcessInfo();
@ -284,10 +295,15 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) { if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(2); jp.setStatus(2);
bmsDeclarationRecords.setStatus(2L); bmsDeclarationRecords.setStatus(2L);
} else { }
if(bmsApprovalInfoUpdateDto.getApprovalStatus() == 2){
jp.setStatus(8); jp.setStatus(8);
bmsDeclarationRecords.setStatus(8L); bmsDeclarationRecords.setStatus(8L);
} }
if(bmsApprovalInfoUpdateDto.getApprovalStatus() == 3){
jp.setStatus(10);
bmsDeclarationRecords.setStatus(10L);
}
} else if (bmsProcessInfo.getApprovalLevel().equals(1)) { } else if (bmsProcessInfo.getApprovalLevel().equals(1)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) { if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(3); jp.setStatus(3);
@ -694,4 +710,14 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
return null; return null;
} }
} }
/**
* idid
* @return
*/
@Override
public List<BmsDeclarationRecords> selectET(Long templateId, List<String> list) {
return baseMapper.selectET(templateId,list);
}
} }

@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsIndustrialInternetAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsIndustrialInternetAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsIndustrialInternetAwardService; 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.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
@ -37,7 +38,8 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
@Autowired @Autowired
private ICommonService iCommonService; private ICommonService iCommonService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Autowired @Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource @Resource
@ -86,31 +88,18 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
// 新增申请记录 // 新增申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
BeanUtil.copyProperties(bmsIndustrialInternetAwardAddDto,declarationRecords);
declarationRecords.setMatter("提交5G+工业互联网奖补申请"); declarationRecords.setMatter("提交5G+工业互联网奖补申请");
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsIndustrialInternetAward.getId()); declarationRecords.setDetailId(bmsIndustrialInternetAward.getId());
declarationRecords.setYear(String.valueOf(Year.now().getValue())); declarationRecords.setStatus(1L);
iBmsDeclarationRecordsService.save(declarationRecords); declarationRecords.setId(bmsIndustrialInternetAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
Map<String, String> allJson = getAllJson(declarationRecords.getId());
//新增项目 //新增项目
JProject jP = new JProject(); declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsIndustrialInternetAwardAddDto.getDeclarationId())));
jP.setProjectYear(declarationRecords.getYear()); iBmsDeclarationRecordsService.updateById(declarationRecords);
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());
// 生成审核 // 生成审核
if (bmsIndustrialInternetAwardAddDto.getStatus()==1){ iCommonService.insertAuditRecord(declarationRecords.getId(),0);
// 审批状态
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }
@ -127,6 +116,9 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
BmsIndustrialInternetAward p1 = declarationRecordsVo.getBmsIndustrialInternetAward(); BmsIndustrialInternetAward p1 = declarationRecordsVo.getBmsIndustrialInternetAward();
//5G+工业互联网奖补JSON //5G+工业互联网奖补JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}")); jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
jsonMap.put("fileJson", "{" + jsonMap.put("fileJson", "{" +
'"' + "证明材料" + '"' + ":" + '"' + p1.getMaterial() + '"' + '"' + "证明材料" + '"' + ":" + '"' + p1.getMaterial() + '"' +
@ -159,7 +151,7 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
//修改项目 //修改项目
jProjectService.updateTheJson(allJson); jProjectService.updateTheJson(allJson);
// 审批状态 // 审批状态
iCommonService.insertAuditRecord(bmsIndustrialInternetAwardUpdateDto.getDeclarationRecordsId(),0); iCommonService.updateAuditRecord(bmsIndustrialInternetAwardUpdateDto.getDeclarationRecordsId(), 0);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsIntegrationIndustriesMapper; import com.ruoyi.jjh.declaration.mapper.BmsIntegrationIndustriesMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsIntegrationIndustriesService; import com.ruoyi.jjh.declaration.service.IBmsIntegrationIndustriesService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
import com.ruoyi.jjh.declaration.service.ICommonService; import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
@ -37,7 +38,8 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
@Autowired @Autowired
private ICommonService iCommonService; private ICommonService iCommonService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Autowired @Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@ -87,31 +89,18 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
// 新增申请记录 // 新增申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
BeanUtil.copyProperties(bmsIntegrationIndustriesAddDto,declarationRecords);
declarationRecords.setMatter("提交两业融合奖补申请"); declarationRecords.setMatter("提交两业融合奖补申请");
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsIntegrationIndustries.getId()); declarationRecords.setDetailId(bmsIntegrationIndustries.getId());
declarationRecords.setYear(String.valueOf(Year.now().getValue())); declarationRecords.setId(bmsIntegrationIndustriesAddDto.getDeclarationId());
iBmsDeclarationRecordsService.save(declarationRecords); declarationRecords.setStatus(1L);
iBmsDeclarationRecordsService.updateById(declarationRecords);
Map<String, String> allJson = getAllJson(declarationRecords.getId());
//新增项目 //新增项目
JProject jP = new JProject(); declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsIntegrationIndustriesAddDto.getDeclarationId())));
jP.setProjectYear(declarationRecords.getYear()); iBmsDeclarationRecordsService.updateById(declarationRecords);
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(allJson.get("declareUnit"));
jP.setProjectClassify(10);
jP.setStatus(1);
jP.setOtherJson(allJson.get("otherJson"));
jP.setFileJson(allJson.get("fileJson"));
jProjectService.saveProject(jP,declarationRecords.getId());
// 生成审核 // 生成审核
if (bmsIntegrationIndustriesAddDto.getStatus()==1){ iCommonService.insertAuditRecord(declarationRecords.getId(),0);
// 审批状态
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }
@ -128,6 +117,9 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
BmsIntegrationIndustries p1 = declarationRecordsVo.getBmsIntegrationIndustries(); BmsIntegrationIndustries p1 = declarationRecordsVo.getBmsIntegrationIndustries();
//两业融合奖补申请JSON //两业融合奖补申请JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}")); jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
jsonMap.put("fileJson", "{" + jsonMap.put("fileJson", "{" +
'"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' + ","+ '"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' + ","+
@ -168,7 +160,7 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
//修改项目 //修改项目
jProjectService.updateTheJson(allJson); jProjectService.updateTheJson(allJson);
// 审批状态 // 审批状态
iCommonService.insertAuditRecord(bmsIntegrationIndustriesUpdateDto.getDeclarationRecordsId(),0); iCommonService.updateAuditRecord(bmsIntegrationIndustriesUpdateDto.getDeclarationRecordsId(), 0);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsLogisticsDevelopmentAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsLogisticsDevelopmentAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsLogisticsDevelopmentAwardService; import com.ruoyi.jjh.declaration.service.IBmsLogisticsDevelopmentAwardService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
import com.ruoyi.jjh.declaration.service.ICommonService; import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
@ -41,6 +42,8 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
@Autowired @Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
/** /**
@ -88,32 +91,18 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
// 新增申请记录 // 新增申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
BeanUtil.copyProperties(bmsLogisticsDevelopmentAwardAddDto,declarationRecords);
declarationRecords.setMatter("提交物流发展奖补申请"); declarationRecords.setMatter("提交物流发展奖补申请");
declarationRecords.setEnterpriseId(enterpriseId); declarationRecords.setStatus(1L);
declarationRecords.setDetailId(bmsLogisticsDevelopmentAward.getId()); declarationRecords.setDetailId(bmsLogisticsDevelopmentAward.getId());
declarationRecords.setYear(String.valueOf(Year.now().getValue())); declarationRecords.setId(bmsLogisticsDevelopmentAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.save(declarationRecords); iBmsDeclarationRecordsService.updateById(declarationRecords);
Map<String, String> allJson = getAllJson(declarationRecords.getId());
//新增项目 //新增项目
JProject jP = new JProject(); declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsLogisticsDevelopmentAwardAddDto.getDeclarationId())));
jP.setProjectYear(declarationRecords.getYear()); iBmsDeclarationRecordsService.updateById(declarationRecords);
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());
// 生成审核 // 生成审核
if (bmsLogisticsDevelopmentAwardAddDto.getStatus()==1){ iCommonService.insertAuditRecord(declarationRecords.getId(),0);
// 审批状态
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }
@ -130,6 +119,9 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
BmsLogisticsDevelopmentAward p1 = declarationRecordsVo.getBmsLogisticsDevelopmentAward(); BmsLogisticsDevelopmentAward p1 = declarationRecordsVo.getBmsLogisticsDevelopmentAward();
//物流发展奖补JSON //物流发展奖补JSON
// String js3 = JSONObject.toJSONString(p1); // String js3 = JSONObject.toJSONString(p1);
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, "{}", "{}")); jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, "{}", "{}"));
jsonMap.put("fileJson", "{" + jsonMap.put("fileJson", "{" +
'"' + "荣誉证明文件" + '"' + ":" + '"' + p1.getHonorCertificate() + '"' + ","+ '"' + "荣誉证明文件" + '"' + ":" + '"' + p1.getHonorCertificate() + '"' + ","+
@ -167,7 +159,7 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
//修改项目 //修改项目
jProjectService.updateTheJson(allJson); jProjectService.updateTheJson(allJson);
// 审批状态 // 审批状态
iCommonService.insertAuditRecord(bmsLogisticsDevelopmentAwardUpdateDto.getDeclarationRecordsId(),0); iCommonService.updateAuditRecord(bmsLogisticsDevelopmentAwardUpdateDto.getDeclarationRecordsId(), 0);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsManufacturingServicesAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsManufacturingServicesAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsManufacturingServicesAwardService; import com.ruoyi.jjh.declaration.service.IBmsManufacturingServicesAwardService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
import com.ruoyi.jjh.declaration.service.ICommonService; import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
@ -37,7 +38,8 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
@Autowired @Autowired
private ICommonService iCommonService; private ICommonService iCommonService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Autowired @Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource @Resource
@ -86,31 +88,18 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
// 新增申请记录 // 新增申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
BeanUtil.copyProperties(bmsManufacturingServicesAwardAddDto,declarationRecords);
declarationRecords.setMatter("提交制造服务业有效投入奖补申请"); declarationRecords.setMatter("提交制造服务业有效投入奖补申请");
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsManufacturingServicesAward.getId()); declarationRecords.setDetailId(bmsManufacturingServicesAward.getId());
declarationRecords.setYear(String.valueOf(Year.now().getValue())); declarationRecords.setStatus(1L);
iBmsDeclarationRecordsService.save(declarationRecords); declarationRecords.setId(bmsManufacturingServicesAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
Map<String, String> allJson = getAllJson(declarationRecords.getId());
//新增项目 //新增项目
JProject jP = new JProject(); declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsManufacturingServicesAwardAddDto.getDeclarationId())));
jP.setProjectYear(declarationRecords.getYear()); iBmsDeclarationRecordsService.updateById(declarationRecords);
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());
// 生成审核 // 生成审核
if (bmsManufacturingServicesAwardAddDto.getStatus()==1){ iCommonService.insertAuditRecord(declarationRecords.getId(),0);
// 审批状态
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }
@ -127,6 +116,9 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
BmsManufacturingServicesAward p1 = declarationRecordsVo.getBmsManufacturingServicesAward(); BmsManufacturingServicesAward p1 = declarationRecordsVo.getBmsManufacturingServicesAward();
//制造服务业有效投入奖补JSON //制造服务业有效投入奖补JSON
// String js3 = JSONObject.toJSONString(p1); // String js3 = JSONObject.toJSONString(p1);
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, "{}", "{}")); jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, "{}", "{}"));
jsonMap.put("fileJson", "{" + jsonMap.put("fileJson", "{" +
'"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+ '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
@ -162,7 +154,7 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
//修改项目 //修改项目
jProjectService.updateTheJson(allJson); jProjectService.updateTheJson(allJson);
// 审批状态 // 审批状态
iCommonService.insertAuditRecord(bmsManufacturingServicesAwardUpdateDto.getDeclarationRecordsId(),0); iCommonService.updateAuditRecord(bmsManufacturingServicesAwardUpdateDto.getDeclarationRecordsId(), 0);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsPlatformConstructionAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsPlatformConstructionAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsPlatformConstructionAwardService; import com.ruoyi.jjh.declaration.service.IBmsPlatformConstructionAwardService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
import com.ruoyi.jjh.declaration.service.ICommonService; import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
@ -42,7 +43,8 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
@Autowired @Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
/** /**
@ -89,32 +91,18 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
// 新增申请记录 // 新增申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
BeanUtil.copyProperties(bmsPlatformConstructionAwardAddDto,declarationRecords);
declarationRecords.setMatter("提交平台建设奖补申请"); declarationRecords.setMatter("提交平台建设奖补申请");
declarationRecords.setEnterpriseId(enterpriseId); declarationRecords.setStatus(1L);
declarationRecords.setDetailId(bmsPlatformConstructionAward.getId()); declarationRecords.setDetailId(bmsPlatformConstructionAward.getId());
declarationRecords.setYear(String.valueOf(Year.now().getValue())); declarationRecords.setId(bmsPlatformConstructionAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.save(declarationRecords); iBmsDeclarationRecordsService.updateById(declarationRecords);
Map<String, String> allJson = getAllJson(declarationRecords.getId());
//新增项目 //新增项目
JProject jP = new JProject(); declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsPlatformConstructionAwardAddDto.getDeclarationId())));
jP.setProjectYear(declarationRecords.getYear()); iBmsDeclarationRecordsService.updateById(declarationRecords);
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());
// 生成审核 // 生成审核
if (bmsPlatformConstructionAwardAddDto.getStatus()==1){ iCommonService.insertAuditRecord(declarationRecords.getId(),0);
// 审批状态
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }
@ -132,6 +120,9 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
BmsPlatformConstructionAward p1 = declarationRecordsVo.getBmsPlatformConstructionAward(); BmsPlatformConstructionAward p1 = declarationRecordsVo.getBmsPlatformConstructionAward();
//平台建设奖补json //平台建设奖补json
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}")); jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
jsonMap.put("fileJson", "{" + jsonMap.put("fileJson", "{" +
'"' + "合作协议" + '"' + ":" + '"' + p1.getAgreement() + '"' + '"' + "合作协议" + '"' + ":" + '"' + p1.getAgreement() + '"' +
@ -166,7 +157,7 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
//修改项目 //修改项目
jProjectService.updateTheJson(allJson); jProjectService.updateTheJson(allJson);
// 审批状态 // 审批状态
iCommonService.insertAuditRecord(bmsPlatformConstructionAwardUpdateDto.getDeclarationRecordsId(),0); iCommonService.updateAuditRecord(bmsPlatformConstructionAwardUpdateDto.getDeclarationRecordsId(), 0);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

@ -16,10 +16,7 @@ import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsProjectSettlementAwardQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsProjectSettlementAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsProjectSettlementAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsProjectSettlementAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.declaration.service.IBmsFundingDetailService;
import com.ruoyi.jjh.declaration.service.IBmsProjectSettlementAwardService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -55,7 +52,8 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
@Autowired @Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@ -114,33 +112,20 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
}); });
// 批量新增资金信息 // 批量新增资金信息
iBmsFundingDetailService.saveOrUpdateBatch(fundingDetailList); iBmsFundingDetailService.saveOrUpdateBatch(fundingDetailList);
// 新增申请记录 // 修改申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
BeanUtil.copyProperties(bmsProjectSettlementAwardAddDto, declarationRecords);
declarationRecords.setMatter("提交落户奖补申请"); declarationRecords.setMatter("提交落户奖补申请");
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(projectSettlementAward.getId()); declarationRecords.setDetailId(projectSettlementAward.getId());
declarationRecords.setYear(String.valueOf(Year.now().getValue())); declarationRecords.setStatus(1L);
iBmsDeclarationRecordsService.save(declarationRecords); declarationRecords.setId(bmsProjectSettlementAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
Map<String, String> allJson = getAllJson(declarationRecords.getId());
//新增项目 //新增项目
JProject jP = new JProject(); declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsProjectSettlementAwardAddDto.getDeclarationId())));
jP.setProjectYear(declarationRecords.getYear()); iBmsDeclarationRecordsService.updateById(declarationRecords);
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());
// 生成审核 // 生成审核
if (bmsProjectSettlementAwardAddDto.getStatus() == 1) { iCommonService.insertAuditRecord(declarationRecords.getId(), 0);
// 审批状态
iCommonService.insertAuditRecord(declarationRecords.getId(), 0);
}
return num; return num;
} }
@ -157,6 +142,9 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
BmsProjectSettlementAwardQueryVo p1 = declarationRecordsVo.getBmsProjectSettlementAwardQueryVo(); BmsProjectSettlementAwardQueryVo p1 = declarationRecordsVo.getBmsProjectSettlementAwardQueryVo();
//落户奖补对象JSON //落户奖补对象JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, jProjectService.getJsonString(p1.getFundingDetailList()))); jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, jProjectService.getJsonString(p1.getFundingDetailList())));
jsonMap.put("fileJson", "{" + jsonMap.put("fileJson", "{" +
'"' + "招商协议" + '"' + ":" + '"' + p1.getAgreement() + '"' + "," + '"' + "招商协议" + '"' + ":" + '"' + p1.getAgreement() + '"' + "," +
@ -193,7 +181,7 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
//修改项目 //修改项目
jProjectService.updateTheJson(allJson); jProjectService.updateTheJson(allJson);
// 审批状态 // 审批状态
iCommonService.insertAuditRecord(bmsProjectSettlementAwardUpdateDto.getDeclarationRecordsId(), 0); iCommonService.updateAuditRecord(bmsProjectSettlementAwardUpdateDto.getDeclarationRecordsId(), 0);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

@ -13,6 +13,7 @@ import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsSceneOpeningAwardMapper; import com.ruoyi.jjh.declaration.mapper.BmsSceneOpeningAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsSceneOpeningAwardService; import com.ruoyi.jjh.declaration.service.IBmsSceneOpeningAwardService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
import com.ruoyi.jjh.declaration.service.ICommonService; import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
@ -43,6 +44,9 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
/** /**
* *
* *
@ -85,34 +89,20 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
// 新增做大做强奖详情 // 新增做大做强奖详情
int num = baseMapper.insert(bmsSceneOpeningAward); int num = baseMapper.insert(bmsSceneOpeningAward);
// 新增申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
BeanUtil.copyProperties(bmsSceneOpeningAwardAddDto,declarationRecords);
declarationRecords.setMatter("提交场景开放奖补申请"); declarationRecords.setMatter("提交场景开放奖补申请");
declarationRecords.setEnterpriseId(enterpriseId); declarationRecords.setStatus(1L);
declarationRecords.setDetailId(bmsSceneOpeningAward.getId()); declarationRecords.setDetailId(bmsSceneOpeningAward.getId());
declarationRecords.setYear(String.valueOf(Year.now().getValue())); declarationRecords.setId(bmsSceneOpeningAwardAddDto.getDeclarationId());
iBmsDeclarationRecordsService.save(declarationRecords); iBmsDeclarationRecordsService.updateById(declarationRecords);
Map<String, String> allJson = getAllJson(declarationRecords.getId());
//新增项目 //新增项目
JProject jP = new JProject(); declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsSceneOpeningAwardAddDto.getDeclarationId())));
jP.setProjectYear(declarationRecords.getYear()); iBmsDeclarationRecordsService.updateById(declarationRecords);
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());
// 生成审核 // 生成审核
if (bmsSceneOpeningAwardAddDto.getStatus()==1){ iCommonService.insertAuditRecord(declarationRecords.getId(),0);
// 审批状态
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
}
return num; return num;
} }
@ -127,6 +117,9 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
BmsSceneOpeningAward p1 = declarationRecordsVo.getBmsSceneOpeningAward(); BmsSceneOpeningAward p1 = declarationRecordsVo.getBmsSceneOpeningAward();
//场景开放奖补JSON //场景开放奖补JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
jsonMap.put("otherJson",jProjectService.allJsonString(js1, "{}", js3,"{}")); jsonMap.put("otherJson",jProjectService.allJsonString(js1, "{}", js3,"{}"));
jsonMap.put("fileJson", "{" + jsonMap.put("fileJson", "{" +
'"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + p1.getMaterial() + '"' + '"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + p1.getMaterial() + '"' +
@ -159,7 +152,7 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
//修改项目 //修改项目
jProjectService.updateTheJson(allJson); jProjectService.updateTheJson(allJson);
// 审批状态 // 审批状态
iCommonService.insertAuditRecord(bmsSceneOpeningAwardUpdateDto.getDeclarationRecordsId(),0); iCommonService.updateAuditRecord(bmsSceneOpeningAwardUpdateDto.getDeclarationRecordsId(), 0);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

@ -3,7 +3,6 @@ package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo;
@ -19,6 +18,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
@ -106,8 +106,9 @@ public class BmsTemplateInfoServiceImpl extends ServiceImpl<BmsTemplateInfoMappe
public int insertBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo) { public int insertBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo) {
int num = 0; int num = 0;
try { try {
bmsTemplateInfo.setCreateTime(DateUtils.getNowDate()); //页面暂不可新增,所以代码不做改变
num = baseMapper.insertBmsTemplateInfo(bmsTemplateInfo); // bmsTemplateInfo.setCreateTime(DateUtils.getNowDate());
num = baseMapper.insert(bmsTemplateInfo);
// List<BmsEnterpriseDirectory> enterpriseDirectoryList = bmsTemplateInfo // List<BmsEnterpriseDirectory> enterpriseDirectoryList = bmsTemplateInfo
// .getEnterpriseDirectoryList(); // .getEnterpriseDirectoryList();
// if (null != enterpriseDirectoryList && enterpriseDirectoryList.size()>0){ // if (null != enterpriseDirectoryList && enterpriseDirectoryList.size()>0){
@ -130,8 +131,8 @@ public class BmsTemplateInfoServiceImpl extends ServiceImpl<BmsTemplateInfoMappe
*/ */
@Override @Override
public int updateBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo) { public int updateBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo) {
bmsTemplateInfo.setUpdateTime(DateUtils.getNowDate()); // bmsTemplateInfo.setUpdateTime(DateUtils.getNowDate());
return baseMapper.updateBmsTemplateInfo(bmsTemplateInfo); return baseMapper.updateById(bmsTemplateInfo);
} }
/** /**

@ -1,9 +1,13 @@
package com.ruoyi.jjh.declaration.service.impl; package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
@ -13,7 +17,10 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordVo; import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordVo;
import com.ruoyi.jjh.declaration.mapper.BmsDeclarationRecordsMapper;
import com.ruoyi.jjh.declaration.mapper.BmsTemplateRecordMapper; import com.ruoyi.jjh.declaration.mapper.BmsTemplateRecordMapper;
import com.ruoyi.jjh.declaration.regular.TimeChange;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService; import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService; import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService;
@ -21,10 +28,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.Year;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.Map;
/** /**
* 线Service * 线Service
@ -41,6 +50,11 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
@Autowired @Autowired
private IBmsEnterpriseBasicInfoService iBmsEnterpriseBasicInfoService; private IBmsEnterpriseBasicInfoService iBmsEnterpriseBasicInfoService;
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private TimeChange tiTimeChange;
/** /**
* 线 * 线
* *
@ -56,6 +70,7 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
return bmsTemplateRecordVo; return bmsTemplateRecordVo;
} }
/** /**
* 线 * 线
* *
@ -67,6 +82,11 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
return baseMapper.selectTemplateRecordVo(bmsTemplateRecordQueryDto); return baseMapper.selectTemplateRecordVo(bmsTemplateRecordQueryDto);
} }
@Override
public Page<BmsTemplateRecordQueryVo> selectBmsTemplateRecordList(Page<BmsTemplateRecordQueryVo> page, BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) {
return baseMapper.selectTemplateRecordVo(page, bmsTemplateRecordQueryDto);
}
@Override @Override
public List<BmsTemplateRecordQueryVo> selectTemplateRecordList(String creditCode) { public List<BmsTemplateRecordQueryVo> selectTemplateRecordList(String creditCode) {
return baseMapper.selectTemplateRecordList(creditCode); return baseMapper.selectTemplateRecordList(creditCode);
@ -93,34 +113,106 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public int insertBmsTemplateRecord(BmsTemplateRecordAddDto bmsTemplateRecordAddDto) { public int insertBmsTemplateRecord(BmsTemplateRecordAddDto bmsTemplateRecordAddDto) {
int num = 0; int num = 0;
try { //新增的时候根据当前时间判断状态是否有效
bmsTemplateRecordAddDto.setCreateTime(DateUtils.getNowDate()); tiTimeChange.getTime(bmsTemplateRecordAddDto);
num = baseMapper.insertBmsTemplateRecord(bmsTemplateRecordAddDto); //添加在线模板
List<BmsEnterpriseDirectory> enterpriseDirectoryList = bmsTemplateRecordAddDto num = baseMapper.insert(bmsTemplateRecordAddDto);
.getEnterpriseDirectoryList(); //前端excel企业名录集合
if (null != enterpriseDirectoryList && enterpriseDirectoryList.size() > 0) { List<BmsEnterpriseDirectory> enterpriseDirectoryList = bmsTemplateRecordAddDto
enterpriseDirectoryList.forEach(x -> { .getEnterpriseDirectoryList();
x.setTemplateRecordId(bmsTemplateRecordAddDto.getId()); //要添加的在线申报记录
}); List<BmsDeclarationRecords> drlist = new ArrayList<>();
enterpriseDirectoryService.saveOrUpdateBatch(enterpriseDirectoryList); //如果前端部分企业名录集合为空
if (null != enterpriseDirectoryList && enterpriseDirectoryList.size() > 0) {
// //保存所有的信用代码
// List<String> codeList = new ArrayList<>();
// for (BmsEnterpriseDirectory x : enterpriseDirectoryList) {
// codeList.add(x.getCreditCode());
// }
// //根据信用代码去企业信息表里查找该企业,如果能找到并且该企业未填报过该模板 就添加企业id
// LambdaQueryWrapper<BmsEnterpriseBasicInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// lambdaQueryWrapper.in(BmsEnterpriseBasicInfo::getCreditCode, codeList);
// List<BmsEnterpriseBasicInfo> list = iBmsEnterpriseBasicInfoService.list(lambdaQueryWrapper);
//如果能找到该企业就是集合不为空的话,并且长度和excel企业名录长度一致的话
// if (!list.isEmpty() & list.size() == enterpriseDirectoryList.size()) {
//保存所有能在企业基础信息里面找的企业id
// List<Long> idList = new ArrayList<>();
// list.forEach(a1 -> {
// idList.add(a1.getId());
//保存在在线申报模板集合里面
// });
List<String> codeList = new ArrayList<>();
enterpriseDirectoryList.forEach(x -> {
codeList.add(x.getCreditCode());
getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, x.getCreditCode(), bmsTemplateRecordAddDto.getTemplateId());
x.setTemplateRecordId(bmsTemplateRecordAddDto.getId());
});
//在在线申报记录里面找到对于该模板和该企业的在线申报记录
List<BmsDeclarationRecords> bm = iBmsDeclarationRecordsService.selectET(bmsTemplateRecordAddDto.getTemplateId(), codeList);
//如果一条也没有找到就添加到企业名录表里呢
if (bm.isEmpty()) {
enterpriseDirectoryService.saveBatch(enterpriseDirectoryList);
} else { } else {
List<BmsEnterpriseBasicInfo> list = iBmsEnterpriseBasicInfoService.list(); //如果有的企业已经对该模板分配过申请任务的话就报错
Collection<BmsEnterpriseDirectory> copyList = new ArrayList<>(); throw new ServiceException("某企业已经分配该模板任务");
for (BmsEnterpriseBasicInfo items : list) { }
BmsEnterpriseDirectory bms = new BmsEnterpriseDirectory(); // }else {
bms.setTemplateRecordId(bmsTemplateRecordAddDto.getId()); // throw new ServiceException("某企业不在企业信息库");
bms.setEnterpriseName(items.getEnterpriseName()); // }
bms.setCreditCode(items.getCreditCode()); } else {
copyList.add(bms); List<BmsEnterpriseBasicInfo> list = iBmsEnterpriseBasicInfoService.list();
} List<BmsEnterpriseDirectory> copyList = new ArrayList<>();
//保存所有的企业信用代码
List<String> 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<BmsDeclarationRecords> bm = iBmsDeclarationRecordsService.selectET(bmsTemplateRecordAddDto.getTemplateId(), idList);
if (bm.isEmpty()) {
enterpriseDirectoryService.saveBatch(copyList); enterpriseDirectoryService.saveBatch(copyList);
} else {
throw new ServiceException("某企业已经分配该模板任务");
} }
} catch (Exception e) {
e.printStackTrace();
} }
iBmsDeclarationRecordsService.saveBatch(drlist);
return num; return num;
} }
// /**
// * 假如给该企业已经加了申报任务指定申报模板,就不能再给这个企业加该申报模板的申报任务(所有的企业)
// *
// * @param list
// */
// private void judgement(List<BmsDeclarationRecords> bm, List<BmsEnterpriseDirectory> list) {
// List<String> 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<BmsDeclarationRecords> 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<BmsTemplateRecordM
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public int updateBmsTemplateRecord(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) { public int updateBmsTemplateRecord(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
bmsTemplateRecordUpdateDto.setUpdateTime(DateUtils.getNowDate()); tiTimeChange.getTime(bmsTemplateRecordUpdateDto);
int num = baseMapper.updateBmsTemplateRecord(bmsTemplateRecordUpdateDto); int num = baseMapper.updateById(bmsTemplateRecordUpdateDto);
// 删除企业相关列表 // 删除企业相关列表
QueryWrapper<BmsEnterpriseDirectory> queryWrapper = new QueryWrapper<>(); QueryWrapper<BmsEnterpriseDirectory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("template_record_id", bmsTemplateRecordUpdateDto.getId()); queryWrapper.eq("template_record_id", bmsTemplateRecordUpdateDto.getId());
@ -169,4 +261,130 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
public int deleteBmsTemplateRecordById(Long id) { public int deleteBmsTemplateRecordById(Long id) {
return baseMapper.deleteBmsTemplateRecordById(id); return baseMapper.deleteBmsTemplateRecordById(id);
} }
/**
*
*
* @param bmsTemplateRecordUpdateDto
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int supplementation(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
//只有未修改之前是过期的才能补录
if (bmsTemplateRecordUpdateDto.getStatus() != 1) {
throw new ServiceException("未过期不可以补录");
}
tiTimeChange.getTime(bmsTemplateRecordUpdateDto);
if (bmsTemplateRecordUpdateDto.getStatus() != 2) {
throw new ServiceException("请修改时间范围为有效区间");
}
int num = baseMapper.updateById(bmsTemplateRecordUpdateDto);
//要添加的在线申报记录
List<BmsDeclarationRecords> drlist = new ArrayList<>();
//获取前端传递的企业名录列表
List<BmsEnterpriseDirectory> enterpriseDirectoryList = bmsTemplateRecordUpdateDto
.getEnterpriseDirectoryList();
//先去查找企业名录中对应该在线模板的相关企业
List<BmsEnterpriseDirectory> list = enterpriseDirectoryService.lambdaQuery()
.eq(BmsEnterpriseDirectory::getTemplateRecordId, bmsTemplateRecordUpdateDto.getId()).list();
//首先部分企业和所有企业去区分
if (bmsTemplateRecordUpdateDto.getIsFrame() == 0) {
enterpriseDirectoryList = new ArrayList<>();
//企业信息表里所有企业
List<BmsEnterpriseBasicInfo> 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<BmsDeclarationRecords> query = new QueryWrapper<>();
// query.eq("template_record_id", bmsTemplateRecordUpdateDto.getId())
// .ne("status", 0)
// .isNotNull("detail_id");
// List<BmsDeclarationRecords> deRList = iBmsDeclarationRecordsService.list(query);
//存储已经填报过的所有企业信用代码
// List<BmsEnterpriseDirectory> deIdList = new ArrayList<>();
// for (BmsDeclarationRecords items : deRList) {
// BmsEnterpriseDirectory bmsEnterpriseDirectory = new BmsEnterpriseDirectory();
// bmsEnterpriseDirectory.setCreditCode(items.getCreditCode());
// deIdList.add(bmsEnterpriseDirectory);
// }
// 创建存放所有数据的map
// Map<String, BmsEnterpriseDirectory> map = new HashMap<>();
// // 合并俩个集合
// list.addAll(enterpriseDirectoryList);
// // 遍历合并后的集合存放到map里
// list.forEach(t -> {
// map.putIfAbsent(t.getCreditCode(), t);
// });
// // 这是将excel和企业名录去重之后的企业
// List<BmsEnterpriseDirectory> mergeList = new ArrayList<>(map.values());
//
// List<String> code = new ArrayList<>();
// mergeList.forEach(x->{
// code.add(x.getCreditCode());
// x.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId());
// getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getTemplateId());
// });
// QueryWrapper<BmsDeclarationRecords> 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<BmsDeclarationRecords> bm = iBmsDeclarationRecordsService.selectET(bmsTemplateRecordUpdateDto.getId(), idList);
// //保存要删除的在线申报记录id集合
// List<Long> 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<BmsEnterpriseBasicInfo> filterEnterprise(List<BmsEnterpriseDirectory> enterpriseDirectoryList) {
//保存所有的信用代码
List<String> codeList = new ArrayList<>();
for (BmsEnterpriseDirectory x : enterpriseDirectoryList) {
codeList.add(x.getCreditCode());
}
//根据信用代码去企业信息表里查找该企业,如果能找到并且该企业未填报过该模板 就添加企业id
LambdaQueryWrapper<BmsEnterpriseBasicInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(BmsEnterpriseBasicInfo::getCreditCode, codeList);
return iBmsEnterpriseBasicInfoService.list(lambdaQueryWrapper);
}
} }

@ -149,11 +149,14 @@ public class CommonServiceImpl implements ICommonService {
if (BeanUtil.isEmpty(templateRecord)) { if (BeanUtil.isEmpty(templateRecord)) {
throw new ServiceException("该申请已经错过时间"); throw new ServiceException("该申请已经错过时间");
} }
List<BmsDeclarationRecords> list = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getEnterpriseId, enterpriseInfo.getId()).eq(BmsDeclarationRecords::getTemplateRecordId, templateRecord.getId()).list(); //查看该企业是否已经填报过
if (CollectionUtil.isNotEmpty(list)) { BmsTemplateRecord templateRecordOne = iBmsTemplateRecordService.getById(templateRecordId);
throw new ServiceException("该企业已经申请,请勿重复申请!"); List<BmsDeclarationRecords> 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) { if (declarationTemplateType == 1) {
// 项目落户奖补 // 项目落户奖补
BmsProjectSettlementAwardQueryVo settlementAwardQueryVo = iBmsProjectSettlementAwardService.selectBmsProjectSettlementAwardById(detailId); BmsProjectSettlementAwardQueryVo settlementAwardQueryVo = iBmsProjectSettlementAwardService.selectBmsProjectSettlementAwardById(detailId);
List<BmsFundingDetail> list = iBmsFundingDetailService.lambdaQuery().eq(BmsFundingDetail::getDetailId, settlementAwardQueryVo.getId()).list(); if(detailId!=null){
settlementAwardQueryVo.setFundingDetailList(list); List<BmsFundingDetail> list = iBmsFundingDetailService.lambdaQuery().eq(BmsFundingDetail::getDetailId, settlementAwardQueryVo.getId()).list();
settlementAwardQueryVo.setFundingDetailList(list);
}
declarationRecordsVo.setBmsProjectSettlementAwardQueryVo(settlementAwardQueryVo); declarationRecordsVo.setBmsProjectSettlementAwardQueryVo(settlementAwardQueryVo);
} else if (declarationTemplateType == 2) { } else if (declarationTemplateType == 2) {
// 做大做强奖补 // 做大做强奖补
BmsBigStrongAwardQueryVo bmsBigStrongAwardQueryVo = iBmsBigStrongAwardService.selectBmsBigStrongAwardById(detailId); BmsBigStrongAwardQueryVo bmsBigStrongAwardQueryVo = iBmsBigStrongAwardService.selectBmsBigStrongAwardById(detailId);
List<BmsFundingDetail> list = iBmsFundingDetailService.lambdaQuery().eq(BmsFundingDetail::getDetailId, bmsBigStrongAwardQueryVo.getId()).list(); if(detailId!=null){
bmsBigStrongAwardQueryVo.setFundingDetailList(list); List<BmsFundingDetail> list = iBmsFundingDetailService.lambdaQuery().eq(BmsFundingDetail::getDetailId, bmsBigStrongAwardQueryVo.getId()).list();
bmsBigStrongAwardQueryVo.setFundingDetailList(list);
}
declarationRecordsVo.setBmsBigStrongAwardQueryVo(bmsBigStrongAwardQueryVo); declarationRecordsVo.setBmsBigStrongAwardQueryVo(bmsBigStrongAwardQueryVo);
} else if (declarationTemplateType == 3) { } 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<BmsApprovalInfo> 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);
});
}
}
/** /**
* *

@ -40,7 +40,11 @@ public interface JProjectService extends IService<JProject> {
String allJsonString(String a1,String a2,String a3,String a4); String allJsonString(String a1,String a2,String a3,String a4);
void saveProject(JProject jp,Long id); /**
*
* @param allJson
*/
Long saveProject(Map<String, String> allJson);
void updateTheJson( Map<String, String> allJson); void updateTheJson( Map<String, String> allJson);
} }

@ -7,6 +7,7 @@ import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; 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.mapper.JProjectMapper;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
@ -29,6 +30,9 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
@Resource @Resource
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
/** /**
* *
* *
@ -75,15 +79,25 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
return mergedObj.toJSONString(); return mergedObj.toJSONString();
} }
/**
*
* @param allJson
*/
@Override @Override
public void saveProject(JProject jp, Long id) { public Long saveProject(Map<String, String> allJson) {
this.save(jp); JProject jP = new JProject();
BmsDeclarationRecords n1 = new BmsDeclarationRecords(); jP.setProjectYear(allJson.get("year"));
n1.setId(id); jP.setProjectName(allJson.get("projectName"));
n1.setJjhProjectId(jp.getId()); jP.setDeclareUnit(allJson.get("declareUnit"));
iBmsDeclarationRecordsService.updateById(n1); 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 @Override
public void updateTheJson(Map<String, String> allJson) { public void updateTheJson(Map<String, String> allJson) {
//修改项目 //修改项目

@ -6,8 +6,10 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: 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 url: jdbc:mysql://39.101.188.84:3307/jingji_hu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
# password: root
password: Admin123@ password: Admin123@
# 从库数据源 # 从库数据源
slave: slave:

@ -11,8 +11,9 @@
<result property="matter" column="matter"/> <result property="matter" column="matter"/>
<result property="enterpriseId" column="enterprise_id"/> <result property="enterpriseId" column="enterprise_id"/>
<result property="year" column="year"/> <result property="year" column="year"/>
<result property="declarationTemplateType" column="declaration_template_type"/>
<result property="templateRecordId" column="template_record_id"/> <result property="templateRecordId" column="template_record_id"/>
<result property="templateId" column="template_id"/>
<result property="creditCode" column="credit_code"/>
<result property="detailId" column="detail_id"/> <result property="detailId" column="detail_id"/>
<result property="status" column="status"/> <result property="status" column="status"/>
<result property="isDeleted" column="is_deleted"/> <result property="isDeleted" column="is_deleted"/>
@ -35,7 +36,8 @@
<result property="type" column="type"/> <result property="type" column="type"/>
<result property="road" column="road"/> <result property="road" column="road"/>
<result property="responsibilityUnit" column="responsibility_unit"/> <result property="responsibilityUnit" column="responsibility_unit"/>
<result property="declarationTemplateType" column="declaration_template_type"/> <result property="templateId" column="template_id"/>
<result property="creditCode" column="credit_code"/>
<result property="templateRecordId" column="template_record_id"/> <result property="templateRecordId" column="template_record_id"/>
<result property="detailId" column="detail_id"/> <result property="detailId" column="detail_id"/>
<result property="status" column="status"/> <result property="status" column="status"/>
@ -49,7 +51,7 @@
project_name, project_name,
project_id, project_id,
matter, 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 from bms_declaration_records
</sql> </sql>
@ -58,16 +60,15 @@
SELECT SELECT
a.id, a.id,
a.jjh_project_id, a.jjh_project_id,
d.project_name,
a.project_id, a.project_id,
a.credit_code,
a.enterprise_id, a.enterprise_id,
c.LEVEL, c.LEVEL,
a.YEAR, a.YEAR,
c.type, c.type,
a.template_record_id, a.template_record_id,
c.id as template_id, a.template_id,
c.responsibility_unit, c.responsibility_unit,
a.declaration_template_type,
a.detail_id, a.detail_id,
a.STATUS, a.STATUS,
a.is_deleted, a.is_deleted,
@ -77,29 +78,27 @@
a.update_time, a.update_time,
a.remark, a.remark,
b.enterprise_name, b.enterprise_name,
f.road f.road,
f.enterprise_directory
FROM FROM
bms_declaration_records AS a bms_declaration_records AS a
inner join bms_template_record f on a.template_record_id = f.id 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.template_id = c.id
LEFT JOIN bms_template_info c on a.declaration_template_type = c.id LEFT JOIN bms_enterprise_basic_info b ON a.credit_code = b.credit_code
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' left join sys_dict_data e on a.status = e.dict_value and e.dict_type='bms_approval_status'
<where> <where>
<if test="projectName != null and projectName != ''">and a.project_name like concat('%', #{projectName}, <if test="enterpriseDirectory != null and enterpriseDirectory != ''">and f.enterprise_directory like
concat('%', #{enterpriseDirectory},
'%') '%')
</if> </if>
<if test="templateName != null and templateName != ''">and c.template_name like concat('%', <if test="templateName != null and templateName != ''">and c.template_name like concat('%',
#{templateName}, '%') #{templateName}, '%')
</if> </if>
<if test="creditCode != null ">and a.credit_code = #{creditCode}</if>
<if test="enterpriseId != null ">and a.enterprise_id = #{enterpriseId}</if> <if test="enterpriseId != null ">and a.enterprise_id = #{enterpriseId}</if>
<if test="level != null ">and c.level = #{level}</if> <if test="level != null ">and c.level = #{level}</if>
<if test="year != null and year != ''">and year = #{year}</if> <if test="year != null and year != ''">and year = #{year}</if>
<if test="type != null ">and c.type = #{type}</if>
<if test="responsibilityUnit != null ">and c.responsibility_unit = #{responsibilityUnit}</if> <if test="responsibilityUnit != null ">and c.responsibility_unit = #{responsibilityUnit}</if>
<if test="declarationTemplateType != null ">and a.declaration_template_type = #{declarationTemplateType}
</if>
<if test="status != null ">and a.status = #{status}</if> <if test="status != null ">and a.status = #{status}</if>
<if test="statusStr != null and statusStr.size>0"> <if test="statusStr != null and statusStr.size>0">
and a.status in and a.status in
@ -107,6 +106,12 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="statusChange == 0">
and a.status = 0
</if>
<if test="statusChange == 1">
and a.status != 0
</if>
<if test="isDeleted != null ">and a.is_deleted = #{isDeleted}</if> <if test="isDeleted != null ">and a.is_deleted = #{isDeleted}</if>
</where> </where>
order by a.create_time desc, e.dict_sort desc order by a.create_time desc, e.dict_sort desc
@ -121,28 +126,26 @@
SELECT SELECT
d.approval_status, d.approval_status,
a.matter, a.matter,
b.project_name,
b.product_area,
c.enterprise_name, c.enterprise_name,
c.id as enterpriseId, c.id as enterpriseId,
b.support_methods,
b.start_time,
b.end_time,
a.create_time, a.create_time,
a.`status`, a.`status`,
a.template_record_id, a.template_record_id,
a.detail_id, a.detail_id,
a.id as declarationRecordsId, a.id as declarationRecordsId,
e.template_id, e.template_id,
e.enterprise_directory,
i.level,
i.responsibility_unit,
d.approval_time d.approval_time
FROM FROM
bms_declaration_records a 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.credit_code = c.credit_code
INNER JOIN bms_enterprise_basic_info c ON a.enterprise_id = c.id
INNER JOIN bms_template_record e on a.template_record_id = e.id 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 INNER JOIN bms_approval_info d on a.id=d.declaration_records_id and is_before_data = 0
<where> <where>
<if test="projectName != null and projectName != ''">and b.project_name like concat('%', #{projectName}, <if test="enterpriseDirectory != null and enterpriseDirectory != ''">and e.enterprise_directory like concat('%', #{enterpriseDirectory},
'%') '%')
</if> </if>
<if test="enterpriseName != null and enterpriseName != ''">and c.enterprise_name like concat('%', <if test="enterpriseName != null and enterpriseName != ''">and c.enterprise_name like concat('%',
@ -182,16 +185,14 @@
resultType="com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo"> resultType="com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo">
SELECT SELECT
a.id, a.id,
d.project_name,
a.project_id, a.project_id,
a.enterprise_id, a.enterprise_id,
c.LEVEL, c.LEVEL,
a.YEAR, a.YEAR,
c.type, c.type,
a.template_record_id, a.template_record_id,
c.id as template_id, a.template_id,
c.responsibility_unit, c.responsibility_unit,
a.declaration_template_type,
a.detail_id, a.detail_id,
a.STATUS, a.STATUS,
a.is_deleted, a.is_deleted,
@ -206,8 +207,7 @@
bms_declaration_records AS a bms_declaration_records AS a
inner join bms_template_record f on a.template_record_id = f.id 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_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_template_info c on a.template_id = 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' left join sys_dict_data e on a.status = e.dict_value and e.dict_type='bms_approval_status'
<where> <where>
and a.status != 0 and a.status != 0
@ -222,8 +222,6 @@
<if test="year != null and year != ''">and year = #{year}</if> <if test="year != null and year != ''">and year = #{year}</if>
<if test="type != null ">and c.type = #{type}</if> <if test="type != null ">and c.type = #{type}</if>
<if test="responsibilityUnit != null ">and c.responsibility_unit = #{responsibilityUnit}</if> <if test="responsibilityUnit != null ">and c.responsibility_unit = #{responsibilityUnit}</if>
<if test="declarationTemplateType != null ">and a.declaration_template_type = #{declarationTemplateType}
</if>
<if test="statusStr != null and statusStr.size>0"> <if test="statusStr != null and statusStr.size>0">
and a.status in and a.status in
<foreach collection="statusStr" item="item" separator="," open="(" close=")"> <foreach collection="statusStr" item="item" separator="," open="(" close=")">
@ -251,16 +249,14 @@
resultType="com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo"> resultType="com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo">
SELECT SELECT
a.id, a.id,
d.project_name,
a.project_id, a.project_id,
a.enterprise_id, a.enterprise_id,
c.LEVEL, c.LEVEL,
a.YEAR, a.YEAR,
c.type, c.type,
a.template_record_id, a.template_record_id,
c.id as template_id, a.template_id,
c.responsibility_unit, c.responsibility_unit,
a.declaration_template_type,
a.detail_id, a.detail_id,
a.STATUS, a.STATUS,
a.is_deleted, a.is_deleted,
@ -275,8 +271,6 @@
bms_declaration_records AS a bms_declaration_records AS a
inner join bms_template_record f on a.template_record_id = f.id 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_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' left join sys_dict_data e on a.status = e.dict_value and e.dict_type='bms_approval_status'
<where> <where>
<if test="list != null and list.size>0"> <if test="list != null and list.size>0">
@ -287,11 +281,27 @@
</if> </if>
</where> </where>
</select> </select>
<select id="selectET" resultType="com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords">
select * from bms_declaration_records a
<where>
<if test="templateId != null">
a.template_id = #{templateId}
</if>
<if test="list != null and list.size>0">
and a.credit_code in
<foreach collection="list" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</if>
</where>
</select>
<insert id="insertBmsDeclarationRecords" parameterType="com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords" <insert id="insertBmsDeclarationRecords" parameterType="com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords"
useGeneratedKeys="true" keyProperty="id"> useGeneratedKeys="true" keyProperty="id">
insert into bms_declaration_records insert into bms_declaration_records
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="creditCode != null">credit_code,</if>
<if test="templateId != null">template_id,</if>
<if test="projectName != null">project_name,</if> <if test="projectName != null">project_name,</if>
<if test="projectId != null">project_id,</if> <if test="projectId != null">project_id,</if>
<if test="matter != null">matter,</if> <if test="matter != null">matter,</if>
@ -299,7 +309,6 @@
<if test="templateRecordId != null">template_record_id,</if> <if test="templateRecordId != null">template_record_id,</if>
<if test="year != null">year,</if> <if test="year != null">year,</if>
<if test="detailId != null">detail_id,</if> <if test="detailId != null">detail_id,</if>
<if test="declarationTemplateType != null">declaration_template_type,</if>
<if test="status != null">status,</if> <if test="status != null">status,</if>
<if test="isDeleted != null">is_deleted,</if> <if test="isDeleted != null">is_deleted,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
@ -309,6 +318,8 @@
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="creditCode != null">#{creditCode},</if>
<if test="templateId != null">#{templateId},</if>
<if test="projectName != null">#{projectName},</if> <if test="projectName != null">#{projectName},</if>
<if test="projectId != null">#{projectId},</if> <if test="projectId != null">#{projectId},</if>
<if test="matter != null">#{matter},</if> <if test="matter != null">#{matter},</if>
@ -316,7 +327,6 @@
<if test="templateRecordId != null">#{templateRecordId},</if> <if test="templateRecordId != null">#{templateRecordId},</if>
<if test="year != null">#{year},</if> <if test="year != null">#{year},</if>
<if test="detailId != null">#{detailId},</if> <if test="detailId != null">#{detailId},</if>
<if test="declarationTemplateType != null">#{declarationTemplateType},</if>
<if test="status != null">#{status},</if> <if test="status != null">#{status},</if>
<if test="isDeleted != null">#{isDeleted},</if> <if test="isDeleted != null">#{isDeleted},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
@ -330,6 +340,7 @@
<update id="updateBmsDeclarationRecords" parameterType="com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords"> <update id="updateBmsDeclarationRecords" parameterType="com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords">
update bms_declaration_records update bms_declaration_records
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="templateId != null">template_id = #{templateId},</if>
<if test="projectName != null">project_name = #{projectName},</if> <if test="projectName != null">project_name = #{projectName},</if>
<if test="projectId != null">project_id = #{projectId},</if> <if test="projectId != null">project_id = #{projectId},</if>
<if test="matter != null">matter = #{matter},</if> <if test="matter != null">matter = #{matter},</if>
@ -337,7 +348,6 @@
<if test="templateRecordId != null">template_record_id = #{templateRecordId},</if> <if test="templateRecordId != null">template_record_id = #{templateRecordId},</if>
<if test="year != null">year = #{year},</if> <if test="year != null">year = #{year},</if>
<if test="detailId != null">detail_id = #{detailId},</if> <if test="detailId != null">detail_id = #{detailId},</if>
<if test="declarationTemplateType != null">declaration_template_type = #{declarationTemplateType},</if>
<if test="status != null">status = #{status},</if> <if test="status != null">status = #{status},</if>
<if test="isDeleted != null">is_deleted = #{isDeleted},</if> <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
@ -345,6 +355,7 @@
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="creditCode != null">credit_code = #{creditCode},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>

@ -8,8 +8,6 @@
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="templateName" column="template_name"/> <result property="templateName" column="template_name"/>
<result property="level" column="level"/> <result property="level" column="level"/>
<result property="productArea" column="product_area"/>
<result property="type" column="type"/>
<result property="notes" column="notes"/> <result property="notes" column="notes"/>
<result property="responsibilityUnit" column="responsibility_unit"/> <result property="responsibilityUnit" column="responsibility_unit"/>
<result property="isDeleted" column="is_deleted"/> <result property="isDeleted" column="is_deleted"/>
@ -18,6 +16,10 @@
<result property="updateBy" column="update_by"/> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
<result property="projectClassify" column="project_classify"/>
<result property="useStart" column="use_start"/>
<result property="useEnd" column="use_end"/>
<result property="status" column="status"/>
</resultMap> </resultMap>
<sql id="selectBmsTemplateInfoVo"> <sql id="selectBmsTemplateInfoVo">
@ -29,6 +31,10 @@
notes, notes,
responsibility_unit, responsibility_unit,
is_deleted, is_deleted,
project_classify,
use_start,
use_end,
status,
create_by, create_by,
create_time, create_time,
update_by, update_by,
@ -65,12 +71,10 @@
<if test="templateName != null and templateName != ''">and a.template_name like concat('%', <if test="templateName != null and templateName != ''">and a.template_name like concat('%',
#{templateName}, '%') #{templateName}, '%')
</if> </if>
<if test="level != null ">and a.level = #{level}</if> <if test="projectClassify != null ">and a.project_classify = #{projectClassify}</if>
<if test="productArea != null ">and a.product_area = #{productArea}</if>
<if test="type != null ">and a.type = #{type}</if>
<if test="notes != null and notes != ''">and a.notes = #{notes}</if>
<if test="responsibilityUnit != null ">and a.responsibility_unit = #{responsibilityUnit}</if> <if test="responsibilityUnit != null ">and a.responsibility_unit = #{responsibilityUnit}</if>
<if test="isDeleted != null ">and a.is_deleted = #{isDeleted}</if> <if test="status != null ">and a.status = #{status}</if>
<if test="isDeleted != null ">and is_deleted = #{isDeleted}</if>
</where> </where>
</select> </select>
@ -95,6 +99,10 @@
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="projectClassify != null">project_classify,</if>
<if test="useStart != null">use_start,</if>
<if test="useEnd != null">use_end,</if>
<if test="status != null">status,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if> <if test="id != null">#{id},</if>
@ -110,6 +118,10 @@
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="projectClassify != null">#{projectClassify},</if>
<if test="useStart != null">#{useStart},</if>
<if test="useEnd != null">#{useEnd},</if>
<if test="status != null">#{status},</if>
</trim> </trim>
</insert> </insert>
@ -128,6 +140,10 @@
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="projectClassify != null">project_classify = #{projectClassify},</if>
<if test="useStart != null">use_start = #{useStart},</if>
<if test="useEnd != null">use_end = #{useEnd},</if>
<if test="status != null">status = #{status},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>

@ -18,6 +18,7 @@
<result property="updateBy" column="update_by"/> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
<result property="status" column="remark"/>
</resultMap> </resultMap>
<sql id="selectBmsTemplateRecordVo"> <sql id="selectBmsTemplateRecordVo">
@ -29,6 +30,7 @@
file_name, file_name,
road, road,
notes, notes,
status,
create_by, create_by,
create_time, create_time,
update_by, update_by,
@ -50,6 +52,7 @@
<if test="road != null ">and road = #{road}</if> <if test="road != null ">and road = #{road}</if>
<if test="fileName != null ">and file_name = #{fileName}</if> <if test="fileName != null ">and file_name = #{fileName}</if>
<if test="notes != null and notes != ''">and notes = #{notes}</if> <if test="notes != null and notes != ''">and notes = #{notes}</if>
<if test="status != null and status != ''">and status = #{status}</if>
</where> </where>
</select> </select>
@ -74,6 +77,7 @@
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="status != null">status,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="templateId != null">#{templateId},</if> <if test="templateId != null">#{templateId},</if>
@ -88,6 +92,7 @@
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="status != null">#{status},</if>
</trim> </trim>
</insert> </insert>
@ -106,6 +111,7 @@
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="status != null">status = #{status},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
@ -127,7 +133,9 @@
resultType="com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo"> resultType="com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo">
SELECT SELECT
a.id as templateRecordId, a.id as templateRecordId,
a.status,
a.enterprise_directory, a.enterprise_directory,
b.project_classify,
b.id as templateId, b.id as templateId,
b.template_name, b.template_name,
b.LEVEL, b.LEVEL,
@ -144,21 +152,21 @@
INNER JOIN bms_template_info b ON a.template_id = b.id INNER JOIN bms_template_info b ON a.template_id = b.id
INNER JOIN sys_user c ON b.create_by = c.user_id INNER JOIN sys_user c ON b.create_by = c.user_id
<where> <where>
<if test="enterpriseDirectory != null and enterpriseDirectory != ''">and a.enterprise_directory like <if test="req.enterpriseDirectory != null and req.enterpriseDirectory != ''">and a.enterprise_directory like
concat('%', #{enterpriseDirectory}, '%') concat('%', #{req.enterpriseDirectory}, '%')
</if> </if>
<if test="templateId != null ">and b.id = #{templateId}</if> <if test="req.templateId != null ">and b.id = #{req.templateId}</if>
<if test="startTime != null "> <if test="req.startTime != null ">
and date_format(a.create_time ,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d') and date_format(a.create_time ,'%y%m%d') &gt;= date_format(#{req.startTime},'%y%m%d')
</if> </if>
<if test="endTime != null "> <if test="req.endTime != null ">
and date_format(a.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d') and date_format(a.create_time,'%y%m%d') &lt;= date_format(#{req.endTime},'%y%m%d')
</if> </if>
<if test="road != null ">and a.road = #{road}</if> <if test="req.road != null ">and a.road = #{req.road}</if>
<if test="level != null ">and b.level = #{level}</if> <if test="req.level != null ">and b.level = #{req.level}</if>
<if test="responsibilityUnit != null ">and b.responsibility_unit = #{responsibilityUnit}</if> <if test="req.responsibilityUnit != null ">and b.responsibility_unit = #{req.responsibilityUnit}</if>
<if test="templateName != null and templateName != ''">and b.template_name like concat('%', <if test="req.templateName != null and templateName != ''">and b.template_name like concat('%',
#{templateName}, '%') #{req.templateName}, '%')
</if> </if>
</where> </where>
order by a.create_time desc order by a.create_time desc
@ -172,12 +180,14 @@
a.file_name, a.file_name,
a.road, a.road,
a.notes, a.notes,
a.status,
a.create_by, a.create_by,
a.create_time, a.create_time,
a.update_by, a.update_by,
a.update_time, a.update_time,
a.remark, a.remark,
b.responsibility_unit b.responsibility_unit,
b.project_classify
FROM bms_template_record a FROM bms_template_record a
INNER JOIN bms_template_info b ON a.template_id = b.id INNER JOIN bms_template_info b ON a.template_id = b.id
where a.id = #{id} where a.id = #{id}

@ -22,9 +22,15 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
@Override @Override
public void insertFill(MetaObject metaObject) { public void insertFill(MetaObject metaObject) {
// 获取当前登录用户 // 获取当前登录用户
LoginUser loginUser = SecurityUtils.getLoginUser();
String userName = loginUser.getUsername(); String userName = null;
Long userId = SecurityUtils.getUserId(); Long userId = null;
try {
LoginUser loginUser = SecurityUtils.getLoginUser();
userName = loginUser.getUsername();
userId = SecurityUtils.getUserId();
} catch (Exception ignored) {
}
if (!Objects.equals(userName, "")) { if (!Objects.equals(userName, "")) {
this.strictInsertFill(metaObject, "createBy", String.class, userName); this.strictInsertFill(metaObject, "createBy", String.class, userName);
} }
@ -37,9 +43,14 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
@Override @Override
public void updateFill(MetaObject metaObject) { public void updateFill(MetaObject metaObject) {
// 获取当前登录用户 // 获取当前登录用户
LoginUser loginUser = SecurityUtils.getLoginUser(); String userName = null;
String userName = loginUser.getUsername(); Long userId = null;
Long userId = SecurityUtils.getUserId(); try {
LoginUser loginUser = SecurityUtils.getLoginUser();
userName = loginUser.getUsername();
userId = SecurityUtils.getUserId();
} catch (Exception ignored) {
}
if (userId!=null) { if (userId!=null) {
this.strictUpdateFill(metaObject, "updateId", Long.class, userId); this.strictUpdateFill(metaObject, "updateId", Long.class, userId);
} }

Loading…
Cancel
Save