Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-health-science

# Conflicts:
#	science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
#	science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

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

@@ -27,11 +27,11 @@ public class ComProjectStageGoal extends BaseEntity {
     private String objectId;
     /** 内容 */
     @ApiModelProperty(value = "内容", position = 2 )
-    @Length(max=2000, message = "内容不能大于2000")
+    @Length(max=3000, message = "内容不能大于3000")
     private String contentInfo;
     /** 阶段目标 */
     @ApiModelProperty(value = "阶段目标", position = 5 )
-    @Length(max=500, message = "阶段目标不能大于500")
+    @Length(max=3000, message = "阶段目标不能大于3000")
     private String target;
     /** 开始时间 */
     @ApiModelProperty(value = "开始时间", position = 3 )
@@ -41,10 +41,6 @@ public class ComProjectStageGoal extends BaseEntity {
     @ApiModelProperty(value = "结束时间", position = 4 )
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
-    /** 类型 (参数表获取) */
-    @ApiModelProperty(value = "类型 (参数表获取)", position = 5 )
-    @Length(max=36, message = "类型 (参数表获取)不能大于36")
-    private String contentType;
     /** 排序 */
     @ApiModelProperty(value = "排序", position = 6 )
     private Integer showIndex;

science-admin/src/main/java/com/yiboshi/science/enumeration/CommonEnum.java

@@ -307,12 +307,7 @@ public class CommonEnum {
     public enum projState implements INumberEnum {
         draft(-10, "起草"),
         waitSubmit(10, "待提交"),
-        toUnit(20, "单位评审"),
-        toCounty(22, "县（区）评审"),
-        toCity(24, "州（市）评审"),
-        toProvinceFirstTrial(25, "省卫健委初审"),
-        toExpert(26, "专家评审"),
-        toProvince(28, "省卫健委复审"),
+        toAudit(20, "评审中"),
         returnModify(30, "返回修改"),
         failed(40, "未批准立项"),
         pass(50, "批准立项"),

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

@@ -317,24 +317,29 @@ 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 ProjectKPIStatisticDTO projectKPI;
-    /** 购置设备预算明细表 */
-    private List<ComProjectEquipmentDTO> equipments;
     /** 购置设备预算明细表 */
     private List<ComProjectEquipmentDTO> deviceList;
+    /** 试制设备预算明细表 */
+    private List<ComProjectManufactureDTO> manufacture;
+    /** 项目绩效目标表 */
+    private ProjectKPIStatisticDTO projectKPI;
     /** 项目安排及阶段目标 */
     private List<ComProjectStageGoalDTO> stageGoals;
     /** 项目课颖设置表 */
     private List<ComProjectSubDTO> projectSubList;
+<<<<<<< HEAD
     /** 试制设备预算明细表 */
     private List<ComProjectManufactureDTO> manufactureList;
+=======
+>>>>>>> 90574225c4c1f47742d66430afac9c7d3cf70f6a
     /** 附件列表 */
     private List<ComFileDTO> fileList;
     /** 审核列表 */

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

@@ -26,11 +26,11 @@ public class ComProjectStageGoalDTO extends BaseDTO {
     private String objectId;
     /** 内容 */
     @ApiModelProperty(value = "内容", position = 2 )
-    @Length(max=2000, message = "内容不能大于2000")
+    @Length(max=3000, message = "内容不能大于3000")
     private String contentInfo;
     /** 阶段目标 */
     @ApiModelProperty(value = "阶段目标", position = 5 )
-    @Length(max=500, message = "阶段目标不能大于500")
+    @Length(max=3000, message = "阶段目标不能大于3000")
     private String target;
     /** 开始时间 */
     @ApiModelProperty(value = "开始时间", position = 3 )
@@ -40,10 +40,6 @@ public class ComProjectStageGoalDTO extends BaseDTO {
     @ApiModelProperty(value = "结束时间", position = 4 )
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
-    /** 类型 (参数表获取) */
-    @ApiModelProperty(value = "类型 (参数表获取)", position = 5 )
-    @Length(max=36, message = "类型 (参数表获取)不能大于36")
-    private String contentType;
     /** 排序 */
     @ApiModelProperty(value = "排序", position = 6 )
     private Integer showIndex;

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

@@ -6,6 +6,7 @@ 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;
 
@@ -26,8 +27,13 @@ public class ComProjectStageGoalQueryVO extends PaginationVO{
     @ApiModelProperty(value = "任务书Id", position = 1)
     private String objectId;
     /** 内容 */
-    @ApiModelProperty(value = "内容", position = 2)
+    @ApiModelProperty(value = "内容", position = 2 )
+    @Length(max=3000, message = "内容不能大于3000")
     private String contentInfo;
+    /** 阶段目标 */
+    @ApiModelProperty(value = "阶段目标", position = 5 )
+    @Length(max=3000, message = "阶段目标不能大于3000")
+    private String target;
     /** 开始时间 */
     @ApiModelProperty(value = "开始时间", position = 3)
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@@ -36,9 +42,6 @@ public class ComProjectStageGoalQueryVO extends PaginationVO{
     @ApiModelProperty(value = "结束时间", position = 4)
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
-    /** 类型 (参数表获取) */
-    @ApiModelProperty(value = "类型 (参数表获取)", position = 5)
-    private String contentType;
     /** 排序 */
     @ApiModelProperty(value = "排序", position = 6)
     private Integer showIndex;

science-admin/src/main/java/com/yiboshi/science/service/ComProjectService.java

@@ -28,7 +28,7 @@ public interface ComProjectService extends BaseService<ComProjectQueryVO, ComPro
      *
      * @return
      */
-    void updateState(String id, Integer state, String versionNo);
+    void updateStateOrNo(String id, Integer state, String versionNo);
 
     /**
      * 获取新的版本号

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

@@ -196,7 +196,7 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
             //职称
             List<SystemParameter> titleList = systemParameterService.getListByType(7);
             //专业学科
-            List<SystemParameter> specList = systemParameterService.getListByType(57);
+            List<SystemParameter> specList = systemParameterService.getListByType(68);
             list.forEach(e -> {
                 if (null != comPersonService.getPersonByCertId(e.getCertId()))
                     return;

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

@@ -193,7 +193,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
         modal.setId(conclusion.getId());
         modal.setState(CommonEnum.conclusionState.report.getCode());
         modal.setThesisState(CommonEnum.thesisState.pass.getCode());
-        comProjectService.updateState(conclusion.getProjId(), CommonEnum.projState.report.getCode(), null);
+        comProjectService.updateStateOrNo(conclusion.getProjId(), CommonEnum.projState.report.getCode(), null);
         comProjectAuditService.report(DateUtils.getYear(), conclusion.getId(), 4, auditUnitId, treeCode);
         return this.update(modal);
     }
@@ -210,7 +210,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
         Integer state = null;
         if (e.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
             state = CommonEnum.conclusionState.pass.getCode();
-            comProjectService.updateState(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null);
+            comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null);
         } else if (e.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
             state = CommonEnum.conclusionState.returnModify.getCode();
         } else {
@@ -236,7 +236,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
         Integer state = null;
         if (e.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
             state = CommonEnum.thesisState.pass.getCode();
-            comProjectService.updateState(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null);
+            comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null);
         } else if (e.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
             state = CommonEnum.thesisState.returnModify.getCode();
         } else {
@@ -307,7 +307,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
             c.setThesisState(CommonEnum.thesisState.unFilled.getCode());
             this.update(c);
         }
-        comProjectService.updateState(projId, CommonEnum.projState.conclusion.getCode(), null);
+        comProjectService.updateStateOrNo(projId, CommonEnum.projState.conclusion.getCode(), null);
 
         comProjectAuditService.insertAudit(comProject.getReportYear(), 4, id, CommonEnum.auditMethod.audit.getCode(),
                 auditUnitId, null, CommonEnum.auditResult.pass.getCode(), new Date(), 1, 1, SecurityUserHolder.getPersonId());

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

@@ -13,7 +13,7 @@
     <select id="getListByExpertId" parameterType="java.lang.String"  resultType="com.yiboshi.science.param.dto.ComExpertSpecDTO">
         SELECT a.spec_id,b.name specName
         FROM com_expert_spec a
-        left join system_parameter b on a.spec_id=b.id and b.type_id=57
+        left join system_parameter b on a.spec_id=b.id and b.type_id=68
         where expert_id=#{expertId} order by a.show_index
     </select>
     <select id="getExpertListBySpecId"  resultType="com.yiboshi.science.param.dto.ComExpertDTO">

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

@@ -23,7 +23,7 @@
         left join system_parameter g on e.nation=g.id and g.type_id=11
         left join system_parameter h on e.education=h.id and h.type_id=8
         left join system_parameter i on e.title=i.id and i.type_id=7
-        left join system_parameter j on e.spec=j.id and j.type_id=42
+        left join system_parameter j on e.spec=j.id and j.type_id=68
         left join system_parameter k on j.parent_id = k.id
         <where>
             ${ew.sqlSegment}
@@ -39,7 +39,7 @@
         left join system_parameter g on e.nation=g.id and g.type_id=11
         left join system_parameter h on e.education=h.id and h.type_id=8
         left join system_parameter i on e.title=i.id and i.type_id=7
-        left join system_parameter j on e.spec=j.id and j.type_id=42
+        left join system_parameter j on e.spec=j.id and j.type_id=68
         left join system_parameter k on j.parent_id = k.id
         <where>
             ${ew.sqlSegment}
@@ -62,7 +62,7 @@
         left join system_parameter c on a.nation = c.id and c.type_id = 11
         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 f on a.spec = f.id and f.type_id = 68
         left join system_parameter h on a.degree = h.id and h.type_id = 9
         where a.id = #{id}
     </select>
@@ -73,7 +73,7 @@
                  left join system_parameter c on a.nation = c.id and c.type_id = 11
                  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 f on a.spec = f.id and f.type_id = 68
     </select>
     <select id="getManagerListByUnitId" resultType="com.yiboshi.science.param.dto.ComPersonDTO">
         SELECT a.*,b.unit_name,c.username,c.password,c.id user_id,d.id user_role_id,d.state,

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

@@ -12,8 +12,8 @@
         LEFT JOIN com_expert b ON a.expert_id = b.id
         LEFT JOIN com_person c ON b.person_id = c.id
         LEFT JOIN com_unit g ON c.unit_id = g.id
-        left join system_parameter d on a.knowledge_id = d.id and d.type_id = 57
-        left join system_parameter e on c.title=e.id and e.type_id = 7
+        left join system_parameter d on a.knowledge_id = d.id
+        left join system_parameter e on c.title=e.id 
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -18,7 +18,7 @@
        left join system_parameter c on a.nation=c.id and c.type_id=11
        left join system_parameter d on a.title = d.id and d.type_id=7
        left join system_parameter e on a.degree=e.id and e.type_id=9
-       left join system_parameter f on a.spec=f.id and f.type_id=42
+       left join system_parameter f on a.spec=f.id and f.type_id=68
        left join com_download g on a.file_id=g.id
        where object_id=#{objectId}
        order by a.show_index asc

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

@@ -30,7 +30,7 @@
         LEFT JOIN system_parameter g on e.nation=g.id and g.type_id=11
         LEFT JOIN system_parameter h on e.education=h.id and h.type_id=8
         LEFT JOIN system_parameter i on e.title=i.id and i.type_id=7
-        LEFT JOIN system_parameter j on e.spec=j.id and j.type_id=42
+        LEFT JOIN system_parameter j on e.spec=j.id and j.type_id=68
         LEFT JOIN system_parameter k on j.parent_id = k.id
         <where>
             ${ew.sqlSegment}
@@ -47,7 +47,7 @@
                  LEFT JOIN system_parameter g on e.nation=g.id and g.type_id=11
                  LEFT JOIN system_parameter h on e.education=h.id and h.type_id=8
                  LEFT JOIN system_parameter i on e.title=i.id and i.type_id=7
-                 LEFT JOIN system_parameter j on e.spec=j.id and j.type_id=42
+                 LEFT JOIN system_parameter j on e.spec=j.id and j.type_id=68
                  LEFT JOIN system_parameter k on j.parent_id = k.id
         where a.id = #{id}
     </select>