diff --git a/science-admin/src/main/java/com/yiboshi/science/dao/ComUnitDAO.java b/science-admin/src/main/java/com/yiboshi/science/dao/ComUnitDAO.java
index 24909fa0c0d1be09a9bae7564839812802573313..9fa71500b4160883e758cd103a9b45b286ad0105 100644
--- a/science-admin/src/main/java/com/yiboshi/science/dao/ComUnitDAO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/dao/ComUnitDAO.java
@@ -22,6 +22,8 @@ public interface ComUnitDAO extends BaseMapper<ComUnit>, BaseDAO<ComUnitQueryVO,
ComUnitDTO getUnitById(String id);
ComUnitDTO getUnitByTreeCode(String treeCode);
List<ComUnitDTO> getList();
+ List<ComUnitDTO> getListByUnitName(String UnitName);
DataStatisticsDTO getRegisterUnitCount(@Param("ew") Wrapper<ComProject> queryWrapper);
DataStatisticsDTO getRegisterUnitCountByDay(@Param("ew") Wrapper<ComProject> queryWrapper);
+
}
diff --git a/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java b/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java
index 1c0e0c337d039086fe22ac5b12f94b757e583c2a..0ab36c5e586f89d6df8b8a0d702242c1eac8de08 100644
--- a/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java
+++ b/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java
@@ -35,6 +35,10 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "主要研究领域", position = 19 )
@Length(max=200, message = "主要研究领域不能大于200")
private String mainResearchAreas;
+ /** 申报人通信地址 */
+ @ApiModelProperty(value = "申报人通信地址", position = 15 )
+ @Length(max=200, message = "申报人通信地址不能大于200")
+ private String address;
/** 单位联系人姓名 */
@ApiModelProperty(value = "单位联系人姓名", position = 16)
@@ -101,6 +105,9 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "第三年目标", position = 14 )
@Length(max=500, message = "第三年目标500")
private String year3Goal;
+ /** 附件Id */
+ @ApiModelProperty(value = "附件Id", position = 4 )
+ private String fileId;
/** 备注 */
@ApiModelProperty(value = "备注", position = 38 )
@Length(max=65535, message = "备注不能大于65535")
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java
index 08c2b718a4e01ff746452509d39911d3e184edb8..552570f2ecba6757767c672eab8f3c00a1304ea1 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java
@@ -34,6 +34,10 @@ public class ComProjectBasicDTO extends BaseDTO {
@ApiModelProperty(value = "主要研究领域", position = 19 )
@Length(max=200, message = "主要研究领域不能大于200")
private String mainResearchAreas;
+ /** 申报人通信地址 */
+ @ApiModelProperty(value = "申报人通信地址", position = 15 )
+ @Length(max=200, message = "申报人通信地址不能大于200")
+ private String address;
/** 单位联系人姓名 */
@ApiModelProperty(value = "单位联系人姓名", position = 16)
@@ -100,6 +104,9 @@ public class ComProjectBasicDTO extends BaseDTO {
@ApiModelProperty(value = "第三年目标", position = 14 )
@Length(max=500, message = "第三年目标500")
private String year3Goal;
+ /** 附件Id */
+ @ApiModelProperty(value = "附件Id", position = 4 )
+ private String fileId;
/** 备注 */
@ApiModelProperty(value = "备注", position = 38 )
@Length(max=65535, message = "备注不能大于65535")
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
index 11866a2d6f0742c64a598069a6af8d28e6dacbe2..04c98e7676d78d1cd23c8e670cc09b9d04593880 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
@@ -209,6 +209,23 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "项目组成员_参加单位数", position = 25)
private Integer workCount;
+ /** 附件Id */
+ @ApiModelProperty(value = "附件Id", position = 4 )
+ private String fileId;
+ /** 附件Id */
+ @ApiModelProperty(value = "附件Id", position = 1 )
+ @Length(max=36, message = "附件Id不能大于36")
+ private String downloadId;
+ /** 附件名 */
+ @ApiModelProperty(value = "附件名", position = 6)
+ private String fileName;
+ /** URL */
+ @ApiModelProperty(value = "URL", position = 7)
+ private String downloadUrl;
+
+ /** 单位 */
+ @ApiModelProperty(value = "单位", position = 41)
+ private String appUnitName;
/** 注册单位类型 */
@ApiModelProperty(value = "注册单位类型", position = 12)
@Length(max=100, message = "注册单位类型不能大于100")
@@ -230,10 +247,6 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "结束", position = 3)
private String endDateStr;
- /** 姓名 */
- @ApiModelProperty(value = "姓名", position = 41)
- private String appUnitName;
-
/** 姓名 */
@ApiModelProperty(value = "姓名", position = 41)
private String appPersonName;
@@ -252,6 +265,9 @@ public class ComProjectDTO extends BaseDTO {
/** 电话号码 */
@ApiModelProperty(value = "电话号码", position = 16)
private String mobile;
+ /** 地址 */
+ @ApiModelProperty(value = "地址", position = 3)
+ private String address;
/** 民族 */
@ApiModelProperty(value = "民族", position = 3)
private String nationName;
@@ -276,38 +292,17 @@ public class ComProjectDTO extends BaseDTO {
/** 合作单位 */
private List<ComProjectCooperativeUnitsDTO> cooperativeUnits;
- /** 项目主要参与单位 */
- private List<ComProjectCooperativeUnitsDTO> participateUnits;
/** 项目组成员 */
private List<ComProjectMembersDTO> members;
/** 经费表 */
private List<ComProjectBudgetDTO> budget;
/** 年度用款计划 */
private List<ComProjectFundPlanDTO> fundPlan;
- /** 设备仪器经费表 */
- private List<ComProjectEquipmentDTO> equipments;
- /** 单位支出明细预算 */
- private List<ComProjectUnitPaymentDTO> unitPayment;
/** 项目绩效目标表 */
private ProjectKPIStatisticDTO projectKPI;
-
- /** 项目经费构成表 */
- private List<ComProjectFundCompositionDTO> fundCompositions;
- /** 在研或完成基础研究项目情况 */
- private List<ComProjectResearchDTO> projectResearchList;
- /** 项目课颖设置表 */
- private List<ComProjectSubDTO> projectSubList;
- /** 单位科研项目及资金管理制度表 */
- private List<ComProjectManagementRuleDTO> managementRuleList;
/** 附件列表 */
private List<ComFileDTO> fileList;
-
/** 审核列表 */
private List<ComProjectAuditNoteDTO> auditList;
- /** 项目安排及阶段目标 */
- private List<ComProjectStageGoalDTO> stageGoals;
- /** 成果形式 */
- // private List<ComProjectResultsDTO> results;
- private List<String> results;
}
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectTaskDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectTaskDTO.java
index 201bc1b097e1a1b35138b152f15b0e04f880fcef..8536c57f7cb235655809c9dc423cb2d4253ad34f 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectTaskDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectTaskDTO.java
@@ -152,4 +152,40 @@ public class ComProjectTaskDTO extends BaseDTO {
/** 项目组成员_硕士(学历) */
@ApiModelProperty(value = "项目组成员_硕士(学历)", position = 25 )
private Integer memDegree2;
+
+ /** 合作单位 */
+ private List<ComProjectCooperativeUnitsDTO> cooperativeUnits;
+ /** 项目主要参与单位 */
+ private List<ComProjectCooperativeUnitsDTO> participateUnits;
+// /** 项目组成员 */
+// private List<ComProjectMembersDTO> members;
+// /** 经费表 */
+// private List<ComProjectBudgetDTO> budget;
+ /** 年度用款计划 */
+ private List<ComProjectFundPlanDTO> fundPlan;
+ /** 设备仪器经费表 */
+ private List<ComProjectEquipmentDTO> equipments;
+ /** 单位支出明细预算 */
+ private List<ComProjectUnitPaymentDTO> unitPayment;
+ /** 项目绩效目标表 */
+ private ProjectKPIStatisticDTO projectKPI;
+
+ /** 项目经费构成表 */
+ private List<ComProjectFundCompositionDTO> fundCompositions;
+ /** 在研或完成基础研究项目情况 */
+ private List<ComProjectResearchDTO> projectResearchList;
+ /** 项目课颖设置表 */
+ private List<ComProjectSubDTO> projectSubList;
+ /** 单位科研项目及资金管理制度表 */
+ private List<ComProjectManagementRuleDTO> managementRuleList;
+ /** 附件列表 */
+ private List<ComFileDTO> fileList;
+
+// /** 审核列表 */
+// private List<ComProjectAuditNoteDTO> auditList;
+ /** 项目安排及阶段目标 */
+ private List<ComProjectStageGoalDTO> stageGoals;
+ /** 成果形式 */
+ // private List<ComProjectResultsDTO> results;
+ private List<String> results;
}
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComUnitDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComUnitDTO.java
index 9ee695d9e67d70bd89db435a6ed6f86dd9a5de34..b4418240d0e05c272bed3e9cbb222d8a9ca99791 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComUnitDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComUnitDTO.java
@@ -24,7 +24,7 @@ import java.util.List;
public class ComUnitDTO extends BaseDTO {
/** 树编码 */
@ApiModelProperty(value = "树编码", position = 1 , required = true)
- @NotNull(message = "树编码不能为空")
+ // @NotNull(message = "树编码不能为空")
@Length(max=50, message = "树编码不能大于50")
private String treeCode;
/** 单位名称 */
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java
index f71dcfe7ad4f7511ec3ec511370f1338b80f9f8b..59a1208a7fea5984ba71e234c57b157b4871e271 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java
@@ -33,6 +33,10 @@ public class ComProjectBasicQueryVO extends PaginationVO{
@ApiModelProperty(value = "主要研究领域", position = 19 )
@Length(max=200, message = "主要研究领域不能大于200")
private String mainResearchAreas;
+ /** 申报人通信地址 */
+ @ApiModelProperty(value = "申报人通信地址", position = 15 )
+ @Length(max=200, message = "申报人通信地址不能大于200")
+ private String address;
/** 单位联系人姓名 */
@ApiModelProperty(value = "单位联系人姓名", position = 16)
@@ -99,6 +103,9 @@ public class ComProjectBasicQueryVO extends PaginationVO{
@ApiModelProperty(value = "第三年目标", position = 14 )
@Length(max=500, message = "第三年目标500")
private String year3Goal;
+ /** 附件Id */
+ @ApiModelProperty(value = "附件Id", position = 4 )
+ private String fileId;
/** 备注 */
@ApiModelProperty(value = "备注", position = 38 )
@Length(max=65535, message = "备注不能大于65535")
diff --git a/science-admin/src/main/java/com/yiboshi/science/rest/v1/AuthorizationController.java b/science-admin/src/main/java/com/yiboshi/science/rest/v1/AuthorizationController.java
index e12c6a1ba1f24cc5a7717f2f078c643d232ecb76..bde78dce2870a6822a180af89b6168cf419f79d8 100644
--- a/science-admin/src/main/java/com/yiboshi/science/rest/v1/AuthorizationController.java
+++ b/science-admin/src/main/java/com/yiboshi/science/rest/v1/AuthorizationController.java
@@ -169,7 +169,8 @@ public class AuthorizationController {
if(!user.getType().equals("3")){
user.setProjType(systemSetService.getByKey(SystemSetKey.SysProjectType));
}
- user.setComplete(comPersonService.isComplete(SecurityUserHolder.getPersonId()));
+ ComPerson person = comPersonService.getById(SecurityUserHolder.getPersonId());
+ user.setComplete(comPersonService.isComplete(person));
List<UserMenuDTO> menuList = systemMenuService.findByRoleId(SecurityUserHolder.getRoles());
Map<String, Object> userInfo = new HashMap<String, Object>(3) {
{
diff --git a/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComPersonController.java b/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComPersonController.java
index f658d247893a2d669217be29d869e478549b9351..14221f633fbda6d8b0d14340dc33113a9933ac82 100644
--- a/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComPersonController.java
+++ b/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComPersonController.java
@@ -177,17 +177,7 @@ public class ComPersonController extends BaseController<ComPersonService, ComPer
public ResponseDataModel<Map<String, Object>> getAppPersonInfo() {
boolean isComplete = true;
ComPerson comPerson = comPersonService.entityById(SecurityUserHolder.getPersonId());
- if (null == comPerson)
- isComplete= false;
- if (StringUtils.isEmpty(comPerson.getNation()) ||
- StringUtils.isEmpty(comPerson.getTitle()) ||
- StringUtils.isEmpty(comPerson.getDegree()) ||
- StringUtils.isEmpty(comPerson.getEducation()) ||
- StringUtils.isEmpty(comPerson.getSpec()) ||
- StringUtils.isEmpty(comPerson.getEmail())) {
- isComplete= false;
- }
- boolean finalComplete = isComplete;
+ boolean finalComplete = comPersonService.isComplete(comPerson);
Map<String, Object> data = new HashMap<String, Object>(3) {
{
put("person", comPerson);
diff --git a/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComUnitController.java b/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComUnitController.java
index 366c61f4d378d7bf07d4345497ee7a78aa5abd39..c28844d917eed5752e42565b0faa9bdbee212e2a 100644
--- a/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComUnitController.java
+++ b/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComUnitController.java
@@ -166,6 +166,21 @@ public class ComUnitController extends BaseController<ComUnitService, ComUnitQue
return ResponseDataModel.ok(list);
}
+ @ApiOperation(value = "获取单位信息", httpMethod = "GET", notes = "获取单位信息")
+ @GetMapping
+ @RequestMapping("/getListByUnitName")
+ @Anonymous
+ public ResponseDataModel<List<SelectListItem>> getListByUnitName(String UnitName) {
+ List<SelectListItem> list = new ArrayList<>();
+ List<ComUnitDTO> dtoList = comUnitService.getListByUnitName(UnitName);
+ dtoList.forEach((e) -> {
+ list.add(new SelectListItem(e.getUnitName(), e.getId(),"",true, true, null));
+ });
+ return ResponseDataModel.ok(list);
+ }
+
+
+
@ApiOperation(value = "获取单位类型", httpMethod = "GET", notes = "获取单位类型")
@GetMapping
@RequestMapping("/getUnitType")
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/ComPersonService.java b/science-admin/src/main/java/com/yiboshi/science/service/ComPersonService.java
index ecc820073c18148f7d618d51362a66b28f7c5f59..15cafda51d8adc1a268377458ced2a8dce2323f4 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/ComPersonService.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/ComPersonService.java
@@ -107,5 +107,5 @@ public interface ComPersonService extends BaseService<ComPersonQueryVO, ComPerso
DataStatisticsDTO getRegisterPersonCount(ComPersonQueryVO v);
DataStatisticsDTO getRegisterPersonCountByDay(ComPersonQueryVO v);
- boolean isComplete(String id);
+ boolean isComplete(ComPerson person);
}
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/ComProjectCooperativeUnitsService.java b/science-admin/src/main/java/com/yiboshi/science/service/ComProjectCooperativeUnitsService.java
index 69c5cd899ddfe1f85d61dc5c7544766774ae7817..5a66aa421723ce688c54fcd5a719e9a16f2ee385 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/ComProjectCooperativeUnitsService.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/ComProjectCooperativeUnitsService.java
@@ -23,7 +23,7 @@ public interface ComProjectCooperativeUnitsService extends BaseService<ComProjec
*
* @param objectId
*/
- void deleteByObjectId(String objectId);
+ void deleteByObjectId(String objectId, int type);
/** 插入合作单位
*
* @param list
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/ComUnitService.java b/science-admin/src/main/java/com/yiboshi/science/service/ComUnitService.java
index 769f20d03bab68e342927b1c0b0cd71be60f4008..72a4bd3b01c3d3bd28f8a12528f72975b25163b9 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/ComUnitService.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/ComUnitService.java
@@ -58,6 +58,14 @@ public interface ComUnitService extends BaseService<ComUnitQueryVO, ComUnitDTO,
*/
List<ComUnitDTO> getListByType(Integer unitType);
+ /**
+ * 根据单位名称获取单位列表
+ * @param UnitName
+ * @return
+ */
+ List<ComUnitDTO> getListByUnitName(String UnitName);
+
+
/**
* 单位注册
* @param unit
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComPersonServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComPersonServiceImpl.java
index 06b1631e7274c7c6504f42d8f309574bb5b808a7..cc752b50c704a1cb1c357bf52d46f171aa3e3604 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComPersonServiceImpl.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComPersonServiceImpl.java
@@ -327,15 +327,15 @@ public class ComPersonServiceImpl extends BaseServiceImpl<ComPersonDAO, ComPerso
return state;
}
- public boolean isComplete(String id) {
- ComPerson person = this.getById(id);
+ public boolean isComplete(ComPerson person) {
if (null == person)
return false;
- if (StringUtils.isEmpty(person.getNation()) ||
+ if (StringUtils.isEmpty(person.getPersonName()) ||
+ StringUtils.isEmpty(person.getNation()) ||
StringUtils.isEmpty(person.getTitle()) ||
- StringUtils.isEmpty(person.getDegree()) ||
- StringUtils.isEmpty(person.getEducation()) ||
StringUtils.isEmpty(person.getSpec()) ||
+ StringUtils.isEmpty(person.getDegree()) ||
+ StringUtils.isEmpty(person.getDuty()) ||
StringUtils.isEmpty(person.getEmail())) {
return false;
}
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCooperativeUnitsServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCooperativeUnitsServiceImpl.java
index 0d15f098dc3406d0149f656cb104cdb227192a78..a6c0ee64dc68b42f254d45dfdd1b19ff21e8200f 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCooperativeUnitsServiceImpl.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCooperativeUnitsServiceImpl.java
@@ -57,6 +57,7 @@ public class ComProjectCooperativeUnitsServiceImpl extends BaseServiceImpl<ComPr
for (int i = 0; i < list.size(); i++) {
ComProjectCooperativeUnits item = convert2Entity(list.get(i));
item.setObjectId(objectId);
+ item.setType(type);
item.setShowIndex(i + 1);
iList.add(item);
}
@@ -64,9 +65,10 @@ public class ComProjectCooperativeUnitsServiceImpl extends BaseServiceImpl<ComPr
}
}
- public void deleteByObjectId(String objectId) {
+ public void deleteByObjectId(String objectId, int type) {
ComProjectCooperativeUnits model = new ComProjectCooperativeUnits();
model.setObjectId(objectId);
+ model.setType(type);
this.delete(model);
}
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
index 452c87d7d3997cc388e29b2aaa05401b83afb1cd..4121a2857a6f84cb7eaf12f26c98c12e2953d9e9 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
@@ -254,9 +254,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
//申报单位
ComUnitDTO comUnitDTO = comUnitService.getUnitById(SecurityUserHolder.getUnitId());
if (null != comUnitDTO) {
-// dto.setAppUnitName(comUnitDTO.getUnitName());
- dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
-// dto.setAddress(comUnitDTO.getUnitAddress());
+ dto.setAppUnitName(comUnitDTO.getUnitName());
//
// dto.setOrganizationCode(comUnitDTO.getOrganizationCode());
// dto.setRegisteredAddress(comUnitDTO.getRegisteredAddress());
@@ -283,6 +281,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
ComPersonDTO comPersonDTO = comPersonService.getPersonById(SecurityUserHolder.getPersonId());
if (null != comPersonDTO) {
loadPersonInfo(dto, comPersonDTO);
+ dto.setAddress(comPersonDTO.getAddress());
+ dto.setMainResearchAreas(comPersonDTO.getMainResearchAreas());
}
//经费表
@@ -331,19 +331,13 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
//申报单位
ComUnitDTO comUnitDTO = comUnitService.getUnitById(dto.getAppUnitId());
if (null != comUnitDTO) {
-// dto.setAppUnitName(comUnitDTO.getUnitName());
- dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
+ dto.setAppUnitName(comUnitDTO.getUnitName());
}
// 项目合作单位
List<ComProjectCooperativeUnitsDTO> cooperativeUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId(),1);
dto.setCooperativeUnits(cooperativeUnits);
- // 项目主要参与单位
- List<ComProjectCooperativeUnitsDTO> participateUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId(),2);
- dto.setCooperativeUnits(participateUnits);
-
-
//获取项目组成员
List<ComProjectMembersDTO> memList = comProjectMembersService.getListByObjectId(dto.getId());
dto.setMembers(memList);
@@ -371,33 +365,33 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
fundPlanList = comProjectFundPlanService.getList();
dto.setFundPlan(fundPlanList);
- // 项目经费构成表
- List<ComProjectFundCompositionDTO> fundCompositions = comProjectFundCompositionService.getListByObjectId(dto.getId());
- dto.setFundCompositions(fundCompositions);
+// // 项目经费构成表
+// List<ComProjectFundCompositionDTO> fundCompositions = comProjectFundCompositionService.getListByObjectId(dto.getId());
+// dto.setFundCompositions(fundCompositions);
- // 设备仪器经费表
- List<ComProjectEquipmentDTO> equipmentList = comProjectEquipmentService.getListByObjectId(dto.getId());
- dto.setEquipments(equipmentList);
+// // 设备仪器经费表
+// List<ComProjectEquipmentDTO> equipmentList = comProjectEquipmentService.getListByObjectId(dto.getId());
+// dto.setEquipments(equipmentList);
- // 单位支出明细预算
- List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId());
- dto.setUnitPayment(unitPaymentList);
+// // 单位支出明细预算
+// List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId());
+// dto.setUnitPayment(unitPaymentList);
// 项目绩效目标表
LoadProjectKPIInfo(dto);
- // 在研或完成基础研究项目情况
- List<ComProjectResearchDTO> projectResearchList = comProjectResearchService.getListByObjectId(dto.getId());
- dto.setProjectResearchList(projectResearchList);
+// // 在研或完成基础研究项目情况
+// List<ComProjectResearchDTO> projectResearchList = comProjectResearchService.getListByObjectId(dto.getId());
+// dto.setProjectResearchList(projectResearchList);
- // 项目课颖设置表
- List<ComProjectSubDTO> projectSubList = comProjectSubService.getListByObjectId(dto.getId());
- dto.setProjectSubList(projectSubList);
+// // 项目课颖设置表
+// List<ComProjectSubDTO> projectSubList = comProjectSubService.getListByObjectId(dto.getId());
+// dto.setProjectSubList(projectSubList);
- // 单位科研项目及资金管理制度表
- List<ComProjectManagementRuleDTO> managementRuleList = comProjectManagementRuleService.getListByObjectId(dto.getId());
- dto.setManagementRuleList(managementRuleList);
+// // 单位科研项目及资金管理制度表
+// List<ComProjectManagementRuleDTO> managementRuleList = comProjectManagementRuleService.getListByObjectId(dto.getId());
+// dto.setManagementRuleList(managementRuleList);
//附件列表
List<ComFileDTO> fileList = ComFileService.getListByObjectId(dto.getId(), CommonEnum.fileType.project.getCode());
@@ -669,7 +663,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
if (comProject.getProjState() > CommonEnum.projState.waitSubmit.getCode())
throw new BusinessException("当前项目状态不能删除");
// 项目合作单位
- comProjectCooperativeUnitsService.deleteByObjectId(id);
+ comProjectCooperativeUnitsService.deleteByObjectId(id,1);
+// comProjectCooperativeUnitsService.deleteByObjectId(id,2);
// 项目参加人员
comProjectMembersService.deleteByObjectId(id);
// 经费预算
@@ -677,19 +672,19 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 年度用款计划表
comProjectFundPlanService.deleteByObjectId(id);
// 单位支出明细预算表
- comProjectUnitPaymentService.deleteByObjectId(id);
+// comProjectUnitPaymentService.deleteByObjectId(id);
// 项目绩效指标表
comProjectKpitDetailService.deleteByObjectId(id);
// 项目经费构成表
- comProjectFundCompositionService.deleteByObjectId(id);
+// comProjectFundCompositionService.deleteByObjectId(id);
// 仪器、设备
- comProjectEquipmentService.deleteByObjectId(id);
+// comProjectEquipmentService.deleteByObjectId(id);
// 在研或完成基础研究项目情况
- comProjectResearchService.deleteByObjectId(id);
+// comProjectResearchService.deleteByObjectId(id);
// 项目课颖设置表
- comProjectSubService.deleteByObjectId(id);
+// comProjectSubService.deleteByObjectId(id);
// 单位科研项目及资金管理制度表
- comProjectManagementRuleService.deleteByObjectId(id);
+// comProjectManagementRuleService.deleteByObjectId(id);
// 项目信息表
comProjectBasicService.deleteByProjId(id);
// 附件
@@ -710,6 +705,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
@Transactional
public String save(ComProjectDTO dto) {
+ dto.setFileId(dto.getDownloadId());
if (Objects.isNull(dto.getId()))
dto.setId(projectInsert(dto));
else {
@@ -740,7 +736,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 项目合作单位
comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), id,1);
// 主要参与单位
- comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
+// comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
// 项目参加人员
comProjectMembersService.insertList(dto.getMembers(), id);
// 经费预算
@@ -748,19 +744,19 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 年度用款计划表
comProjectFundPlanService.insertList(dto.getFundPlan(), id);
// 单位支出明细预算表
- comProjectUnitPaymentService.insertList(dto.getUnitPayment(), id);
+// comProjectUnitPaymentService.insertList(dto.getUnitPayment(), id);
// 项目绩效指标表
comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), id);
// 项目经费构成表
- comProjectFundCompositionService.insertList(dto.getFundCompositions(), id);
+// comProjectFundCompositionService.insertList(dto.getFundCompositions(), id);
// 仪器、设备
- comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), id);
+// comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), id);
// 在研或完成基础研究项目情况
- comProjectResearchService.insertList(dto.getProjectResearchList(), id);
+// comProjectResearchService.insertList(dto.getProjectResearchList(), id);
// 项目课颖设置表
- comProjectSubService.insertList(dto.getProjectSubList(), id);
+// comProjectSubService.insertList(dto.getProjectSubList(), id);
// 单位科研项目及资金管理制度表
- comProjectManagementRuleService.insertList(dto.getManagementRuleList(), id);
+// comProjectManagementRuleService.insertList(dto.getManagementRuleList(), id);
// // 项目安排及阶段目标
// comProjectStageGoalService.insertList(dto.getStageGoals(), id);
@@ -797,7 +793,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 项目合作单位
comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), comProject.getId(),1);
// 主要参与单位
- comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
+// comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
// 项目参加人员
comProjectMembersService.insertList(dto.getMembers(), comProject.getId());
// 经费预算
@@ -805,20 +801,20 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 年度用款计划表
comProjectFundPlanService.insertList(dto.getFundPlan(), comProject.getId());
// 仪器、设备
- comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), comProject.getId());
+// comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), comProject.getId());
// 单位支出明细预算表
- comProjectUnitPaymentService.insertList(dto.getUnitPayment(), comProject.getId());
+// comProjectUnitPaymentService.insertList(dto.getUnitPayment(), comProject.getId());
// 项目绩效指标表
comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), comProject.getId());
// 项目经费构成表
- comProjectFundCompositionService.insertList(dto.getFundCompositions(), comProject.getId());
+// comProjectFundCompositionService.insertList(dto.getFundCompositions(), comProject.getId());
// 在研或完成基础研究项目情况
- comProjectResearchService.insertList(dto.getProjectResearchList(), comProject.getId());
+// comProjectResearchService.insertList(dto.getProjectResearchList(), comProject.getId());
// 项目课颖设置表
- comProjectSubService.insertList(dto.getProjectSubList(), comProject.getId());
+// comProjectSubService.insertList(dto.getProjectSubList(), comProject.getId());
// 单位科研项目及资金管理制度表
- comProjectManagementRuleService.insertList(dto.getManagementRuleList(), comProject.getId());
+// comProjectManagementRuleService.insertList(dto.getManagementRuleList(), comProject.getId());
// // 项目安排及阶段目标
// comProjectStageGoalService.insertList(dto.getStageGoals(), id);
// // 成果形式
@@ -875,14 +871,14 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
}
p.setBudget(item);
}
- if (null == p.getEquipments() || p.getEquipments().size() < 4) {
- int count = p.getEquipments() == null ? 0 : p.getEquipments().size();
- List<ComProjectEquipmentDTO> item = p.getEquipments() == null ? new ArrayList<>() : p.getEquipments();
- for (int i = 1; i <= 4 - count; i++) {
- item.add(new ComProjectEquipmentDTO());
- }
- p.setEquipments(item);
- }
+// if (null == p.getEquipments() || p.getEquipments().size() < 4) {
+// int count = p.getEquipments() == null ? 0 : p.getEquipments().size();
+// List<ComProjectEquipmentDTO> item = p.getEquipments() == null ? new ArrayList<>() : p.getEquipments();
+// for (int i = 1; i <= 4 - count; i++) {
+// item.add(new ComProjectEquipmentDTO());
+// }
+// p.setEquipments(item);
+// }
List<String> str = comProjectResultsService.getNameByObjectId(p.getId());
if (p.getProjType().equals(1)) {
WordUtils utl = new WordUtils();
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComUnitServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComUnitServiceImpl.java
index 1db996ef16080b584355377b4a835ecea62e91f8..bc385e5ed17f5e35818e1f334a4d32a32386d43f 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComUnitServiceImpl.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComUnitServiceImpl.java
@@ -374,6 +374,13 @@ public class ComUnitServiceImpl extends BaseServiceImpl<ComUnitDAO, ComUnitQuery
return list;
}
+ public List<ComUnitDTO> getListByUnitName(String UnitName) {
+ List<ComUnitDTO> UnitList = comUnitDAO.getListByUnitName(UnitName);
+ return UnitList;
+ }
+
+
+
public List<ComUnitDTO> getList() {
List<ComUnitDTO> list = null;
Object obj = redisUtils.get(RedisKey.UnitList);
diff --git a/science-admin/src/main/resources/mapper/ComPersonDAO.xml b/science-admin/src/main/resources/mapper/ComPersonDAO.xml
index bc88ad5612d12cf268d925ebf07366825a0ec69e..8783c5d25dd0aedd2bd93fbca5d1f3981a8cc68b 100644
--- a/science-admin/src/main/resources/mapper/ComPersonDAO.xml
+++ b/science-admin/src/main/resources/mapper/ComPersonDAO.xml
@@ -53,6 +53,7 @@
d.name education_name,
e.name title_name,
f.name spec_name,
+ h.name degree_name,
g.id user_id,
g.username
FROM com_person a
@@ -62,6 +63,7 @@
left join system_parameter d on a.education = d.id and d.type_id = 8
left join system_parameter e on a.title = e.id and e.type_id = 7
left join system_parameter f on a.spec = f.id and f.type_id = 42
+ left join system_parameter h on a.degree = h.id and h.type_id = 9
where a.id = #{id}
</select>
<select id="getList" resultType="com.yiboshi.science.param.dto.ComPersonDTO">
diff --git a/science-admin/src/main/resources/mapper/ComProjectDAO.xml b/science-admin/src/main/resources/mapper/ComProjectDAO.xml
index 19f68d0ce63be75ecd59527da7724886d2d6de05..0e5363bacd9a3369a92361df3378bf59cc2d9194 100644
--- a/science-admin/src/main/resources/mapper/ComProjectDAO.xml
+++ b/science-admin/src/main/resources/mapper/ComProjectDAO.xml
@@ -40,14 +40,16 @@
<select id="getById" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectDTO">
SELECT a.*,b.name knowledge_name,
- ic.proj_id,ic.job_time,ic.main_research_areas,
+ ic.proj_id,ic.job_time,ic.main_research_areas,ic.address
ic.unit_link_name,ic.unit_link_mobile,ic.unit_link_email,ic.unit_link_fax,ic.subject_scope,ic.proj_abstract,ic.proj_keywords,
ic.total_funding,ic.gov_funding,ic.unit_funding,ic.self_funding,ic.other_funding,
ic.proj_content,
- ic.proj_attribute,ic.remark,ic.year_target,ic.year1_goal,ic.year2_goal,ic.year3_goal
+ ic.proj_attribute,ic.remark,ic.year_target,ic.year1_goal,ic.year2_goal,ic.year3_goal,
+ c.id download_id,c.download_url,c.file_name
from com_project a
left join com_project_basic ic on a.id=ic.proj_id
left join system_parameter b on a.knowledge_id=b.id
+ left join com_download c on ic.file_id=c.id
where a.id = #{id}
</select>
<select id="getProjectReportCountByGov" resultType="com.yiboshi.science.param.dto.DataStatisticsDTO">
diff --git a/science-admin/src/main/resources/mapper/ComUnitDAO.xml b/science-admin/src/main/resources/mapper/ComUnitDAO.xml
index 38bd2f05cc55aadd848ac3e24ad1700d3c5cbfbd..85cb6281c281047445d5d3618b221531a2ffc817 100644
--- a/science-admin/src/main/resources/mapper/ComUnitDAO.xml
+++ b/science-admin/src/main/resources/mapper/ComUnitDAO.xml
@@ -31,6 +31,12 @@
where a.tree_code = #{treeCode}
</select>
+ <select id="getListByUnitName" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComUnitDTO">
+ select a.*
+ from com_unit a
+ where a.unit_name = #{UnitName}
+ </select>
+
<select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComUnitDTO">
select a.*, b.username, b.password, c.unit_name as upUnitName,d.name natureName
from com_unit a