111

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -28,14 +29,6 @@ public class ComProjectMembersDTO extends BaseDTO {
     @ApiModelProperty(value = "姓名", position = 2 )
     @Length(max=60, message = "姓名不能大于60")
     private String name;
-    /** 证书类型 */
-    @ApiModelProperty(value = "证书类型", position = 1)
-    @Length(max=36, message = "证书类型不能大于36")
-    private String certificateType;
-    /** 证件号 */
-    @ApiModelProperty(value = "证件号", position = 1)
-    @Length(max=100, message = "证件号不能大于100")
-    private String certId;
     /** 性别 */
     @ApiModelProperty(value = "性别", position = 4 )
     @Length(max=2, message = "性别不能大于2")
@@ -44,9 +37,15 @@ public class ComProjectMembersDTO extends BaseDTO {
     @ApiModelProperty(value = "出生年月", position = 3 )
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date birthday;
-    /** 年龄 */
-    @ApiModelProperty(value = "年龄", position = 5 )
-    private Integer age;
+    /** 证书类型 */
+    @ApiModelProperty(value = "证书类型", position = 1)
+    @Length(max=36, message = "证书类型不能大于36")
+    private String certificateType;
+    /** 证件号 */
+    @ApiModelProperty(value = "证件号", position = 1)
+    @Length(max=100, message = "证件号不能大于100")
+    private String certId;
+
     /** 民族 */
     @ApiModelProperty(value = "民族", position = 9 )
     @Length(max=36, message = "民族不能大于36")
@@ -63,6 +62,10 @@ public class ComProjectMembersDTO extends BaseDTO {
     @ApiModelProperty(value = "职称", position = 5 )
     @Length(max=36, message = "职称不能大于36")
     private String title;
+    /** 最高学位 */
+    @ApiModelProperty(value = "最高学位", position = 5 )
+    @Length(max=36, message = "最高学位不能大于36")
+    private String degree;
     /** 电子邮箱 */
     @ApiModelProperty(value = "电子邮箱", position = 8)
     @Length(max=100, message = "学历不能大于100")
@@ -85,7 +88,7 @@ public class ComProjectMembersDTO extends BaseDTO {
     private String projWork;
     /** 每年工作（月）*/
     @ApiModelProperty(value = "每年工作（月）", position = 9 )
-    private Integer forMonths;
+    private BigDecimal forMonths;
     /** 从事专业 */
     @ApiModelProperty(value = "专业", position = 11)
     @Length(max=36, message = "专业不能大于36")
@@ -97,18 +100,23 @@ public class ComProjectMembersDTO extends BaseDTO {
     @ApiModelProperty(value = "角色 1项目负责人 2一般成员", position = 11 )
     private Integer role;
 
-    /** 职务 */
-    @ApiModelProperty(value = "职务", position = 9)
-    private String dutyName;
+    /** 证件类型 */
+    @ApiModelProperty(value = "证件类型", position = 9)
+    private String certificateTypeName;
+    /** 民族 */
+    @ApiModelProperty(value = "民族", position = 9)
+    private String nationName;
     /** 职称名称 */
     @ApiModelProperty(value = "职称名称", position = 9)
     private String titleName;
-    /** 专业 */
-    @ApiModelProperty(value = "专业", position = 9)
-    private String specName;
     /** 学位 */
     @ApiModelProperty(value = "学位", position = 8)
     private String degreeName;
+    /** 专业 */
+    @ApiModelProperty(value = "专业", position = 9)
+    private String specName;
+    /** 证件类型 */
+
     /** 学历 */
     @ApiModelProperty(value = "学历", position = 8)
     private String educationName;

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

@@ -307,57 +307,16 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         List<ComProjectMembersDTO> memList = comProjectMembersService.getListByObjectId(dto.getId());
         dto.setMembers(memList);
 
-        ComProjectMembersDTO comProjectMembersDTO = comProjectMembersService.getMemCountById(id);
-        dto.setMemCount(comProjectMembersDTO.getMemCount() + 1);
-        dto.setMemHighCount(comProjectMembersDTO.getMemHighCount());
-        dto.setMemMiddleCount(comProjectMembersDTO.getMemMiddleCount());
-        dto.setMemLowCount(comProjectMembersDTO.getMemLowCount());
-        dto.setMemBshCount(comProjectMembersDTO.getMemBshCount());
-        dto.setMemBsCount(comProjectMembersDTO.getMemBsCount());
-        dto.setMemSsCount(comProjectMembersDTO.getMemSsCount());
-        dto.setMemXsCount(comProjectMembersDTO.getMemXsCount());
-        dto.setWorkCount(comProjectMembersDTO.getWorkCount());
-        //申报人职称统计
-        if (!StringUtils.isEmpty(comPersonDTO.getTitle())) {
-            String titleName = systemParameterService.judgmentTitleLevel(comPersonDTO.getTitle());
-
-            if (!StringUtils.isEmpty(titleName)) {
-                switch (titleName) {
-                    case "无职称":
-                    case "初级职称":
-                        dto.setMemLowCount(dto.getMemLowCount() + 1);
-                        break;
-                    case "中级职称":
-                        dto.setMemMiddleCount(dto.getMemMiddleCount() + 1);
-                        break;
-                    case "副高级职称":
-                    case "高级职称":
-                        dto.setMemHighCount(dto.getMemHighCount() + 1);
-                        break;
-                }
-            }
-        }
-
-        //申报人学历统计
-        if (!StringUtils.isEmpty(comPersonDTO.getEducationName())) {
-            switch (comPersonDTO.getEducationName()) {
-//                case "博士后":
-//                    dto.setMemBshCount(dto.getMemBshCount() + 1);
-//                    break;
-                case "博士":
-                    dto.setMemBsCount(dto.getMemBsCount() + 1);
-                    break;
-                case "硕士":
-                    dto.setMemSsCount(dto.getMemSsCount() + 1);
-                    break;
-                case "本科":
-                    dto.setMemXsCount(dto.getMemXsCount() + 1);
-                    break;
-                case "大专":
-                case "其他":
-                    break;
-            }
-        }
+//        ComProjectMembersDTO comProjectMembersDTO = comProjectMembersService.getMemCountById(id);
+//        dto.setMemCount(comProjectMembersDTO.getMemCount() + 1);
+//        dto.setMemHighCount(comProjectMembersDTO.getMemHighCount());
+//        dto.setMemMiddleCount(comProjectMembersDTO.getMemMiddleCount());
+//        dto.setMemLowCount(comProjectMembersDTO.getMemLowCount());
+//        dto.setMemBshCount(comProjectMembersDTO.getMemBshCount());
+//        dto.setMemBsCount(comProjectMembersDTO.getMemBsCount());
+//        dto.setMemSsCount(comProjectMembersDTO.getMemSsCount());
+//        dto.setMemXsCount(comProjectMembersDTO.getMemXsCount());
+//        dto.setWorkCount(comProjectMembersDTO.getWorkCount());
 
         //经费表
         List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getListByObjectId(dto.getId());
@@ -728,7 +687,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             if (null != p.getCreated())
                 p.setCreatedStr(sdf.format(p.getCreated()));
             p.getMembers().forEach((e) -> {
-                e.setAge(IDCardUtil.getAge(e.getCertId()));
+//              e.setAge(IDCardUtil.getAge(e.getCertId()));
                 e.setSex(IDCardUtil.getSex(e.getCertId()));
             });
 

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

@@ -38,15 +38,17 @@
         </where>
     </select>
     <select id="getById" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectDTO">
-        SELECT a.*,b.name knowledge_name,c.name anticipated_name,
-               ic.proj_id,ic.app_unit_name,ic.address,ic.post_code,ic.credit_code,ic.nature,ic.telephone,ic.mobile,ic.email,ic.link_name,ic.link_unit,ic.link_mobile,ic.link_email,ic.technical_field,ic.annual_technology_report,ic.mid_technical_report,
-               ic.final_technical_report,ic.proj_abstract,ic.total_funding,ic.gov_funding,ic.unit_funding,ic.self_funding,ic.other_funding,ic.research_progress,ic.research_content,ic.research_plan,ic.main_features,ic.progressiveness,ic.supporting_conditions,
-               ic.mem_resume,ic.technology_target,ic.economy_target,ic.achievement_target,ic.social_benefit,ic.other_target,ic.dept,ic.anticipated_forms,ic.apply_money,ic.proj_keywords,ic.keywords_english,ic.proj_reference,ic.proj_basis,ic.proj_content,
-               ic.study_plan,ic.expected_results,ic.work_foundation,ic.working_conditions,ic.research_projects,ic.proj_doc,ic.is_accept,ic.is_overseas,ic.is_achieve,ic.overseas_remark,ic.remark,ic.award_situation
+        SELECT a.*,b.name knowledge_name,
+               ic.proj_id,ic.app_unit_name,ic.unit_type,ic.organization_code,ic.address,
+               ic.registered_address,ic.post_code,ic.legal_person,ic.workforce,ic.specialized_personnel,ic.research_personnel,ic.deposit_bank,
+               ic.bank_account,ic.deposit_bank_address,ic.interbank_number,ic.research_total,ic.is_research_active,ic.research_count,
+               ic.research_person_count,ic.lead_unit,ic.recommend_unit,ic.technology_innovation_base,ic.total_funding,ic.gov_funding,ic.unit_funding,ic.self_funding,ic.other_funding,ic.link_name,ic.link_mobile,ic.link_email,ic.proj_abstract,
+               ic.proj_keywords,ic.proj_content,ic.mem_resume, ic.research_progress,
+               ic.research_content,ic.technology_target,ic.economy_target,ic.achievement_target,
+               ic.other_target,ic.proj_basis,ic.research_plan,ic.main_features,ic.expected_results,ic.research_projects,ic.proj_doc,ic.remark
         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 system_parameter c on ic.anticipated_forms=c.id
         where a.id = #{id}
     </select>
     <select id="getProjectReportCountByGov" resultType="com.yiboshi.science.param.dto.DataStatisticsDTO">

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

@@ -2,13 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- 合作单位表 -->
-<mapper namespace="com.yiboshi.science.dao. ComProjectManagementRuleDAO">
+<mapper namespace="com.yiboshi.science.dao.ComProjectManagementRuleDAO">
     <sql id="allColumns">
         t.id as id, t.object_id as objectId, t.unit_name as unitName, t.unit_address as unitAddress, t.project_work as projectWork
     </sql>
     <select id="getListByObjectId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectManagementRuleDTO">
-        SELECT
-        a.*
+        SELECT a.*
         FROM com_project_management_rule a
         where object_id=#{objectId} order by a.show_index asc
     </select>

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

@@ -11,27 +11,27 @@
        select count(distinct(work_unit)) workCount from com_project_members where object_id=#{objectId}
     </select>
     <select id="getListByObjectId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectMembersDTO">
-       SELECT c.name degree_name,d.name duty_name,f.name spec_name,e.name title_name,g.name education_name,a.*
+       SELECT a.*,b.name certificate_type_name,c.name nation_name,d.name title_name,e.name degree_name,f.name spec_name
        FROM com_project_members a
-       left join system_parameter c on a.degree=c.id and c.type_id=9
-       left join system_parameter d on a.duty=d.id and d.type_id=55
+       left join system_parameter b on a.certificate_type=b.id and b.type_id=49
+       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 e on a.title = e.id and e.type_id=7
-       left join system_parameter g on a.education= g.id and g.type_id=8
        where object_id=#{objectId}
        order by a.show_index asc
     </select>
     <select id="getMemCountById" parameterType="java.lang.String"  resultType="com.yiboshi.science.param.dto.ComProjectMembersDTO">
         select IFNULL(count(*),0)mem_count,
-               IFNULL(sum(case when b.gb_Code='duty_h' then 1 else 0 end),0)mem_high_count,
-               IFNULL(sum(case when b.gb_Code='duty_m' then 1 else 0 end),0)mem_middle_count,
-               IFNULL(sum(case when b.gb_Code='duty_l' then 1 else 0 end),0)mem_low_count,
+--                IFNULL(sum(case when b.gb_Code='duty_h' then 1 else 0 end),0)mem_high_count,
+--                IFNULL(sum(case when b.gb_Code='duty_m' then 1 else 0 end),0)mem_middle_count,
+--                IFNULL(sum(case when b.gb_Code='duty_l' then 1 else 0 end),0)mem_low_count,
                IFNULL(sum(case when c.gb_Code='1' then 1 else 0 end),0)mem_bsh_count,
                IFNULL(sum(case when c.gb_Code='2' then 1 else 0 end),0)mem_bs_count,
                IFNULL(sum(case when c.gb_Code='3' then 1 else 0 end),0)mem_ss_count,
                IFNULL(sum(case when c.gb_Code='4' then 1 else 0 end),0)mem_xs_count
         from com_project_members a
-        left join system_parameter b on a.duty=b.id and b.type_id=55
+--         left join system_parameter b on a.duty=b.id and b.type_id=55
         left join system_parameter c on a.degree=c.id and c.type_id=9
         where object_id=#{objectId}
     </select>

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

@@ -7,8 +7,7 @@
         t.id as id, t.object_id as objectId, t.unit_name as unitName, t.unit_address as unitAddress, t.project_work as projectWork
     </sql>
     <select id="getListByObjectId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectSubDTO">
-        SELECT
-        a.*
+        SELECT a.*
         FROM com_project_sub a
         where object_id=#{objectId} order by a.show_index asc
     </select>