Skip to content

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

1

parent fdac8148
Show whitespace changes
Inline Side-by-side
Showing with 300 additions and 1372 deletions
science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationContentDAO.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluationContent;
import com.yiboshi.science.param.dto.ComEvaluationContentDTO;
import com.yiboshi.science.param.query.ComEvaluationContentQueryVO;
public interface ComEvaluationContentDAO extends BaseMapper<ComEvaluationContent>, BaseDAO<ComEvaluationContentQueryVO, ComEvaluationContentDTO,ComEvaluationContent> {
}
science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationDAO.java
View file @ 08555645
......@@ -8,6 +8,5 @@ import com.yiboshi.science.param.query.ComEvaluationQueryVO;
public interface ComEvaluationDAO extends BaseMapper<ComEvaluation>, BaseDAO<ComEvaluationQueryVO, ComEvaluationDTO,ComEvaluation> {
ComEvaluationDTO getEvaluationById(String id);
ComEvaluationDTO getEvaluation();
}
science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationItemDAO.java
View file @ 08555645
......@@ -6,7 +6,9 @@ import com.yiboshi.science.entity.ComEvaluationItem;
import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
import com.yiboshi.science.param.query.ComEvaluationItemQueryVO;
import java.util.List;
public interface ComEvaluationItemDAO extends BaseMapper<ComEvaluationItem>, BaseDAO<ComEvaluationItemQueryVO, ComEvaluationItemDTO,ComEvaluationItem> {
public interface ComEvaluationItemDAO extends BaseMapper<ComEvaluationItem>, BaseDAO<ComEvaluationItemQueryVO, ComEvaluationItemDTO,ComEvaluationItem> {
List<ComEvaluationItemDTO> getListByEvaluationId(String evaluationId);
}
science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationItemNoteDAO.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluationItemNote;
import com.yiboshi.science.param.dto.ComEvaluationItemNoteDTO;
import com.yiboshi.science.param.query.ComEvaluationItemNoteQueryVO;
public interface ComEvaluationItemNoteDAO extends BaseMapper<ComEvaluationItemNote>, BaseDAO<ComEvaluationItemNoteQueryVO, ComEvaluationItemNoteDTO,ComEvaluationItemNote> {
}
science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationNoteDAO.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluationNote;
import com.yiboshi.science.param.dto.ComEvaluationNoteDTO;
import com.yiboshi.science.param.query.ComEvaluationNoteQueryVO;
public interface ComEvaluationNoteDAO extends BaseMapper<ComEvaluationNote>, BaseDAO<ComEvaluationNoteQueryVO, ComEvaluationNoteDTO,ComEvaluationNote> {
}
science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationStandardDAO.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluationStandard;
import com.yiboshi.science.param.dto.ComEvaluationStandardDTO;
import com.yiboshi.science.param.query.ComEvaluationStandardQueryVO;
public interface ComEvaluationStandardDAO extends BaseMapper<ComEvaluationStandard>, BaseDAO<ComEvaluationStandardQueryVO, ComEvaluationStandardDTO, ComEvaluationStandard> {
}
science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationValueDAO.java
View file @ 08555645
......@@ -3,10 +3,13 @@ package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluationValue;
import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
import java.util.List;
public interface ComEvaluationValueDAO extends BaseMapper<ComEvaluationValue>, BaseDAO<ComEvaluationValueQueryVO, ComEvaluationValueDTO,ComEvaluationValue> {
public interface ComEvaluationValueDAO extends BaseMapper<ComEvaluationValue>, BaseDAO<ComEvaluationValueQueryVO, ComEvaluationValueDTO,ComEvaluationValue> {
List<ComEvaluationValueDTO> getListByAssignId(String assignId);
}
science-admin/src/main/java/com/yiboshi/science/entity/ComEvaluationContent.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.entity;
import com.yiboshi.science.base.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "评审内容表")
public class ComEvaluationContent extends BaseEntity {
/** 评审表Id */
@ApiModelProperty(value = "评审表Id", position = 1)
@Length(max=36, message = "评审表Id不能大于36")
private String evaluationId;
/** 标题 */
@ApiModelProperty(value = "标题", position = 2)
@Length(max=200, message = "标题不能大于200")
private String name;
/** 总分 */
@ApiModelProperty(value = "总分", position = 3)
private BigDecimal score;
/** 排序 */
@ApiModelProperty(value = "排序", position = 4)
private Integer showIndex;
/** 是否有子项 */
@ApiModelProperty(value = "是否有子项", position = 5)
private Boolean hasSubitem;
/** 值类型：1单选、2多选、3打分 */
@ApiModelProperty(value = "值类型：1单选、2多选、3打分", position = 6)
private Integer valueType;
/** 备注 */
@ApiModelProperty(value = "备注", position = 7)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/entity/ComEvaluationItem.java
View file @ 08555645
......@@ -13,17 +13,21 @@ import java.math.BigDecimal;
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "评审项目表")
public class ComEvaluationItem extends BaseEntity {
/** 评审内容Id */
@ApiModelProperty(value = "评审内容Id", position = 1)
@Length(max=36, message = "评审内容Id不能大于36")
private String contentId;
/** 标题 */
@ApiModelProperty(value = "标题", position = 2)
@Length(max=200, message = "标题不能大于200")
private String name;
/** 总分 */
@ApiModelProperty(value = "总分", position = 3)
private BigDecimal score;
/** 评审表Id */
@ApiModelProperty(value = "评审表Id", position = 1)
@Length(max=36, message = "评审表Id")
private String evaluationId;
/** 父Id */
@ApiModelProperty(value = "父Id", position = 2)
private String parentId;
/** 内容 */
@ApiModelProperty(value = "内容", position = 2)
@Length(max=200, message = "内容不能大于200")
private String content;
/** 单项得分 */
@ApiModelProperty(value = "单项得分", position = 2)
@Length(max=200, message = "单项得分不能大于200")
private String scoreDetail;
/** 排序 */
@ApiModelProperty(value = "排序", position = 4)
private Integer showIndex;
......
science-admin/src/main/java/com/yiboshi/science/entity/ComEvaluationItemNote.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.entity;
import com.yiboshi.science.base.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "评审记录明细表")
public class ComEvaluationItemNote extends BaseEntity {
/** 评审记录Id */
@ApiModelProperty(value = "评审记录Id", position = 1)
@Length(max=36, message = "评审记录Id不能大于36")
private String evaluationNoteId;
/** 评审内容Id */
@ApiModelProperty(value = "评审内容Id", position = 1)
@Length(max=36, message = "评审内容Id不能大于36")
private String contentId;
/** 评审项目Id */
@ApiModelProperty(value = "评审项目Id", position = 1)
@Length(max=36, message = "评审项目Id不能大于36")
private String itemId;
/** 得分 */
@ApiModelProperty(value = "得分", position = 4)
private BigDecimal score;
/** 备注 */
@ApiModelProperty(value = "备注", position = 1)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/entity/ComEvaluationNote.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.entity;
import com.yiboshi.science.base.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "评审记录表")
public class ComEvaluationNote extends BaseEntity {
/** 评审表Id */
@ApiModelProperty(value = "评审表Id", position = 1)
@Length(max=36, message = "评审表Id不能大于36")
private String evaluationId;
/** 创建人Id */
@ApiModelProperty(value = "创建人Id", position = 1)
@Length(max=36, message = "创建人Id不能大于36")
private String createId;
/** 评审对象Id */
@ApiModelProperty(value = "评审对象Id", position = 1)
@Length(max=36, message = "评审对象Id不能大于36")
private String objectId;
/** 得分 */
@ApiModelProperty(value = "得分", position = 4)
private BigDecimal score;
/** 备注 */
@ApiModelProperty(value = "备注", position = 1)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/entity/ComEvaluationStandard.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.entity;
import com.yiboshi.science.base.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "评审标准表")
public class ComEvaluationStandard extends BaseEntity {
/** 标题 */
@ApiModelProperty(value = "评审表名称", position = 1)
@Length(max=200, message = "评审表名称不能大于200")
private String name;
/** 年度批次Id */
@ApiModelProperty(value = "年度批次Id", position = 2)
@Length(max=36, message = "年度批次Id不能大于36")
private String batchId;
/** 专家组Id */
@ApiModelProperty(value = "专家组Id", position = 6)
@Length(max=36, message = "专家组Id不能大于36")
private String groupId;
/** 备注 */
@ApiModelProperty(value = "备注", position = 3)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/entity/ComEvaluationValue.java
View file @ 08555645
......@@ -13,22 +13,22 @@ import java.math.BigDecimal;
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "评审分值表")
public class ComEvaluationValue extends BaseEntity {
/** 专家分配表Id */
@ApiModelProperty(value = "专家分配表Id", position = 1)
@Length(max=36, message = "专家分配表Id不能大于36")
private String assignId;
/** 值对象Id */
@ApiModelProperty(value = "值对象Id", position = 1)
@Length(max=36, message = "值对象Id不能大于36")
private String objectId;
/** 标题 */
@ApiModelProperty(value = "标题", position = 1)
@Length(max=200, message = "标题不能大于200")
private String name;
private String itemId;
/** 明细 */
@ApiModelProperty(value = "明细", position = 2)
@Length(max=200, message = "明细不能大于200")
private String detail;
/** 数量 */
@ApiModelProperty(value = "数量", position = 2)
private Integer count;
/** 总分 */
@ApiModelProperty(value = "总分", position = 4)
@ApiModelProperty(value = "总分", position = 3)
private BigDecimal score;
/** 排序 */
@ApiModelProperty(value = "排序", position = 6 )
private Integer showIndex;
/** 备注 */
@ApiModelProperty(value = "备注", position = 1)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/entity/ComTalentAssign.java
View file @ 08555645
......@@ -8,6 +8,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
/**
* 人才专家分配明细表
*/
......@@ -31,12 +33,17 @@ public class ComTalentAssign extends BaseEntity {
@ApiModelProperty(value = "分配年度", position = 3)
private Integer assignYear;
/** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 保存 2 已提交）", position = 11)
private Integer auditState;
/** 总分 */
@ApiModelProperty(value = "总分", position = 9)
private BigDecimal totalScore;
/** 备注 */
@ApiModelProperty(value = "备注", position =10)
@Length(max=65535, message = "备注不能大于65535")
private String remark;
/** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 保存 2 已提交）", position = 11)
private Integer auditState;
}
science-admin/src/main/java/com/yiboshi/science/param/dto/ComEvaluationContentDTO.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.param.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.BaseDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "评审表DTO")
public class ComEvaluationContentDTO extends BaseDTO {
/** 评审表Id */
@ApiModelProperty(value = "评审表Id", position = 2)
private String evaluationId;
/** 标题 */
@ApiModelProperty(value = "标题", position = 3)
@Length(max=200, message = "标题长度不能大于200")
private String name;
/** 总分 */
@ApiModelProperty(value = "总分", position = 4)
private BigDecimal score;
/** 排序 */
@ApiModelProperty(value = "排序", position = 5)
private Integer showIndex;
/** 是否有子项 */
@ApiModelProperty(value = "是否有子项", position = 6)
private Boolean hasSubitem;
/** 值类型：1单选、2多选、3打分 */
@ApiModelProperty(value = "值类型：1单选、2多选、3打分", position = 7)
private Integer valueType;
/** 备注 */
@ApiModelProperty(value = "备注", position = 8)
@Length(max=200, message = "备注长度不能大于200")
private String remark;
/** 内容子项列表 */
@ApiModelProperty(value = "内容子项列表", position = 9)
private List<ComEvaluationItemDTO> ContentItems;
/** 值列表 */
@ApiModelProperty(value = "值列表", position = 10)
private List<ComEvaluationValueDTO> ContentValues;
}
science-admin/src/main/java/com/yiboshi/science/param/dto/ComEvaluationItemDTO.java
View file @ 08555645
......@@ -16,28 +16,47 @@ import java.util.List;
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "评审项目表DTO")
public class ComEvaluationItemDTO extends BaseDTO {
/** 评审内容Id */
@ApiModelProperty(value = "评审内容Id", position = 2)
@Length(max=36, message = "评审内容Id不能大于36")
private String contentId;
/** 标题 */
@ApiModelProperty(value = "标题", position = 3)
@Length(max=200, message = "标题不能大于200")
private String name;
/** 总分 */
@ApiModelProperty(value = "总分", position = 4)
private BigDecimal score;
/** 评审表Id */
@ApiModelProperty(value = "评审表Id", position = 1)
@Length(max=36, message = "评审表Id")
private String evaluationId;
/** 父Id */
@ApiModelProperty(value = "父Id", position = 2)
private String parentId;
/** 内容 */
@ApiModelProperty(value = "内容", position = 2)
@Length(max=200, message = "内容不能大于200")
private String content;
/** 单项得分 */
@ApiModelProperty(value = "单项得分", position = 2)
@Length(max=200, message = "单项得分不能大于200")
private String scoreDetail;
/** 排序 */
@ApiModelProperty(value = "排序", position = 5)
@ApiModelProperty(value = "排序", position = 4)
private Integer showIndex;
/** 值类型：1单选、2多选、3打分 */
@ApiModelProperty(value = "值类型：1单选、2多选、3打分", position = 6)
@ApiModelProperty(value = "值类型：1单选、2多选、3打分", position = 5)
private Integer valueType;
/** 最大分值 */
private Integer maxScore;
/** 备注 */
@ApiModelProperty(value = "备注", position = 7)
@ApiModelProperty(value = "备注", position = 6)
@Length(max=200, message = "备注不能大于200")
private String remark;
@ApiModelProperty(value = "值列表", position = 8)
private List<ComEvaluationValueDTO> ItemValues;
/** 父Id */
@ApiModelProperty(value = "父Id", position = 2)
private String ppId;
/** 内容 */
@ApiModelProperty(value = "内容", position = 2)
@Length(max=200, message = "内容不能大于200")
private String content1;
/** 父Id */
@ApiModelProperty(value = "父Id", position = 2)
private String pId;
/** 内容 */
@ApiModelProperty(value = "内容", position = 2)
@Length(max=200, message = "内容不能大于200")
private String content2;
}
science-admin/src/main/java/com/yiboshi/science/param/dto/ComEvaluationItemNoteDTO.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.param.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.BaseDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "评审记录明细表DTO")
public class ComEvaluationItemNoteDTO extends BaseDTO {
/** 评审记录Id */
@ApiModelProperty(value = "评审记录Id", position = 2)
@Length(max=36, message = "评审记录Id不能大于36")
private String evaluationNoteId;
/** 评审内容Id */
@ApiModelProperty(value = "评审内容Id", position = 3)
@Length(max=36, message = "评审内容Id不能大于36")
private String contentId;
/** 评审项目Id */
@ApiModelProperty(value = "评审项目Id", position = 4)
@Length(max=36, message = "评审项目Id不能大于36")
private String itemId;
/** 得分 */
@ApiModelProperty(value = "得分", position = 5)
private BigDecimal score;
/** 备注 */
@ApiModelProperty(value = "备注", position = 6)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/param/dto/ComEvaluationNoteDTO.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.param.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.BaseDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "评审记录表DTO")
public class ComEvaluationNoteDTO extends BaseDTO {
/** 评审表Id */
@ApiModelProperty(value = "评审表Id", position = 2)
@Length(max=36, message = "评审表Id不能大于36")
private String evaluationId;
/** 创建人Id */
@ApiModelProperty(value = "创建人Id", position = 3)
@Length(max=36, message = "创建人Id不能大于36")
private String createId;
/** 评审对象Id */
@ApiModelProperty(value = "评审对象Id", position = 4)
@Length(max=36, message = "评审对象Id不能大于36")
private String objectId;
/** 得分 */
@ApiModelProperty(value = "得分", position = 5)
private BigDecimal score;
/** 备注 */
@ApiModelProperty(value = "备注", position = 6)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/param/dto/ComEvaluationStandardDTO.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.param.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.BaseDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "评审标准表")
public class ComEvaluationStandardDTO extends BaseDTO {
/** 标题 */
@ApiModelProperty(value = "评审表名称", position = 2)
@Length(max=200, message = "评审表名称不能大于200")
private String name;
/** 年度批次名称 */
@ApiModelProperty(value = "年度批次名称", position = 3)
private String batchName;
/** 年度批次Id */
@ApiModelProperty(value = "年度批次Id", position = 4)
@Length(max=36, message = "年度批次Id不能大于36")
private String batchId;
/** 专家组名称 */
@ApiModelProperty(value = "专家组名称", position = 5)
@Length(max=200, message = "专家组名称不能大于200")
private String groupName;
/** 专家组Id */
@ApiModelProperty(value = "专家组Id", position = 6)
@Length(max=36, message = "专家组Id不能大于36")
private String groupId;
/** 备注 */
@ApiModelProperty(value = "备注", position = 7)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/param/dto/ComEvaluationValueDTO.java
View file @ 08555645
......@@ -10,30 +10,71 @@ import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "评审分值表DTO")
public class ComEvaluationValueDTO extends BaseDTO {
/** 专家分配表Id */
@ApiModelProperty(value = "专家分配表Id", position = 1)
@Length(max=36, message = "专家分配表Id不能大于36")
private String assignId;
/** 值对象Id */
@ApiModelProperty(value = "值对象Id", position = 2)
@ApiModelProperty(value = "值对象Id", position = 1)
@Length(max=36, message = "值对象Id不能大于36")
private String objectId;
/** 标题 */
@ApiModelProperty(value = "标题", position = 3)
@Length(max=200, message = "标题不能大于200")
private String name;
private String itemId;
/** 明细 */
@ApiModelProperty(value = "明细", position = 2)
@Length(max=200, message = "明细不能大于200")
private String detail;
/** 数量 */
@ApiModelProperty(value = "数量", position = 2)
private Integer count;
/** 总分 */
@ApiModelProperty(value = "总分", position = 4)
@ApiModelProperty(value = "总分", position = 3)
private BigDecimal score;
/** 内容 */
@ApiModelProperty(value = "内容", position = 2)
@Length(max=200, message = "内容不能大于200")
private String content;
/** 单项得分 */
@ApiModelProperty(value = "单项得分", position = 2)
@Length(max=200, message = "单项得分不能大于200")
private String scoreDetail;
/** 排序 */
@ApiModelProperty(value = "排序", position = 5)
@ApiModelProperty(value = "排序", position = 4)
private Integer showIndex;
/** 值类型：1单选、2多选、3打分 */
@ApiModelProperty(value = "值类型：1单选、2多选、3打分", position = 5)
private Integer valueType;
/** 最大分值 */
private Integer maxScore;
/** 备注 */
@ApiModelProperty(value = "备注", position = 6)
@Length(max=200, message = "备注不能大于200")
private String remark;
@ApiModelProperty(value = "已经存在数据库", position = 9)
private Integer hasAdd;
/** 父Id */
@ApiModelProperty(value = "父Id", position = 2)
private String ppId;
/** 内容 */
@ApiModelProperty(value = "内容", position = 2)
@Length(max=200, message = "内容不能大于200")
private String content1;
/** 父Id */
@ApiModelProperty(value = "父Id", position = 2)
private String pId;
/** 内容 */
@ApiModelProperty(value = "内容", position = 2)
@Length(max=200, message = "内容不能大于200")
private String content2;
/** 合并单元格字段 */
private Integer row1;
/** 合并单元格字段 */
private Integer row2;
}
science-admin/src/main/java/com/yiboshi/science/param/dto/ComTalentAssignDTO.java
View file @ 08555645
......@@ -30,6 +30,14 @@ public class ComTalentAssignDTO extends BaseDTO {
@ApiModelProperty(value = "分配年度", position = 3)
private Integer assignYear;
/** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 保存 2 已提交）", position = 11)
private Integer auditState;
/** 总分 */
@ApiModelProperty(value = "总分", position = 9)
private BigDecimal totalScore;
/** 备注 */
@ApiModelProperty(value = "备注", position =10)
@Length(max=65535, message = "备注不能大于65535")
......@@ -47,13 +55,7 @@ public class ComTalentAssignDTO extends BaseDTO {
@ApiModelProperty(value = "电话号码", position = 10)
private String mobile;
/** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 保存 2 已提交）", position = 11)
private Integer auditState;
/** 总分 */
@ApiModelProperty(value = "总分", position = 9)
private BigDecimal totalScore;
/** 评审状态 */
@ApiModelProperty(value = "评审状态", position =10)
......@@ -62,4 +64,8 @@ public class ComTalentAssignDTO extends BaseDTO {
/** 评审专业 */
@ApiModelProperty(value = "评审专业", position = 13)
private List<ComExpertSpecDTO> specList;
/** 评分列表 */
@ApiModelProperty(value = "评分列表", position = 13)
private List<ComEvaluationValueDTO> scoreList;
}
science-admin/src/main/java/com/yiboshi/science/param/query/ComEvaluationContentQueryVO.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.param.query;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.PaginationVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(description = "评审表VO")
public class ComEvaluationContentQueryVO extends PaginationVO {
/** 评审表Id */
@ApiModelProperty(value = "评审表Id", position = 2)
@Length(max=36, message = "评审表Id不能大于36")
private String evaluationId;
/** 标题 */
@ApiModelProperty(value = "标题", position = 3)
@Length(max=200, message = "标题不能大于200")
private String name;
/** 总分 */
@ApiModelProperty(value = "总分", position = 4)
private BigDecimal score;
/** 排序 */
@ApiModelProperty(value = "排序", position = 5)
private Integer showIndex;
/** 是否有子项 */
@ApiModelProperty(value = "是否有子项", position = 6)
private Boolean hasSubitem;
/** 值类型：1单选、2多选、3打分 */
@ApiModelProperty(value = "值类型：1单选、2多选、3打分", position = 7)
private Integer valueType;
/** 备注 */
@ApiModelProperty(value = "备注", position = 8)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/param/query/ComEvaluationItemNoteQueryVO.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.param.query;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.PaginationVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(description = "评审记录明细表VO")
public class ComEvaluationItemNoteQueryVO extends PaginationVO {
/** 评审记录Id */
@ApiModelProperty(value = "评审记录Id", position = 1)
@Length(max=36, message = "评审记录Id不能大于36")
private String evaluationNoteId;
/** 评审内容Id */
@ApiModelProperty(value = "评审内容Id", position = 1)
@Length(max=36, message = "评审内容Id不能大于36")
private String contentId;
/** 评审项目Id */
@ApiModelProperty(value = "评审项目Id", position = 1)
@Length(max=36, message = "评审项目Id不能大于36")
private String itemId;
/** 得分 */
@ApiModelProperty(value = "得分", position = 4)
private BigDecimal score;
/** 备注 */
@ApiModelProperty(value = "备注", position = 1)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/param/query/ComEvaluationItemQueryVO.java
View file @ 08555645
......@@ -15,25 +15,30 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@ApiModel(description = "评审项目表VO")
public class ComEvaluationItemQueryVO extends PaginationVO {
/** 评审内容Id */
@ApiModelProperty(value = "评审内容Id", position = 2)
@Length(max=36, message = "评审内容Id不能大于36")
private String contentId;
/** 标题 */
@ApiModelProperty(value = "标题", position = 3)
@Length(max=200, message = "标题不能大于200")
private String name;
/** 总分 */
@ApiModelProperty(value = "总分", position = 4)
private BigDecimal score;
/** 评审表Id */
@ApiModelProperty(value = "评审表Id", position = 1)
@Length(max=36, message = "评审表Id")
private String evaluationId;
/** 父Id */
@ApiModelProperty(value = "父Id", position = 2)
private String parentId;
/** 内容 */
@ApiModelProperty(value = "内容", position = 2)
@Length(max=200, message = "内容不能大于200")
private String content;
/** 单项得分 */
@ApiModelProperty(value = "单项得分", position = 2)
@Length(max=200, message = "单项得分不能大于200")
private String scoreDetail;
/** 排序 */
@ApiModelProperty(value = "排序", position = 5)
@ApiModelProperty(value = "排序", position = 4)
private Integer showIndex;
/** 值类型：1单选、2多选、3打分 */
@ApiModelProperty(value = "值类型：1单选、2多选、3打分", position = 6)
@ApiModelProperty(value = "值类型：1单选、2多选、3打分", position = 5)
private Integer valueType;
/** 备注 */
@ApiModelProperty(value = "备注", position = 7)
@ApiModelProperty(value = "备注", position = 6)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/param/query/ComEvaluationNoteQueryVO.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.param.query;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.PaginationVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(description = "评审记录表VO")
public class ComEvaluationNoteQueryVO extends PaginationVO {
/** 评审表Id */
@ApiModelProperty(value = "评审表Id", position = 1)
@Length(max=36, message = "评审表Id不能大于36")
private String evaluationId;
/** 创建人Id */
@ApiModelProperty(value = "创建人Id", position = 1)
@Length(max=36, message = "创建人Id不能大于36")
private String createId;
/** 评审对象Id */
@ApiModelProperty(value = "评审对象Id", position = 1)
@Length(max=36, message = "评审对象Id不能大于36")
private String objectId;
/** 得分 */
@ApiModelProperty(value = "得分", position = 4)
private BigDecimal score;
/** 备注 */
@ApiModelProperty(value = "备注", position = 1)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/param/query/ComEvaluationStandardQueryVO.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.param.query;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.PaginationVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(description = "评审标准表VO")
public class ComEvaluationStandardQueryVO extends PaginationVO {
/** 标题 */
@ApiModelProperty(value = "评审表名称", position = 2)
@Length(max=200, message = "评审表名称不能大于200")
private String name;
/** 年度批次名称 */
@ApiModelProperty(value = "年度批次名称", position = 3)
private String batchName;
/** 年度批次Id */
@ApiModelProperty(value = "年度批次Id", position = 4)
@Length(max=36, message = "年度批次Id不能大于36")
private String batchId;
/** 专家组名称 */
@ApiModelProperty(value = "专家组名称", position = 5)
private String groupName;
/** 专家组Id */
@ApiModelProperty(value = "专家组Id", position = 6)
@Length(max=36, message = "专家组Id不能大于36")
private String groupId;
/** 备注 */
@ApiModelProperty(value = "备注", position = 7)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/param/query/ComEvaluationValueQueryVO.java
View file @ 08555645
......@@ -15,22 +15,43 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@ApiModel(description = "评审分值表VO")
public class ComEvaluationValueQueryVO extends PaginationVO {
/** 值对象Id */
@ApiModelProperty(value = "值对象Id", position = 1)
@Length(max=36, message = "值对象Id不能大于36")
private String objectId;
/** 标题 */
@ApiModelProperty(value = "标题", position = 1)
@Length(max=200, message = "标题不能大于200")
private String name;
/** 专家分配表Id */
@ApiModelProperty(value = "专家分配表Id", position = 1)
@Length(max=36, message = "专家分配表Id不能大于36")
private String assignId;
/** 评审表Id */
@ApiModelProperty(value = "评审表Id", position = 1)
@Length(max=36, message = "评审表Id")
private String evaluationId;
/** 父Id */
@ApiModelProperty(value = "父Id", position = 2)
private String parentId;
/** 内容 */
@ApiModelProperty(value = "内容", position = 2)
@Length(max=200, message = "内容不能大于200")
private String content;
/** 单项得分 */
@ApiModelProperty(value = "单项得分", position = 2)
@Length(max=200, message = "单项得分不能大于200")
private String scoreDetail;
/** 明细 */
@ApiModelProperty(value = "明细", position = 2)
@Length(max=200, message = "明细不能大于200")
private String detail;
/** 数量 */
@ApiModelProperty(value = "数量", position = 2)
private Integer count;
/** 总分 */
@ApiModelProperty(value = "总分", position = 4)
@ApiModelProperty(value = "总分", position = 3)
private BigDecimal score;
/** 排序 */
@ApiModelProperty(value = "排序", position = 6 )
@ApiModelProperty(value = "排序", position = 4)
private Integer showIndex;
/** 值类型：1单选、2多选、3打分 */
@ApiModelProperty(value = "值类型：1单选、2多选、3打分", position = 5)
private Integer valueType;
/** 备注 */
@ApiModelProperty(value = "备注", position = 1)
@ApiModelProperty(value = "备注", position = 6)
@Length(max=200, message = "备注不能大于200")
private String remark;
}
science-admin/src/main/java/com/yiboshi/science/param/query/ComTalentAssignQueryVO.java
View file @ 08555645
......@@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
import java.util.Date;
@Data
......@@ -30,15 +31,19 @@ public class ComTalentAssignQueryVO extends PaginationVO {
@ApiModelProperty(value = "分配年度", position = 3)
private Integer assignYear;
/** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 保存 2 已提交）", position = 11)
private Integer auditState;
/** 总分 */
@ApiModelProperty(value = "总分", position = 9)
private BigDecimal totalScore;
/** 备注 */
@ApiModelProperty(value = "备注", position =10)
@Length(max=65535, message = "备注不能大于65535")
private String remark;
/** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 保存 2 已提交）", position = 11)
private Integer auditState;
/** 证件号 */
@ExcelProperty("证件号")
@ApiModelProperty(value = "证件号", position = 1)
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationContentController.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.entity.ComEvaluationContent;
import com.yiboshi.science.param.dto.ComEvaluationContentDTO;
import com.yiboshi.science.param.query.ComEvaluationContentQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComEvaluationContentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(tags = "com-expert-spec", description = "评审内容表")
@RestController
@RequestMapping("/v1/science-admin/com-evaluation-content")
public class ComEvaluationContentController extends BaseController<ComEvaluationContentService, ComEvaluationContentQueryVO, ComEvaluationContentDTO, ComEvaluationContent> {
@Autowired
private ComEvaluationContentService comEvaluationContentService;
@ApiOperation(value = "获取评审内容列表信息", httpMethod = "GET", notes = "获取评审内容列表信息")
@GetMapping
@RequestMapping("/getEvaluationContentByEvalId")
public ResponseDataModel<List<ComEvaluationContentDTO>> getEvaluationContentByEvalId(String id) {
return ResponseDataModel.ok(comEvaluationContentService.getEvaluationContentByEvalId(id));
}
@ApiOperation(value = "获取评审内容信息", httpMethod = "GET", notes = "获取评审内容信息")
@GetMapping
@RequestMapping("/getEvaluationContentById")
public ResponseDataModel<ComEvaluationContentDTO> getEvaluationContentById(String id) {
return ResponseDataModel.ok(comEvaluationContentService.getEvaluationContentById(id));
}
@ApiOperation(value = "判断是否可以添加子项或添加值", httpMethod = "POST", notes = "判断是否可以添加子项或添加值")
@RequestMapping("/CheckContentHasItemsOrValues")
@PostMapping
public ResponseDataModel<String> CheckContentHasItemsOrValues(@Validated @RequestBody ComEvaluationContentDTO dto) {
return ResponseDataModel.ok(comEvaluationContentService.CheckContentHasItemsOrValues(dto));
}
@ApiOperation(value = "判断是否可以修改打分子项", httpMethod = "POST", notes = "判断是否可以修改打分子项")
@RequestMapping("/CheckContentHasValues")
@PostMapping
public ResponseDataModel<String> CheckContentHasValues(@Validated @RequestBody ComEvaluationContentDTO dto) {
return ResponseDataModel.ok(comEvaluationContentService.CheckContentHasValues(dto));
}
@ApiOperation(value = "评审内容添加", httpMethod = "POST", notes = "评审内容添加")
@RequestMapping("/insertEvaluationContent")
@PostMapping
public ResponseDataModel<String> insertEvaluationContent(@Validated @RequestBody ComEvaluationContentDTO dto) {
return ResponseDataModel.ok(comEvaluationContentService.insertEvaluationContent(dto));
}
@ApiOperation(value = "评审内容修改", httpMethod = "POST", notes = "评审内容修改")
@RequestMapping("/updateEvaluationContent")
@PostMapping
public ResponseDataModel<String> updateEvaluationContent(@Validated @RequestBody ComEvaluationContentDTO dto) {
return ResponseDataModel.ok(comEvaluationContentService.updateEvaluationContent(dto));
}
@ApiOperation(value = "评审内容删除", httpMethod = "DELETE", notes = "评审内容删除")
@DeleteMapping(value = "deleteEvaluationContent/{id}")
public ResponseDataModel<String> deleteEvaluationContent(@PathVariable String id) {
return ResponseDataModel.ok(comEvaluationContentService.deleteEvaluationContent(id));
}
}
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationItemController.java
View file @ 08555645
......@@ -2,7 +2,10 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.config.annotation.Anonymous;
import com.yiboshi.science.entity.ComEvaluationItem;
import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.entity.SystemParameter;
import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
import com.yiboshi.science.param.query.ComEvaluationItemQueryVO;
import com.yiboshi.science.rest.BaseController;
......@@ -13,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
......@@ -24,44 +28,13 @@ public class ComEvaluationItemController extends BaseController<ComEvaluationIte
@Autowired
private ComEvaluationItemService comEvaluationItemService;
@ApiOperation(value = "获取内容子项列表信息", httpMethod = "GET", notes = "获取内容子项列表信息")
@ApiOperation(value = "获取列表", httpMethod = "GET", notes = "获取列表")
@GetMapping
@RequestMapping("/getEvaluationItemByContentId")
public ResponseDataModel<List<ComEvaluationItemDTO>> getEvaluationItemByContentId(String ContentId) {
return ResponseDataModel.ok(comEvaluationItemService.getEvaluationItemByContentId(ContentId));
@Anonymous
@RequestMapping("/getEvaluationList")
public ResponseDataModel<List<ComEvaluationItemDTO>> getEvaluationList() {
List<ComEvaluationItemDTO> list = comEvaluationItemService.getListByEvaluationId();
return ResponseDataModel.ok(list);
}
@ApiOperation(value = "获取内容子项信息", httpMethod = "GET", notes = "获取内容子项信息")
@GetMapping
@RequestMapping("/getEvaluationItemById")
public ResponseDataModel<ComEvaluationItemDTO> getEvaluationItemById(String id) {
return ResponseDataModel.ok(comEvaluationItemService.getEvaluationItemById(id));
}
@ApiOperation(value = "判断是否可以修改打分子项", httpMethod = "GET", notes = "判断是否可以修改打分子项")
@GetMapping
@RequestMapping("/CheckItemHasValues")
public ResponseDataModel<String> CheckItemHasValues(@Validated @RequestBody ComEvaluationItemDTO dto) {
return ResponseDataModel.ok(comEvaluationItemService.CheckItemHasValues(dto));
}
@ApiOperation(value = "评审内容添加", httpMethod = "POST", notes = "评审内容添加")
@RequestMapping("/insertEvaluationItem")
@PostMapping
public ResponseDataModel<String> insertEvaluationItem(@Validated @RequestBody ComEvaluationItemDTO dto) {
return ResponseDataModel.ok(comEvaluationItemService.insertEvaluationItem(dto));
}
@ApiOperation(value = "评审内容修改", httpMethod = "POST", notes = "评审内容修改")
@RequestMapping("/updateEvaluationItem")
@PostMapping
public ResponseDataModel<String> updateEvaluationItem(@Validated @RequestBody ComEvaluationItemDTO dto) {
return ResponseDataModel.ok(comEvaluationItemService.updateEvaluationItem(dto));
}
@ApiOperation(value = "评审内容删除", httpMethod = "DELETE", notes = "评审内容删除")
@DeleteMapping(value = "deleteEvaluationItem/{id}")
public ResponseDataModel<String> deleteEvaluationItem(@PathVariable String id) {
return ResponseDataModel.ok(comEvaluationItemService.deleteEvaluationItem(id));
}
}
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationItemNoteController.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComEvaluationItemNote;
import com.yiboshi.science.param.dto.ComEvaluationItemNoteDTO;
import com.yiboshi.science.param.query.ComEvaluationItemNoteQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComEvaluationItemNoteService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(tags = "com-expert-spec", description = "评审记录明细表")
@RestController
@RequestMapping("/v1/science-admin/com-evaluation-item-note")
public class ComEvaluationItemNoteController extends BaseController<ComEvaluationItemNoteService, ComEvaluationItemNoteQueryVO, ComEvaluationItemNoteDTO, ComEvaluationItemNote> {
}
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationNoteController.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComEvaluationNote;
import com.yiboshi.science.param.dto.ComEvaluationNoteDTO;
import com.yiboshi.science.param.query.ComEvaluationNoteQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComEvaluationNoteService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(tags = "com-expert-spec", description = "评审记录表")
@RestController
@RequestMapping("/v1/science-admin/com-evaluation-note")
public class ComEvaluationNoteController extends BaseController<ComEvaluationNoteService, ComEvaluationNoteQueryVO, ComEvaluationNoteDTO, ComEvaluationNote> {
}
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationStandardController.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.entity.ComEvaluationStandard;
import com.yiboshi.science.param.dto.ComBatchDTO;
import com.yiboshi.science.param.dto.ComEvaluationStandardDTO;
import com.yiboshi.science.param.query.ComEvaluationStandardQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComEvaluationStandardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(tags = "com-evaluation-standard", description = "评审标准表")
@RestController
@RequestMapping("/v1/science-admin/com-evaluation-standard")
public class ComEvaluationStandardController extends BaseController<ComEvaluationStandardService, ComEvaluationStandardQueryVO, ComEvaluationStandardDTO, ComEvaluationStandard> {
@Autowired
private ComEvaluationStandardService comEvaluationStandardService;
@ApiOperation(value = "分页查询", httpMethod = "GET", notes = "根据参数获取列表")
@GetMapping
@RequestMapping("/getListByPage")
public ResponseDataModel<Pagination<ComEvaluationStandardDTO>> getListByPage(@Validated ComEvaluationStandardQueryVO vo, BindingResult bindingResult) {
Pagination<ComEvaluationStandardDTO> page = comEvaluationStandardService.getListByPage(vo);
return ResponseDataModel.ok(page);
}
@ApiOperation(value = "获取评审标准信息", httpMethod = "GET", notes = "获取评审标准信息")
@GetMapping
@RequestMapping("/getEvaluationStandardById")
public ResponseDataModel<ComEvaluationStandardDTO> getEvaluationStandardById(String id) {
return ResponseDataModel.ok(comEvaluationStandardService.getEvaluationStandardById(id));
}
@ApiOperation(value = "获取当前年度批次（下拉）", httpMethod = "GET", notes = "获取当前年度批次（下拉）")
@GetMapping
@RequestMapping("/getEvaluationYearBatchList")
public ResponseDataModel<List<ComBatchDTO>> getEvaluationYearBatchList() {
return ResponseDataModel.ok(comEvaluationStandardService.getEvaluationYearBatchList());
}
@ApiOperation(value = "评审标准添加", httpMethod = "POST", notes = "评审标准添加")
@RequestMapping("/insertEvaluationStandard")
@PostMapping
//@Logs(value = CommonEnum.LogType.BatchAdd)
public ResponseDataModel<String> insertEvaluationStandard(@Validated @RequestBody ComEvaluationStandardDTO dto) {
return ResponseDataModel.ok(comEvaluationStandardService.insertEvaluationStandard(dto));
}
@ApiOperation(value = "评审标准修改", httpMethod = "POST", notes = "评审标准修改")
@RequestMapping("/updateEvaluationStandard")
@PostMapping
//@Logs(value = CommonEnum.LogType.BatchUpdate)
public ResponseDataModel<String> updateEvaluationStandard(@Validated @RequestBody ComEvaluationStandardDTO dto) {
return ResponseDataModel.ok(comEvaluationStandardService.updateEvaluationStandard(dto));
}
@ApiOperation(value = "删除评审标准", httpMethod = "DELETE", notes = "删除评审标准")
@DeleteMapping(value = "deleteEvaluationStandard/{id}")
//@Logs(value = CommonEnum.LogType.BatchDelete)
public ResponseDataModel<String> deleteEvaluationStandard(@PathVariable String id) {
return ResponseDataModel.ok(comEvaluationStandardService.deleteEvaluationStandard(id));
}
}
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationValueController.java
View file @ 08555645
......@@ -22,24 +22,4 @@ public class ComEvaluationValueController extends BaseController<ComEvaluationVa
@Autowired
private ComEvaluationValueService comEvaluationValueService;
@ApiOperation(value = "值添加", httpMethod = "POST", notes = "值添加")
@RequestMapping("/insertEvaluationValue")
@PostMapping
public ResponseDataModel<String> insertEvaluationValue(@Validated @RequestBody ComEvaluationValueDTO dto) {
return ResponseDataModel.ok(comEvaluationValueService.insertEvaluationValue(dto));
}
@ApiOperation(value = "值修改", httpMethod = "POST", notes = "值修改")
@RequestMapping("/updateEvaluationValue")
@PostMapping
public ResponseDataModel<String> updateEvaluationValue(@Validated @RequestBody ComEvaluationValueDTO dto) {
return ResponseDataModel.ok(comEvaluationValueService.updateEvaluationValue(dto));
}
@ApiOperation(value = "值删除", httpMethod = "DELETE", notes = "值删除")
@DeleteMapping(value = "deleteEvaluationValue/{id}")
public ResponseDataModel<String> deleteEvaluationValue(@PathVariable String id) {
return ResponseDataModel.ok(comEvaluationValueService.deleteEvaluationValue(id));
}
}
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComTalentAssignController.java
View file @ 08555645
......@@ -66,13 +66,9 @@ public class ComTalentAssignController extends BaseController<ComTalentAssignSer
@ApiOperation(value = "根据Id专家评分信息", httpMethod = "GET", notes = "根据Id专家评分信息")
@GetMapping
@RequestMapping("/getAssignExpertById")
public ResponseDataModel<ComTalentAssignDTO> getAssignExpertById(String id) {
@RequestMapping("/getTalentAssignInfoById")
public ResponseDataModel<ComTalentAssignDTO> getTalentAssignInfoById(String id) {
ComTalentAssignDTO dto = comTalentAssignService.getAssignExpertById(id);
if (null != dto) {
dto.setCertId(hideAllIdCardNum(dto.getCertId()));
dto.setMobile(hideAllPhoneNum(dto.getMobile()));
}
return ResponseDataModel.ok(dto);
}
......
science-admin/src/main/java/com/yiboshi/science/service/ComEvaluationContentService.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComEvaluationContent;
import com.yiboshi.science.param.dto.ComEvaluationContentDTO;
import com.yiboshi.science.param.query.ComEvaluationContentQueryVO;
import java.util.List;
/**
* 评审内容表 Service
*
* @author lkl
* @version 2021-08-26
*/
public interface ComEvaluationContentService extends BaseService<ComEvaluationContentQueryVO, ComEvaluationContentDTO, ComEvaluationContent> {
List<ComEvaluationContentDTO> getEvaluationContentByEvalId(String EvaluationId);
ComEvaluationContentDTO getEvaluationContentById(String id);
String CheckContentHasItemsOrValues(ComEvaluationContentDTO dto);
String CheckContentHasValues(ComEvaluationContentDTO dto);
String insertEvaluationContent(ComEvaluationContentDTO dto);
String updateEvaluationContent(ComEvaluationContentDTO dto);
String deleteEvaluationContent(String id);
}
science-admin/src/main/java/com/yiboshi/science/service/ComEvaluationItemNoteService.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComEvaluationItemNote;
import com.yiboshi.science.param.dto.ComEvaluationItemNoteDTO;
import com.yiboshi.science.param.query.ComEvaluationItemNoteQueryVO;
/**
* 评审记录明细表 Service
*
* @author lkl
* @version 2021-08-26
*/
public interface ComEvaluationItemNoteService extends BaseService<ComEvaluationItemNoteQueryVO, ComEvaluationItemNoteDTO, ComEvaluationItemNote> {
}
science-admin/src/main/java/com/yiboshi/science/service/ComEvaluationItemService.java
View file @ 08555645
......@@ -13,16 +13,5 @@ import java.util.List;
* @version 2021-08-26
*/
public interface ComEvaluationItemService extends BaseService<ComEvaluationItemQueryVO, ComEvaluationItemDTO, ComEvaluationItem> {
List<ComEvaluationItemDTO> getEvaluationItemByContentId(String contentId);
ComEvaluationItemDTO getEvaluationItemById(String id);
String CheckItemHasValues(ComEvaluationItemDTO dto);
String insertEvaluationItem(ComEvaluationItemDTO dto);
String updateEvaluationItem(ComEvaluationItemDTO dto);
String deleteEvaluationItem(String id);
List<ComEvaluationItemDTO> getListByEvaluationId() ;
}
science-admin/src/main/java/com/yiboshi/science/service/ComEvaluationNoteService.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComEvaluationNote;
import com.yiboshi.science.param.dto.ComEvaluationNoteDTO;
import com.yiboshi.science.param.query.ComEvaluationNoteQueryVO;
/**
* 评审记录表 Service
*
* @author lkl
* @version 2021-08-26
*/
public interface ComEvaluationNoteService extends BaseService<ComEvaluationNoteQueryVO, ComEvaluationNoteDTO, ComEvaluationNote> {
}
science-admin/src/main/java/com/yiboshi/science/service/ComEvaluationService.java
View file @ 08555645
......@@ -12,20 +12,5 @@ import com.yiboshi.science.param.query.ComEvaluationQueryVO;
* @version 2021-08-26
*/
public interface ComEvaluationService extends BaseService<ComEvaluationQueryVO, ComEvaluationDTO, ComEvaluation> {
/**
* 添加或更新专家
*
* @param dto
* @return
*/
String save(ComEvaluationDTO dto);
ComEvaluationDTO getEvaluationById(String id);
String insertEvaluation(ComEvaluationDTO dto);
String updateEvaluation(ComEvaluationDTO dto);
String deleteEvaluation(String id);
ComEvaluationDTO getEvaluation();
}
science-admin/src/main/java/com/yiboshi/science/service/ComEvaluationStandardService.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComEvaluationStandard;
import com.yiboshi.science.param.dto.ComBatchDTO;
import com.yiboshi.science.param.dto.ComEvaluationStandardDTO;
import com.yiboshi.science.param.query.ComEvaluationStandardQueryVO;
import java.util.List;
public interface ComEvaluationStandardService extends BaseService<ComEvaluationStandardQueryVO, ComEvaluationStandardDTO, ComEvaluationStandard> {
ComEvaluationStandardDTO getEvaluationStandardById(String id);
List<ComBatchDTO> getEvaluationYearBatchList();
String insertEvaluationStandard(ComEvaluationStandardDTO dto);
String updateEvaluationStandard(ComEvaluationStandardDTO dto);
String deleteEvaluationStandard(String id);
}
science-admin/src/main/java/com/yiboshi/science/service/ComEvaluationValueService.java
View file @ 08555645
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComEvaluationValue;
import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
......@@ -13,12 +14,5 @@ import java.util.List;
* @version 2021-08-26
*/
public interface ComEvaluationValueService extends BaseService<ComEvaluationValueQueryVO, ComEvaluationValueDTO, ComEvaluationValue> {
List<ComEvaluationValueDTO> getEvaluationValueByObjectId(String id);
String insertEvaluationValue(ComEvaluationValueDTO dto);
String updateEvaluationValue(ComEvaluationValueDTO dto);
String deleteEvaluationValue(String id);
List<ComEvaluationValueDTO> getListByAssignId(String assignId);
}
science-admin/src/main/java/com/yiboshi/science/service/impl/ComEvaluationContentServiceImpl.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yiboshi.science.base.BaseServiceImpl;
import com.yiboshi.science.dao.ComEvaluationContentDAO;
import com.yiboshi.science.entity.ComEvaluationContent;
import com.yiboshi.science.param.dto.ComEvaluationContentDTO;
import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
import com.yiboshi.science.param.query.ComEvaluationContentQueryVO;
import com.yiboshi.science.service.ComEvaluationContentService;
import com.yiboshi.science.service.ComEvaluationItemService;
import com.yiboshi.science.service.ComEvaluationValueService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
@AllArgsConstructor
public class ComEvaluationContentServiceImpl extends BaseServiceImpl<ComEvaluationContentDAO, ComEvaluationContentQueryVO, ComEvaluationContentDTO, ComEvaluationContent> implements ComEvaluationContentService {
@Autowired
private ComEvaluationContentDAO comEvaluationContentDAO;
@Autowired
private ComEvaluationItemService comEvaluationItemService;
@Autowired
private ComEvaluationValueService comEvaluationValueService;
@Override
protected void setCriteriaForQuery(ComEvaluationContentQueryVO vo, QueryWrapper<ComEvaluationContentQueryVO> criteria) {
}
public List<ComEvaluationContentDTO> getEvaluationContentByEvalId(String EvaluationId) {
QueryWrapper<ComEvaluationContent> criteria = new QueryWrapper();
ComEvaluationContent comEvaluationContent = new ComEvaluationContent();
comEvaluationContent.setEvaluationId(EvaluationId);
notNullField(comEvaluationContent, criteria);
criteria.orderByAsc("show_index");
List<ComEvaluationContentDTO> ContentList = convertEntity2DtoList(this.list(criteria));
ContentList.forEach(c -> {
if (c.getHasSubitem()) {
List<ComEvaluationItemDTO> ItemList = comEvaluationItemService.getEvaluationItemByContentId(c.getId());
ItemList.forEach(p -> {
if (p.getValueType() == 1 || p.getValueType() == 2) {
List<ComEvaluationValueDTO> ItemValueList = comEvaluationValueService.getEvaluationValueByObjectId(p.getId());
ItemValueList.forEach(m -> {
m.setHasAdd(1);
});
p.setItemValues(ItemValueList);
}
});
c.setContentItems(ItemList);
} else {
List<ComEvaluationValueDTO> ItemValueList = comEvaluationValueService.getEvaluationValueByObjectId(c.getId());
ItemValueList.forEach(p -> {
p.setHasAdd(1);
});
c.setContentValues(ItemValueList);
}
});
return ContentList;
}
public ComEvaluationContentDTO getEvaluationContentById(String id) {
return this.dtoById(id);
}
public String CheckContentHasItemsOrValues(ComEvaluationContentDTO dto) {
if (dto.getHasSubitem()) {
List<ComEvaluationValueDTO> ValueList = comEvaluationValueService.getEvaluationValueByObjectId(dto.getId());
if (ValueList.size() > 0)
return "0|已经有值子项存在，不能修改为内容子项！";
else
return "1|可以修改为内容子项！";
} else {
List<ComEvaluationItemDTO> ItemList = comEvaluationItemService.getEvaluationItemByContentId(dto.getId());
if (ItemList.size() > 0)
return "0|已经有内容子项存在，不能修改为值子项！";
else
return "1|可以修改为值子项！";
}
}
public String CheckContentHasValues(ComEvaluationContentDTO dto) {
ComEvaluationContentDTO model = this.dtoById(dto.getId());
List<ComEvaluationValueDTO> ValueList = comEvaluationValueService.getEvaluationValueByObjectId(dto.getId());
if (ValueList.size() > 0)
return "0|" + model.getValueType().toString() + "|已经有值子项存在，不能修改为打分子项！";
else
return "1|" + model.getValueType().toString() + "|可以修改为打分子项！";
}
public String insertEvaluationContent(ComEvaluationContentDTO dto) {
ComEvaluationContent entity = convert2Entity(dto);
this.insert(entity);
return "评审内容添加成功！";
}
public String updateEvaluationContent(ComEvaluationContentDTO dto) {
ComEvaluationContent entity = convert2Entity(dto);
this.update(entity);
return "评审内容更新成功！";
}
public String deleteEvaluationContent(String id) {
ComEvaluationContentDTO model = this.dtoById(id);
if (model.getHasSubitem()) {
List<ComEvaluationItemDTO> ItemList = comEvaluationItemService.getEvaluationItemByContentId(id);
if (ItemList.size() > 0) {
return "0|评审内容子项存在，不能删除评审内容！";
} else {
this.deleteById(id);
return "1|评审内容删除成功！";
}
} else {
if (model.getValueType() == 3) {
this.deleteById(id);
return "1|评审内容删除成功！";
} else {
List<ComEvaluationValueDTO> ValueList = comEvaluationValueService.getEvaluationValueByObjectId(id);
if (ValueList.size() > 0) {
return "0|评审内容子项存在，不能删除评审内容！";
} else {
this.deleteById(id);
return "1|评审内容删除成功！";
}
}
}
}
}
science-admin/src/main/java/com/yiboshi/science/service/impl/ComEvaluationItemNoteServiceImpl.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yiboshi.science.base.BaseServiceImpl;
import com.yiboshi.science.dao.ComEvaluationItemNoteDAO;
import com.yiboshi.science.entity.ComEvaluationItemNote;
import com.yiboshi.science.param.dto.ComEvaluationItemNoteDTO;
import com.yiboshi.science.param.query.ComEvaluationItemNoteQueryVO;
import com.yiboshi.science.service.ComEvaluationItemNoteService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
@AllArgsConstructor
public class ComEvaluationItemNoteServiceImpl extends BaseServiceImpl<ComEvaluationItemNoteDAO, ComEvaluationItemNoteQueryVO, ComEvaluationItemNoteDTO, ComEvaluationItemNote> implements ComEvaluationItemNoteService {
@Autowired
private ComEvaluationItemNoteDAO comEvaluationItemNoteDAO;
@Override
protected void setCriteriaForQuery(ComEvaluationItemNoteQueryVO vo, QueryWrapper<ComEvaluationItemNoteQueryVO> criteria) {
}
}
science-admin/src/main/java/com/yiboshi/science/service/impl/ComEvaluationItemServiceImpl.java
View file @ 08555645
......@@ -4,16 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yiboshi.science.base.BaseServiceImpl;
import com.yiboshi.science.dao.ComEvaluationItemDAO;
import com.yiboshi.science.entity.ComEvaluationItem;
import com.yiboshi.science.param.dto.ComEvaluationDTO;
import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
import com.yiboshi.science.param.query.ComEvaluationItemQueryVO;
import com.yiboshi.science.service.ComEvaluationItemService;
import com.yiboshi.science.service.ComEvaluationService;
import com.yiboshi.science.service.ComEvaluationValueService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@Service
@AllArgsConstructor
......@@ -23,49 +26,18 @@ public class ComEvaluationItemServiceImpl extends BaseServiceImpl<ComEvaluationI
private ComEvaluationItemDAO comEvaluationItemDAO;
@Autowired
private ComEvaluationValueService comEvaluationValueService;
private ComEvaluationService comEvaluationService;
@Override
protected void setCriteriaForQuery(ComEvaluationItemQueryVO vo, QueryWrapper<ComEvaluationItemQueryVO> criteria) {
}
public List<ComEvaluationItemDTO> getEvaluationItemByContentId(String contentId) {
QueryWrapper<ComEvaluationItem> criteria = new QueryWrapper();
ComEvaluationItem comEvaluationItem = new ComEvaluationItem();
comEvaluationItem.setContentId(contentId);
notNullField(comEvaluationItem, criteria);
criteria.orderByAsc("show_index");
return convertEntity2DtoList(this.list(criteria));
public List<ComEvaluationItemDTO> getListByEvaluationId() {
ComEvaluationDTO dto = comEvaluationService.getEvaluation();
if (null != dto) {
return comEvaluationItemDAO.getListByEvaluationId(dto.getId());
}
public ComEvaluationItemDTO getEvaluationItemById(String id) {
return this.dtoById(id);
}
public String CheckItemHasValues(ComEvaluationItemDTO dto) {
ComEvaluationItemDTO model = this.dtoById(dto.getId());
List<ComEvaluationValueDTO> ValueList = comEvaluationValueService.getEvaluationValueByObjectId(dto.getId());
if (ValueList.size() > 0)
return "0|" + model.getValueType().toString() + "|已经有值子项存在，不能修改为打分子项！";
else
return "1|" + model.getValueType().toString() + "|可以修改为打分子项！";
}
public String insertEvaluationItem(ComEvaluationItemDTO dto) {
ComEvaluationItem entity = convert2Entity(dto);
this.insert(entity);
return "内容子项添加成功！";
}
public String updateEvaluationItem(ComEvaluationItemDTO dto) {
ComEvaluationItem entity = convert2Entity(dto);
this.update(entity);
return "内容子项更新成功！";
}
public String deleteEvaluationItem(String id){
this.deleteById(id);
return "内容子项删除成功！";
return null;
}
}
science-admin/src/main/java/com/yiboshi/science/service/impl/ComEvaluationNoteServiceImpl.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yiboshi.science.base.BaseServiceImpl;
import com.yiboshi.science.dao.ComEvaluationNoteDAO;
import com.yiboshi.science.entity.ComEvaluationNote;
import com.yiboshi.science.param.dto.ComEvaluationNoteDTO;
import com.yiboshi.science.param.query.ComEvaluationNoteQueryVO;
import com.yiboshi.science.service.ComEvaluationNoteService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
@AllArgsConstructor
public class ComEvaluationNoteServiceImpl extends BaseServiceImpl<ComEvaluationNoteDAO, ComEvaluationNoteQueryVO, ComEvaluationNoteDTO, ComEvaluationNote> implements ComEvaluationNoteService {
@Autowired
private ComEvaluationNoteDAO comEvaluationNoteDAO;
@Override
protected void setCriteriaForQuery(ComEvaluationNoteQueryVO vo, QueryWrapper<ComEvaluationNoteQueryVO> criteria) {
}
}
science-admin/src/main/java/com/yiboshi/science/service/impl/ComEvaluationServiceImpl.java
View file @ 08555645
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yiboshi.science.base.BaseServiceImpl;
import com.yiboshi.science.dao.ComEvaluationDAO;
import com.yiboshi.science.entity.ComEvaluation;
import com.yiboshi.science.param.dto.ComBatchDTO;
import com.yiboshi.science.param.dto.ComEvaluationDTO;
import com.yiboshi.science.param.query.ComEvaluationQueryVO;
import com.yiboshi.science.service.ComEvaluationService;
......@@ -12,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Objects;
@Service
@AllArgsConstructor
public class ComEvaluationServiceImpl extends BaseServiceImpl<ComEvaluationDAO, ComEvaluationQueryVO, ComEvaluationDTO, ComEvaluation> implements ComEvaluationService {
......@@ -24,31 +27,8 @@ public class ComEvaluationServiceImpl extends BaseServiceImpl<ComEvaluationDAO,
}
@Override
@Transactional
public String save(ComEvaluationDTO dto) {
return dto.getId();
}
public ComEvaluationDTO getEvaluationById(String id) {
return this.dtoById(id);
}
public String insertEvaluation(ComEvaluationDTO dto) {
ComEvaluation entity = convert2Entity(dto);
this.insert(entity);
return "评审表添加成功！";
}
public String updateEvaluation(ComEvaluationDTO dto) {
ComEvaluation entity = convert2Entity(dto);
this.update(entity);
return "评审表更新成功！";
}
public String deleteEvaluation(String id) {
this.deleteById(id);
return "评审表删除成功！";
public ComEvaluationDTO getEvaluation() {
return comEvaluationDAO.getEvaluation();
}
}
science-admin/src/main/java/com/yiboshi/science/service/impl/ComEvaluationStandardServiceImpl.java deleted 100644 → 0
View file @ fdac8148
package com.yiboshi.science.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yiboshi.science.base.BaseServiceImpl;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.dao.ComEvaluationStandardDAO;
import com.yiboshi.science.entity.ComBatch;
import com.yiboshi.science.entity.ComEvaluationStandard;
import com.yiboshi.science.entity.ComExpertGroup;
import com.yiboshi.science.param.dto.ComBatchDTO;
import com.yiboshi.science.param.dto.ComEvaluationStandardDTO;
import com.yiboshi.science.param.query.ComEvaluationStandardQueryVO;
import com.yiboshi.science.service.ComBatchService;
import com.yiboshi.science.service.ComEvaluationStandardService;
import com.yiboshi.science.service.ComExpertGroupService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
@Service
@AllArgsConstructor
public class ComEvaluationStandardServiceImpl extends BaseServiceImpl<ComEvaluationStandardDAO, ComEvaluationStandardQueryVO, ComEvaluationStandardDTO, ComEvaluationStandard> implements ComEvaluationStandardService {
@Autowired
private ComEvaluationStandardDAO comEvaluationStandardDAO;
@Autowired
private ComBatchService comBatchService;
@Autowired
private ComExpertGroupService comExpertGroupService;
@Override
protected void setCriteriaForQuery(ComEvaluationStandardQueryVO vo, QueryWrapper<ComEvaluationStandardQueryVO> criteria) {
if (Objects.nonNull(vo.getName())) {
criteria.like("name", vo.getName());
}
}
@Override
public Pagination<ComEvaluationStandardDTO> getListByPage(ComEvaluationStandardQueryVO vo) {
QueryWrapper criteria = new QueryWrapper();
setCriteriaForQuery(vo, criteria);
Page<ComEvaluationStandardQueryVO> page = new Page<>(vo.getPageIndex(), vo.getPageSize());
List<ComEvaluationStandardDTO> dtoList = comEvaluationStandardDAO.getListByPage(page, criteria).getRecords();
dtoList.forEach(p -> {
ComBatch entity = comBatchService.getById(p.getBatchId());
if (null != entity) {
p.setBatchName(entity.getYear() + "年度第" + entity.getBatch() + "批次");
}
ComExpertGroup groupEntity = comExpertGroupService.getById(p.getGroupId());
if (null != groupEntity) {
p.setGroupName(groupEntity.getName());
}
});
return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
}
public ComEvaluationStandardDTO getEvaluationStandardById(String id) {
return this.dtoById(id);
}
public List<ComBatchDTO> getEvaluationYearBatchList() {
ComBatch entity = new ComBatch();
return comBatchService.dtoList(entity);
}
public String insertEvaluationStandard(ComEvaluationStandardDTO dto) {
ComEvaluationStandard entity = convert2Entity(dto);
this.insert(entity);
return "评审标准添加成功！";
}
public String updateEvaluationStandard(ComEvaluationStandardDTO dto) {
ComEvaluationStandard entity = convert2Entity(dto);
this.update(entity);
return "评审标准更新成功！";
}
public String deleteEvaluationStandard(String id){
this.deleteById(id);
return "评审标准删除成功！";
}
}
science-admin/src/main/java/com/yiboshi/science/service/impl/ComEvaluationValueServiceImpl.java
View file @ 08555645
......@@ -4,14 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yiboshi.science.base.BaseServiceImpl;
import com.yiboshi.science.dao.ComEvaluationValueDAO;
import com.yiboshi.science.entity.ComEvaluationValue;
import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
import com.yiboshi.science.service.ComEvaluationItemService;
import com.yiboshi.science.service.ComEvaluationValueService;
import com.yiboshi.science.utils.StringUtil;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@Service
@AllArgsConstructor
......@@ -20,35 +25,45 @@ public class ComEvaluationValueServiceImpl extends BaseServiceImpl<ComEvaluation
@Autowired
private ComEvaluationValueDAO comEvaluationValueDAO;
@Autowired
private ComEvaluationItemService comEvaluationItemService;
@Override
protected void setCriteriaForQuery(ComEvaluationValueQueryVO vo, QueryWrapper<ComEvaluationValueQueryVO> criteria) {
}
public List<ComEvaluationValueDTO> getEvaluationValueByObjectId(String id) {
QueryWrapper<ComEvaluationValue> criteria = new QueryWrapper();
ComEvaluationValue comEvaluationValue = new ComEvaluationValue();
comEvaluationValue.setObjectId(id);
notNullField(comEvaluationValue, criteria);
criteria.orderByAsc("show_index");
return convertEntity2DtoList(this.list(criteria));
public List<ComEvaluationValueDTO> getListByAssignId(String assignId) {
List<ComEvaluationValueDTO> list = comEvaluationValueDAO.getListByAssignId(assignId);
if (null == list || list.size() == 0) {
List<ComEvaluationItemDTO> dtoList = comEvaluationItemService.getListByEvaluationId();
dtoList.forEach((e) -> {
ComEvaluationValueDTO dto = new ComEvaluationValueDTO();
StringUtil.copyObj2Obj(e, dto);
dto.setItemId(dto.getId());
dto.setAssignId(dto.getId());
list.add(dto);
});
}
public String insertEvaluationValue(ComEvaluationValueDTO dto) {
ComEvaluationValue entity = convert2Entity(dto);
this.save(entity);
return "值添加成功！";
final String[] ppId = {""};
final String[] pId = {""};
list.forEach((e) -> {
if (!ppId[0].equals(e.getPpId())) {
Integer row1 = list.stream().filter(f -> f.getPpId().equals(e.getPpId())).collect(Collectors.toList()).size();
e.setRow1(row1);
ppId[0] = e.getPpId();
} else {
e.setRow1(0);
}
public String updateEvaluationValue(ComEvaluationValueDTO dto) {
ComEvaluationValue entity = convert2Entity(dto);
this.update(entity);
return "值修改成功！";
if (!pId[0].equals(e.getPId())) {
Integer row2 = list.stream().filter(f -> f.getPId().equals(e.getPId())).collect(Collectors.toList()).size();
e.setRow2(row2);
pId[0] = e.getPId();
} else {
e.setRow2(0);
}
public String deleteEvaluationValue(String id) {
this.deleteById(id);
return "值删除成功！";
e.setMaxScore(10);
});
return list;
}
}
science-admin/src/main/java/com/yiboshi/science/service/impl/ComTalentAssignServiceImpl.java
View file @ 08555645
......@@ -11,10 +11,7 @@ import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComTalentAssignDTO;
import com.yiboshi.science.param.dto.ComTalentGroupDTO;
import com.yiboshi.science.param.query.ComTalentAssignQueryVO;
import com.yiboshi.science.service.ComBatchService;
import com.yiboshi.science.service.ComExpertSpecService;
import com.yiboshi.science.service.ComTalentApplyService;
import com.yiboshi.science.service.ComTalentAssignService;
import com.yiboshi.science.service.*;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -49,6 +46,9 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
@Autowired
private ComTalentApplyService comTalentApplyService;
@Autowired
private ComEvaluationValueService comEvaluationValueService;
@Override
protected void setCriteriaForQuery(ComTalentAssignQueryVO vo, QueryWrapper<ComTalentAssignQueryVO> criteria) {
if (Objects.nonNull(vo.getExpertId())) {
......@@ -192,6 +192,7 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
if (null != dto) {
dto.setSpecList(comExpertSpecService.getListByExpertId(dto.getExpertId()));
}
dto.setScoreList(comEvaluationValueService.getListByAssignId(id));
return dto;
}
......
science-admin/src/main/resources/mapper/ComEvaluationContentDAO.xml deleted 100644 → 0
View file @ fdac8148
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!-- 登录日志表 -->
<mapper namespace="com.yiboshi.science.dao.ComEvaluationContentDAO">
<sql id="allColumns">
t.user_id as userId, t.role_id as roleId, t.login_time as loginTime, t.login_ip as loginIp, t.remark as remark
</sql>
</mapper>
\ No newline at end of file
science-admin/src/main/resources/mapper/ComEvaluationDAO.xml
View file @ 08555645
......@@ -6,4 +6,9 @@
<sql id="allColumns">
t.user_id as userId, t.role_id as roleId, t.login_time as loginTime, t.login_ip as loginIp, t.remark as remark
</sql>
<select id="getEvaluation" resultType="com.yiboshi.science.param.dto.ComEvaluationDTO">
select *
from com_evaluation
order by updated desc, batch desc limit 1
</select>
</mapper>
science-admin/src/main/resources/mapper/ComEvaluationItemDAO.xml
View file @ 08555645
......@@ -6,4 +6,12 @@
<sql id="allColumns">
t.user_id as userId, t.role_id as roleId, t.login_time as loginTime, t.login_ip as loginIp, t.remark as remark
</sql>
<select id="getListByEvaluationId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComEvaluationItemDTO">
SELECT a.*,b.content content2, b.id pId,c.content content1, c.id ppId
FROM com_evaluation_item a
left join com_evaluation_item b on a.parent_id=b.id
left join com_evaluation_item c on b.parent_id=c.id
where a.evaluation_id=#{evaluationId} and b.id is not null and c.id is not null
order by a.show_index asc
</select>
</mapper>
science-admin/src/main/resources/mapper/ComEvaluationItemNoteDAO.xml deleted 100644 → 0
View file @ fdac8148
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!-- 登录日志表 -->
<mapper namespace="com.yiboshi.science.dao.ComEvaluationItemNoteDAO">
<sql id="allColumns">
t.user_id as userId, t.role_id as roleId, t.login_time as loginTime, t.login_ip as loginIp, t.remark as remark
</sql>
</mapper>
\ No newline at end of file
science-admin/src/main/resources/mapper/ComEvaluationNoteDAO.xml deleted 100644 → 0
View file @ fdac8148
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!-- 登录日志表 -->
<mapper namespace="com.yiboshi.science.dao.ComEvaluationNoteDAO">
<sql id="allColumns">
t.user_id as userId, t.role_id as roleId, t.login_time as loginTime, t.login_ip as loginIp, t.remark as remark
</sql>
</mapper>
\ No newline at end of file
science-admin/src/main/resources/mapper/ComEvaluationStandardDAO.xml deleted 100644 → 0
View file @ fdac8148
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yiboshi.science.dao.ComEvaluationStandardDAO">
<select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComEvaluationStandardDTO">
SELECT
c.id,c.name,c.batch_id as batchId,c.group_id as groupId,c.remark,c.created,c.updated
FROM com_evaluation_standard c
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>
\ No newline at end of file
science-admin/src/main/resources/mapper/ComEvaluationValueDAO.xml
View file @ 08555645
......@@ -6,4 +6,14 @@
<sql id="allColumns">
t.user_id as userId, t.role_id as roleId, t.login_time as loginTime, t.login_ip as loginIp, t.remark as remark
</sql>
<select id="getListByAssignId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComEvaluationValueDTO">
SELECT b.*,a.item_id,a.assign_id,a.detail,a.count,a.score
c.content content2, c.id pId,d.content content1, d.id ppId
FROM com_evaluation_value a
left join com_evaluation_item b on a.item_id=b.id
left join com_evaluation_item c on b.parent_id=c.id
left join com_evaluation_item d on c.parent_id=d.id
where a.assign_id=#{assignId}
order by b.show_index asc
</select>
</mapper>
science-admin/src/main/resources/mapper/ComTalentAssignDAO.xml
View file @ 08555645
......@@ -53,7 +53,6 @@
left join system_parameter d on c.education=d.id and d.type_id=8
left join system_parameter e on c.title=e.id and e.type_id=7
left join com_talent_apply f on a.talent_id=f.id
left join com_person h on g.person_id = h.id
where a.id = #{id}
</select>
<select id="getAssignCount" parameterType="java.lang.String" resultType="com.yiboshi.science.entity.AssignCount">
......
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