Merge remote-tracking branch 'origin/master'

science-admin/src/main/java/com/yiboshi/science/entity/ComProject.java

@@ -55,6 +55,9 @@ public class ComProject extends BaseEntity {
     /** 申报批次 */
     @ApiModelProperty(value = "申报批次", position = 7 )
     private Integer batch;
+    /** 主管处室 */
+    @ApiModelProperty(value = "主管处室", position = 1)
+    private String managerDept;
     /** 项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项 */
     @ApiModelProperty(value = "项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项", position = 7 )
     private Integer projState;

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java

@@ -56,6 +56,9 @@ public class ComProjectDTO extends BaseDTO {
     /** 申报批次 */
     @ApiModelProperty(value = "申报批次", position = 7 )
     private Integer batch;
+    /** 主管处室 */
+    @ApiModelProperty(value = "主管处室", position = 1)
+    private String managerDept;
     /** 项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项 */
     @ApiModelProperty(value = "项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项", position = 7 )
     private Integer projState;

science-admin/src/main/java/com/yiboshi/science/param/dto/ProjectKPIStatisticDTO.java

@@ -15,6 +15,7 @@ public class ProjectKPIStatisticDTO extends BaseDTO {
 
     private Integer reportYear;
     private String projName;
+    private String managerDept;
     private String appUnitName;
     private String projAttribute;
     private String projDeadline;

science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectQueryVO.java

@@ -55,6 +55,9 @@ public class ComProjectQueryVO extends PaginationVO{
     /** 申报批次 */
     @ApiModelProperty(value = "申报批次", position = 7 )
     private Integer batch;
+    /** 主管处室 */
+    @ApiModelProperty(value = "主管处室", position = 1)
+    private String managerDept;
     /** 项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项 */
     @ApiModelProperty(value = "项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项", position = 7 )
     private Integer projState;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

@@ -427,6 +427,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         kpiDTO.setReportYear(dto.getReportYear());
         kpiDTO.setProjName(dto.getProjName());
         kpiDTO.setAppUnitName(dto.getAppUnitName());
+        kpiDTO.setManagerDept(dto.getManagerDept());
         kpiDTO.setProjAttribute(dto.getProjAttribute());
         kpiDTO.setYearTarget(dto.getYearTarget());
         kpiDTO.setYear1Goal(dto.getYear1Goal());