项目库和申请连接

dongdingding
杜函宇 1 year ago
parent 3626eecc3f
commit 08d940a6ab

@ -1,5 +1,6 @@
package com.ruoyi.jjh.common.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -21,12 +22,14 @@ public class BaseInfoEntity implements Serializable {
/**
*
*/
@JSONField(serialize=false)
@TableField(fill = FieldFill.INSERT)
private String createBy;
/**
*
*/
@JSONField(serialize=false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT)
private Date createTime;
@ -34,12 +37,14 @@ public class BaseInfoEntity implements Serializable {
/**
*
*/
@JSONField(serialize=false)
@TableField(fill = FieldFill.UPDATE)
private String updateBy;
/**
*
*/
@JSONField(serialize=false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.UPDATE)
private Date updateTime;
@ -47,6 +52,7 @@ public class BaseInfoEntity implements Serializable {
/**
*
*/
@JSONField(serialize=false)
private String remark;
}

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -23,26 +24,32 @@ public class BmsBigStrongAward extends BaseInfoEntity {
* id
*/
@TableId(value = "id", type = IdType.AUTO)
@JSONField(serialize = false)
private Long id;
/**
* id
*/
@Excel(name = "企业id")
@JSONField(serialize = false)
private Long enterpriseId;
/**
*
*/
@Excel(name = "是否获得园区其他经营奖励01否", readConverterExp = "0=是,1=否")
@JSONField(name = "是否获得园区其他经营奖励")
private int isGainRewards;
@JSONField(name = "园区其他经营奖励")
@Excel(name = "奖励说明")
private String rewardDescription;
/**
*
*/
@JSONField(name = "申报成立时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "成立时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date establishTime;
@ -50,12 +57,14 @@ public class BmsBigStrongAward extends BaseInfoEntity {
/**
* 3
*/
@JSONField(serialize = false)
@Excel(name = "企业近3年发展情况及未来发展计划")
private String developmentPlan;
/**
* 01
*/
@JSONField(serialize = false)
@Excel(name = "是否删除0未删除1已删除")
private Long isDeleted;

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
@ -19,36 +20,42 @@ public class BmsBrandingAward extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize = false)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* id
*/
@JSONField(serialize = false)
@Excel(name = "企业id")
private Long enterpriseId;
/**
* /
*/
@JSONField(name="所获荣誉/所举办活动")
@Excel(name = "所获荣誉/所举办活动")
private String honorsReceived;
/**
*
*/
@JSONField(name="所属等级")
@Excel(name = "所属等级")
private Long level;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "证明材料")
private String evidence;
/**
* 01
*/
@JSONField(serialize = false)
@Excel(name = "是否删除0未删除1已删除")
private Long isDeleted;

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
@ -20,42 +21,52 @@ public class BmsCarrierConstructionAward extends BaseInfoEntity {
private static final long serialVersionUID = 1L;
/** 主键id */
@JSONField(serialize = false)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 企业id */
@JSONField(serialize = false)
@Excel(name = "企业id")
private Long enterpriseId;
/** 项目名称 */
@JSONField(name = "项目名称")
@Excel(name = "项目名称")
private String projectName;
/** 文体企业数量占比 */
@JSONField(name = "文体企业数量占比")
@Excel(name = "文体企业数量占比")
private String quantityProportion;
/** 文体企业营收占比 */
@JSONField(name = "文体企业营收占比")
@Excel(name = "文体企业营收占比")
private String revenueProportion;
/** 文体企业从业人员占比 */
@JSONField(name = "文体企业从业人员占比")
@Excel(name = "文体企业从业人员占比")
private String personnelProportion;
/** 相关佐证材料 */
@JSONField(serialize = false)
@Excel(name = "相关佐证材料")
private String supportingMaterials;
/** 项目工商登记许可 */
@JSONField(serialize = false)
@Excel(name = "项目工商登记许可")
private String businessLicense;
/** 消防验收报告 */
@JSONField(serialize = false)
@Excel(name = "消防验收报告")
private String fireReport;
/** 是否删除0未删除1已删除 */
@JSONField(serialize = false)
@Excel(name = "是否删除0未删除1已删除")
private Long isDeleted;

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
@ -21,9 +22,17 @@ import org.apache.commons.lang3.builder.ToStringStyle;
public class BmsDeclarationRecords extends BaseInfoEntity {
private static final long serialVersionUID = 1L;
/**
* Id
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "项目库的Id")
private Long jjhProjectId;
/**
* id
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ -33,11 +42,14 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
*/
@ApiModelProperty(value = "项目名称")
@Excel(name = "项目名称")
@JSONField(name = "项目名称")
private String projectName;
@JSONField(serialize = false)
@ApiModelProperty(value = "项目id")
private Long projectId;
@JSONField(serialize = false)
@ApiModelProperty(value = "事项")
@Excel(name = "事项")
private String matter;
@ -45,12 +57,14 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "企业id")
private Long enterpriseId;
/**
*
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "年份")
@Excel(name = "年份")
private String year;
@ -58,18 +72,21 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
/**
* 线id
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "在线模板记录id")
private Long templateRecordId;
/**
*
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "申报模版类型")
private Integer declarationTemplateType;
/**
* idid
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "详情id对应详情id")
private Long detailId;
@ -77,6 +94,7 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
/**
*
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "审批状态")
@Excel(name = "审批状态", readConverterExp = "0=草稿,1=初审中,2=复审中,3=专家评审中,4=市级评定中,5=评定通过,6=专家评审-拒绝,7=复审-拒绝,8=初审-拒绝,9=评定驳回")
private Long status;
@ -84,6 +102,7 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
/**
* 01
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "是否删除0未删除1已删除")
private Long isDeleted;

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
@ -23,42 +24,49 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize=false)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
*
*/
@JSONField(name = "企业名称")
@Excel(name = "企业名称")
private String enterpriseName;
/**
*
*/
@JSONField(name = "企业统一信用代码")
@Excel(name = "企业统一信用代码")
private String creditCode;
/**
*
*/
@JSONField(name = "联系人")
@Excel(name = "联系人")
private String contacts;
/**
*
*/
@JSONField(name = "联系人电话")
@Excel(name = "联系人电话")
private String contactsNumber;
/**
*
*/
@JSONField(name = "企业地址")
@Excel(name = "企业地址")
private String address;
/**
* 01
*/
@JSONField(serialize=false)
@Excel(name = "是否删除",readConverterExp = "0=未删除,1=已删除")
private Long isDeleted;

@ -2,8 +2,10 @@ package com.ruoyi.jjh.declaration.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@ -13,6 +15,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @author farben
* @date 2023-09-04
*/
@Data
@TableName(value = "bms_funding_detail")
public class BmsFundingDetail extends BaseInfoEntity {
private static final long serialVersionUID = 1L;
@ -65,81 +69,4 @@ public class BmsFundingDetail extends BaseInfoEntity {
*/
@Excel(name = "是否删除0未删除1已删除")
private Long isDeleted;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public int getTemplateRecordId() {
return templateRecordId;
}
public void setTemplateRecordId(int templateRecordId) {
this.templateRecordId = templateRecordId;
}
public Long getDetailId() {
return detailId;
}
public void setDetailId(Long detailId) {
this.detailId = detailId;
}
public String getVModel() {
return vModel;
}
public void setVModel(String vModel) {
this.vModel = vModel;
}
public String getYear() {
return year;
}
public void setYear(String year) {
this.year = year;
}
public String getIllustrate() {
return illustrate;
}
public void setIllustrate(String illustrate) {
this.illustrate = illustrate;
}
public Long getAmount() {
return amount;
}
public void setAmount(Long amount) {
this.amount = amount;
}
public Long getIsDeleted() {
return isDeleted;
}
public void setIsDeleted(Long isDeleted) {
this.isDeleted = isDeleted;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("type", getType()).append("templateRecordId", getTemplateRecordId()).append("detailId", getDetailId()).append("vModel", getVModel()).append("year", getYear()).append("illustrate", getIllustrate()).append("amount", getAmount()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString();
}
}

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
@ -19,30 +20,35 @@ public class BmsIndustrialInternetAward extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize = false)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* id
*/
@JSONField(serialize = false)
@Excel(name = "企业id")
private Long enterpriseId;
/**
*
*/
@JSONField(name = "荣誉名称")
@Excel(name = "荣誉名称")
private String honoraryName;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "证明材料")
private String material;
/**
* 01
*/
@JSONField(serialize = false)
@Excel(name = "是否删除0未删除1已删除")
private Long isDeleted;

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
@ -21,75 +22,88 @@ public class BmsIntegrationIndustries extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize = false)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* id
*/
@JSONField(serialize = false)
@Excel(name = "企业id")
private Long enterpriseId;
@JSONField(name = "申报类型")
@Excel(name = "申报类型", readConverterExp = "1=两业融合示范企业,2=制造业企业设立财务独立核算的制造服务业职能部门,3=制造业企业剥离服务业务成立独立的法人")
private Integer declarationType;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "证明材料")
private String evidence;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "营业执照")
private String businessLicense;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "完税证明")
private String taxPaymentCertificate;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "审计报告")
private String auditReport;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "股权架构图")
private String equityStructureChart;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "项目申报报告", readConverterExp = "含=企业基本情况和项目基本情况")
private String declarationReport;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "独立核算相关证明")
private String independentAccounting;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "验资报告")
private String capitalVerificationReport;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "证明材料")
private String otherEvidence;
/**
* 01
*/
@JSONField(serialize = false)
@Excel(name = "是否删除0未删除1已删除")
private Long isDeleted;

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
@ -19,42 +20,49 @@ public class BmsManufacturingServicesAward extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize = false)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* id
*/
@JSONField(serialize = false)
@Excel(name = "企业id")
private Long enterpriseId;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "企业投资项目备案通知书或核准批复文件")
private String filingNotice;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "购置设备发票清单及发票扫描件")
private String invoice;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "会计师事务所出具的企业申报项目购置设备情况的专项审计报告")
private String auditReport;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "会计师事务所出具的企业财务报表审计报告")
private String financialStatements;
/**
* 01
*/
@JSONField(serialize = false)
@Excel(name = "是否删除0未删除1已删除")
private Long isDeleted;

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
@ -19,30 +20,35 @@ public class BmsPlatformConstructionAward extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize = false)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* id
*/
@JSONField(serialize = false)
@Excel(name = "企业id")
private Long enterpriseId;
/**
*
*/
@JSONField(name = "平台(项目)名称")
@Excel(name = "平台(项目)名称")
private String platformName;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "合作协议")
private String agreement;
/**
* 01
*/
@JSONField(serialize = false)
@Excel(name = "是否删除0未删除1已删除")
private Long isDeleted;

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -27,18 +28,21 @@ public class BmsProjectSettlementAward extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize = false)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* id
*/
@JSONField(serialize = false)
@Excel(name = "企业id")
private Long enterpriseId;
/**
*
*/
@JSONField(name= "申报单位成立时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "申报单位成立时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date establishTime;
@ -46,36 +50,43 @@ public class BmsProjectSettlementAward extends BaseInfoEntity {
/**
*
*/
@JSONField(name= "截至目前员工人数")
@Excel(name = "截至目前员工人数")
private Long employeeNum;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "招商协议")
private String agreement;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "验资报告")
private String report;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "营业执照")
private String businessLicense;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "其他材料")
private String otherMaterials;
/**
* 01
*/
@JSONField(serialize = false)
@Excel(name = "是否删除0未删除1已删除")
private Long isDeleted;

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
@ -23,36 +24,42 @@ public class BmsSceneOpeningAward extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize = false)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* id
*/
@JSONField(serialize = false)
@Excel(name = "企业id")
private Long enterpriseId;
/**
*
*/
@JSONField(name = "项目名称")
@Excel(name = "项目名称")
private String projectName;
/**
*
*/
@JSONField(name = "所属类型")
@Excel(name = "所属类型")
private Long type;
/**
*
*/
@JSONField(serialize = false)
@Excel(name = "公示、发文证明、专家评分表")
private String material;
/**
* 01
*/
@JSONField(serialize = false)
@Excel(name = "是否删除0未删除1已删除")
private Long isDeleted;

@ -3,6 +3,9 @@ package com.ruoyi.jjh.declaration.entity.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -13,46 +16,55 @@ import java.io.Serializable;
* @author farben
* @date 2023-09-09
*/
@ApiModel("审批记录信息对象")
@Data
public class BmsApprovalInfoQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty("主键Id")
private Long id;
@ApiModelProperty("默认审批人id")
@Excel(name = "默认审批人id")
private Long approvalById;
@ApiModelProperty("默认审批人")
@Excel(name = "默认审批人")
private String approvalByName;
/** 审批状态(0=待审核.1=审批通过,2=审批驳回) */
@ApiModelProperty("审批状态(0=待审核.1=审批通过,2=审批驳回)")
@Excel(name = "审批状态(0=待审核.1=审批通过,2=审批驳回)")
private Integer approvalStatus;
/** 审批意见 */
@ApiModelProperty("审批意见")
@Excel(name = "审批意见")
private String approvalOpinions;
/** 审批附件 */
@ApiModelProperty("审批附件")
@Excel(name = "审批附件")
private String approvalAttachment;
/** 是否可审核(0=是,1=否,2=结束) */
@ApiModelProperty("是否可审核(0=是,1=否,2=结束)")
@Excel(name = "是否可审核(0=是,1=否,2=结束)")
private Integer isReview;
@ApiModelProperty("是否为拒绝前数据01是")
@Excel(name = "是否为拒绝前数据01是")
private Integer isBeforeData;
/** 排序 */
@ApiModelProperty("排序")
@Excel(name = "排序")
private Integer sort;
@ApiModelProperty("审批时间")
@Excel(name = "审批时间")
private String approvalTime;
}

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity.vo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward;
import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
import io.swagger.annotations.ApiModelProperty;
@ -22,5 +23,6 @@ public class BmsBigStrongAwardQueryVo extends BmsBigStrongAward {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "应收列表")
@JSONField(serialize = false)
private List<BmsFundingDetail> fundingDetailList;
}

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity.vo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward;
import io.swagger.annotations.ApiModelProperty;
@ -22,5 +23,6 @@ public class BmsProjectSettlementAwardQueryVo extends BmsProjectSettlementAward
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "应收列表")
@JSONField(serialize = false)
private List<BmsFundingDetail> fundingDetailList;
}

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
@ -9,16 +10,21 @@ import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsFundingDetailAddDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsProjectSettlementAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsBigStrongAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsBigStrongAwardService;
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.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@ -41,6 +47,8 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private JProjectService jProjectService;
/**
*
*
@ -106,6 +114,33 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
declarationRecords.setDetailId(bmsBigStrongAward.getId());
declarationRecords.setEnterpriseId(enterpriseId);
iBmsDeclarationRecordsService.save(declarationRecords);
//获取该申报记录的详情
DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
//申报的企业信息JSON
String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
//在线申报信息JSON
String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
//做大做强
BmsBigStrongAwardQueryVo p1 = declarationRecordsVo.getBmsBigStrongAwardQueryVo();
//做大做强对象JSON
String js3 = JSONObject.toJSONString(p1);
String str = jProjectService.allJsonString(js1, js2, js3, jProjectService.getJsonString(p1.getFundingDetailList()));
String str1 = "{" +
'"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + p1.getDevelopmentPlan() + '"' +
"}";
//新增项目
JProject jP = new JProject();
jP.setProjectYear(declarationRecords.getYear());
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
jP.setProjectClassify(2);
jP.setStatus(1);
jP.setOtherJson(str);
jP.setFileJson(str1);
jProjectService.saveProject(jP,declarationRecords.getId());
// 申请审批
if (bmsBigStrongAwardAddDto.getStatus() == 1) {
// 审批状态

@ -1,20 +1,26 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsBrandingAward;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsBrandingAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsBrandingAwardService;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
@ -31,6 +37,9 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private JProjectService jProjectService;
/**
*
*
@ -80,6 +89,33 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsBrandingAward.getId());
iBmsDeclarationRecordsService.save(declarationRecords);
//获取该申报记录的详情
DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
//申报的企业信息JSON
String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
//在线申报信息JSON
String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
//品牌打造奖补
BmsBrandingAward p1 = declarationRecordsVo.getBmsBrandingAward();
//品牌打造奖补JSON
String js3 = JSONObject.toJSONString(p1);
String str = jProjectService.allJsonString(js1, js2, js3, "{}");
String str1 = "{" +
'"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' +
"}";
//新增项目
JProject jP = new JProject();
jP.setProjectYear(declarationRecords.getYear());
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
jP.setProjectClassify(4);
jP.setStatus(1);
jP.setOtherJson(str);
jP.setFileJson(str1);
jProjectService.saveProject(jP,declarationRecords.getId());
// 生成审核
if (bmsBrandingAwardAddDto.getStatus()==1){
// 审批状态

@ -1,20 +1,26 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsCarrierConstructionAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsCarrierConstructionAwardService;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
@ -31,6 +37,9 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private JProjectService jProjectService;
/**
*
*
@ -81,6 +90,34 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsCarrierConstructionAward.getId());
iBmsDeclarationRecordsService.save(declarationRecords);
//获取该申报记录的详情
DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
//申报的企业信息JSON
String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
//载体建设奖补
BmsCarrierConstructionAward p1 = declarationRecordsVo.getBmsCarrierConstructionAward();
//载体建设奖补JSON
String js3 = JSONObject.toJSONString(p1);
String str = jProjectService.allJsonString(js1, "{}", js3, "{}");
String str1 = "{" +
'"' + "相关佐证资料" + '"' + ":" + '"' + p1.getSupportingMaterials() + '"' + ','+
'"' + "项目工商登记许可" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + ','+
'"' + "消防验收报告" + '"' + ":" + '"' + p1.getFireReport() + '"' +
"}";
//新增项目
JProject jP = new JProject();
jP.setProjectYear(declarationRecords.getYear());
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
jP.setProjectClassify(2);
jP.setStatus(1);
jP.setOtherJson(str);
jP.setFileJson(str1);
jProjectService.saveProject(jP,declarationRecords.getId());
// 生成审核
if (bmsCarrierConstructionAwardAddDto.getStatus()==1){
// 审批状态

@ -1,20 +1,26 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsCreditManagement;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsCreditManagementMapper;
import com.ruoyi.jjh.declaration.service.IBmsCreditManagementService;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
@ -32,6 +38,8 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private JProjectService jProjectService;
/**
*
*
@ -81,6 +89,35 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsCreditManagement.getId());
iBmsDeclarationRecordsService.save(declarationRecords);
//获取该申报记录的详情
DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
//申报的企业信息JSON
String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
//在线申报信息JSON
String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
//信用管理奖补
BmsCreditManagement p1 = declarationRecordsVo.getBmsCreditManagement();
//信用管理奖补JSON
// String js3 = JSONObject.toJSONString(p1);
String str = jProjectService.allJsonString(js1, js2, "{}", "{}");
String str1 = "{" +
'"' + "项目方案" + '"' + ":" + '"' + p1.getProjectPlan() + '"' + ","+
'"' + "资金使用说明" + '"' + ":" + '"' + p1.getUsesFunds() + '"' + ","+
'"' + "项目专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
"}";
//新增项目
JProject jP = new JProject();
jP.setProjectYear(declarationRecords.getYear());
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
jP.setProjectClassify(7);
jP.setStatus(1);
jP.setOtherJson(str);
jP.setFileJson(str1);
jProjectService.saveProject(jP,declarationRecords.getId());
// 生成审核
if (bmsCreditManagementAddDto.getStatus()==1){
// 审批状态

@ -15,10 +15,13 @@ import com.ruoyi.jjh.declaration.entity.vo.BmsMunicipalBureauReviewQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsDeclarationRecordsMapper;
import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -54,6 +57,8 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
@Autowired
private IBmsEnterpriseBasicInfoService iBmsEnterpriseBasicInfoService;
@Resource
private JProjectService jProjectService;
/**
* 线
@ -214,31 +219,42 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
public int approval(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto, BmsProcessInfo bmsProcessInfo) {
BmsDeclarationRecords bmsDeclarationRecords = baseMapper.selectById(bmsApprovalInfoUpdateDto.getDeclarationRecordsId());
JProject jp = new JProject();
jp.setId(bmsDeclarationRecords.getJjhProjectId());
if (bmsProcessInfo.getApprovalLevel().equals(0)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(2);
bmsDeclarationRecords.setStatus(2L);
} else {
jp.setStatus(8);
bmsDeclarationRecords.setStatus(8L);
}
} else if (bmsProcessInfo.getApprovalLevel().equals(1)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(3);
bmsDeclarationRecords.setStatus(3L);
} else {
jp.setStatus(7);
bmsDeclarationRecords.setStatus(7L);
}
} else if (bmsProcessInfo.getApprovalLevel().equals(2)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(4);
bmsDeclarationRecords.setStatus(4L);
} else {
jp.setStatus(6);
bmsDeclarationRecords.setStatus(6L);
}
} else if (bmsProcessInfo.getApprovalLevel().equals(3)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(5);
bmsDeclarationRecords.setStatus(5L);
} else {
jp.setStatus(9);
bmsDeclarationRecords.setStatus(9L);
}
}
jProjectService.updateById(jp);
return baseMapper.updateById(bmsDeclarationRecords);
}
@ -255,31 +271,42 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
BmsProcessInfo bmsProcessInfo = iBmsProcessInfoService.lambdaQuery().eq(BmsProcessInfo::getId, processId).list().get(0);
if (BeanUtil.isNotEmpty(bmsProcessInfo)) {
BmsDeclarationRecords bmsDeclarationRecords = baseMapper.selectById(bmsApprovalInfoUpdateDto.getDeclarationRecordsId());
JProject jp = new JProject();
jp.setId(bmsDeclarationRecords.getJjhProjectId());
if (bmsProcessInfo.getApprovalLevel().equals(0)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(2);
bmsDeclarationRecords.setStatus(2L);
} else {
jp.setStatus(8);
bmsDeclarationRecords.setStatus(8L);
}
} else if (bmsProcessInfo.getApprovalLevel().equals(1)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(3);
bmsDeclarationRecords.setStatus(3L);
} else {
jp.setStatus(7);
bmsDeclarationRecords.setStatus(7L);
}
} else if (bmsProcessInfo.getApprovalLevel().equals(2)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(4);
bmsDeclarationRecords.setStatus(4L);
} else {
jp.setStatus(6);
bmsDeclarationRecords.setStatus(6L);
}
} else if (bmsProcessInfo.getApprovalLevel().equals(3)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(5);
bmsDeclarationRecords.setStatus(5L);
} else {
jp.setStatus(9);
bmsDeclarationRecords.setStatus(9L);
}
}
jProjectService.updateById(jp);
baseMapper.updateById(bmsDeclarationRecords);
}
}
@ -482,6 +509,12 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
if (CollectionUtil.isNotEmpty(recordsIdList)) {
iBmsApprovalInfoService.updateApprovalList(recordsIdList);
}
for (BmsDeclarationRecords a1 : recordsUpdate) {
JProject jp = new JProject();
jp.setId(a1.getJjhProjectId());
jp.setStatus(Math.toIntExact(a1.getStatus()));
jProjectService.updateById(jp);
}
// 批量保存记录
this.saveOrUpdateBatch(recordsUpdate);
// 审查审批记录

@ -1,20 +1,26 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward;
import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsIndustrialInternetAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsIndustrialInternetAwardService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
@ -31,7 +37,8 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private JProjectService jProjectService;
/**
* 5G+
*
@ -81,6 +88,34 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsIndustrialInternetAward.getId());
iBmsDeclarationRecordsService.save(declarationRecords);
//获取该申报记录的详情
DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
//申报的企业信息JSON
String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
//在线申报信息JSON
String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
//5G+工业互联网奖补
BmsIndustrialInternetAward p1 = declarationRecordsVo.getBmsIndustrialInternetAward();
//5G+工业互联网奖补JSON
String js3 = JSONObject.toJSONString(p1);
String str = jProjectService.allJsonString(js1, js2, js3, "{}");
String str1 = "{" +
'"' + "证明材料" + '"' + ":" + '"' + p1.getMaterial() + '"' +
"}";
//新增项目
JProject jP = new JProject();
jP.setProjectYear(declarationRecords.getYear());
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
jP.setProjectClassify(2);
jP.setStatus(1);
jP.setOtherJson(str);
jP.setFileJson(str1);
jProjectService.saveProject(jP,declarationRecords.getId());
// 生成审核
if (bmsIndustrialInternetAwardAddDto.getStatus()==1){
// 审批状态

@ -1,20 +1,26 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries;
import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward;
import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsIntegrationIndustriesMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsIntegrationIndustriesService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
@ -32,6 +38,8 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private JProjectService jProjectService;
/**
*
*
@ -81,6 +89,41 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsIntegrationIndustries.getId());
iBmsDeclarationRecordsService.save(declarationRecords);
//获取该申报记录的详情
DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
//申报的企业信息JSON
String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
//在线申报信息JSON
String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
//两业融合奖补申请
BmsIntegrationIndustries p1 = declarationRecordsVo.getBmsIntegrationIndustries();
//两业融合奖补申请JSON
String js3 = JSONObject.toJSONString(p1);
String str = jProjectService.allJsonString(js1, js2, js3, "{}");
String str1 = "{" +
'"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' + ","+
'"' + "营业执照" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + ","+
'"' + "完税证明" + '"' + ":" + '"' + p1.getTaxPaymentCertificate() + '"' + ","+
'"' + "审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
'"' + "股权架构图" + '"' + ":" + '"' + p1.getEquityStructureChart() + '"' + ","+
'"' + "项目申报报告" + '"' + ":" + '"' + p1.getDeclarationReport() + '"' + ","+
'"' + "独立核算相关证明" + '"' + ":" + '"' + p1.getIndependentAccounting() + '"' + ","+
'"' + "验资报告" + '"' + ":" + '"' + p1.getCapitalVerificationReport()+ '"' + ","+
'"' + "其他证明材料" + '"' + ":" + '"' + p1.getOtherEvidence() + '"' +
"}";
//新增项目
JProject jP = new JProject();
jP.setProjectYear(declarationRecords.getYear());
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
jP.setProjectClassify(10);
jP.setStatus(1);
jP.setOtherJson(str);
jP.setFileJson(str1);
jProjectService.saveProject(jP,declarationRecords.getId());
// 生成审核
if (bmsIntegrationIndustriesAddDto.getStatus()==1){
// 审批状态

@ -1,20 +1,26 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward;
import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsLogisticsDevelopmentAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsLogisticsDevelopmentAwardService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
@ -31,6 +37,9 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private JProjectService jProjectService;
/**
*
*
@ -81,6 +90,36 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsLogisticsDevelopmentAward.getId());
iBmsDeclarationRecordsService.save(declarationRecords);
//获取该申报记录的详情
DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
//申报的企业信息JSON
String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
//在线申报信息JSON
String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
//物流发展奖补
BmsLogisticsDevelopmentAward p1 = declarationRecordsVo.getBmsLogisticsDevelopmentAward();
//物流发展奖补JSON
// String js3 = JSONObject.toJSONString(p1);
String str = jProjectService.allJsonString(js1, js2, "{}", "{}");
String str1 = "{" +
'"' + "荣誉证明文件" + '"' + ":" + '"' + p1.getHonorCertificate() + '"' + ","+
'"' + "平台名称" + '"' + ":" + '"' + p1.getPlatformName() + '"' + ","+
'"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
'"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' +
"}";
//新增项目
JProject jP = new JProject();
jP.setProjectYear(declarationRecords.getYear());
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
jP.setProjectClassify(9);
jP.setStatus(1);
jP.setOtherJson(str);
jP.setFileJson(str1);
jProjectService.saveProject(jP,declarationRecords.getId());
// 生成审核
if (bmsLogisticsDevelopmentAwardAddDto.getStatus()==1){
// 审批状态

@ -1,20 +1,26 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward;
import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsManufacturingServicesAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsManufacturingServicesAwardService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
@ -31,7 +37,8 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private JProjectService jProjectService;
/**
*
*
@ -81,6 +88,36 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsManufacturingServicesAward.getId());
iBmsDeclarationRecordsService.save(declarationRecords);
//获取该申报记录的详情
DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
//申报的企业信息JSON
String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
//在线申报信息JSON
String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
//制造服务业有效投入奖补
BmsManufacturingServicesAward p1 = declarationRecordsVo.getBmsManufacturingServicesAward();
//制造服务业有效投入奖补JSON
// String js3 = JSONObject.toJSONString(p1);
String str = jProjectService.allJsonString(js1, js2, "{}", "{}");
String str1 = "{" +
'"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
'"' + "购置设备发票清单及发票扫描件" + '"' + ":" + '"' + p1.getInvoice() + '"' + ","+
'"' + "会计师事务所出具的企业申报项目购置设备情况的专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
'"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getFinancialStatements() + '"' + ","+
"}";
//新增项目
JProject jP = new JProject();
jP.setProjectYear(declarationRecords.getYear());
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
jP.setProjectClassify(8);
jP.setStatus(1);
jP.setOtherJson(str);
jP.setFileJson(str1);
jProjectService.saveProject(jP,declarationRecords.getId());
// 生成审核
if (bmsManufacturingServicesAwardAddDto.getStatus()==1){
// 审批状态

@ -1,21 +1,27 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward;
import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsPlatformConstructionAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsPlatformConstructionAwardService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
@ -34,6 +40,8 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private JProjectService jProjectService;
/**
*
*
@ -83,6 +91,34 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsPlatformConstructionAward.getId());
iBmsDeclarationRecordsService.save(declarationRecords);
//获取该申报记录的详情
DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
//申报的企业信息JSON
String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
//在线申报信息JSON
String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
//平台建设奖补
BmsPlatformConstructionAward p1 = declarationRecordsVo.getBmsPlatformConstructionAward();
//平台建设奖补json
String js3 = JSONObject.toJSONString(p1);
String str = jProjectService.allJsonString(js1, js2, js3, "{}");
String str1 = "{" +
'"' + "合作协议" + '"' + ":" + '"' + p1.getAgreement() + '"' +
"}";
//新增项目
JProject jP = new JProject();
jP.setProjectYear(declarationRecords.getYear());
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
jP.setProjectClassify(3);
jP.setStatus(1);
jP.setOtherJson(str);
jP.setFileJson(str1);
jProjectService.saveProject(jP,declarationRecords.getId());
// 生成审核
if (bmsPlatformConstructionAwardAddDto.getStatus()==1){
// 审批状态

@ -1,26 +1,39 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward;
import com.ruoyi.jjh.declaration.entity.dto.BmsFundingDetailAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsProjectSettlementAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsProjectSettlementAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
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.service.JProjectService;
import io.swagger.annotations.ApiModelProperty;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
import java.util.*;
/**
* Service
@ -42,6 +55,9 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private JProjectService jProjectService;
/**
*
*
@ -104,6 +120,35 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(projectSettlementAward.getId());
iBmsDeclarationRecordsService.save(declarationRecords);
//获取该申报记录的详情
DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
//申报的企业信息JSON
String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
//在线申报信息JSON
String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
//落户奖补对象
BmsProjectSettlementAwardQueryVo p1 = declarationRecordsVo.getBmsProjectSettlementAwardQueryVo();
//落户奖补对象JSON
String js3 = JSONObject.toJSONString(p1);
String str = jProjectService.allJsonString(js1, js2, js3, jProjectService.getJsonString(p1.getFundingDetailList()));
String str1 = "{" +
'"' + "招商协议" + '"' + ":" + '"' + p1.getAgreement() + '"' + "," +
'"' + "验资报告" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + "," +
'"' + "营业执照" + '"' + ":" + '"' + p1.getOtherMaterials() + '"' + "," +
'"' + "其他证明材料" + '"' + ":" + '"' + p1.getReport() + '"' +
"}";
//新增项目
JProject jP = new JProject();
jP.setProjectYear(declarationRecords.getYear());
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
jP.setProjectClassify(1);
jP.setStatus(1);
jP.setOtherJson(str);
jP.setFileJson(str1);
jProjectService.saveProject(jP,declarationRecords.getId());
// 生成审核
if (bmsProjectSettlementAwardAddDto.getStatus() == 1) {
// 审批状态

@ -1,20 +1,26 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward;
import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsSceneOpeningAwardMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsSceneOpeningAwardService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
@ -32,6 +38,8 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private JProjectService jProjectService;
/**
*
*
@ -81,6 +89,32 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
declarationRecords.setEnterpriseId(enterpriseId);
declarationRecords.setDetailId(bmsSceneOpeningAward.getId());
iBmsDeclarationRecordsService.save(declarationRecords);
//获取该申报记录的详情
DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(declarationRecords.getId());
//申报的企业信息JSON
String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
//场景开放奖补
BmsSceneOpeningAward p1 = declarationRecordsVo.getBmsSceneOpeningAward();
//场景开放奖补JSON
String js3 = JSONObject.toJSONString(p1);
String str = jProjectService.allJsonString(js1, "{}", js3,"{}");
String str1 = "{" +
'"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + p1.getMaterial() + '"' +
"}";
//新增项目
JProject jP = new JProject();
jP.setProjectYear(declarationRecords.getYear());
jP.setProjectName(declarationRecords.getProjectName());
jP.setDeclareUnit(declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
jP.setProjectClassify(6);
jP.setStatus(1);
jP.setOtherJson(str);
jP.setFileJson(str1);
jProjectService.saveProject(jP,declarationRecords.getId());
// 生成审核
if (bmsSceneOpeningAwardAddDto.getStatus()==1){
// 审批状态

@ -16,16 +16,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@ -83,7 +74,8 @@ public class JProjectController extends BaseController {
@ApiOperation(value = "通过主键查询该项目的在线流程", response = BmsApprovalInfoQueryVo.class)
@GetMapping("/declarationRecordsId/{id}")
public AjaxResult getApprovalInfoList(@PathVariable Serializable id) {
return success(jProjectService.getApprovalInfoList(id));
List<BmsApprovalInfoQueryVo> approvalInfoList = jProjectService.getApprovalInfoList(id);
return success(approvalInfoList);
}

@ -2,6 +2,7 @@ package com.ruoyi.jjh.ent.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo;
import com.ruoyi.jjh.ent.entity.JProject;
@ -33,5 +34,11 @@ public interface JProjectService extends IService<JProject> {
* @return
*/
List<BmsApprovalInfoQueryVo> getApprovalInfoList(Serializable id);
String getJsonString(List<BmsFundingDetail> obj);
String allJsonString(String a1,String a2,String a3,String a4);
void saveProject(JProject jp,Long id);
}

@ -1,13 +1,18 @@
package com.ruoyi.jjh.ent.service.impl;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.ent.mapper.JProjectMapper;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
@ -20,6 +25,9 @@ import java.util.List;
@Service("jProjectService")
public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> implements JProjectService {
@Resource
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
/**
*
*
@ -43,5 +51,36 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
return baseMapper.getApprovalInfoList(id);
}
@Override
public String getJsonString(List<BmsFundingDetail> fund) {
StringBuilder str = new StringBuilder();
//金额
str.append("{");
for (BmsFundingDetail v1 : fund) {
str.append('"').append(v1.getYear()).append(v1.getIllustrate()).append('"').append(":").append('"').append(v1.getAmount()).append('"').append(",");
}
str.append("}");
return String.valueOf(str);
}
@Override
public String allJsonString(String a1, String a2, String a3, String a4) {
// 创建一个新的JSON对象并将两个JSON对象合并到新对象中
JSONObject mergedObj = new JSONObject();
mergedObj.putAll(JSONObject.parseObject(a1));
mergedObj.putAll(JSONObject.parseObject(a2));
mergedObj.putAll(JSONObject.parseObject(a3));
mergedObj.putAll(JSONObject.parseObject(a4));
return mergedObj.toJSONString();
}
@Override
public void saveProject(JProject jp, Long id) {
this.save(jp);
BmsDeclarationRecords n1 = new BmsDeclarationRecords();
n1.setId(id);
n1.setJjhProjectId(jp.getId());
iBmsDeclarationRecordsService.updateById(n1);
}
}

@ -64,7 +64,7 @@ spring:
devtools:
restart:
# 热部署开关
enabled: true
enabled: false
# redis 配置
redis:
# 地址

@ -40,9 +40,7 @@
left join bms_declaration_records b on a.id = b.jjh_project_id
left join bms_approval_info c on b.id = c.declaration_records_id
left join sys_user d on c.approval_by_id = d.user_id
<where>
a.id=#{id}
</where>
where a.id=#{id}
order by c.sort asc
</select>
</mapper>

@ -75,18 +75,7 @@ import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -456,7 +445,7 @@ public class ProjectExcelUtil<T> {
int rows = sheet.getLastRowNum();
if (rows > 0) {
// 定义一个map用于存放excel列的序号和field.
Map<String, Integer> cellMap = new HashMap<String, Integer>();
Map<String, Integer> cellMap = new LinkedHashMap<>();
// 获取表头
Row heard = sheet.getRow(titleNum);
for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
@ -470,7 +459,7 @@ public class ProjectExcelUtil<T> {
}
// 有数据时才处理 得到类的所有field.
List<Object[]> fields = this.getFields();
Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>();
Map<Integer, Object[]> fieldsMap = new LinkedHashMap<Integer, Object[]>();
List<String> hasStr = new ArrayList<>();
for (Object[] objects : fields) {
Excel attr = (Excel) objects[1];
@ -558,32 +547,32 @@ public class ProjectExcelUtil<T> {
ReflectUtils.invokeSetter(entity, "status", 5);
cellMap.entrySet().removeIf(entry -> hasStr.contains(entry.getKey()));
StringBuilder str = new StringBuilder();
Map<String, String> sortHash = new HashMap<>();
Map<String, String> sortHash = new LinkedHashMap<>();
str.append("{");
for (Map.Entry<String, Integer> entry : cellMap.entrySet()) {
String key1 = entry.getKey();
Object val1 = this.getCellValue(row, entry.getValue());
sortHash.put(key1, String.valueOf(val1));
}
// 自定义比较器按值排序
Comparator<Map.Entry<String, String>> customComparator = (entry1, entry2) -> {
if (entry1.getValue().length() > entry2.getValue().length()) {
return 1;
} else if (entry1.getValue().length() < entry2.getValue().length()) {
return -1;
} else {
return 0; // 默认升序排序
}
};
Map<String, String> sortedMap = sortHash.entrySet().stream()
.sorted(customComparator)
.collect(Collectors.toMap(
Map.Entry::getKey,
Map.Entry::getValue,
(oldVal, newVal) -> oldVal,
LinkedHashMap::new
));
for (Map.Entry<String, String> entry : sortedMap.entrySet()) {
// 自定义比较器按值排序
// Comparator<Map.Entry<String, String>> customComparator = (entry1, entry2) -> {
// if (entry1.getValue().length() > entry2.getValue().length()) {
// return 1;
// } else if (entry1.getValue().length() < entry2.getValue().length()) {
// return -1;
// } else {
// return 0; // 默认升序排序
// }
// };
// Map<String, String> sortedMap = sortHash.entrySet().stream()
// .sorted(customComparator)
// .collect(Collectors.toMap(
// Map.Entry::getKey,
// Map.Entry::getValue,
// (oldVal, newVal) -> oldVal,
// LinkedHashMap::new
// ));
for (Map.Entry<String, String> entry : sortHash.entrySet()) {
if (Objects.equals(entry.getValue(), "") || entry.getValue() == null) {
String nulls = null;
str.append('"').append(entry.getKey()).append('"').append(":").append(nulls).append(",");

@ -455,7 +455,7 @@ public class ProjectValueUtil<T> {
int rows = sheet.getLastRowNum();
if (rows > 0) {
// 定义一个map用于存放excel列的序号和field.
Map<String, Integer> cellMap = new HashMap<String, Integer>();
Map<String, Integer> cellMap = new LinkedHashMap<String, Integer>();
// 获取表头
Row heard = sheet.getRow(titleNum);
for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
@ -469,7 +469,7 @@ public class ProjectValueUtil<T> {
}
// 有数据时才处理 得到类的所有field.
List<Object[]> fields = this.getFields();
Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>();
Map<Integer, Object[]> fieldsMap = new LinkedHashMap<Integer, Object[]>();
List<String> hasStr = new ArrayList<>();
for (Object[] objects : fields) {
Excel attr = (Excel) objects[1];
@ -555,7 +555,7 @@ public class ProjectValueUtil<T> {
ReflectUtils.invokeSetter(entity, "status", 5);
cellMap.entrySet().removeIf(entry -> hasStr.contains(entry.getKey()));
StringBuilder str = new StringBuilder();
Map<String, String> sortHash = new HashMap<>();
Map<String, String> sortHash = new LinkedHashMap<>();
str.append("{");
for (Map.Entry<String, Integer> entry : cellMap.entrySet()) {
String key1 = entry.getKey();
@ -563,24 +563,23 @@ public class ProjectValueUtil<T> {
sortHash.put(key1, String.valueOf(val1));
}
// 自定义比较器按值排序
Comparator<Map.Entry<String, String>> customComparator = (entry1, entry2) -> {
if (entry1.getValue().length() > entry2.getValue().length()) {
return 1;
} else if (entry1.getValue().length() < entry2.getValue().length()) {
return -1;
} else {
return 0; // 默认升序排序
}
};
Map<String, String> sortedMap = sortHash.entrySet().stream()
.sorted(customComparator)
.collect(Collectors.toMap(
Map.Entry::getKey,
Map.Entry::getValue,
(oldVal, newVal) -> oldVal,
LinkedHashMap::new
));
for (Map.Entry<String, String> entry : sortedMap.entrySet()) {
// Comparator<Map.Entry<String, String>> customComparator = (entry1, entry2) -> {
// if (entry1.getValue().length() > entry2.getValue().length()) {
// return 1;
// } else if (entry1.getValue().length() < entry2.getValue().length()) {
// return -1;
// } else {
// return 0; // 默认升序排序
// }
// };
// Map<String, String> sortedMap = sortHash.entrySet().stream()
// .collect(Collectors.toMap(
// Map.Entry::getKey,
// Map.Entry::getValue,
// (oldVal, newVal) -> oldVal,
// LinkedHashMap::new
// ));
for (Map.Entry<String, String> entry : sortHash.entrySet()) {
if (Objects.equals(entry.getValue(), "") || entry.getValue() == null) {
String nulls = null;
str.append('"').append(entry.getKey()).append('"').append(":").append(nulls).append(",");

Loading…
Cancel
Save