Skip to content

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

111

parent 009051ca
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 342 deletions
science-admin/src/main/java/com/yiboshi/science/dao/ComProjectTogetherDAO.java deleted 100644 → 0
View file @ 009051ca
package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectTogether;
import com.yiboshi.science.param.dto.ComProjectTogetherDTO;
import com.yiboshi.science.param.query.ComProjectTogetherQueryVO;
import java.util.List;
/**
* 合作单位表 DAO
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectTogetherDAO extends BaseMapper<ComProjectTogether>, BaseDAO<ComProjectTogetherQueryVO,ComProjectTogetherDTO, ComProjectTogether> {
List<ComProjectTogetherDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectCooperativeUnits.java
View file @ e400630f
...@@ -26,10 +26,18 @@ public class ComProjectCooperativeUnits extends BaseEntity { ...@@ -26,10 +26,18 @@ public class ComProjectCooperativeUnits extends BaseEntity {
@ApiModelProperty(value = "单位名称", position = 2 ) @ApiModelProperty(value = "单位名称", position = 2 )
@Length(max=200, message = "单位名称不能大于200") @Length(max=200, message = "单位名称不能大于200")
private String unitName; private String unitName;
/** 地址 */ /** 单位国别 */
@ApiModelProperty(value = "地址", position = 3 ) @ApiModelProperty(value = "单位国别", position = 2 )
@Length(max=200, message = "地址不能大于200") @Length(max=200, message = "单位国别不能大于200")
private String unitCountry;
/** 单位地址 */
@ApiModelProperty(value = "单位地址", position = 3 )
@Length(max=200, message = "单位地址不能大于200")
private String unitAddress; private String unitAddress;
/** 组织机构代码/统社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统社会信用代码", position = 2 )
@Length(max=100, message = "组织机构代码/统社会信用代码不能大于100")
private String organizationCode;
/** 在项目中的分工 */ /** 在项目中的分工 */
@ApiModelProperty(value = "在项目中的分工", position = 4 ) @ApiModelProperty(value = "在项目中的分工", position = 4 )
@Length(max=300, message = "在项目中的分工不能大于300") @Length(max=300, message = "在项目中的分工不能大于300")
......
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectTogether.java → science-admin/src/main/java/com/yiboshi/science/entity/ComProjectManagementRule.java
View file @ e400630f
...@@ -7,39 +7,45 @@ import lombok.Data; ...@@ -7,39 +7,45 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import java.util.Date;
/** /**
* 合作单位表VO * 单位科研项目及资金管理制度表
* *
* @author lkl * @author lkl
* @version 2021-08-26 * @version 2021-08-26
*/ */
@Data @Data
@EqualsAndHashCode(callSuper=true) @EqualsAndHashCode(callSuper=true)
@ApiModel(description = "合作单位表VO") @ApiModel(description = "单位科研项目及资金管理制度表")
public class ComProjectTogether extends BaseEntity { public class ComProjectManagementRule extends BaseEntity {
/** 对象Id（项目Id/任务书Id） */ /** 对象Id（项目Id/任务书Id） */
@ApiModelProperty(value = "对象Id（项目Id/任务书Id）", position = 1 ) @ApiModelProperty(value = "对象Id（项目Id/任务书Id）", position = 1 )
@Length(max=36, message = "对象Id（项目Id/任务书Id）不能大于36") @Length(max=36, message = "对象Id（项目Id/任务书Id）不能大于36")
private String objectId; private String objectId;
/** 单位名称 */ /** 单位政策名称 */
@ApiModelProperty(value = "单位名称", position = 2 ) @ApiModelProperty(value = "单位政策名称", position = 2 )
@Length(max=200, message = "单位名称不能大于200") @Length(max=100, message = "单位政策名称不能大于100")
private String unitName; private String policyName;
/** 单位国别 */ /** 出台日期 */
@ApiModelProperty(value = "单位国别", position = 2 ) @ApiModelProperty(value = "出台日期", position = 2 )
@Length(max=200, message = "单位国别不能大于200") private Date releaseDate;
private String unitCountry; /** 文号 */
/** 单位地址 */ @ApiModelProperty(value = "文号", position = 3 )
@ApiModelProperty(value = "单位地址", position = 3 ) @Length(max=100, message = "文号不能大于100")
@Length(max=200, message = "单位地址不能大于200") private String documentNumber;
private String unitAddress; /** 有效期 */
/** 组织机构代码/统社会信用代码 */ @ApiModelProperty(value = "有效期", position = 2 )
@ApiModelProperty(value = "组织机构代码/统社会信用代码", position = 2 ) private Date validityPeriod;
@Length(max=100, message = "组织机构代码/统社会信用代码不能大于100") /** 主要内容 */
private String organizationCode; @ApiModelProperty(value = "主要内容", position = 4 )
/** 在项目中的分工 */ @Length(max=200, message = "在项目中的分工不能大于200")
@ApiModelProperty(value = "在项目中的分工", position = 4 ) private String mainContent;
@Length(max=300, message = "在项目中的分工不能大于300") /** 排序 */
private String projectWork; @ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 4 )
private String fileId;
} }
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectSub.java 0 → 100644
View file @ e400630f
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;
/**
* 项目课颖设置表
*
* @author lkl
* @version 2021-08-26
*/
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "项目课颖设置表")
public class ComProjectSub extends BaseEntity {
/** 对象Id（项目Id/任务书Id） */
@ApiModelProperty(value = "对象Id（项目Id/任务书Id）", position = 1 )
@Length(max=36, message = "对象Id（项目Id/任务书Id）不能大于36")
private String objectId;
/** 课题名称 */
@ApiModelProperty(value = "课题名称", position = 2 )
@Length(max=100, message = "课题名称不能大于100")
private String projName;
/** 课题承担单位 */
@ApiModelProperty(value = "课题承担单位", position = 2 )
@Length(max=100, message = "单位国别不能大于100")
private String undertakingUnit;
/** 所在地 */
@ApiModelProperty(value = "所在地", position = 3 )
@Length(max=100, message = "所在地不能大于100")
private String address;
/** 课颖负责人 */
@ApiModelProperty(value = "课颖负责人", position = 2 )
@Length(max=50, message = "课颖负责人不能大于50")
private String director;
/** 课题预算总经费 */
@ApiModelProperty(value = "课题预算总经费", position = 4 )
private BigDecimal totalBudget;
/** 其中:省科技经费 */
@ApiModelProperty(value = "其中:省科技经费", position = 4 )
private BigDecimal govBudget;
/** 自筹经费 */
@ApiModelProperty(value = "自筹经费", position = 4 )
private BigDecimal selfBudget;
/** 合作单位 */
@ApiModelProperty(value = "合作单位", position = 4 )
@Length(max=100, message = "合作单位不能大于100")
private String cooperativeUnits;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 4 )
private String fileId;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectCooperativeUnitsDTO.java
View file @ e400630f
...@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; ...@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
/** /**
* 合作单位表DTO * 合作单位表DTO
...@@ -17,15 +18,30 @@ import lombok.EqualsAndHashCode; ...@@ -17,15 +18,30 @@ import lombok.EqualsAndHashCode;
@ApiModel(description = "合作单位表DTO") @ApiModel(description = "合作单位表DTO")
public class ComProjectCooperativeUnitsDTO extends BaseDTO { public class ComProjectCooperativeUnitsDTO extends BaseDTO {
/** 对象Id（项目Id/任务书Id） */ /** 对象Id（项目Id/任务书Id） */
@ApiModelProperty(value = "对象Id（项目Id/任务书Id）", position = 1) @ApiModelProperty(value = "对象Id（项目Id/任务书Id）", position = 1 )
@Length(max=36, message = "对象Id（项目Id/任务书Id）不能大于36")
private String objectId; private String objectId;
/** 单位名称 */ /** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 2) @ApiModelProperty(value = "单位名称", position = 2 )
@Length(max=200, message = "单位名称不能大于200")
private String unitName; private String unitName;
/** 地址 */ /** 单位国别 */
@ApiModelProperty(value = "地址", position = 3) @ApiModelProperty(value = "单位国别", position = 2 )
@Length(max=200, message = "单位国别不能大于200")
private String unitCountry;
/** 单位地址 */
@ApiModelProperty(value = "单位地址", position = 3 )
@Length(max=200, message = "单位地址不能大于200")
private String unitAddress; private String unitAddress;
/** 组织机构代码/统社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统社会信用代码", position = 2 )
@Length(max=100, message = "组织机构代码/统社会信用代码不能大于100")
private String organizationCode;
/** 在项目中的分工 */ /** 在项目中的分工 */
@ApiModelProperty(value = "在项目中的分工", position = 4) @ApiModelProperty(value = "在项目中的分工", position = 4 )
@Length(max=300, message = "在项目中的分工不能大于300")
private String projectWork; private String projectWork;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
} }
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectTogetherDTO.java deleted 100644 → 0
View file @ 009051ca
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;
/**
* 合作单位表DTO
*
* @author lkl
* @version 2021-08-26
*/
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "合作单位表DTO")
public class ComProjectTogetherDTO extends BaseDTO {
/** 对象Id（项目Id/任务书Id） */
@ApiModelProperty(value = "对象Id（项目Id/任务书Id）", position = 1 )
@Length(max=36, message = "对象Id（项目Id/任务书Id）不能大于36")
private String objectId;
/** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 2 )
@Length(max=200, message = "单位名称不能大于200")
private String unitName;
/** 单位国别 */
@ApiModelProperty(value = "单位国别", position = 2 )
@Length(max=200, message = "单位国别不能大于200")
private String unitCountry;
/** 单位地址 */
@ApiModelProperty(value = "单位地址", position = 3 )
@Length(max=200, message = "单位地址不能大于200")
private String unitAddress;
/** 组织机构代码/统社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统社会信用代码", position = 2 )
@Length(max=100, message = "组织机构代码/统社会信用代码不能大于100")
private String organizationCode;
/** 在项目中的分工 */
@ApiModelProperty(value = "在项目中的分工", position = 4 )
@Length(max=300, message = "在项目中的分工不能大于300")
private String projectWork;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectCooperativeUnitsQueryVO.java
View file @ e400630f
...@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; ...@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
/** /**
* 查询合作单位表VO * 查询合作单位表VO
...@@ -16,19 +17,31 @@ import lombok.EqualsAndHashCode; ...@@ -16,19 +17,31 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper=true) @EqualsAndHashCode(callSuper=true)
@ApiModel(description = "查询合作单位表VO") @ApiModel(description = "查询合作单位表VO")
public class ComProjectCooperativeUnitsQueryVO extends PaginationVO{ public class ComProjectCooperativeUnitsQueryVO extends PaginationVO{
/** Id */
@ApiModelProperty(value = "Id")
private String id;
/** 对象Id（项目Id/任务书Id） */ /** 对象Id（项目Id/任务书Id） */
@ApiModelProperty(value = "对象Id（项目Id/任务书Id）", position = 1) @ApiModelProperty(value = "对象Id（项目Id/任务书Id）", position = 1 )
@Length(max=36, message = "对象Id（项目Id/任务书Id）不能大于36")
private String objectId; private String objectId;
/** 单位名称 */ /** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 2) @ApiModelProperty(value = "单位名称", position = 2 )
@Length(max=200, message = "单位名称不能大于200")
private String unitName; private String unitName;
/** 地址 */ /** 单位国别 */
@ApiModelProperty(value = "地址", position = 3) @ApiModelProperty(value = "单位国别", position = 2 )
@Length(max=200, message = "单位国别不能大于200")
private String unitCountry;
/** 单位地址 */
@ApiModelProperty(value = "单位地址", position = 3 )
@Length(max=200, message = "单位地址不能大于200")
private String unitAddress; private String unitAddress;
/** 组织机构代码/统社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统社会信用代码", position = 2 )
@Length(max=100, message = "组织机构代码/统社会信用代码不能大于100")
private String organizationCode;
/** 在项目中的分工 */ /** 在项目中的分工 */
@ApiModelProperty(value = "在项目中的分工", position = 4) @ApiModelProperty(value = "在项目中的分工", position = 4 )
@Length(max=300, message = "在项目中的分工不能大于300")
private String projectWork; private String projectWork;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
} }
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectTogetherQueryVO.java deleted 100644 → 0
View file @ 009051ca
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;
/**
* 查询合作单位表VO
*
* @author lkl
* @version 2021-08-26
*/
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "查询合作单位表VO")
public class ComProjectTogetherQueryVO extends PaginationVO{
/** 对象Id（项目Id/任务书Id） */
@ApiModelProperty(value = "对象Id（项目Id/任务书Id）", position = 1 )
@Length(max=36, message = "对象Id（项目Id/任务书Id）不能大于36")
private String objectId;
/** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 2 )
@Length(max=200, message = "单位名称不能大于200")
private String unitName;
/** 单位国别 */
@ApiModelProperty(value = "单位国别", position = 2 )
@Length(max=200, message = "单位国别不能大于200")
private String unitCountry;
/** 单位地址 */
@ApiModelProperty(value = "单位地址", position = 3 )
@Length(max=200, message = "单位地址不能大于200")
private String unitAddress;
/** 组织机构代码/统社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统社会信用代码", position = 2 )
@Length(max=100, message = "组织机构代码/统社会信用代码不能大于100")
private String organizationCode;
/** 在项目中的分工 */
@ApiModelProperty(value = "在项目中的分工", position = 4 )
@Length(max=300, message = "在项目中的分工不能大于300")
private String projectWork;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectTogetherController.java deleted 100644 → 0
View file @ 009051ca
package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComProjectTogether;
import com.yiboshi.science.param.dto.ComProjectTogetherDTO;
import com.yiboshi.science.param.query.ComProjectTogetherQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComProjectTogetherService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 功能：合作单位表 接口
* @author lkl
* @version 2021-08-26
*/
@Api(tags = "com-project-together",description = "合作单位表")
@RestController
@RequestMapping("/v1/science-admin/com-project-together")
public class ComProjectTogetherController extends BaseController<ComProjectTogetherService, ComProjectTogetherQueryVO, ComProjectTogetherDTO, ComProjectTogether> {
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/service/ComProjectTogetherService.java deleted 100644 → 0
View file @ 009051ca
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComProjectTogether;
import com.yiboshi.science.param.dto.ComProjectTogetherDTO;
import com.yiboshi.science.param.query.ComProjectTogetherQueryVO;
import java.util.List;
/**
* 合作单位表 Service
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectTogetherService extends BaseService<ComProjectTogetherQueryVO, ComProjectTogetherDTO,ComProjectTogether> {
/** 根据对象获取合作单位列表
*
* @param objectId
* @return
*/
List<ComProjectTogetherDTO> getListByObjectId(String objectId);
/** 插入合作单位
*
* @param togetherList
* @param objectId
*/
void insertTogetherList(List<ComProjectTogetherDTO> togetherList, String objectId);
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
View file @ e400630f
...@@ -155,9 +155,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -155,9 +155,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
if (Objects.nonNull(vo.getEndDate())) { if (Objects.nonNull(vo.getEndDate())) {
criteria.eq("end_date", vo.getEndDate()); criteria.eq("end_date", vo.getEndDate());
} }
if (Objects.nonNull(vo.getApplyMoney())) {
criteria.eq("apply_money", vo.getApplyMoney());
}
if (Objects.nonNull(vo.getProjContent())) { if (Objects.nonNull(vo.getProjContent())) {
criteria.eq("proj_content", vo.getProjContent()); criteria.eq("proj_content", vo.getProjContent());
} }
...@@ -182,30 +179,21 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -182,30 +179,21 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
if (Objects.nonNull(vo.getResearchPlan())) { if (Objects.nonNull(vo.getResearchPlan())) {
criteria.eq("research_plan", vo.getResearchPlan()); criteria.eq("research_plan", vo.getResearchPlan());
} }
if (Objects.nonNull(vo.getStudyPlan())) {
criteria.eq("study_plan", vo.getStudyPlan());
}
if (Objects.nonNull(vo.getMainFeatures())) { if (Objects.nonNull(vo.getMainFeatures())) {
criteria.eq("main_features", vo.getMainFeatures()); criteria.eq("main_features", vo.getMainFeatures());
} }
if (Objects.nonNull(vo.getExpectedResults())) { if (Objects.nonNull(vo.getExpectedResults())) {
criteria.eq("expected_results", vo.getExpectedResults()); criteria.eq("expected_results", vo.getExpectedResults());
} }
if (Objects.nonNull(vo.getWorkFoundation())) {
criteria.eq("work_foundation", vo.getWorkFoundation());
}
if (Objects.nonNull(vo.getWorkingConditions())) {
criteria.eq("working_conditions", vo.getWorkingConditions());
}
if (Objects.nonNull(vo.getMemResume())) { if (Objects.nonNull(vo.getMemResume())) {
criteria.eq("mem_resume", vo.getMemResume()); criteria.eq("mem_resume", vo.getMemResume());
} }
if (Objects.nonNull(vo.getProjDoc())) { if (Objects.nonNull(vo.getProjDoc())) {
criteria.eq("proj_doc", vo.getProjDoc()); criteria.eq("proj_doc", vo.getProjDoc());
} }
if (Objects.nonNull(vo.getFileId())) {
criteria.eq("file_id", vo.getFileId());
}
if (Objects.nonNull(vo.getRemark())) { if (Objects.nonNull(vo.getRemark())) {
criteria.eq("remark", vo.getRemark()); criteria.eq("remark", vo.getRemark());
} }
...@@ -215,15 +203,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -215,15 +203,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
if (Objects.nonNull(vo.getAppPersonName())) { if (Objects.nonNull(vo.getAppPersonName())) {
criteria.like("person_name", vo.getAppPersonName()); criteria.like("person_name", vo.getAppPersonName());
} }
if (Objects.nonNull(vo.getAuditUnitId())) {
criteria.like("a.audit_unit_id", vo.getAuditUnitId());
}
if (Objects.nonNull(vo.getTreeCode())) {
criteria.likeRight("tree_code", vo.getTreeCode());
}
if (Objects.nonNull(vo.getKnowledgeParentId())) {
criteria.eq("p1.id", vo.getKnowledgeParentId());
}
} }
@Override @Override
...@@ -267,19 +246,15 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -267,19 +246,15 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
loadPersonInfo(dto, comPersonDTO); loadPersonInfo(dto, comPersonDTO);
} }
//申报单位 //申报单位
dto.setIsBasic(false);
ComUnitDTO comUnitDTO = comUnitService.getUnitById(dto.getAppUnitId()); ComUnitDTO comUnitDTO = comUnitService.getUnitById(dto.getAppUnitId());
if (null != comUnitDTO) { if (null != comUnitDTO) {
dto.setAppUnitName(comUnitDTO.getUnitName()); dto.setAppUnitName(comUnitDTO.getUnitName());
dto.setAppUnitAddress(comUnitDTO.getUnitAddress()); dto.setAddress(comUnitDTO.getUnitAddress());
if (comUnitDTO.getTreeCode().length() > (properties.getDefaultCodeLength() * 3)) if (comUnitDTO.getTreeCode().length() > (properties.getDefaultCodeLength() * 3));
dto.setIsBasic(true);
}
if (null != dto.getNature()) {
SystemParameter systemParameter = systemParameterService.getParameterById(dto.getNature());
dto.setNatureName(systemParameter.getName());
} }
// 项目合作单位 // 项目合作单位
List<ComProjectCooperativeUnitsDTO> cooperativeUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId()); List<ComProjectCooperativeUnitsDTO> cooperativeUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId());
dto.setCooperativeUnits(cooperativeUnits); dto.setCooperativeUnits(cooperativeUnits);
...@@ -429,7 +404,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -429,7 +404,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
ComUnitDTO comUnitDTO = comUnitService.dtoById(SecurityUserHolder.getUnitId()); ComUnitDTO comUnitDTO = comUnitService.dtoById(SecurityUserHolder.getUnitId());
if (null != comUnitDTO) { if (null != comUnitDTO) {
dto.setAppUnitName(comUnitDTO.getUnitName()); dto.setAppUnitName(comUnitDTO.getUnitName());
dto.setAppUnitAddress(comUnitDTO.getUnitAddress()); dto.setAddress(comUnitDTO.getUnitAddress());
} }
//经费表 //经费表
List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getList(projType); List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getList(projType);
...@@ -478,7 +453,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -478,7 +453,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
} }
private void loadPersonInfo(ComProjectDTO dto, ComPersonDTO comPersonDTO) { private void loadPersonInfo(ComProjectDTO dto, ComPersonDTO comPersonDTO) {
dto.setPersonName(comPersonDTO.getPersonName()); dto.setAppPersonName(comPersonDTO.getPersonName());
dto.setSex(comPersonDTO.getSex()); dto.setSex(comPersonDTO.getSex());
SimpleDateFormat time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
dto.setBirthday(time.format(comPersonDTO.getBirthday())); dto.setBirthday(time.format(comPersonDTO.getBirthday()));
...@@ -488,12 +463,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -488,12 +463,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
dto.setEducationName(comPersonDTO.getEducationName()); dto.setEducationName(comPersonDTO.getEducationName());
dto.setSpecName(comPersonDTO.getSpecName()); dto.setSpecName(comPersonDTO.getSpecName());
dto.setJobUnit(comPersonDTO.getUnitName()); dto.setJobUnit(comPersonDTO.getUnitName());
if (Objects.isNull(dto.getMobile()))
dto.setMobile(comPersonDTO.getMobile());
if (Objects.isNull(dto.getEmail()))
dto.setMobile(comPersonDTO.getEmail());
if (Objects.isNull(dto.getAddress()))
dto.setMobile(comPersonDTO.getAddress());
} }
/** /**
...@@ -747,7 +716,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -747,7 +716,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
unit[0] = unit[0] + " " + e.getUnitName(); unit[0] = unit[0] + " " + e.getUnitName();
} }
}); });
p.setCooperativeUnitsStr(unit[0].toString());
if (null == p.getCooperativeUnits() || p.getCooperativeUnits().size() < 3) { if (null == p.getCooperativeUnits() || p.getCooperativeUnits().size() < 3) {
int count = p.getCooperativeUnits() == null ? 0 : p.getCooperativeUnits().size(); int count = p.getCooperativeUnits() == null ? 0 : p.getCooperativeUnits().size();
...@@ -783,40 +751,21 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -783,40 +751,21 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
p.setEquipments(item); p.setEquipments(item);
} }
List<String> str = comProjectResultsService.getNameByObjectId(p.getId()); List<String> str = comProjectResultsService.getNameByObjectId(p.getId());
p.setResultsStr((loop(str,"专利") ? "☑" : "□") + "专利" +
(loop(str,"新技术") ? "☑" : "□") + "新技术" +
(loop(str,"新产品") ? "☑" : "□") + "新产品" +
(loop(str,"新材料") ? "☑" : "□") + "新材料" +
(loop(str,"新设备") ? "☑" : "□") + "新设备" +
(loop(str,"关键部件") ? "☑" : "□") + "关键部件" +
(loop(str,"实验装置/系统") ? "☑" : "□") + "实验装置/系统" +
(loop(str,"应用解决方案") ? "☑" : "□") + "应用解决方案" +
(loop(str,"新诊疗方案")? "☑" : "□") + "新诊疗方案" +
(loop(str,"临床指南/规范") ? "☑" : "□") + "临床指南/规范" +
(loop(str,"科学数据") ? "☑" : "□") + "科学数据" +
(loop(str,"技术标准") ? "☑" : "□") + "技术标准" +
(loop(str,"其他") ? "☑" : "□") + "其他");
if (p.getProjType().equals(1)) { if (p.getProjType().equals(1)) {
if (null != p.getProjContent()) if (null != p.getProjContent())
p.setProjContent(p.getProjContent().replace("<", "&lt;")); p.setProjContent(p.getProjContent().replace("<", "&lt;"));
if (null != p.getProjBasis()) if (null != p.getProjBasis())
p.setProjBasis(p.getProjBasis().replace("<", "&lt;")); p.setProjBasis(p.getProjBasis().replace("<", "&lt;"));
if (null != p.getProjReference())
p.setProjReference(p.getProjReference().replace("<", "&lt;"));
if (null != p.getResearchContent()) if (null != p.getResearchContent())
p.setResearchContent(p.getResearchContent().replace("<", "&lt;")); p.setResearchContent(p.getResearchContent().replace("<", "&lt;"));
if (null != p.getResearchPlan()) if (null != p.getResearchPlan())
p.setResearchPlan(p.getResearchPlan().replace("<", "&lt;")); p.setResearchPlan(p.getResearchPlan().replace("<", "&lt;"));
if (null != p.getMainFeatures()) if (null != p.getMainFeatures())
p.setMainFeatures(p.getMainFeatures().replace("<", "&lt;")); p.setMainFeatures(p.getMainFeatures().replace("<", "&lt;"));
if (null != p.getStudyPlan())
p.setStudyPlan(p.getStudyPlan().replace("<", "&lt;"));
if (null != p.getExpectedResults()) if (null != p.getExpectedResults())
p.setExpectedResults(p.getExpectedResults().replace("<", "&lt;")); p.setExpectedResults(p.getExpectedResults().replace("<", "&lt;"));
if (null != p.getWorkFoundation())
p.setWorkFoundation(p.getWorkFoundation().replace("<", "&lt;"));
if (null != p.getWorkingConditions())
p.setWorkingConditions(p.getWorkingConditions().replace("<", "&lt;"));
if (null != p.getMemResume()) if (null != p.getMemResume())
p.setMemResume(p.getMemResume().replace("<", "&lt;")); p.setMemResume(p.getMemResume().replace("<", "&lt;"));
if (null != p.getResearchProjects()) if (null != p.getResearchProjects())
...@@ -1010,15 +959,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -1010,15 +959,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
if (null != comPersonDTO) { if (null != comPersonDTO) {
loadPersonInfo(dto, comPersonDTO); loadPersonInfo(dto, comPersonDTO);
} }
//申报单位
dto.setIsBasic(false);
ComUnitDTO comUnitDTO = comUnitService.getUnitById(dto.getAppUnitId());
if (null != comUnitDTO) {
dto.setAppUnitName(comUnitDTO.getUnitName());
dto.setAppUnitAddress(comUnitDTO.getUnitAddress());
if (comUnitDTO.getTreeCode().length() > (properties.getDefaultCodeLength() * 3))
dto.setIsBasic(true);
}
return dto; return dto;
} }
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java
View file @ e400630f
...@@ -164,9 +164,9 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO ...@@ -164,9 +164,9 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
test.setStartDate(comProject.getStartDate()); test.setStartDate(comProject.getStartDate());
test.setEndDate(comProject.getEndDate()); test.setEndDate(comProject.getEndDate());
if (null == test.getBudgetCount()) if (null == test.getBudgetCount())
test.setBudgetCount(comProject.getApplyMoney()); test.setBudgetCount(comProject.getTotalFunding());
if (null == test.getBudgetGovCount()) if (null == test.getBudgetGovCount())
test.setBudgetGovCount(comProject.getApplyMoney()); test.setBudgetGovCount(comProject.getTotalFunding());
//合作单位 //合作单位
List<ComProjectCooperativeUnitsDTO> together = ComProjectCooperativeUnitsService.getListByObjectId(comProject.getId()); List<ComProjectCooperativeUnitsDTO> together = ComProjectCooperativeUnitsService.getListByObjectId(comProject.getId());
test.setTogether(together); test.setTogether(together);
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTogetherServiceImpl.java deleted 100644 → 0
View file @ 009051ca
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.ComProjectTogetherDAO;
import com.yiboshi.science.entity.ComProjectTogether;
import com.yiboshi.science.param.dto.ComProjectTogetherDTO;
import com.yiboshi.science.param.query.ComProjectTogetherQueryVO;
import com.yiboshi.science.service.ComProjectTogetherService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
/**
* 合作单位表 Service 实现类
*
* @author lkl
* @version 2021-08-26
*/
@Service
public class ComProjectTogetherServiceImpl extends BaseServiceImpl<ComProjectTogetherDAO,ComProjectTogetherQueryVO, ComProjectTogetherDTO,ComProjectTogether> implements ComProjectTogetherService {
@Autowired
private ComProjectTogetherDAO comProjectTogetherDAO;
@Override
protected void setCriteriaForQuery(ComProjectTogetherQueryVO vo, QueryWrapper<ComProjectTogetherQueryVO> criteria) {
if(Objects.nonNull(vo.getObjectId())){
criteria.eq("object_id", vo.getObjectId());
}
if(Objects.nonNull(vo.getUnitName())){
criteria.eq("unit_name", vo.getUnitName());
}
if(Objects.nonNull(vo.getUnitAddress())){
criteria.eq("unit_address", vo.getUnitAddress());
}
if(Objects.nonNull(vo.getProjectWork())){
criteria.eq("project_work", vo.getProjectWork());
}
}
@Override
public List<ComProjectTogetherDTO> getListByObjectId(String objectId)
{
return comProjectTogetherDAO.getListByObjectId(objectId);
}
@Override
public void insertTogetherList(List<ComProjectTogetherDTO> togetherList, String objectId) {
ComProjectTogether E =new ComProjectTogether();
E.setObjectId(objectId);
this.delete(E);
if (null != togetherList) {
togetherList.forEach(e -> e.setObjectId(objectId));
List<ComProjectTogether> list = convertDto2EntityList(togetherList);
this.insertBatch(list);
}
}
}
\ No newline at end of file
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