1

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

@@ -158,6 +158,25 @@ public class ComProjectTaskDTO extends BaseDTO {
     @ApiModelProperty(value = "项目结束时间", position = 11 )
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date projEnd;
+    /** 项目实施目标 */
+    @ApiModelProperty(value = "项目实施目标", position = 28 )
+    private String researchContent;
+    /** 主要技术指标 */
+    @ApiModelProperty(value = "主要技术指标", position = 35 )
+    private String technologyTarget;
+    /** 主要经济指标 */
+    @ApiModelProperty(value = "主要经济指标", position = 35 )
+    private String economyTarget;
+    /** 项目实施中形成的示范基地、中试线、生产线及其规模等 */
+    @ApiModelProperty(value = "项目实施中形成的示范基地、中试线、生产线及其规模等", position = 35 )
+    private String achievementTarget;
+    /** 科技报告考核指标 */
+    @ApiModelProperty(value = "科技报告考核指标", position = 35 )
+    private String technologyReportsTarget;
+    /** 其他应考核的指标 */
+    @ApiModelProperty(value = "其他应考核的指标", position = 35 )
+    private String otherTarget;
+
 
     /** 项目总经费(万元） */
     @ApiModelProperty(value = "项目总经费(万元）", position = 39)
@@ -233,4 +252,78 @@ public class ComProjectTaskDTO extends BaseDTO {
     /** 联系电话 */
     @ApiModelProperty(value = "联系电话", position = 8)
     private String phone;
+
+    private String managerDept;
+    @ApiModelProperty(value = "项目属性Id", position = 36)
+    private String projAttribute;
+    /** 年度总目标 */
+    @ApiModelProperty(value = "年度总目标", position = 14 )
+    private String yearTarget;
+    /** 第一年目标 */
+    @ApiModelProperty(value = "第一年目标", position = 14 )
+    private String year1Goal;
+    /** 第二年目标 */
+    @ApiModelProperty(value = "第二年目标", position = 14 )
+    private String year2Goal;
+    /** 第三年目标 */
+    @ApiModelProperty(value = "第三年目标", position = 14 )
+    private String year3Goal;
+
+    /** 项目组成员_总人数 */
+    @ApiModelProperty(value = "项目组成员_总人数", position = 17 )
+    private Integer memCount;
+    /** 项目组成员_高职 */
+    @ApiModelProperty(value = "项目组成员_高职", position = 18 )
+    private Integer memHighCount;
+    /** 项目组成员_中职 */
+    @ApiModelProperty(value = "项目组成员_中职", position = 19 )
+    private Integer memMiddleCount;
+    /** 项目组成员_初职 */
+    @ApiModelProperty(value = "项目组成员_初职", position = 20 )
+    private Integer memLowCount;
+    /** 项目组成员_其他 */
+    @ApiModelProperty(value = "项目组成员_其他", position = 21 )
+    private Integer memOtherCount;
+    /** 项目组成员_博士后 */
+    @ApiModelProperty(value = "项目组成员_博士研究生", position = 22 )
+    private Integer memBshCount;
+    /** 项目组成员_博士生 */
+    @ApiModelProperty(value = "项目组成员_博士研究生", position = 22 )
+    private Integer memBsCount;
+    /** 项目组成员_硕士生 */
+    @ApiModelProperty(value = "项目组成员_硕士研究生", position = 23 )
+    private Integer memSsCount;
+    /** 项目组成员_硕士生 */
+    @ApiModelProperty(value = "项目组成员_学士", position = 24)
+    private Integer memXsCount;
+    /** 项目组成员_参加单位数 */
+    @ApiModelProperty(value = "项目组成员_参加单位数", position = 25)
+    private Integer workCount;
+
+    /** 合作单位 */
+    private List<ComProjectCooperativeUnitsDTO> cooperativeUnits;
+    /** 项目主要参与单位 */
+    private List<ComProjectCooperativeUnitsDTO> participateUnits;
+    /** 项目组成员 */
+    private List<ComProjectMembersDTO> members;
+    /** 经费表 */
+    private List<ComProjectBudgetDTO> budget;
+    /** 年度用款计划 */
+    private List<ComProjectFundPlanDTO> fundPlan;
+    /** 购置设备预算明细表 */
+    private List<ComProjectEquipmentDTO> deviceList;
+    /** 单位支出明细预算 */
+    private List<ComProjectUnitPaymentDTO> unitPayment;
+    /** 项目绩效目标表 */
+    private ProjectKPIStatisticDTO projectKPI;
+    /** 项目安排及阶段目标 */
+    private List<ComProjectStageGoalDTO> stageGoals;
+    /** 项目课颖设置表 */
+    private List<ComProjectSubDTO> projectSubList;
+    /** 试制设备预算明细表 */
+    private List<ComProjectManufactureDTO> manufactureList;
+    /** 附件列表 */
+    private List<ComFileDTO> fileList;
+    /** 审核列表 */
+    private List<ComProjectAuditNoteDTO> auditList;
 }
\ No newline at end of file

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

@@ -214,8 +214,7 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         return page;
     }
 
-    public void report(Integer reportYear, String auditObjectId, Integer auditType, String auditUnitId, String
-            treeCode) {
+    public void report(Integer reportYear, String auditObjectId, Integer auditType, String auditUnitId, String treeCode) {
         int maxIndex = this.getMaxAuditIndex(auditObjectId);
         ComProjectAudit comProjectAudit = this.getAudit(auditObjectId, auditUnitId, auditType, CommonEnum.auditMethod.audit.getCode(), null);
         if (null != comProjectAudit) {
@@ -252,7 +251,7 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         // 审核通过
         if (model.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
             if (unitLevel.equals(1)) {
-                if (auditMethod.equals(CommonEnum.auditMethod.audit.getCode())) {
+                if (auditMethod.equals(CommonEnum.auditMethod.audit.getCode()) && auditType.equals(1)) {
                     // 查询上级单位上报记录
                     ComProjectAudit auditNote = this.getAudit(auditObjectId, auditUnitId, auditType, CommonEnum.auditMethod.last.getCode(), null);
                     if (null != auditNote) {
@@ -297,12 +296,10 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
             if (auditMethod.equals(CommonEnum.auditMethod.last.getCode()))
                 throw new BusinessException("终审项目不能返回修改！");
             unitLevel = unitLevel + 1;
-
             // 跳过县级行政机构
             if (reportTreeCode.length() / properties.getDefaultCodeLength() > 3 && auditUnitTreeCode.length() / properties.getDefaultCodeLength() == 2) {
                 unitLevel = comProjectAuditDAO.getMaxUnitLevelByObjectId(model.getAuditObjectId());
             }
-
             //更新上报表
             ComProjectAudit auditNote = this.getAudit(auditObjectId, null, auditType, CommonEnum.auditMethod.audit.getCode(), unitLevel);
             if (null != auditNote) {
@@ -417,7 +414,7 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         return this.getEntity(comProjectAudit);
     }
 
-    public void insertAudit(Integer reportYear, Integer auditType, String auditObjectId, Integer auditMethod, String auditUnitId, String auditContent, Integer auditResult, Date auditDate, Integer unitLevel, Integer showIndex,String comPerson) {
+    public void insertAudit(Integer reportYear, Integer auditType, String auditObjectId, Integer auditMethod, String auditUnitId, String auditContent, Integer auditResult, Date auditDate, Integer unitLevel, Integer showIndex, String comPerson) {
         ComProjectAudit comProjectAudit = new ComProjectAudit();
         comProjectAudit.setReportYear(reportYear);
         comProjectAudit.setAuditType(auditType);

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

@@ -88,9 +88,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
     @Autowired
     private final HtmlBuilder htmlBuilder;
     @Autowired
-    private final ComProjectFundPlanService comProjectFundPlanService;
+    private  ComProjectFundPlanService comProjectFundPlanService;
     @Autowired
-    private final ComProjectUnitPaymentService comProjectUnitPaymentService;
+    private  ComProjectUnitPaymentService comProjectUnitPaymentService;
     @Autowired
     private ComProjectKpitService comProjectKpitService;
     @Autowired
@@ -630,7 +630,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         return state;
     }
 
-
     public void report(ComProjectAudit model, String unitId, String treeCode) {
         ComProject comProject = this.entityById(model.getAuditObjectId());
         if (null == comProject)

science-admin/src/main/resources/mapper/ComProjectTaskDAO.xml

@@ -37,7 +37,7 @@
                pt.key_areas,pt.proj_work,pt.telephone,pt.fax,
                pt.link_name,pt.link_mobile,pt.link_fax,pt.link_email,
                pt.is_technology_report,pt.project_report,pt.progress_report,pt.special_report,pt.final_report,
-               a.proj_name,a.proj_no,a.start_date projStart,a.end_date projEnd,a.app_person_id,a.app_unit_id,
+               a.proj_name,a.proj_no,a.start_date projStart,a.end_date projEnd,a.app_person_id,a.app_unit_id,a.proj_type,
                b.name knowledge_name,
                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,