添加人才统计和高层次科技人才

research-generator/src/main/resources/mbg.xml

@@ -62,10 +62,10 @@
 <!--            <table tableName="tms_tenant_user" domainObjectName="TmsTenantUser" enableDeleteByExample="false"/>-->
 <!--            <table tableName="tms_tenant_config" domainObjectName="TmsTenantConfig" enableDeleteByExample="false"/>-->
 <!--        <table tableName="tms_tenant_srv_relation" domainObjectName="TmsTenantSrvRelation" enableDeleteByExample="false"/>-->
-<!--        <table tableName="ach_achievement" domainObjectName="AchAchievement" enableDeleteByExample="false"/>-->
+        <table tableName="ach_achievement" domainObjectName="AchAchievement" enableDeleteByExample="false"/>
 <!--        <table tableName="ach_achievement_category" domainObjectName="AchAchievementCategory" enableDeleteByExample="false"/>-->
 <!--        <table tableName="fud_fund_record" domainObjectName="FudFundRecord" enableDeleteByExample="false"/>-->
-        <table tableName="kts_kt_group" domainObjectName="KtsKtGroup" enableDeleteByExample="false"/>
+<!--        <table tableName="kts_kt_group" domainObjectName="KtsKtGroup" enableDeleteByExample="false"/>-->
 <!--        <table tableName="kts_kt_group_member" domainObjectName="KtsKtGroupMember" enableDeleteByExample="false"/>-->
 <!--        <table tableName="met_meeting_participant" domainObjectName="MetMeetingParticipant" enableDeleteByExample="false"/>-->
 <!--        <table tableName="met_meeting_record" domainObjectName="MetMeetingRecord" enableDeleteByExample="false"/>-->
@@ -94,9 +94,9 @@
 <!--        <table tableName="chat_session_members" domainObjectName="ChatSessionMembers" enableDeleteByExample="false"/>-->
 <!--        <table tableName="chat_session_messages" domainObjectName="ChatSessionMessages" enableDeleteByExample="false"/>-->
 <!--        <table tableName="chat_sessions" domainObjectName="ChatSessions" enableDeleteByExample="false"/>-->
-        <table tableName="kt_research_content" domainObjectName="KtResearchContent" enableDeleteByExample="false"/>
-        <table tableName="kt_expected_outcomes" domainObjectName="KtExpectedOutcomes" enableDeleteByExample="false"/>
-        <table tableName="kt_config" domainObjectName="KtConfig" enableDeleteByExample="false"/>
+<!--        <table tableName="kt_research_content" domainObjectName="KtResearchContent" enableDeleteByExample="false"/>-->
+<!--        <table tableName="kt_expected_outcomes" domainObjectName="KtExpectedOutcomes" enableDeleteByExample="false"/>-->
+<!--        <table tableName="kt_config" domainObjectName="KtConfig" enableDeleteByExample="false"/>-->
         <!-- 有些表的字段需要指定java类型
          <table schema="" tableName="">
             <columnOverride column="" javaType="" />

research-system/src/main/java/com/research/system/domain/dto/OutcomeDto.java

@@ -95,6 +95,18 @@ public class OutcomeDto {
         private String partition;
         @ApiModelProperty("影响因子")
         private String impactFactor;
+        @ApiModelProperty("姓名")
+        private String name;
+        @ApiModelProperty("性别")
+        private String sex;
+        @ApiModelProperty("年龄")
+        private Integer age;
+        @ApiModelProperty("入选人才计划或项目")
+        private String projects;
+        @ApiModelProperty("类别(0博士后 1博士 2硕士)")
+        private Byte type;
+        @ApiModelProperty("状态（0在研 1毕业）")
+        private Byte status;
 
         public String getAuthors() {
             if (CollUtil.isNotEmpty(authors)) {

research-system/src/main/java/com/research/system/domain/po/AchAchievement.java

@@ -70,6 +70,18 @@ public class AchAchievement implements Serializable {
 
     private String impactFactor;
 
+    private String name;
+
+    private String sex;
+
+    private Integer age;
+
+    private String projects;
+
+    private Byte type;
+
+    private Byte status;
+
     private String abstracts;
 
     private static final long serialVersionUID = 1L;
@@ -338,6 +350,54 @@ public class AchAchievement implements Serializable {
         this.impactFactor = impactFactor == null ? null : impactFactor.trim();
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex == null ? null : sex.trim();
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    public String getProjects() {
+        return projects;
+    }
+
+    public void setProjects(String projects) {
+        this.projects = projects == null ? null : projects.trim();
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
     public String getAbstracts() {
         return abstracts;
     }
@@ -385,6 +445,12 @@ public class AchAchievement implements Serializable {
         sb.append(", paperDoi=").append(paperDoi);
         sb.append(", partition=").append(partition);
         sb.append(", impactFactor=").append(impactFactor);
+        sb.append(", name=").append(name);
+        sb.append(", sex=").append(sex);
+        sb.append(", age=").append(age);
+        sb.append(", projects=").append(projects);
+        sb.append(", type=").append(type);
+        sb.append(", status=").append(status);
         sb.append(", abstracts=").append(abstracts);
         sb.append("]");
         return sb.toString();

research-system/src/main/java/com/research/system/domain/po/AchAchievementExample.java

@@ -2301,6 +2301,396 @@ public class AchAchievementExample {
             addCriterion("impact_factor not between", value1, value2, "impactFactor");
             return (Criteria) this;
         }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexIsNull() {
+            addCriterion("sex is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexIsNotNull() {
+            addCriterion("sex is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexEqualTo(String value) {
+            addCriterion("sex =", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexNotEqualTo(String value) {
+            addCriterion("sex <>", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexGreaterThan(String value) {
+            addCriterion("sex >", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexGreaterThanOrEqualTo(String value) {
+            addCriterion("sex >=", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexLessThan(String value) {
+            addCriterion("sex <", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexLessThanOrEqualTo(String value) {
+            addCriterion("sex <=", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexLike(String value) {
+            addCriterion("sex like", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexNotLike(String value) {
+            addCriterion("sex not like", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexIn(List<String> values) {
+            addCriterion("sex in", values, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexNotIn(List<String> values) {
+            addCriterion("sex not in", values, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexBetween(String value1, String value2) {
+            addCriterion("sex between", value1, value2, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexNotBetween(String value1, String value2) {
+            addCriterion("sex not between", value1, value2, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgeIsNull() {
+            addCriterion("age is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgeIsNotNull() {
+            addCriterion("age is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgeEqualTo(Integer value) {
+            addCriterion("age =", value, "age");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgeNotEqualTo(Integer value) {
+            addCriterion("age <>", value, "age");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgeGreaterThan(Integer value) {
+            addCriterion("age >", value, "age");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("age >=", value, "age");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgeLessThan(Integer value) {
+            addCriterion("age <", value, "age");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgeLessThanOrEqualTo(Integer value) {
+            addCriterion("age <=", value, "age");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgeIn(List<Integer> values) {
+            addCriterion("age in", values, "age");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgeNotIn(List<Integer> values) {
+            addCriterion("age not in", values, "age");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgeBetween(Integer value1, Integer value2) {
+            addCriterion("age between", value1, value2, "age");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgeNotBetween(Integer value1, Integer value2) {
+            addCriterion("age not between", value1, value2, "age");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsIsNull() {
+            addCriterion("projects is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsIsNotNull() {
+            addCriterion("projects is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsEqualTo(String value) {
+            addCriterion("projects =", value, "projects");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsNotEqualTo(String value) {
+            addCriterion("projects <>", value, "projects");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsGreaterThan(String value) {
+            addCriterion("projects >", value, "projects");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsGreaterThanOrEqualTo(String value) {
+            addCriterion("projects >=", value, "projects");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsLessThan(String value) {
+            addCriterion("projects <", value, "projects");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsLessThanOrEqualTo(String value) {
+            addCriterion("projects <=", value, "projects");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsLike(String value) {
+            addCriterion("projects like", value, "projects");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsNotLike(String value) {
+            addCriterion("projects not like", value, "projects");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsIn(List<String> values) {
+            addCriterion("projects in", values, "projects");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsNotIn(List<String> values) {
+            addCriterion("projects not in", values, "projects");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsBetween(String value1, String value2) {
+            addCriterion("projects between", value1, value2, "projects");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectsNotBetween(String value1, String value2) {
+            addCriterion("projects not between", value1, value2, "projects");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Byte value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Byte value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Byte value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Byte value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Byte> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Byte> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Byte value1, Byte value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Byte value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Byte value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Byte value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Byte value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Byte> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Byte> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Byte value1, Byte value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

research-system/src/main/java/com/research/system/domain/vo/ClientPrjProjInfoVo.java

@@ -160,4 +160,60 @@ public class ClientPrjProjInfoVo {
         private String uploadTime;
     }
 
+    @Data
+    public static class Statistics{
+        @ApiModelProperty("论文数量")
+        private Integer lwTotal;
+        @ApiModelProperty("专利数量")
+        private Integer zlTotal;
+        @ApiModelProperty("高层次科技人才数量")
+        private Integer gccTotal;
+        @ApiModelProperty("人才数量")
+        private Integer rcTotal;
+
+        @ApiModelProperty("论文统计")
+        private List<Lw> lwList;
+        @ApiModelProperty("专利统计")
+        private List<Zl> zlList;
+        @ApiModelProperty("高层次科技人才统计")
+        private List<Gcc> gccList;
+        @ApiModelProperty("人才培养统计")
+        private List<Rcpy> rcpyList;
+
+        @Data
+        public static class Lw{
+            private Long orgId;
+            private String orgName;
+            private Integer sci;
+            private Integer zwqk;
+            private Integer qt;
+        }
+
+        @Data
+        public static class Zl{
+            private Long orgId;
+            private String orgName;
+            private Integer fm;
+            private Integer syxx;
+            private Integer wg;
+        }
+
+        @Data
+        public static class Gcc{
+            private Long orgId;
+            private String orgName;
+            private Integer dtr;
+        }
+
+        @Data
+        public static class Rcpy{
+            private Long orgId;
+            private String orgName;
+            private Integer bsh;
+            private Integer bs;
+            private Integer ss;
+        }
+
+    }
+
 }

research-system/src/main/java/com/research/system/domain/vo/OutcomeVo.java

@@ -82,6 +82,18 @@ public class OutcomeVo {
         private String partition;
         @ApiModelProperty("影响因子")
         private String impactFactor;
+        @ApiModelProperty("姓名")
+        private String name;
+        @ApiModelProperty("性别")
+        private String sex;
+        @ApiModelProperty("年龄")
+        private Integer age;
+        @ApiModelProperty("入选人才计划或项目")
+        private String projects;
+        @ApiModelProperty("类别(0博士后 1博士 2硕士)")
+        private Byte type;
+        @ApiModelProperty("状态（0在研 1毕业）")
+        private Byte status;
     }
 
     @Data

research-system/src/main/java/com/research/system/persist/dao/ClientPrjProOrgDao.java

@@ -15,4 +15,14 @@ import java.util.List;
 public interface ClientPrjProOrgDao {
 
     List<ClientPrjProjInfoVo.OrgVo> query(@Param("dto") ClientPrjProOrgDto.Query dto, @Param("tenantId")  Long tenantId);
+
+    ClientPrjProjInfoVo.Statistics statistics();
+
+    List<ClientPrjProjInfoVo.Statistics.Lw> lwStatistics1();
+
+    List<ClientPrjProjInfoVo.Statistics.Zl> zjStatistics2();
+
+    List<ClientPrjProjInfoVo.Statistics.Gcc> zjStatistics3();
+
+    List<ClientPrjProjInfoVo.Statistics.Rcpy> zjStatistics4();
 }

research-system/src/main/java/com/research/system/service/CooperatorService.java

@@ -30,4 +30,6 @@ public interface CooperatorService {
     void importOrg(MultipartFile file);
 
     String template();
+
+    ClientPrjProjInfoVo.Statistics statistics();
 }

research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java

@@ -13,11 +13,13 @@ import com.research.common.utils.SecurityUtils;
 import com.research.system.domain.dto.ClientPrjProOrgDto;
 import com.research.system.domain.dto.ClientPrjProjInfoDto;
 import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.po.AchAchievementExample;
 import com.research.system.domain.po.PrjProjInfo;
 import com.research.system.domain.po.PrjProjOrg;
 import com.research.system.domain.po.PrjProjOrgExample;
 import com.research.system.domain.vo.ClientPrjProjInfoVo;
 import com.research.system.persist.dao.ClientPrjProOrgDao;
+import com.research.system.persist.mapper.AchAchievementMapper;
 import com.research.system.persist.mapper.PrjProjOrgMapper;
 import com.research.system.service.ClientPrjProjInfoService;
 import com.research.system.service.CooperatorService;
@@ -48,6 +50,8 @@ public class CooperatorServiceImpl implements CooperatorService {
     private ClientPrjProOrgDao prjProOrgDao;
     @Resource
     private ClientPrjProjInfoService clientPrjProjInfoService;
+    @Resource
+    private AchAchievementMapper achAchievementMapper;
 
     @Override
     public List<ClientPrjProjInfoVo.OrgVo> query(ClientPrjProOrgDto.Query dto) {
@@ -192,4 +196,12 @@ public class CooperatorServiceImpl implements CooperatorService {
     public String template() {
         return "/profile/a.pdf";
     }
+
+    @Override
+    public ClientPrjProjInfoVo.Statistics statistics() {
+        ClientPrjProjInfoVo.Statistics statistics = prjProOrgDao.statistics();
+        statistics.setLwList(prjProOrgDao.lwStatistics1());
+        statistics.setZlList(prjProOrgDao.zjStatistics2());
+        return statistics;
+    }
 }

research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml

@@ -63,4 +63,49 @@
         </where>
 
     </select>
+
+    <select id="statistics" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$Statistics">
+        select sum(case when category_id_1 = '1' then 1 else 0 end)  as lwTotal,
+               sum(case when category_id_1 = '11' then 1 else 0 end) as zlTotal,
+               sum(case when category_id_1 = '5' then 1 else 0 end) as gccTotal,
+               sum(case when category_id_1 = '6' then 1 else 0 end) as rcTotal
+        from ach_achievement
+        where del_flag = 0
+    </select>
+
+    <select id="lwStatistics1" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$Statistics$Lw">
+        select o.id                                                                           as orgId,
+               o.org_name                                                                     as orgName,
+               sum(case when a.category_id_1 = '2' then 1 else 0 end)                           as sci,
+               sum(case when a.category_id_2 = '3' and category_id_2 = '1' then 1 else 0 end)   as zwqk,
+               sum(case when a.category_id_2 != '2' and category_id_2 != '3' then 1 else 0 end) as qt
+        from prj_proj_org o
+        left join
+             ach_achievement a on a.proj_org_id = o.id
+        where o.del_flag = 0
+        GROUP BY
+            o.id
+    </select>
+
+    <select id="lwStatistics2" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$Statistics$Zl">
+        select o.id                                                                           as orgId,
+               o.org_name                                                                     as orgName,
+               sum(case when a.category_id_1 = '11' then 1 else 0 end)                           as fm,
+               sum(case when a.category_id_2 = '13' then 1 else 0 end)   as syxx,
+               sum(case when a.category_id_2 = '14' then 1 else 0 end) as wg
+        from prj_proj_org o
+                 left join
+             ach_achievement a on a.proj_org_id = o.id
+        where o.del_flag = 0
+        GROUP BY
+            o.id
+    </select>
+
+    <select id="lwStatistics3" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$Statistics$Gcc">
+   
+    </select>
+
+    <select id="lwStatistics4" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$Statistics$Rcpy">
+
+    </select>
 </mapper>

research-system/src/main/resources/mapper/dao/OutcomeDao.xml

@@ -51,7 +51,14 @@
         p.org_name as projOrgName,
         g.kt_group_name as ktGroupName,
         a.partition,
-        a.impact_factor as impactFactor
+        a.impact_factor as impactFactor,
+        a.name,
+        a.sex,
+        a.age,
+        a.projects,
+        a.type,
+        a.status
+
         FROM ach_achievement a
         left join prj_proj_org p on a.proj_org_id = p.id
         left join kts_kt_group g on a.kt_group_id = g.id

research-system/src/main/resources/mapper/system/AchAchievementMapper.xml

@@ -35,6 +35,12 @@
     <result column="paper_doi" jdbcType="VARCHAR" property="paperDoi" />
     <result column="partition" jdbcType="VARCHAR" property="partition" />
     <result column="impact_factor" jdbcType="VARCHAR" property="impactFactor" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="sex" jdbcType="VARCHAR" property="sex" />
+    <result column="age" jdbcType="INTEGER" property="age" />
+    <result column="projects" jdbcType="VARCHAR" property="projects" />
+    <result column="type" jdbcType="TINYINT" property="type" />
+    <result column="status" jdbcType="TINYINT" property="status" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.research.system.domain.po.AchAchievement">
     <result column="abstracts" jdbcType="LONGVARCHAR" property="abstracts" />
@@ -102,7 +108,7 @@
     apply_date, publish_date, place, ach_type, source, paper_source_type, yskt_xmfzr, 
     yskt_funds, yskt_lxpzwh, yskt_status, keywords, paper_link, pdf_download_url, commitment_letter_url, 
     del_flag, create_by, create_time, update_by, update_time, remark, tx_authors, paper_doi, 
-    partition, impact_factor
+    partition, impact_factor, name, sex, age, projects, type, status
   </sql>
   <sql id="Blob_Column_List">
     abstracts
@@ -161,7 +167,9 @@
       create_by, create_time, update_by, 
       update_time, remark, tx_authors, 
       paper_doi, partition, impact_factor, 
-      abstracts)
+      name, sex, age, projects, 
+      type, status, abstracts
+      )
     values (#{id,jdbcType=BIGINT}, #{projId,jdbcType=BIGINT}, #{projOrgId,jdbcType=BIGINT}, 
       #{ktGroupId,jdbcType=BIGINT}, #{categoryId1,jdbcType=BIGINT}, #{categoryId2,jdbcType=BIGINT}, 
       #{title,jdbcType=VARCHAR}, #{no,jdbcType=VARCHAR}, #{authors,jdbcType=VARCHAR}, 
@@ -173,7 +181,9 @@
       #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{txAuthors,jdbcType=VARCHAR}, 
       #{paperDoi,jdbcType=VARCHAR}, #{partition,jdbcType=VARCHAR}, #{impactFactor,jdbcType=VARCHAR}, 
-      #{abstracts,jdbcType=LONGVARCHAR})
+      #{name,jdbcType=VARCHAR}, #{sex,jdbcType=VARCHAR}, #{age,jdbcType=INTEGER}, #{projects,jdbcType=VARCHAR}, 
+      #{type,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{abstracts,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.research.system.domain.po.AchAchievement">
     insert into ach_achievement
@@ -277,6 +287,24 @@
       <if test="impactFactor != null">
         impact_factor,
       </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="sex != null">
+        sex,
+      </if>
+      <if test="age != null">
+        age,
+      </if>
+      <if test="projects != null">
+        projects,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
       <if test="abstracts != null">
         abstracts,
       </if>
@@ -381,6 +409,24 @@
       <if test="impactFactor != null">
         #{impactFactor,jdbcType=VARCHAR},
       </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sex != null">
+        #{sex,jdbcType=VARCHAR},
+      </if>
+      <if test="age != null">
+        #{age,jdbcType=INTEGER},
+      </if>
+      <if test="projects != null">
+        #{projects,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=TINYINT},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=TINYINT},
+      </if>
       <if test="abstracts != null">
         #{abstracts,jdbcType=LONGVARCHAR},
       </if>
@@ -494,6 +540,24 @@
       <if test="record.impactFactor != null">
         impact_factor = #{record.impactFactor,jdbcType=VARCHAR},
       </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sex != null">
+        sex = #{record.sex,jdbcType=VARCHAR},
+      </if>
+      <if test="record.age != null">
+        age = #{record.age,jdbcType=INTEGER},
+      </if>
+      <if test="record.projects != null">
+        projects = #{record.projects,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=TINYINT},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=TINYINT},
+      </if>
       <if test="record.abstracts != null">
         abstracts = #{record.abstracts,jdbcType=LONGVARCHAR},
       </if>
@@ -537,6 +601,12 @@
       paper_doi = #{record.paperDoi,jdbcType=VARCHAR},
       partition = #{record.partition,jdbcType=VARCHAR},
       impact_factor = #{record.impactFactor,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      sex = #{record.sex,jdbcType=VARCHAR},
+      age = #{record.age,jdbcType=INTEGER},
+      projects = #{record.projects,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=TINYINT},
+      status = #{record.status,jdbcType=TINYINT},
       abstracts = #{record.abstracts,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -576,7 +646,13 @@
       tx_authors = #{record.txAuthors,jdbcType=VARCHAR},
       paper_doi = #{record.paperDoi,jdbcType=VARCHAR},
       partition = #{record.partition,jdbcType=VARCHAR},
-      impact_factor = #{record.impactFactor,jdbcType=VARCHAR}
+      impact_factor = #{record.impactFactor,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      sex = #{record.sex,jdbcType=VARCHAR},
+      age = #{record.age,jdbcType=INTEGER},
+      projects = #{record.projects,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=TINYINT},
+      status = #{record.status,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -675,11 +751,29 @@
         paper_doi = #{paperDoi,jdbcType=VARCHAR},
       </if>
       <if test="partition != null">
-        `partition` = #{partition,jdbcType=VARCHAR},
+        partition = #{partition,jdbcType=VARCHAR},
       </if>
       <if test="impactFactor != null">
         impact_factor = #{impactFactor,jdbcType=VARCHAR},
       </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sex != null">
+        sex = #{sex,jdbcType=VARCHAR},
+      </if>
+      <if test="age != null">
+        age = #{age,jdbcType=INTEGER},
+      </if>
+      <if test="projects != null">
+        projects = #{projects,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=TINYINT},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=TINYINT},
+      </if>
       <if test="abstracts != null">
         abstracts = #{abstracts,jdbcType=LONGVARCHAR},
       </if>
@@ -720,6 +814,12 @@
       paper_doi = #{paperDoi,jdbcType=VARCHAR},
       partition = #{partition,jdbcType=VARCHAR},
       impact_factor = #{impactFactor,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      sex = #{sex,jdbcType=VARCHAR},
+      age = #{age,jdbcType=INTEGER},
+      projects = #{projects,jdbcType=VARCHAR},
+      type = #{type,jdbcType=TINYINT},
+      status = #{status,jdbcType=TINYINT},
       abstracts = #{abstracts,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -756,7 +856,13 @@
       tx_authors = #{txAuthors,jdbcType=VARCHAR},
       paper_doi = #{paperDoi,jdbcType=VARCHAR},
       partition = #{partition,jdbcType=VARCHAR},
-      impact_factor = #{impactFactor,jdbcType=VARCHAR}
+      impact_factor = #{impactFactor,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      sex = #{sex,jdbcType=VARCHAR},
+      age = #{age,jdbcType=INTEGER},
+      projects = #{projects,jdbcType=VARCHAR},
+      type = #{type,jdbcType=TINYINT},
+      status = #{status,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>