Skip to content

Y
yn-health-science
Commit 9b074700 authored by wangxl's avatar wangxl
Browse files
Options

1

parent d1878833
Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 147 deletions
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBudget.java
View file @ 9b074700
......@@ -37,8 +37,7 @@ public class ComProjectBudget extends BaseEntity {
/** 自筹经费(临床科技项目) */
@ApiModelProperty(value = "自筹经费", position = 5)
private BigDecimal selfFunds;
/** 计算依据 */
@ApiModelProperty(value = "计算依据", position = 6)
@Length(max=200, message = "计算依据不能大于200")
/** 计算依据/备注 */
@ApiModelProperty(value = "计算依据/备注", position = 6)
private String calculationBasis;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectTask.java
View file @ 9b074700
......@@ -21,7 +21,6 @@ import java.util.Date;
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "任务书表VO")
public class ComProjectTask extends BaseEntity {
/** 项目Id */
@ApiModelProperty(value = "项目Id", position = 1 )
@Length(max=36, message = "项目Id不能大于36")
......@@ -41,10 +40,10 @@ public class ComProjectTask extends BaseEntity {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date endDate;
/** 项目类型 */
@ApiModelProperty(value = "项目类型", position = 3 )
private Integer projType;
/** 注册单位类型 */
@ApiModelProperty(value = "注册单位类型", position = 1 )
@Length(max=50, message = "注册单位类型不能大于50")
private String unitType;
/** 组织机构代码/统一社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 )
@Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
......@@ -90,33 +89,12 @@ public class ComProjectTask extends BaseEntity {
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
/** 上年度研发经费支出总额(单位:万元) */
@ApiModelProperty(value = "上年度研发经费支出总额(单位:万元)", position = 1 )
private BigDecimal researchTotal;
/** 上年度是否填报了研发活动情况 0 否 1 是 */
@ApiModelProperty(value = "上年度是否填报了研发活动情况", position = 1 )
private Integer isResearchActive;
/** 上一年度填报的研发投入总数(单位:万元) */
@ApiModelProperty(value = "上一年度填报的研发投入总数(单位:万元)", position = 1 )
private BigDecimal researchCount;
/** 上一年度填报的研发人员数 */
@ApiModelProperty(value = "上一年度填报的研发人员数", position = 1 )
private Integer researchPersonCount;
/** 项目所属二级学院/部门名称(牵头单位) */
@ApiModelProperty(value = "项目所属二级学院/部门名称(牵头单位)", position = 1 )
@Length(max=100, message = "项目所属二级学院/部门名称(牵头单位)不能大于100")
private String leadUnit;
/** 推荐部门 */
@ApiModelProperty(value = "推荐部门", position = 1 )
@Length(max=100, message = "推荐部门不能大于100")
private String recommendUnit;
/** 项目依托的科技创新基地 */
@ApiModelProperty(value = "项目依托的科技创新基地", position = 1 )
@Length(max=100, message = "项目依托的科技创新基地不能大于100")
private String technologyInnovationBase;
/** 所属我省重点领域 */
@ApiModelProperty(value = "所属我省重点领域", position = 13 )
@Length(max=50, message = "所属我省重点领域不能大于50")
private String keyAreas;
/** 项目联系人姓名 */
@ApiModelProperty(value = "项目联系人姓名", position = 16)
@Length(max=100, message = "项目联系人姓名不能大于100")
......@@ -125,67 +103,15 @@ public class ComProjectTask extends BaseEntity {
@ApiModelProperty(value = "联系人手机", position = 16)
@Length(max=50, message = "联系人手机不能大于50")
private String linkMobile;
/** 电子邮箱 */
@ApiModelProperty(value = "电子邮箱", position = 16)
@Length(max=100, message = "电子邮箱不能大于100")
private String linkEmail;
/** 传真 */
@ApiModelProperty(value = "传真", position = 16)
@Length(max=100, message = "传真不能大于100")
private String linkFax;
/** 项目的意义、必要性 */
@ApiModelProperty(value = "主要研究内容和意义", position = 13 )
@Length(max=2147483647, message = "主要研究内容和意义不能大于2147483647")
private String projContent;
/** 项目现有工作基础和支撑条件 */
@ApiModelProperty(value = "项目现有工作基础和支撑条件", position = 35 )
@Length(max=2147483647, message = "项目现有工作基础和支撑条件不能大于2147483647")
private String memResume;
/** 与项目相关的国内外技术发展现状(包括知识产权情况)以及本项目主要研究开发内容技术关键(创新点)、可行性评价及项目风险分析与对策 */
@ApiModelProperty(value = "与项目相关的国内外技术发展现状(包括知识产权情况)以及本项目主要研究开发内容技术关键(创新点)、可行性评价及项目风险分析与对策", position = 30 )
@Length(max=2147483647, message = "不能大于2147483647")
private String researchProgress;
/** 项目实施目标 */
@ApiModelProperty(value = "项目实施目标", position = 28 )
@Length(max=2147483647, message = "项目实施目标不能大于2147483647")
private String researchContent;
/** 主要技术指标 */
@ApiModelProperty(value = "主要技术指标", position = 35 )
@Length(max=2147483647, message = "主要技术指标不能大于2147483647")
private String technologyTarget;
/** 主要经济指标 */
@ApiModelProperty(value = "主要经济指标", position = 35 )
@Length(max=2147483647, message = "主要经济指标不能大于2147483647")
private String economyTarget;
/** 项目实施中形成的示范基地、中试线、生产线及其规模等 */
@ApiModelProperty(value = "项目实施中形成的示范基地、中试线、生产线及其规模等", position = 35 )
@Length(max=2147483647, message = "项目实施中形成的示范基地、中试线、生产线及其规模等不能大于2147483647")
private String achievementTarget;
/** 其他应考核的指标 */
@ApiModelProperty(value = "其他应考核的指标", position = 35 )
@Length(max=2147483647, message = "其他应考核的指标不能大于2147483647")
private String otherTarget;
/** 立项依据 */
@ApiModelProperty(value = "立项依据", position = 27 )
@Length(max=2147483647, message = "立项依据不能大于2147483647")
private String projBasis;
/** 研究思路、方法、技术路线、实验方案及可行性分析 */
@ApiModelProperty(value = "研究思路、方法、技术路线、实验方案及可行性分析", position = 29 )
@Length(max=2147483647, message = "研究思路、方法、技术路线、实验方案及可行性分析不能大于2147483647")
private String researchPlan;
/** 创新点/项目的特色和创新之处 */
@ApiModelProperty(value = "创新点/项目的特色和创新之处", position = 31 )
@Length(max=2147483647, message = "创新点/项目的特色和创新之处不能大于2147483647")
private String mainFeatures;
/** 预期研究成果 */
@ApiModelProperty(value = "预期研究成果", position = 32 )
@Length(max=2147483647, message = "预期研究成果不能大于2147483647")
private String expectedResults;
/** 申请者正在承担的其它研究项目 */
@ApiModelProperty(value = "申请者正在承担的其它研究项目", position = 14 )
@Length(max=1000, message = "申请者正在承担的其它研究项目1000")
private String researchProjects;
/** 电子邮箱 */
@ApiModelProperty(value = "电子邮箱", position = 16)
@Length(max=100, message = "电子邮箱不能大于100")
private String linkEmail;
/** 是否科技报告 0 否 1 是 */
@ApiModelProperty(value = "是否科技报告", position = 1 )
private Integer isTechnologyReport;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/entity/SystemParameter.java
View file @ 9b074700
......@@ -21,41 +21,33 @@ import org.hibernate.validator.constraints.Length;
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "参数表VO")
public class SystemParameter extends BaseEntity {
/** id */
@ApiModelProperty(value = "id" )
@Length(max=36, message = "id不能大于36")
@TableId(value="id",type = IdType.UUID )
private String id;
/** 参数类型 */
@ApiModelProperty(value = "参数类型", position = 1 )
@ApiModelProperty(value = "参数类型", position = 1)
private Integer typeId;
/** 父Id */
@ApiModelProperty(value = "父Id", position = 2 )
@Length(max=36, message = "父Id不能大于36")
// @TableField(strategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "父Id", position = 2)
private String parentId;
/** 参数名称 */
@ApiModelProperty(value = "参数名称", position = 3 )
@Length(max=200, message = "参数名称不能大于200")
@ApiModelProperty(value = "参数名称", position = 3)
private String name;
/** 编码 */
@ApiModelProperty(value = "编码", position = 4)
private String code;
/** 标准编码 */
@ApiModelProperty(value = "标准编码", position = 4 )
@Length(max=50, message = "标准编码不能大于50")
@ApiModelProperty(value = "标准编码", position = 4)
private String gbCode;
/** 树编码 */
@ApiModelProperty(value = "树编码", position = 5 )
@Length(max=50, message = "树编码不能大于50")
@ApiModelProperty(value = "树编码", position = 5)
private String treeCode;
/** 系统编码 */
@ApiModelProperty(value = "系统编码", position = 8)
private String systemCode;
/** 显示顺序 */
@ApiModelProperty(value = "显示顺序", position = 6 )
@ApiModelProperty(value = "显示顺序", position = 6)
private Integer displayOrder;
/** 状态 */
@ApiModelProperty(value = "状态", position = 7 )
@ApiModelProperty(value = "状态", position = 7)
private Integer noteState;
/** 系统编码 */
@ApiModelProperty(value = "系统编码", position = 8)
@Length(max=50, message = "系统编码不能大于50")
private String systemCode;
/** 是否为必填项 */
@ApiModelProperty(value = "是否为必填项", position = 8)
private Boolean isRequired;
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBudgetDTO.java
View file @ 9b074700
......@@ -35,20 +35,28 @@ public class ComProjectBudgetDTO extends BaseDTO {
/** 自筹经费(临床科技项目) */
@ApiModelProperty(value = "自筹经费", position = 5)
private BigDecimal selfFunds;
/** 计算依据 */
@ApiModelProperty(value = "计算依据", position = 6)
/** 计算依据/备注 */
@ApiModelProperty(value = "计算依据/备注", position = 6)
private String calculationBasis;
/** 经费类别 */
@ApiModelProperty(value = "经费类别", position = 1)
private String budgetName;
/** 数据总和来源 */
@ApiModelProperty(value = "禁用 启用", position = 1)
private String level;
@ApiModelProperty(value = "数据总和来源", position = 1)
private Integer[] source;
/** 禁用启用 */
@ApiModelProperty(value = "禁用 启用", position = 1)
private String disabled;
/** 控件类型 */
private String code;
@ApiModelProperty(value = "控件类型", position = 1)
private String type;
/** 系统编码 */
@ApiModelProperty(value = "系统编码", position = 8)
private String systemCode;
/** 禁用启用 */
@ApiModelProperty(value = "禁用 启用", position = 1)
private String disabled;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectTaskDTO.java
View file @ 9b074700
......@@ -41,6 +41,81 @@ public class ComProjectTaskDTO extends BaseDTO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date endDate;
/** 注册单位类型 */
@ApiModelProperty(value = "注册单位类型", position = 1 )
@Length(max=50, message = "注册单位类型不能大于50")
private String unitType;
/** 组织机构代码/统一社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 )
@Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
private String organizationCode;
/** 通讯地址 */
@ApiModelProperty(value = "通讯地址", position = 1)
@Length(max=200, message = "通讯地址不能大于200")
private String unitAddress;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
private String registeredAddress;
/** 邮编 */
@ApiModelProperty(value = "邮编", position = 1 )
@Length(max=10, message = "邮编不能大于10")
private String postCode;
/** 法定代表人 */
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1 )
private Integer workforce;
/** 其中专科以上人员 */
@ApiModelProperty(value = "其中专科以上人员", position = 1 )
private Integer specializedPersonnel;
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
private String depositBank;
/** 银行账号 */
@ApiModelProperty(value = "银行账号", position = 1 )
@Length(max=50, message = "银行账号不能大于50")
private String bankAccount;
/** 开户银行地址 */
@ApiModelProperty(value = "开户银行地址", position = 1 )
@Length(max=100, message = "开户银行地址不能大于100")
private String depositBankAddress;
/** 银行联行号 */
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
/** 所属我省重点领域 */
@ApiModelProperty(value = "所属我省重点领域", position = 13 )
@Length(max=50, message = "所属我省重点领域不能大于50")
private String keyAreas;
/** 项目联系人姓名 */
@ApiModelProperty(value = "项目联系人姓名", position = 16)
@Length(max=100, message = "项目联系人姓名不能大于100")
private String linkName;
/** 联系人手机 */
@ApiModelProperty(value = "联系人手机", position = 16)
@Length(max=50, message = "联系人手机不能大于50")
private String linkMobile;
/** 传真 */
@ApiModelProperty(value = "传真", position = 16)
@Length(max=100, message = "传真不能大于100")
private String linkFax;
/** 电子邮箱 */
@ApiModelProperty(value = "电子邮箱", position = 16)
@Length(max=100, message = "电子邮箱不能大于100")
private String linkEmail;
/** 是否科技报告 0 否 1 是 */
@ApiModelProperty(value = "是否科技报告", position = 1 )
private Integer isTechnologyReport;
/** 合同书状态 0 未 填,-10 起 草, 10 待提交,20 审核中,30 返回修改，40 审核不通过， 50 审核通过*/
private String taskStateName;
......
science-admin/src/main/java/com/yiboshi/science/param/dto/SystemParameterDTO.java
View file @ 9b074700
......@@ -28,21 +28,27 @@ public class SystemParameterDTO extends BaseDTO {
/** 参数名称 */
@ApiModelProperty(value = "参数名称", position = 3)
private String name;
/** 编码 */
@ApiModelProperty(value = "编码", position = 4)
private String code;
/** 标准编码 */
@ApiModelProperty(value = "标准编码", position = 4)
private String gbCode;
/** 树编码 */
@ApiModelProperty(value = "树编码", position = 5)
private String treeCode;
/** 系统编码 */
@ApiModelProperty(value = "系统编码", position = 8)
private String systemCode;
/** 显示顺序 */
@ApiModelProperty(value = "显示顺序", position = 6)
private Integer displayOrder;
/** 状态 */
@ApiModelProperty(value = "状态", position = 7)
private Integer noteState;
/** 系统编码 */
@ApiModelProperty(value = "系统编码", position = 8)
private String systemCode;
/** 是否为必填项 */
@ApiModelProperty(value = "是否为必填项", position = 8)
private Boolean isRequired;
/** 参数类型名称 */
@ApiModelProperty(value = "参数类型名称", position = 10)
......@@ -50,7 +56,5 @@ public class SystemParameterDTO extends BaseDTO {
/** 父名称 */
@ApiModelProperty(value = "父名称", position = 2)
private String parentName;
/** 是否为必填项 */
@ApiModelProperty(value = "是否为必填项", position = 8)
private Boolean isRequired;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBudgetQueryVO.java
View file @ 9b074700
......@@ -38,8 +38,7 @@ public class ComProjectBudgetQueryVO extends PaginationVO{
/** 自筹经费(临床科技项目) */
@ApiModelProperty(value = "自筹经费", position = 5)
private BigDecimal selfFunds;
/** 计算依据 */
@ApiModelProperty(value = "计算依据", position = 6 )
@Length(max=200, message = "计算依据不能大于200")
/** 计算依据/备注 */
@ApiModelProperty(value = "计算依据/备注", position = 6)
private String calculationBasis;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectTaskQueryVO.java
View file @ 9b074700
......@@ -40,6 +40,81 @@ public class ComProjectTaskQueryVO extends PaginationVO{
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date endDate;
/** 注册单位类型 */
@ApiModelProperty(value = "注册单位类型", position = 1 )
@Length(max=50, message = "注册单位类型不能大于50")
private String unitType;
/** 组织机构代码/统一社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 )
@Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
private String organizationCode;
/** 通讯地址 */
@ApiModelProperty(value = "通讯地址", position = 1)
@Length(max=200, message = "通讯地址不能大于200")
private String unitAddress;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
private String registeredAddress;
/** 邮编 */
@ApiModelProperty(value = "邮编", position = 1 )
@Length(max=10, message = "邮编不能大于10")
private String postCode;
/** 法定代表人 */
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1 )
private Integer workforce;
/** 其中专科以上人员 */
@ApiModelProperty(value = "其中专科以上人员", position = 1 )
private Integer specializedPersonnel;
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
private String depositBank;
/** 银行账号 */
@ApiModelProperty(value = "银行账号", position = 1 )
@Length(max=50, message = "银行账号不能大于50")
private String bankAccount;
/** 开户银行地址 */
@ApiModelProperty(value = "开户银行地址", position = 1 )
@Length(max=100, message = "开户银行地址不能大于100")
private String depositBankAddress;
/** 银行联行号 */
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
/** 所属我省重点领域 */
@ApiModelProperty(value = "所属我省重点领域", position = 13 )
@Length(max=50, message = "所属我省重点领域不能大于50")
private String keyAreas;
/** 项目联系人姓名 */
@ApiModelProperty(value = "项目联系人姓名", position = 16)
@Length(max=100, message = "项目联系人姓名不能大于100")
private String linkName;
/** 联系人手机 */
@ApiModelProperty(value = "联系人手机", position = 16)
@Length(max=50, message = "联系人手机不能大于50")
private String linkMobile;
/** 传真 */
@ApiModelProperty(value = "传真", position = 16)
@Length(max=100, message = "传真不能大于100")
private String linkFax;
/** 电子邮箱 */
@ApiModelProperty(value = "电子邮箱", position = 16)
@Length(max=100, message = "电子邮箱不能大于100")
private String linkEmail;
/** 是否科技报告 0 否 1 是 */
@ApiModelProperty(value = "是否科技报告", position = 1 )
private Integer isTechnologyReport;
/** 项目名称 */
@ApiModelProperty(value = "项目名称", position = 1 )
private String projName;
......
science-admin/src/main/java/com/yiboshi/science/param/query/SystemParameterQueryVO.java
View file @ 9b074700
......@@ -28,21 +28,24 @@ public class SystemParameterQueryVO extends PaginationVO{
/** 参数名称 */
@ApiModelProperty(value = "参数名称", position = 3)
private String name;
/** 编码 */
@ApiModelProperty(value = "编码", position = 4)
private String code;
/** 标准编码 */
@ApiModelProperty(value = "标准编码", position = 4)
private String gbCode;
/** 树编码 */
@ApiModelProperty(value = "树编码", position = 5)
private String treeCode;
/** 系统编码 */
@ApiModelProperty(value = "系统编码", position = 8)
private String systemCode;
/** 显示顺序 */
@ApiModelProperty(value = "显示顺序", position = 6)
private Integer displayOrder;
/** 状态 */
@ApiModelProperty(value = "状态", position = 7)
private Integer noteState;
/** 系统编码 */
@ApiModelProperty(value = "系统编码", position = 8)
private String systemCode;
/** 是否为必填项 */
@ApiModelProperty(value = "是否为必填项", position = 8)
private Boolean isRequired;
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectBudgetService.java
View file @ 9b074700
......@@ -17,7 +17,7 @@ public interface ComProjectBudgetService extends BaseService<ComProjectBudgetQue
*
* @return
*/
List<ComProjectBudgetDTO> getList(Integer projType);
List<ComProjectBudgetDTO> getList();
// /**
// * 初始化控件值
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectBudgetServiceImpl.java
View file @ 9b074700
......@@ -9,11 +9,14 @@ import com.yiboshi.science.entity.SystemParameter;
import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
import com.yiboshi.science.param.query.ComProjectBudgetQueryVO;
import com.yiboshi.science.service.ComProjectBudgetService;
import com.yiboshi.science.service.LogsExceptionService;
import com.yiboshi.science.service.SystemParameterService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.method.HandlerMethod;
import java.lang.reflect.Array;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
......@@ -28,11 +31,15 @@ import java.util.Objects;
@Service
public class ComProjectBudgetServiceImpl extends BaseServiceImpl<ComProjectBudgetDAO, ComProjectBudgetQueryVO, ComProjectBudgetDTO, ComProjectBudget> implements ComProjectBudgetService {
@Autowired
private ComProjectBudgetDAO comProjectBudgetDAO;
@Autowired
private SystemParameterService systemParameterService;
@Autowired
private ComProjectBudgetDAO comProjectBudgetDAO;
private LogsExceptionService logsExceptionService;
@Override
protected void setCriteriaForQuery(ComProjectBudgetQueryVO vo, QueryWrapper<ComProjectBudgetQueryVO> criteria) {
......@@ -48,7 +55,7 @@ public class ComProjectBudgetServiceImpl extends BaseServiceImpl<ComProjectBudge
}
@Override
public List<ComProjectBudgetDTO> getList(Integer projType) {
public List<ComProjectBudgetDTO> getList() {
List<ComProjectBudgetDTO> budgetList = new ArrayList<>();
List<SystemParameter> list = systemParameterService.getListByType(54);
list.forEach((e) -> {
......@@ -57,8 +64,22 @@ public class ComProjectBudgetServiceImpl extends BaseServiceImpl<ComProjectBudge
newVO.setTotalBudget(new BigDecimal(0.00));
newVO.setApplyFunds(new BigDecimal(0.00));
newVO.setSelfFunds(new BigDecimal(0.00));
newVO.setCalculationBasis("");
newVO.setBudgetName(e.getName());
newVO.setLevel(e.getTreeCode());
if (Objects.nonNull(e.getSystemCode())) {
try {
String[] arr = e.getSystemCode().split(",");
Integer[] li = new Integer[arr.length];
for (int i = 0; i < arr.length; i++) {
li[i] = Integer.valueOf(arr[i]);
}
newVO.setSource(li);
} catch (Exception ex) {
logsExceptionService.logs(null, ex, "获取参数异常！");
}
}
newVO.setCode(e.getCode());
newVO.setType(e.getGbCode());
budgetList.add(newVO);
});
......@@ -66,7 +87,26 @@ public class ComProjectBudgetServiceImpl extends BaseServiceImpl<ComProjectBudge
}
public List<ComProjectBudgetDTO> getListByObjectId(String objectId) {
return comProjectBudgetDAO.getListByObjectId(objectId);
List<ComProjectBudgetDTO> budgetList = comProjectBudgetDAO.getListByObjectId(objectId);
if (null == budgetList || budgetList.size() == 0)
budgetList = this.getList();
else {
budgetList.forEach((e) -> {
if (Objects.nonNull(e.getSystemCode())) {
try {
String[] arr = e.getSystemCode().split(",");
Integer[] li = new Integer[arr.length];
for (int i = 0; i < arr.length; i++) {
li[i] = Integer.valueOf(arr[i]);
}
e.setSource(li);
} catch (Exception ex) {
logsExceptionService.logs(null, ex, "获取参数异常！");
}
}
});
}
return budgetList;
}
@Transactional
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
View file @ 9b074700
......@@ -193,14 +193,12 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
if (Objects.nonNull(vo.getExpectedResults())) {
criteria.eq("expected_results", vo.getExpectedResults());
}
if (Objects.nonNull(vo.getMemResume())) {
criteria.eq("mem_resume", vo.getMemResume());
}
if (Objects.nonNull(vo.getProjDoc())) {
criteria.eq("proj_doc", vo.getProjDoc());
}
if (Objects.nonNull(vo.getRemark())) {
criteria.eq("remark", vo.getRemark());
}
......@@ -246,7 +244,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
if (Objects.isNull(projType)) {
projType = CommonEnum.projType.num.getCode();
}
dto.setProjType(projType);
//申报单位
ComUnitDTO comUnitDTO = comUnitService.getUnitById(SecurityUserHolder.getUnitId());
......@@ -284,8 +281,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
}
//经费表
List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getList(projType);
List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getList();
dto.setBudget(budgetList);
//年度用款计划表
List<ComProjectFundPlanDTO> fundPlanList = comProjectFundPlanService.getList();
dto.setFundPlan(fundPlanList);
......@@ -399,8 +397,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
//经费表
List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getListByObjectId(dto.getId());
if (null == budgetList || budgetList.size() == 0)
budgetList = comProjectBudgetService.getList(dto.getProjType());
dto.setBudget(budgetList);
// 年度用款计划
......
science-admin/src/main/java/com/yiboshi/science/service/impl/LogsExceptionServiceImpl.java
View file @ 9b074700
......@@ -12,6 +12,7 @@ import com.yiboshi.science.param.dto.LogsExceptionDTO;
import com.yiboshi.science.param.query.LogsExceptionQueryVO;
import com.yiboshi.science.service.LogsExceptionService;
import com.yiboshi.science.utils.CustomerIPAddress;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.core.Authentication;
......@@ -20,6 +21,7 @@ import org.springframework.stereotype.Service;
import org.springframework.web.method.HandlerMethod;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.ParameterizedType;
import java.util.*;
/**
......@@ -82,8 +84,8 @@ public class LogsExceptionServiceImpl extends BaseServiceImpl<LogsExceptionDAO,
}
try {
//获取方法返回类型中，CommonResVo中的泛型对象
//String typeName = ((ParameterizedType) handlerMethod.getMethod().getGenericReturnType()).getActualTypeArguments()[0].getTypeName();
//Var data = Class.forName(typeName).newInstance();
// String typeName = ((ParameterizedType) handlerMethod.getMethod().getGenericReturnType()).getActualTypeArguments()[0].getTypeName();
// Var data = Class.forName(typeName).newInstance();
Enumeration names = request.getParameterNames();
Map<String, String> map = new HashMap<>();
while (names.hasMoreElements()) {
......
science-admin/src/main/resources/mapper/ComProjectBudgetDAO.xml
View file @ 9b074700
......@@ -8,8 +8,7 @@
t.updated as updated
</sql>
<select id="getListByObjectId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectBudgetDTO">
SELECT
a.*,b.name as budgetName
SELECT a.*,b.name as budgetName,b.code,b.gb_code type,b.tree_code level,b.system_code
FROM com_project_budget a
left join system_parameter b on a.budget_id=b.id and b.type_id in (54, 12)
where object_id=#{objectId} order by b.display_order asc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment