From fd7a25064bb73ae142a68050ef29756db78ede7d Mon Sep 17 00:00:00 2001 From: ccsens_zhengzhichuan Date: Wed, 14 Jan 2026 17:55:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/client/ExportController.java | 8 +- .../client/project/GroupController.java | 5 + .../client/project/SysTitleController.java | 3 + .../src/main/resources/application-dev.yml | 3 +- .../src/main/resources/application-prod.yml | 3 +- research-generator/src/main/resources/mbg.xml | 4 +- .../system/domain/dto/ClientPrjProOrgDto.java | 1 + .../research/system/domain/dto/ExportDto.java | 29 ++ .../system/domain/dto/FundingDto.java | 6 +- .../research/system/domain/dto/GroupDto.java | 14 +- .../system/domain/dto/MemberAduitDto.java | 15 +- .../system/domain/dto/OutcomeDto.java | 1 + .../system/domain/po/KtsKtGroupMember.java | 8 +- .../domain/po/KtsKtGroupMemberAduit.java | 8 +- .../po/KtsKtGroupMemberAduitExample.java | 30 +- .../domain/po/KtsKtGroupMemberExample.java | 30 +- .../research/system/domain/vo/GroupVO.java | 92 ++++++- .../system/domain/vo/MemberAduitVo.java | 12 +- .../system/persist/dao/KtsGroupDao.java | 2 + .../system/service/ExportService.java | 4 +- .../system/service/KtsGroupService.java | 3 + .../service/impl/ExportServiceImpl.java | 257 +++++++++++++++++- .../service/impl/KtsGroupServiceImpl.java | 22 +- .../service/impl/MemberAduitServiceImpl.java | 10 +- .../mapper/dao/ClientPrjProOrgDao.xml | 1 + .../main/resources/mapper/dao/FundingDao.xml | 4 +- .../main/resources/mapper/dao/KtsGroupDao.xml | 20 +- .../resources/mapper/dao/MemberAduitDao.xml | 16 +- .../main/resources/mapper/dao/OutcomeDao.xml | 3 + .../system/KtsKtGroupMemberAduitMapper.xml | 14 +- .../mapper/system/KtsKtGroupMemberMapper.xml | 14 +- 31 files changed, 549 insertions(+), 93 deletions(-) create mode 100644 research-system/src/main/java/com/research/system/domain/dto/ExportDto.java diff --git a/research-admin/src/main/java/com/research/web/controller/client/ExportController.java b/research-admin/src/main/java/com/research/web/controller/client/ExportController.java index b4335cfa..4f876a8b 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/ExportController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/ExportController.java @@ -1,9 +1,13 @@ package com.research.web.controller.client; +import com.research.system.domain.dto.ExportDto; import com.research.system.service.ExportService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -28,8 +32,8 @@ public class ExportController { @ApiOperation(value = "导出项目运行报告") @RequestMapping(value = "/all", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public void export(HttpServletResponse response){ - exportService.export( response); + public void export(HttpServletResponse response,@ApiParam @Validated @RequestBody ExportDto.Query dto) { + exportService.export(response, dto); } diff --git a/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java b/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java index 0230c02c..7f334e44 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java @@ -181,6 +181,11 @@ public class GroupController { return JsonResponse.ok(ktsGroupService.workerStatistics()); } + @PostMapping("/gzryxlStatistics") + public JsonResponse> gzryxlStatistics(){ + return JsonResponse.ok(ktsGroupService.gzryxlStatistics()); + } + @PostMapping("/studentStatistics") public JsonResponse> queryStudentList(){ return JsonResponse.ok(ktsGroupService.queryStudentList(new GroupDto.Query())); diff --git a/research-admin/src/main/java/com/research/web/controller/client/project/SysTitleController.java b/research-admin/src/main/java/com/research/web/controller/client/project/SysTitleController.java index b7b560d4..bcb0bd91 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/project/SysTitleController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/project/SysTitleController.java @@ -2,6 +2,7 @@ package com.research.web.controller.client.project; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.research.common.annotation.Anonymous; import com.research.common.core.domain.BaseDto; import com.research.common.core.domain.JsonResponse; import com.research.system.domain.dto.DocumentDto; @@ -33,6 +34,8 @@ public class SysTitleController { @Resource private SysTitleService sysTitleService; + + @Anonymous @PostMapping("/query") public JsonResponse> queryList(@RequestBody @Validated BaseDto dto){ if (dto.getPageNum() > 0) { diff --git a/research-admin/src/main/resources/application-dev.yml b/research-admin/src/main/resources/application-dev.yml index 9d52e8f5..560eb7ed 100644 --- a/research-admin/src/main/resources/application-dev.yml +++ b/research-admin/src/main/resources/application-dev.yml @@ -63,4 +63,5 @@ server: # 服务器的HTTP端口，默认为8080 port: 8080 research: - reportTemplate: C:\Users\zzc16\Desktop\report_template.docx \ No newline at end of file + reportTemplate: C:\Users\zzc16\Desktop\report_template.docx + reportGrTemplate: C:\Users\zzc16\Desktop\reportGrTemplate.docx \ No newline at end of file diff --git a/research-admin/src/main/resources/application-prod.yml b/research-admin/src/main/resources/application-prod.yml index d6fc0895..a95778b4 100644 --- a/research-admin/src/main/resources/application-prod.yml +++ b/research-admin/src/main/resources/application-prod.yml @@ -63,4 +63,5 @@ server: # 服务器的HTTP端口，默认为8080 port: 38081 research: - reportTemplate: D:\Projects\research\server\profile\reportTemplate.docx \ No newline at end of file + reportTemplate: D:\Projects\research\server\profile\reportTemplate.docx + reportGrTemplate: D:\Projects\research\server\profile\reportGrTemplate.docx \ No newline at end of file diff --git a/research-generator/src/main/resources/mbg.xml b/research-generator/src/main/resources/mbg.xml index 6e06875f..9b558105 100644 --- a/research-generator/src/main/resources/mbg.xml +++ b/research-generator/src/main/resources/mbg.xml @@ -68,13 +68,13 @@ - + - +
diff --git a/research-system/src/main/java/com/research/system/domain/dto/ClientPrjProOrgDto.java b/research-system/src/main/java/com/research/system/domain/dto/ClientPrjProOrgDto.java index 864f17dc..b5602c81 100644 --- a/research-system/src/main/java/com/research/system/domain/dto/ClientPrjProOrgDto.java +++ b/research-system/src/main/java/com/research/system/domain/dto/ClientPrjProOrgDto.java @@ -20,6 +20,7 @@ public class ClientPrjProOrgDto { private String orgName; private String orgLeader; private String orgLeaderPhone; + private String username; } } diff --git a/research-system/src/main/java/com/research/system/domain/dto/ExportDto.java b/research-system/src/main/java/com/research/system/domain/dto/ExportDto.java new file mode 100644 index 00000000..676f0968 --- /dev/null +++ b/research-system/src/main/java/com/research/system/domain/dto/ExportDto.java @@ -0,0 +1,29 @@ +package com.research.system.domain.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author zzc + * @Package com.research.system.domain.dto + * @Date 2026/1/13 16:41 + * @description: + */ +public class ExportDto { + + @Data + public static class Query { + @ApiModelProperty("0整体 1个人") + private int type = 0; + @ApiModelProperty("单位") + private Long orgId; + @ApiModelProperty("开始时间") + private String startTime; + @ApiModelProperty("结束时间") + private String endTime; + private Long userId; + } + +} diff --git a/research-system/src/main/java/com/research/system/domain/dto/FundingDto.java b/research-system/src/main/java/com/research/system/domain/dto/FundingDto.java index bfaf8958..286f6cba 100644 --- a/research-system/src/main/java/com/research/system/domain/dto/FundingDto.java +++ b/research-system/src/main/java/com/research/system/domain/dto/FundingDto.java @@ -16,9 +16,9 @@ public class FundingDto { @Data public static class Query { - private String projOrgId;//合作单位id', - private String ktGroupId;//课题组id', - private String payType;//经费类型：0-收入，1-支出', + private Long projOrgId;//合作单位id', + private Long ktGroupId;//课题组id', + private Byte payType;//经费类型：0-收入，1-支出', } @Data diff --git a/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java b/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java index 06f25595..e9afedf6 100644 --- a/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java +++ b/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java @@ -1,5 +1,6 @@ package com.research.system.domain.dto; +import cn.hutool.core.collection.CollUtil; import com.fasterxml.jackson.annotation.JsonFormat; import com.research.system.domain.po.KtsKtGroupMember; import io.swagger.annotations.ApiModelProperty; @@ -8,6 +9,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @Author zzc @@ -38,6 +40,7 @@ public class GroupDto { @Data public static class MemberQuery { + private Long projOrgId; @ApiModelProperty("课题组id") private Long ktGroupId; @ApiModelProperty("姓名") @@ -45,7 +48,7 @@ public class GroupDto { @ApiModelProperty("电话") private String memberPhone; @ApiModelProperty("成员类型：0-课题组负责人，1-课题组成员") - private Byte type; + private String type; @ApiModelProperty("审核状态：0-待审核，1-拒绝，2-通过") private Byte auditStatus; private Byte category; @@ -115,7 +118,7 @@ public class GroupDto { @JsonFormat(pattern = "yyyy-MM-dd") private Date memberBirth; - private Byte type; + private List type; private Byte category; @@ -159,6 +162,13 @@ public class GroupDto { @ApiModelProperty("在读状态（0在读硕士、1在读博士、2在读博士后）") private Byte readingStatus; + + public String getType() { + if (CollUtil.isNotEmpty(type)) { + return type.stream().collect(Collectors.joining(",")); + } + return null; + } } @Data diff --git a/research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java b/research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java index d7151bcc..d789221d 100644 --- a/research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java +++ b/research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java @@ -1,11 +1,13 @@ package com.research.system.domain.dto; +import cn.hutool.core.collection.CollUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @Author zzc @@ -42,13 +44,13 @@ public class MemberAduitDto { @JsonFormat(pattern = "yyyy-MM-dd") private Date memberBirth; - private Byte type; + private List type; private Byte category; private Integer qualification; - private Integer title; + private String title; private Integer sort; @@ -76,6 +78,12 @@ public class MemberAduitDto { private String phone; @ApiModelProperty("负责人") private String name; + public String getType() { + if (CollUtil.isNotEmpty(type)) { + return type.stream().collect(Collectors.joining(",")); + } + return null; + } } @Data @@ -94,6 +102,7 @@ public class MemberAduitDto { private Long ktGroupId; private String memberName; private String memberPhone; - private Byte status; + private Byte memberStatus; + private String category; } } diff --git a/research-system/src/main/java/com/research/system/domain/dto/OutcomeDto.java b/research-system/src/main/java/com/research/system/domain/dto/OutcomeDto.java index d70cf62f..b18c5c99 100644 --- a/research-system/src/main/java/com/research/system/domain/dto/OutcomeDto.java +++ b/research-system/src/main/java/com/research/system/domain/dto/OutcomeDto.java @@ -28,6 +28,7 @@ public class OutcomeDto { private Long categoryId1; private Long categoryId2; private Byte achType; + private String username; } @Data diff --git a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMember.java b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMember.java index 7ff4fa6b..4fa5ee4e 100644 --- a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMember.java +++ b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMember.java @@ -22,7 +22,7 @@ public class KtsKtGroupMember implements Serializable { private Date memberBirth; - private Byte type; + private String type; private Byte category; @@ -130,12 +130,12 @@ public class KtsKtGroupMember implements Serializable { this.memberBirth = memberBirth; } - public Byte getType() { + public String getType() { return type; } - public void setType(Byte type) { - this.type = type; + public void setType(String type) { + this.type = type == null ? null : type.trim(); } public Byte getCategory() { diff --git a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduit.java b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduit.java index 4a1d2fd4..d7cb68e7 100644 --- a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduit.java +++ b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduit.java @@ -34,7 +34,7 @@ public class KtsKtGroupMemberAduit implements Serializable { private String title; - private Byte type; + private String type; private Long userId; @@ -190,12 +190,12 @@ public class KtsKtGroupMemberAduit implements Serializable { this.title = title == null ? null : title.trim(); } - public Byte getType() { + public String getType() { return type; } - public void setType(Byte type) { - this.type = type; + public void setType(String type) { + this.type = type == null ? null : type.trim(); } public Long getUserId() { diff --git a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduitExample.java b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduitExample.java index 3119c61d..2c2ec321 100644 --- a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduitExample.java +++ b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduitExample.java @@ -1085,52 +1085,62 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andTypeEqualTo(Byte value) { + public Criteria andTypeEqualTo(String value) { addCriterion("type =", value, "type"); return (Criteria) this; } - public Criteria andTypeNotEqualTo(Byte value) { + public Criteria andTypeNotEqualTo(String value) { addCriterion("type <>", value, "type"); return (Criteria) this; } - public Criteria andTypeGreaterThan(Byte value) { + public Criteria andTypeGreaterThan(String value) { addCriterion("type >", value, "type"); return (Criteria) this; } - public Criteria andTypeGreaterThanOrEqualTo(Byte value) { + public Criteria andTypeGreaterThanOrEqualTo(String value) { addCriterion("type >=", value, "type"); return (Criteria) this; } - public Criteria andTypeLessThan(Byte value) { + public Criteria andTypeLessThan(String value) { addCriterion("type <", value, "type"); return (Criteria) this; } - public Criteria andTypeLessThanOrEqualTo(Byte value) { + public Criteria andTypeLessThanOrEqualTo(String value) { addCriterion("type <=", value, "type"); return (Criteria) this; } - public Criteria andTypeIn(List values) { + public Criteria andTypeLike(String value) { + addCriterion("type like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotLike(String value) { + addCriterion("type not like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { addCriterion("type in", values, "type"); return (Criteria) this; } - public Criteria andTypeNotIn(List values) { + public Criteria andTypeNotIn(List values) { addCriterion("type not in", values, "type"); return (Criteria) this; } - public Criteria andTypeBetween(Byte value1, Byte value2) { + public Criteria andTypeBetween(String value1, String value2) { addCriterion("type between", value1, value2, "type"); return (Criteria) this; } - public Criteria andTypeNotBetween(Byte value1, Byte value2) { + public Criteria andTypeNotBetween(String value1, String value2) { addCriterion("type not between", value1, value2, "type"); return (Criteria) this; } diff --git a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberExample.java b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberExample.java index 2f94fd3c..67c062c4 100644 --- a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberExample.java +++ b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberExample.java @@ -722,52 +722,62 @@ public class KtsKtGroupMemberExample { return (Criteria) this; } - public Criteria andTypeEqualTo(Byte value) { + public Criteria andTypeEqualTo(String value) { addCriterion("type =", value, "type"); return (Criteria) this; } - public Criteria andTypeNotEqualTo(Byte value) { + public Criteria andTypeNotEqualTo(String value) { addCriterion("type <>", value, "type"); return (Criteria) this; } - public Criteria andTypeGreaterThan(Byte value) { + public Criteria andTypeGreaterThan(String value) { addCriterion("type >", value, "type"); return (Criteria) this; } - public Criteria andTypeGreaterThanOrEqualTo(Byte value) { + public Criteria andTypeGreaterThanOrEqualTo(String value) { addCriterion("type >=", value, "type"); return (Criteria) this; } - public Criteria andTypeLessThan(Byte value) { + public Criteria andTypeLessThan(String value) { addCriterion("type <", value, "type"); return (Criteria) this; } - public Criteria andTypeLessThanOrEqualTo(Byte value) { + public Criteria andTypeLessThanOrEqualTo(String value) { addCriterion("type <=", value, "type"); return (Criteria) this; } - public Criteria andTypeIn(List values) { + public Criteria andTypeLike(String value) { + addCriterion("type like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotLike(String value) { + addCriterion("type not like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { addCriterion("type in", values, "type"); return (Criteria) this; } - public Criteria andTypeNotIn(List values) { + public Criteria andTypeNotIn(List values) { addCriterion("type not in", values, "type"); return (Criteria) this; } - public Criteria andTypeBetween(Byte value1, Byte value2) { + public Criteria andTypeBetween(String value1, String value2) { addCriterion("type between", value1, value2, "type"); return (Criteria) this; } - public Criteria andTypeNotBetween(Byte value1, Byte value2) { + public Criteria andTypeNotBetween(String value1, String value2) { addCriterion("type not between", value1, value2, "type"); return (Criteria) this; } diff --git a/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java b/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java index 833d8224..010031fe 100644 --- a/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java +++ b/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java @@ -8,8 +8,11 @@ import com.research.system.domain.po.KtsKtGroupMember; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.annotation.Resource; +import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @Author zzc @@ -214,7 +217,7 @@ public class GroupVO { @JsonFormat(pattern = "yyyy-MM-dd") private Date memberBirth; - private Byte type; + private String type; private Byte category; @@ -230,6 +233,8 @@ public class GroupVO { private Byte memberStatus; + private Byte readingStatus; + private String createBy; private Date createTime; @@ -268,6 +273,60 @@ public class GroupVO { } return 0; } + + public List getType() { + if (StrUtil.isNotEmpty(type)) { + return Arrays.stream(type.split(",")).collect(Collectors.toList()); + } + return null; + } + + public String getTypeName() { + if (StrUtil.isNotEmpty(type)) { + List type1 = getType(); + return type1.stream().map(title -> { + if (title.equals("1")) { + return "学生"; + } else if (title.equals("2")) { + return "教师"; + } else if (title.equals("3")) { + return "其他"; + } + return ""; + }).collect(Collectors.joining(",")); + } + return type; + } + + public String getCategoryName() { + if (category != null) { + switch (category) { + case 0: + return "工作人员"; + case 1: + return "学生"; + default: + return "未知"; + } + } + return "未知"; + } + + public String getReadingStatusName() { + if (readingStatus != null) { + switch (readingStatus) { + case 0: + return "在读硕士"; + case 1: + return "在读博士"; + case 2: + return "在读博士后"; + default: + return "未知"; + } + } + return "未知"; + } } @Data @@ -328,12 +387,21 @@ public class GroupVO { @Data public static class StudentResult { - private Long orgId; - private String orgName; - @ApiModelProperty("在读人数") - private int zd; - @ApiModelProperty("毕业人数") - private int by; + private Long orgId; + private String orgName; + @ApiModelProperty("在读人数") + private int zd; + @ApiModelProperty("毕业人数") + private int by; + } + + @Data + public static class Gzryxl { + private Long orgId; + private String orgName; + private int ss; + private int bs; + private int bsh; } @Data @@ -346,7 +414,7 @@ public class GroupVO { private Long orgId; private String orgName; private int gj;//高级 -// private int fg;//副高 + // private int fg;//副高 private int zj;//中级 private int cj;//初级 @@ -359,7 +427,7 @@ public class GroupVO { private CjDto cjList; @Data - public static class GjDto{ + public static class GjDto { @ApiModelProperty("教授") private int js; @ApiModelProperty("研究员") @@ -371,7 +439,7 @@ public class GroupVO { } @Data - public static class FgjDto{ + public static class FgjDto { @ApiModelProperty("副教授") private int fjs; @ApiModelProperty("副研究员") @@ -383,7 +451,7 @@ public class GroupVO { } @Data - public static class ZjDto{ + public static class ZjDto { @ApiModelProperty("讲师") private int js; @ApiModelProperty("主治医师") @@ -393,7 +461,7 @@ public class GroupVO { } @Data - public static class CjDto{ + public static class CjDto { @ApiModelProperty("助教") private int zj; @ApiModelProperty("助理研究员") diff --git a/research-system/src/main/java/com/research/system/domain/vo/MemberAduitVo.java b/research-system/src/main/java/com/research/system/domain/vo/MemberAduitVo.java index 19f94567..331ec8f0 100644 --- a/research-system/src/main/java/com/research/system/domain/vo/MemberAduitVo.java +++ b/research-system/src/main/java/com/research/system/domain/vo/MemberAduitVo.java @@ -4,7 +4,10 @@ import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Arrays; import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; /** * @Author zzc @@ -47,7 +50,7 @@ public class MemberAduitVo { private String title; - private Byte type; + private String type; private Long userId; @@ -73,6 +76,13 @@ public class MemberAduitVo { private Date reviewedTime; + public List getType() { + if (StrUtil.isNotEmpty(type)) { + return Arrays.stream(type.split(",")).collect(Collectors.toList()); + } + return null; + } + public String getKtGroupName() { if (StrUtil.isNotEmpty(ktGroupName1)) { return ktGroupName1; diff --git a/research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java b/research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java index b0301826..338bab16 100644 --- a/research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java +++ b/research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java @@ -44,5 +44,7 @@ public interface KtsGroupDao { GroupVO.WorkerStatistics.Title.ZjDto queryZjTitleStatistics(@Param("orgId") Long orgId); + List gzryxlStatistics(); + List queryStudentStatistics(GroupDto.Query query); } diff --git a/research-system/src/main/java/com/research/system/service/ExportService.java b/research-system/src/main/java/com/research/system/service/ExportService.java index 2fb6b303..119e1145 100644 --- a/research-system/src/main/java/com/research/system/service/ExportService.java +++ b/research-system/src/main/java/com/research/system/service/ExportService.java @@ -1,5 +1,7 @@ package com.research.system.service; +import com.research.system.domain.dto.ExportDto; + import javax.servlet.http.HttpServletResponse; /** @@ -9,5 +11,5 @@ import javax.servlet.http.HttpServletResponse; * @description: */ public interface ExportService { - void export(HttpServletResponse response); + void export(HttpServletResponse response, ExportDto.Query dto); } diff --git a/research-system/src/main/java/com/research/system/service/KtsGroupService.java b/research-system/src/main/java/com/research/system/service/KtsGroupService.java index 9d8234b9..d12a292c 100644 --- a/research-system/src/main/java/com/research/system/service/KtsGroupService.java +++ b/research-system/src/main/java/com/research/system/service/KtsGroupService.java @@ -62,5 +62,8 @@ public interface KtsGroupService { GroupVO.WorkerStatistics workerStatistics(); + //工作人员学历统计 + List gzryxlStatistics(); + List queryStudentList(GroupDto.Query query); } diff --git a/research-system/src/main/java/com/research/system/service/impl/ExportServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/ExportServiceImpl.java index 25385d6c..d2139f19 100644 --- a/research-system/src/main/java/com/research/system/service/impl/ExportServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/ExportServiceImpl.java @@ -6,18 +6,17 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.data.*; +import com.research.common.core.domain.entity.SysUser; import com.research.common.utils.DateUtils; import com.research.common.utils.file.FileUtils; import com.research.system.domain.dto.ClientPrjProOrgDto; +import com.research.system.domain.dto.ExportDto; import com.research.system.domain.dto.GroupDto; import com.research.system.domain.dto.OutcomeDto; import com.research.system.domain.vo.ClientPrjProjInfoVo; import com.research.system.domain.vo.GroupVO; import com.research.system.domain.vo.OutcomeVo; -import com.research.system.service.CooperatorService; -import com.research.system.service.ExportService; -import com.research.system.service.KtsGroupService; -import com.research.system.service.OutcomeService; +import com.research.system.service.*; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; import org.springframework.stereotype.Service; @@ -44,15 +43,25 @@ public class ExportServiceImpl implements ExportService { @Resource private CooperatorService cooperatorService; - @Value(value = "${research.reportTemplate}") - private String reportTemplate; @Resource private KtsGroupService ktsGroupService; @Resource private OutcomeService outcomeService; + @Resource + private ISysUserService sysUserService; + + @Value(value = "${research.reportTemplate}") + private String reportTemplate; + @Value(value = "${research.reportGrTemplate}") + private String reportGrTemplate; + @Override - public void export(HttpServletResponse response) { + public void export(HttpServletResponse response, ExportDto.Query dto) { + if (dto.getType() == 1) { + exportGr(response, dto); + return; + } XWPFTemplate template = XWPFTemplate.compile(reportTemplate); HashMap map = new HashMap<>(); List query = cooperatorService.query(new ClientPrjProOrgDto.Query()); @@ -262,4 +271,238 @@ public class ExportServiceImpl implements ExportService { } } + + public void exportGr(HttpServletResponse response, ExportDto.Query dto) { + XWPFTemplate template = XWPFTemplate.compile(reportGrTemplate); + HashMap map = new HashMap<>(); + SysUser sysUser = sysUserService.selectUserById(dto.getUserId()); + if (sysUser == null) { + return; + } + GroupDto.MemberQuery memberQuery = new GroupDto.MemberQuery(); + memberQuery.setMemberPhone(sysUser.getPhonenumber()); + List memberResults = ktsGroupService.queryMemberList(memberQuery); + if (CollUtil.isNotEmpty(memberResults)) { + map.put("groupName", memberResults.stream().map(GroupVO.MemberResult::getKtGroupName).collect(Collectors.joining("，"))); + map.put("orgName", memberResults.stream().map(GroupVO.MemberResult::getProjOrgName).collect(Collectors.joining("，"))); + map.put("title", memberResults.stream().map(GroupVO.MemberResult::getTitleName).collect(Collectors.joining("，"))); + map.put("userType", memberResults.stream().map(GroupVO.MemberResult::getTypeName).collect(Collectors.joining("，"))); + map.put("rxTime", memberResults.get(0).getEnrollmentTime()); + map.put("byTime", memberResults.get(0).getGraduationTime()); + map.put("readingStatus", memberResults.get(0).getReadingStatusName()); + map.put("type", memberResults.get(0).getCategoryName()); + } + map.put("eMail", sysUser.getEmail()); + map.put("name", sysUser.getNickName()); + map.put("phone", sysUser.getUserName()); + ClientPrjProOrgDto.Query query1 = new ClientPrjProOrgDto.Query(); + query1.setUsername(sysUser.getUserName()); + List query = cooperatorService.query(query1); + + //合作单位 + if (CollUtil.isNotEmpty(query)) { + TextRenderData text1 = Texts.of("单位名称").bold().fontSize(12).create(); + TextRenderData text2 = Texts.of("单位类型").bold().fontSize(12).create(); + TextRenderData text3 = Texts.of("负责人").bold().fontSize(12).create(); + RowRenderData headerRow = Rows.of(text1, text2, text3).center().create(); + Tables.TableBuilder of = Tables.of(headerRow); + for (ClientPrjProjInfoVo.OrgVo orgVo : query) { + RowRenderData rowRenderData = Rows.of( + orgVo.getOrgName(), + orgVo.getCategory() == null ? null : orgVo.getCategory() == 0 ? "申报单位" : "合作单位", + orgVo.getOrgLeader() + ).center().create(); + of.addRow(rowRenderData).center(); + } + TableRenderData tableData = of + .create(); + map.put("table0", tableData); + } + + + //项目课题 + List groupList = ktsGroupService.queryGroupList(new GroupDto.Query()); + if (CollUtil.isNotEmpty(groupList)) { + TextRenderData text1 = Texts.of("单位名称").bold().fontSize(12).create(); + TextRenderData text2 = Texts.of("课题").bold().fontSize(12).create(); + TextRenderData text3 = Texts.of("负责人").bold().fontSize(12).create(); + RowRenderData headerRow = Rows.of(text1, text2, text3).center().create(); + Tables.TableBuilder of = Tables.of(headerRow); + for (GroupVO.Result result : groupList) { + RowRenderData rowRenderData = Rows.of( + result.getProjOrgName(), + result.getKtGroupName(), + result.getName() + ).center().create(); + of.addRow(rowRenderData).center(); + } + TableRenderData tableData = of + .create(); + map.put("table1", tableData); + } + //项目成果 + OutcomeDto.Query query2 = new OutcomeDto.Query(); + query2.setUsername(sysUser.getUserName()); + List outcomeList = outcomeService.queryList(query2); + if (CollUtil.isNotEmpty(outcomeList)) { + //学术论文 + Map> outcomeMap = outcomeList.stream().collect(Collectors.groupingBy(OutcomeVo.Result::getCategoryId1)); + List results = outcomeMap.get(1L); + + if (CollUtil.isNotEmpty(results)) { + TextRenderData text1 = Texts.of("单位名称").bold().fontSize(12).create(); + TextRenderData text2 = Texts.of("标题").bold().fontSize(12).create(); + TextRenderData text3 = Texts.of("作者").bold().fontSize(12).create(); + TextRenderData text4 = Texts.of("类型").bold().fontSize(12).create(); + TextRenderData text5 = Texts.of("刊物").bold().fontSize(12).create(); + TextRenderData text6 = Texts.of("收录类别").bold().fontSize(12).create(); + RowRenderData headerRow = Rows.of(text1, text2, text3, text4, text5, text6).center().create(); + Tables.TableBuilder of = Tables.of(headerRow); + for (OutcomeVo.Result result : results) { + RowRenderData rowRenderData = Rows.of( + result.getProjOrgName(), + result.getTitle(), + result.getAuthors(), + result.getAchType() == null ? null : result.getAchType() == 0 ? "期刊论文" : result.getAchType() == 1 ? "会议论文" : result.getAchType() == 2 ? "报刊文章" : result.getAchType() == 3 ? "报纸文章" : "学位论文", + result.getSource(), + result.getCategoryId2() == null ? null : result.getCategoryId2() == 2 ? "SCI" : result.getCategoryId2() == 3 ? "中文期刊" : "其他" + ).center().create(); + of.addRow(rowRenderData).center(); + } + TableRenderData tableData = of + .create(); + map.put("table2", tableData); + } + List results1 = outcomeMap.get(11L); + if (CollUtil.isNotEmpty(results1)) { + TextRenderData text1 = Texts.of("单位名称").bold().fontSize(12).create(); + TextRenderData text2 = Texts.of("专利名称").bold().fontSize(12).create(); + TextRenderData text3 = Texts.of("专利号").bold().fontSize(12).create(); + TextRenderData text4 = Texts.of("专利类型").bold().fontSize(12).create(); + TextRenderData text5 = Texts.of("专利权人").bold().fontSize(12).create(); + TextRenderData text6 = Texts.of("专利内容").bold().fontSize(12).create(); + RowRenderData headerRow = Rows.of(text1, text2, text3, text4, text5, text6).center().create(); + Tables.TableBuilder of = Tables.of(headerRow); + for (OutcomeVo.Result result : results1) { + RowRenderData rowRenderData = Rows.of( + result.getProjOrgName(), + result.getTitle(), + result.getNo(), + result.getAchType() == null ? null : result.getAchType() == 0 ? "发明专利" : result.getAchType() == 1 ? "实用新型专利" : "外观设计专利", + result.getAuthors(), + result.getRemark() + ).center().create(); + of.addRow(rowRenderData).center(); + } + TableRenderData tableData = of + .create(); + map.put("table3", tableData); + } + + //学术交流 + List results2 = outcomeMap.get(71L); + if (CollUtil.isNotEmpty(results2)) { + TextRenderData text1 = Texts.of("标题").bold().fontSize(12).create(); + TextRenderData text2 = Texts.of("时间").bold().fontSize(12).create(); + TextRenderData text3 = Texts.of("地点").bold().fontSize(12).create(); + TextRenderData text4 = Texts.of("参与人").bold().fontSize(12).create(); + TextRenderData text5 = Texts.of("类型").bold().fontSize(12).create(); + TextRenderData text6 = Texts.of("内容").bold().fontSize(12).create(); + RowRenderData headerRow = Rows.of(text1, text2, text3, text4, text5, text6).center().create(); + Tables.TableBuilder of = Tables.of(headerRow); + for (OutcomeVo.Result result : results2) { + RowRenderData rowRenderData = Rows.of( + result.getTitle(), + DateUtil.format(result.getPublishDate(), "yyyy-MM-dd"), + result.getPlace(), + result.getAuthors(), + result.getAchType() == null ? null : result.getAchType() == 0 ? "学术讲座" : result.getAchType() == 1 ? "学术会议" : "外出进修", + result.getRemark() + ).center().create(); + of.addRow(rowRenderData).center(); + } + TableRenderData tableData = of + .create(); + map.put("table4", tableData); + } + + //高层次科技人才 + List results3 = outcomeMap.get(5L); + if (CollUtil.isNotEmpty(results3)) { + Map> collect = results3.stream().collect(Collectors.groupingBy(OutcomeVo.Result::getCategoryId2)); + if (CollUtil.isNotEmpty(collect.get(6L))) { + TextRenderData text1 = Texts.of("序号").bold().fontSize(12).create(); + TextRenderData text2 = Texts.of("姓名").bold().fontSize(12).create(); + TextRenderData text3 = Texts.of("性别").bold().fontSize(12).create(); + TextRenderData text4 = Texts.of("年龄").bold().fontSize(12).create(); + TextRenderData text5 = Texts.of("职称").bold().fontSize(12).create(); + TextRenderData text6 = Texts.of("入选人才计划或项目").bold().fontSize(12).create(); + RowRenderData headerRow = Rows.of(text1, text2, text3, text4, text5, text6).center().create(); + Tables.TableBuilder of = Tables.of(headerRow); + int i = 0; + for (OutcomeVo.Result result : collect.get(6L)) { + i++; + RowRenderData rowRenderData = Rows.of( + i + "", + result.getName(), + StrUtil.isNotEmpty(result.getSex()) ? "未知" : "0".equals(result.getSex()) ? "女" : "男", + result.getAge() + "", + result.getTitle(), + result.getProjects() + ).center().create(); + of.addRow(rowRenderData).center(); + } + TableRenderData tableData = of + .create(); + map.put("table5", tableData); + } + + if (CollUtil.isNotEmpty(collect.get(7L))) { + TextRenderData text1 = Texts.of("序号").bold().fontSize(12).create(); + TextRenderData text2 = Texts.of("姓名").bold().fontSize(12).create(); + TextRenderData text3 = Texts.of("性别").bold().fontSize(12).create(); + TextRenderData text4 = Texts.of("年龄").bold().fontSize(12).create(); + TextRenderData text5 = Texts.of("职称晋升").bold().fontSize(12).create(); + TextRenderData text6 = Texts.of("入选人才计划或项目").bold().fontSize(12).create(); + RowRenderData headerRow = Rows.of(text1, text2, text3, text4, text5, text6).center().create(); + Tables.TableBuilder of = Tables.of(headerRow); + int i = 0; + for (OutcomeVo.Result result : collect.get(6L)) { + i++; + RowRenderData rowRenderData = Rows.of( + i + "", + result.getName(), + StrUtil.isNotEmpty(result.getSex()) ? "未知" : "0".equals(result.getSex()) ? "女" : "男", + result.getAge() + "", + result.getTitle(), + result.getProjects() + ).center().create(); + of.addRow(rowRenderData).center(); + } + TableRenderData tableData = of + .create(); + map.put("table6", tableData); + } + } + + } + + + try { + + String fileName = "个人报告.docx"; +// String path = "C:/Users/zzc16/Desktop/项目运行报告.docx"; + String path = "D:/Projects/research/server/profile/项目运行报告.docx"; + template.render(map); + //以文件形式输出 + template.writeAndClose(Files.newOutputStream(Paths.get(path))); + + //3.写出到客户端 + response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); + FileUtils.setAttachmentResponseHeader(response, fileName); + FileUtils.writeBytes(path, response.getOutputStream()); + } catch (Exception e) { + e.printStackTrace(); // 输出详细的异常信息 + } + } } diff --git a/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java index c20d371b..c8c9a38e 100644 --- a/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java @@ -106,11 +106,26 @@ public class KtsGroupServiceImpl implements KtsGroupService { for (GroupVO.Result result1 : childrenList) { result1.setSort(i); i++; + List childrenList1 = result.getChildrenList(); + if (CollUtil.isNotEmpty(childrenList1)) { + int a = 1; + for (GroupVO.Result result2 : childrenList1) { + result2.setSort(a); + a++; + } + } } } } + return results; + } else { + int i = 1; + for (GroupVO.Result result : results) { + result.setSort(i); + i++; + } } - return results; + return groupList; } return new ArrayList<>(); } @@ -552,6 +567,11 @@ public class KtsGroupServiceImpl implements KtsGroupService { return workerStatistics; } + @Override + public List gzryxlStatistics() { + return ktsGroupDao.gzryxlStatistics(); + } + @Override public List queryStudentList(GroupDto.Query query) { return ktsGroupDao.queryStudentStatistics(query); diff --git a/research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java index 911455ca..bc1428ac 100644 --- a/research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java @@ -17,10 +17,7 @@ import com.research.system.domain.vo.MemberAduitVo; import com.research.system.persist.dao.MemberAduitDao; import com.research.system.persist.mapper.KtsKtGroupMemberAduitMapper; import com.research.system.persist.mapper.SrvMessageMapper; -import com.research.system.service.ISysUserService; -import com.research.system.service.KtsGroupService; -import com.research.system.service.MemberAduitService; -import com.research.system.service.TmsTenantUserService; +import com.research.system.service.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -54,6 +51,8 @@ public class MemberAduitServiceImpl implements MemberAduitService { private KtsGroupService ktsGroupService; @Resource private TmsTenantUserService tmsTenantUserService; + @Resource + private ISysDictDataService sysDictDataService; @Override public void register(MemberAduitDto.Register dto) { @@ -157,6 +156,7 @@ public class MemberAduitServiceImpl implements MemberAduitService { @Override public List query(MemberAduitDto.Query dto) { - return memberAduitDao.query(dto, SecurityUtils.getUserId()); + List query = memberAduitDao.query(dto, SecurityUtils.getUserId()); + return query; } } diff --git a/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml b/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml index 600782e9..35dee49a 100644 --- a/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml +++ b/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml @@ -60,6 +60,7 @@ and o.org_leader_phone like concat('%',#{dto.orgLeaderPhone},'%') + diff --git a/research-system/src/main/resources/mapper/dao/FundingDao.xml b/research-system/src/main/resources/mapper/dao/FundingDao.xml index a1f41409..30826cd9 100644 --- a/research-system/src/main/resources/mapper/dao/FundingDao.xml +++ b/research-system/src/main/resources/mapper/dao/FundingDao.xml @@ -32,8 +32,8 @@ kts_kt_group g on r.kt_group_id = g.id where r.del_flag = 0 - - and r.proj_org_id = #{dto.projOrgid} + + and r.proj_org_id = #{dto.projOrgId} and r.kt_group_id = #{dto.ktGroupId} diff --git a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml index fad5bd5d..4193dc49 100644 --- a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml +++ b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml @@ -65,6 +65,7 @@ m.member_email as memberEmail, m.member_gender as memberGender, m.member_birth as memberBirth, + m.reading_status as readingStatus, m.type, m.category, m.qualification, @@ -93,6 +94,9 @@ left join sys_user u on u.user_id = m.user_id where 1=1 and m.del_flag = 0 + + and g.proj_org_id = #{dto.projOrgId} + and m.kt_group_id = #{dto.ktGroupId} @@ -103,7 +107,7 @@ and m.member_phone like concat('%',#{dto.memberPhone},'%') - and m.type = #{dto.type} + and m.type like concat('%',#{dto.type},'%') and m.audit_status = #{dto.auditStatus} @@ -289,6 +293,20 @@ group by o.id + + @@ -67,10 +64,12 @@ left join sys_user u on u.user_id = a.reviewed_persion left join kts_kt_group g1 on g1.id = a.parent_kt_id WHERE - a.del_flag = 0 and - a.reviewer = #{userId} - - and a.status = #{dto.status} + a.del_flag = 0 + + and a.reviewer = #{userId} + + + and a.status = #{dto.memberStatus} and a.username like concat('%', #{dto.username}, '%') @@ -89,6 +88,9 @@ and a.kt_group_id = #{dto.ktGroupId} + + + and a.category like concat('%', #{dto.category}, '%') order by a.id desc diff --git a/research-system/src/main/resources/mapper/dao/OutcomeDao.xml b/research-system/src/main/resources/mapper/dao/OutcomeDao.xml index 5826412c..362df8e9 100644 --- a/research-system/src/main/resources/mapper/dao/OutcomeDao.xml +++ b/research-system/src/main/resources/mapper/dao/OutcomeDao.xml @@ -82,6 +82,9 @@ AND a.ach_type = #{dto.achType} + + AND a.create_by = #{dto.username} + diff --git a/research-system/src/main/resources/mapper/system/KtsKtGroupMemberAduitMapper.xml b/research-system/src/main/resources/mapper/system/KtsKtGroupMemberAduitMapper.xml index af52d753..34ed293e 100644 --- a/research-system/src/main/resources/mapper/system/KtsKtGroupMemberAduitMapper.xml +++ b/research-system/src/main/resources/mapper/system/KtsKtGroupMemberAduitMapper.xml @@ -17,7 +17,7 @@ - + @@ -141,7 +141,7 @@ #{memberEmail,jdbcType=VARCHAR}, #{memberGender,jdbcType=TINYINT}, #{memberName,jdbcType=VARCHAR}, #{memberPhone,jdbcType=VARCHAR}, #{parentMemberId,jdbcType=BIGINT}, #{password,jdbcType=VARCHAR}, #{projOrgId,jdbcType=BIGINT}, #{roleIdList,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, - #{type,jdbcType=TINYINT}, #{userId,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, + #{type,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{step,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{reviewer,jdbcType=VARCHAR}, @@ -295,7 +295,7 @@ #{title,jdbcType=VARCHAR}, - #{type,jdbcType=TINYINT}, + #{type,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, @@ -402,7 +402,7 @@ title = #{record.title,jdbcType=VARCHAR}, - type = #{record.type,jdbcType=TINYINT}, + type = #{record.type,jdbcType=VARCHAR}, user_id = #{record.userId,jdbcType=BIGINT}, @@ -474,7 +474,7 @@ proj_org_id = #{record.projOrgId,jdbcType=BIGINT}, role_id_list = #{record.roleIdList,jdbcType=VARCHAR}, title = #{record.title,jdbcType=VARCHAR}, - type = #{record.type,jdbcType=TINYINT}, + type = #{record.type,jdbcType=VARCHAR}, user_id = #{record.userId,jdbcType=BIGINT}, username = #{record.username,jdbcType=VARCHAR}, del_flag = #{record.delFlag,jdbcType=TINYINT}, @@ -541,7 +541,7 @@ title = #{title,jdbcType=VARCHAR}, - type = #{type,jdbcType=TINYINT}, + type = #{type,jdbcType=VARCHAR}, user_id = #{userId,jdbcType=BIGINT}, @@ -610,7 +610,7 @@ proj_org_id = #{projOrgId,jdbcType=BIGINT}, role_id_list = #{roleIdList,jdbcType=VARCHAR}, title = #{title,jdbcType=VARCHAR}, - type = #{type,jdbcType=TINYINT}, + type = #{type,jdbcType=VARCHAR}, user_id = #{userId,jdbcType=BIGINT}, username = #{username,jdbcType=VARCHAR}, del_flag = #{delFlag,jdbcType=TINYINT}, diff --git a/research-system/src/main/resources/mapper/system/KtsKtGroupMemberMapper.xml b/research-system/src/main/resources/mapper/system/KtsKtGroupMemberMapper.xml index 78a0abec..b552d94d 100644 --- a/research-system/src/main/resources/mapper/system/KtsKtGroupMemberMapper.xml +++ b/research-system/src/main/resources/mapper/system/KtsKtGroupMemberMapper.xml @@ -11,7 +11,7 @@ - + @@ -130,7 +130,7 @@ values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{ktGroupId,jdbcType=BIGINT}, #{parentMemberId,jdbcType=VARCHAR}, #{memberName,jdbcType=VARCHAR}, #{memberPhone,jdbcType=VARCHAR}, #{memberEmail,jdbcType=VARCHAR}, #{memberGender,jdbcType=TINYINT}, #{memberBirth,jdbcType=DATE}, - #{type,jdbcType=TINYINT}, #{category,jdbcType=TINYINT}, #{qualification,jdbcType=INTEGER}, + #{type,jdbcType=VARCHAR}, #{category,jdbcType=TINYINT}, #{qualification,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{intro,jdbcType=VARCHAR}, #{auditStatus,jdbcType=TINYINT}, #{memberStatus,jdbcType=TINYINT}, #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, @@ -248,7 +248,7 @@ #{memberBirth,jdbcType=DATE}, - #{type,jdbcType=TINYINT}, + #{type,jdbcType=VARCHAR}, #{category,jdbcType=TINYINT}, @@ -337,7 +337,7 @@ member_birth = #{record.memberBirth,jdbcType=DATE}, - type = #{record.type,jdbcType=TINYINT}, + type = #{record.type,jdbcType=VARCHAR}, category = #{record.category,jdbcType=TINYINT}, @@ -403,7 +403,7 @@ member_email = #{record.memberEmail,jdbcType=VARCHAR}, member_gender = #{record.memberGender,jdbcType=TINYINT}, member_birth = #{record.memberBirth,jdbcType=DATE}, - type = #{record.type,jdbcType=TINYINT}, + type = #{record.type,jdbcType=VARCHAR}, category = #{record.category,jdbcType=TINYINT}, qualification = #{record.qualification,jdbcType=INTEGER}, title = #{record.title,jdbcType=VARCHAR}, @@ -452,7 +452,7 @@ member_birth = #{memberBirth,jdbcType=DATE}, - type = #{type,jdbcType=TINYINT}, + type = #{type,jdbcType=VARCHAR}, category = #{category,jdbcType=TINYINT}, @@ -515,7 +515,7 @@ member_email = #{memberEmail,jdbcType=VARCHAR}, member_gender = #{memberGender,jdbcType=TINYINT}, member_birth = #{memberBirth,jdbcType=DATE}, - type = #{type,jdbcType=TINYINT}, + type = #{type,jdbcType=VARCHAR}, category = #{category,jdbcType=TINYINT}, qualification = #{qualification,jdbcType=INTEGER}, title = #{title,jdbcType=VARCHAR},