仪器共享模块完成

research-admin/src/main/java/com/research/web/controller/client/achievement/OutcomeController.java

@@ -35,7 +35,7 @@ public class OutcomeController {
     private OutcomeService outcomeService;
 
     @PostMapping("/query")
-    public JsonResponse<PageInfo<OutcomeVo.Result>> queryList(BaseDto<OutcomeDto.Query> query) {
+    public JsonResponse<PageInfo<OutcomeVo.Result>> queryList(@RequestBody @Validated BaseDto<OutcomeDto.Query> query) {
         if (query.getPageNum() > 0) {
             PageHelper.startPage(query.getPageNum(), query.getPageSize());
         }
@@ -43,13 +43,13 @@ public class OutcomeController {
     }
 
     @PostMapping("/add")
-    public JsonResponse<Integer> add(OutcomeDto.Add dto) {
+    public JsonResponse<Integer> add(@RequestBody @Validated OutcomeDto.Add dto) {
         outcomeService.add(dto);
         return JsonResponse.ok();
     }
 
     @PostMapping("/del")
-    public JsonResponse<Integer> del(CommonDto.DelDto dto) {
+    public JsonResponse<Integer> del(@RequestBody @Validated CommonDto.DelDto dto) {
         outcomeService.del(dto);
         return JsonResponse.ok();
     }

research-admin/src/main/java/com/research/web/controller/client/funding/FundingController.java

@@ -1,13 +1,56 @@
 package com.research.web.controller.client.funding;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.research.common.core.domain.BaseDto;
+import com.research.common.core.domain.JsonResponse;
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.FundingDto;
+import com.research.system.domain.vo.FundingVo;
+import com.research.system.service.FundingService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * @Author zzc
  * @Package com.research.web.controller.client.funding
  * @Date 2025/8/12 16:28
  * @description:
  */
+@Slf4j
+@Api(tags = "经费收支")
+@RestController
+@RequestMapping("/funding")
 public class FundingController {
 
+    @Resource
+    private FundingService fundingService;
+
+    @PostMapping("/query")
+    public JsonResponse<PageInfo<FundingVo.Result>> queryList(@RequestBody @Validated BaseDto<FundingDto.Query> query){
+        if (query.getPageNum() > 0) {
+            PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(fundingService.queryList(query.getParam())));
+    }
 
+    @PostMapping("/add")
+    public JsonResponse<Integer> add(@RequestBody @Validated FundingDto.Add dto){
+        fundingService.add(dto);
+        return JsonResponse.ok();
+    }
 
+    @PostMapping("/del")
+    public JsonResponse<Integer> del(@RequestBody @Validated CommonDto.DelDto dto){
+        fundingService.del(dto);
+        return JsonResponse.ok();
+    }
 }

research-admin/src/main/java/com/research/web/controller/client/meeting/MeetingRecordController.java

@@ -0,0 +1,58 @@
+package com.research.web.controller.client.meeting;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.research.common.core.domain.BaseDto;
+import com.research.common.core.domain.JsonResponse;
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.MeetingDto;
+import com.research.system.domain.vo.MeetingVo;
+import com.research.system.service.MeetingService;
+import io.swagger.annotations.Api;
+import liquibase.pro.packaged.J;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.web.controller.client.meeting
+ * @Date 2025/8/13 9:38
+ * @description:
+ */
+@Slf4j
+@Api(tags = "会议记录")
+@RestController
+@RequestMapping("/meeting")
+public class MeetingRecordController {
+
+    @Resource
+    private MeetingService meetingService;
+
+    @PostMapping("/query")
+    public JsonResponse<PageInfo<MeetingVo.Result>> queryList(@RequestBody @Validated BaseDto<MeetingDto.Query> query){
+        if (query.getPageNum() > 0) {
+            PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(meetingService.queryList(query.getParam())));
+
+    }
+
+    @PostMapping("/add")
+    public JsonResponse add(@RequestBody @Validated MeetingDto.Add dto){
+        meetingService.add(dto);
+        return JsonResponse.ok();
+    }
+
+    @PostMapping("/del")
+    public JsonResponse del(@RequestBody @Validated CommonDto.DelDto dto){
+        meetingService.del(dto);
+        return JsonResponse.ok();
+    }
+}

research-admin/src/main/java/com/research/web/controller/client/shs/ResDeviceController.java

@@ -0,0 +1,61 @@
+package com.research.web.controller.client.shs;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.research.common.core.domain.BaseDto;
+import com.research.common.core.domain.JsonResponse;
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.ShsResDeviceDto;
+import com.research.system.domain.vo.ShsResDeviceVo;
+import com.research.system.service.ShsResDeviceService;
+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;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author zzc
+ * @Package com.research.web.controller.client.shs
+ * @Date 2025/8/13 17:17
+ * @description:
+ */
+@RestController
+@RequestMapping("/instrument")
+@Api(tags = "仪器相关")
+@Slf4j
+public class ResDeviceController {
+
+    @Resource
+    private ShsResDeviceService shsResDeviceService;
+
+    @ApiOperation(value = "查询仪器")
+    @RequestMapping(value = "/list", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<PageInfo<ShsResDeviceVo.Result>> queryList(@ApiParam @Validated @RequestBody BaseDto<ShsResDeviceDto.Query> query) {
+        if (query.getPageNum() > 0) {
+            PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(shsResDeviceService.queryList(query.getParam())));
+    }
+
+    @ApiOperation(value = "新增")
+    @RequestMapping(value = "/add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> add(@ApiParam @Validated @RequestBody ShsResDeviceDto.Add dto) {
+        shsResDeviceService.add(dto);
+        return JsonResponse.ok();
+    }
+
+    @ApiOperation(value = "删除")
+    @RequestMapping(value = "/del", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> del(@ApiParam @Validated @RequestBody CommonDto.DelDto dto) {
+        shsResDeviceService.del(dto);
+        return JsonResponse.ok();
+    }
+
+}

research-admin/src/main/java/com/research/web/controller/client/shs/ResPlatformController.java

@@ -0,0 +1,62 @@
+package com.research.web.controller.client.shs;
+
+import com.research.common.core.controller.BaseController;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.research.common.core.domain.BaseDto;
+import com.research.common.core.domain.JsonResponse;
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.ResPlatformDto;
+import com.research.system.domain.vo.ResPlatformVo;
+import com.research.system.service.ResPlatformService;
+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;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author zzc
+ * @Package com.ccsens.srsp.admin.controller.product
+ * @Date 2025/8/5 16:02
+ * @description:
+ */
+@RestController
+@RequestMapping("/resPlatform")
+@Api(tags = "平台相关")
+@Slf4j
+public class ResPlatformController  {
+
+    @Resource
+    private ResPlatformService resPlatformService;
+
+    @ApiOperation(value = "查询平台")
+    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<PageInfo<ResPlatformVo.Result>> list(@ApiParam @Validated @RequestBody BaseDto<ResPlatformDto.Query> query){
+        if (query.getPageNum()>0) {
+            PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(resPlatformService.list(query.getParam())));
+    }
+
+    @ApiOperation(value = "新增平台")
+    @RequestMapping(value = "/add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> add(@ApiParam @Validated @RequestBody ResPlatformDto.Add dto){
+        resPlatformService.add(dto);
+        return JsonResponse.ok();
+    }
+
+    @ApiOperation(value = "删除平台")
+    @RequestMapping(value = "/del", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> del(@ApiParam @Validated @RequestBody CommonDto.DelDto dto){
+        resPlatformService.del(dto.getIdList());
+        return JsonResponse.ok();
+    }
+
+}

research-admin/src/main/java/com/research/web/controller/client/shs/ShsLibInfoController.java

@@ -0,0 +1,60 @@
+package com.research.web.controller.client.shs;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.research.common.core.domain.BaseDto;
+import com.research.common.core.domain.JsonResponse;
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.ShsLibInfoDto;
+import com.research.system.domain.vo.ShsLibInfoVo;
+import com.research.system.service.ShsLibInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import liquibase.pro.packaged.J;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.web.controller.client.shs
+ * @Date 2025/8/13 16:06
+ * @description:
+ */
+@RestController
+@RequestMapping("/laboratory")
+@Api(tags = "实验室相关")
+@Slf4j
+public class ShsLibInfoController {
+
+    @Resource
+    private ShsLibInfoService shsLibInfoService;
+
+    @ApiOperation(value = "查询实验室")
+    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<PageInfo<ShsLibInfoVo.Result>> queryList(BaseDto<ShsLibInfoDto.Query> query){
+        if (query.getPageNum() > 0) {
+            PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(shsLibInfoService.queryList(query.getParam())));
+    }
+
+    @ApiOperation(value = "新增")
+    @RequestMapping(value = "/add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse add(ShsLibInfoDto.Add dto){
+        shsLibInfoService.add(dto);
+        return JsonResponse.ok();
+    }
+
+    @ApiOperation(value = "删除")
+    @RequestMapping(value = "/del", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse del(CommonDto.DelDto dto){
+        shsLibInfoService.del(dto);
+        return JsonResponse.ok();
+    }
+
+}

research-admin/src/main/resources/application-stage.yml

@@ -0,0 +1,61 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://sd.tall.wiki:3306/open_research?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                username: root
+                password: po3OynBO[M3579p6L7)o
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url:
+                username:
+                password:
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: research
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true

research-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@ research:
   # 版权年份
   copyrightYear: 2025
   # 文件路径 示例（ Windows配置D:/research/uploadPath，Linux配置 /home/research/uploadPath）
-  profile: D:/research/uploadPath
+  profile: /home/research/profile
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -16,7 +16,7 @@ research:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 38001
   servlet:
     # 应用的访问路径
     context-path: /

research-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-    <property name="log.path" value="/Users/2y/zhj/logs" />
+    <property name="log.path" value="/home/research/server" />
 
     <!-- 彩色日志 -->
     <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>

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

@@ -78,7 +78,8 @@
         <table tableName="shs_lib_info" domainObjectName="ShsLibInfo" enableDeleteByExample="false"/>
         <table tableName="shs_syff_category" domainObjectName="ShsSyffCategory" enableDeleteByExample="false"/>
         <table tableName="srv_modules" domainObjectName="SrvModules" enableDeleteByExample="false"/>
-
+        <table tableName="res_platform" domainObjectName="ResPlatform" enableDeleteByExample="false"/>
+        <table tableName="shs_res_device" domainObjectName="ShsResDevice" enableDeleteByExample="false"/>
         <!-- 有些表的字段需要指定java类型
          <table schema="" tableName="">
             <columnOverride column="" javaType="" />

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 projOrgId;//合作单位id',
-        private String ktgroupid;//课题组id',
+        private String ktGroupId;//课题组id',
-        private String paytype;//经费类型：0-收入，1-支出',
+        private String payType;//经费类型：0-收入，1-支出',
     }
 
     @Data

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

@@ -0,0 +1,52 @@
+package com.research.system.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.dto
+ * @Date 2025/8/13 9:50
+ * @description:
+ */
+public class MeetingDto {
+
+    @Data
+    public static class Query {
+        private String projOrgId;//合作单位id',
+        private String ktGroupId;//课题组id',
+        private String meetingTitle;//会议名称' ,
+        private String meetingBeginTime;//会议开始时间',
+        private String meetingEndTime;//会议结束时间',
+    }
+
+    @Data
+    public static class Add {
+        private Long id;
+
+        private Long projId;
+
+        private Long projOrgId;
+
+        private Long ktGroupId;
+
+        private String meetingTitle;
+
+        private String meetingFqr;
+
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+        private Date meetingBeginTime;
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+        private Date meetingEndTime;
+
+        private String meetingAbstract;
+
+        private String meetingNoteUrl;
+
+        private String remark;
+        private List<Long> metMeetingParticipantList;
+    }
+}

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

@@ -0,0 +1,44 @@
+package com.research.system.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author zzc
+ * @Package com.ccsens.srsp.system.domain.dto
+ * @Date 2025/8/5 16:08
+ * @description:
+ */
+public class ResPlatformDto {
+
+    @Data
+    public static class Query{
+        @ApiModelProperty("平台名称")
+        private String name;
+        @ApiModelProperty("管理员")
+        private String administrators;
+        private Integer pageNum;
+        private Integer pageSize;
+        private Long id;
+    }
+
+    @Data
+    public static class Add{
+        @ApiModelProperty("")
+        private Long id;
+        private Long projId;
+        private Long projOrgId;
+        @ApiModelProperty("平台名称")
+        private String name;
+        @ApiModelProperty("管理员")
+        private String administrators;
+        @ApiModelProperty("联系电话")
+        private String phone;
+        @ApiModelProperty("邮箱")
+        private String email;
+        @ApiModelProperty("")
+        private String remark;
+        private Long moduleId;
+    }
+
+}

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

@@ -0,0 +1,39 @@
+package com.research.system.domain.dto;
+
+import com.research.system.domain.po.ShsLibInfo;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.dto
+ * @Date 2025/8/13 15:07
+ * @description:
+ */
+public class ShsLibInfoDto {
+
+    @Data
+    public static class Query {
+        private Long projId;
+
+        private Long projOrgId;
+
+        private String title;
+    }
+
+    @Data
+    public static class Add {
+        private Long id;
+
+        private Long projId;
+
+        private Long projOrgId;
+
+        private String title;
+
+        private String intro;
+
+    }
+
+}

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

@@ -0,0 +1,70 @@
+package com.research.system.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import java.util.Date;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.dto
+ * @Date 2025/8/13 16:27
+ * @description:
+ */
+public class ShsResDeviceDto {
+
+    @Data
+    @ApiModel("后台查看仪器列表-请求")
+    public static class Query {
+        @ApiModelProperty("平台id")
+        private Long platformId;
+        private String projOrgId;
+        @ApiModelProperty("仪器名")
+        private String deviceName;
+    }
+
+    @Data
+    public static class Add {
+        private Long id;
+
+        private Long projId;
+
+        private Long projOrgId;
+
+        private String name;
+
+        private String deviceSn;
+
+        private Date purchaseDate;
+
+        private Date networkingDate;
+
+        private String manufacturer;
+
+        private String model;
+
+        private String purchasePrice;
+
+        private String englishName;
+
+        private String introduction;
+
+        private String persion;
+
+        private Long platformId;
+
+        private Long libraryId;
+
+        private String address;
+
+        private Integer sort;
+
+        private String description;
+    }
+
+
+
+}

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

@@ -0,0 +1,150 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ResPlatform implements Serializable {
+    private Long id;
+
+    private String name;
+
+    private String administrators;
+
+    private String phone;
+
+    private String email;
+
+    private String remark;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte delStatus;
+
+    private Long projId;
+
+    private Long projOrgId;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getAdministrators() {
+        return administrators;
+    }
+
+    public void setAdministrators(String administrators) {
+        this.administrators = administrators == null ? null : administrators.trim();
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone == null ? null : phone.trim();
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email == null ? null : email.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy == null ? null : createBy.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getDelStatus() {
+        return delStatus;
+    }
+
+    public void setDelStatus(Byte delStatus) {
+        this.delStatus = delStatus;
+    }
+
+    public Long getProjId() {
+        return projId;
+    }
+
+    public void setProjId(Long projId) {
+        this.projId = projId;
+    }
+
+    public Long getProjOrgId() {
+        return projOrgId;
+    }
+
+    public void setProjOrgId(Long projOrgId) {
+        this.projOrgId = projOrgId;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", name=").append(name);
+        sb.append(", administrators=").append(administrators);
+        sb.append(", phone=").append(phone);
+        sb.append(", email=").append(email);
+        sb.append(", remark=").append(remark);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", delStatus=").append(delStatus);
+        sb.append(", projId=").append(projId);
+        sb.append(", projOrgId=").append(projOrgId);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,981 @@
+package com.research.system.domain.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ResPlatformExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public ResPlatformExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            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 andAdministratorsIsNull() {
+            addCriterion("administrators is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsIsNotNull() {
+            addCriterion("administrators is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsEqualTo(String value) {
+            addCriterion("administrators =", value, "administrators");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsNotEqualTo(String value) {
+            addCriterion("administrators <>", value, "administrators");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsGreaterThan(String value) {
+            addCriterion("administrators >", value, "administrators");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsGreaterThanOrEqualTo(String value) {
+            addCriterion("administrators >=", value, "administrators");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsLessThan(String value) {
+            addCriterion("administrators <", value, "administrators");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsLessThanOrEqualTo(String value) {
+            addCriterion("administrators <=", value, "administrators");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsLike(String value) {
+            addCriterion("administrators like", value, "administrators");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsNotLike(String value) {
+            addCriterion("administrators not like", value, "administrators");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsIn(List<String> values) {
+            addCriterion("administrators in", values, "administrators");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsNotIn(List<String> values) {
+            addCriterion("administrators not in", values, "administrators");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsBetween(String value1, String value2) {
+            addCriterion("administrators between", value1, value2, "administrators");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdministratorsNotBetween(String value1, String value2) {
+            addCriterion("administrators not between", value1, value2, "administrators");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIsNull() {
+            addCriterion("phone is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIsNotNull() {
+            addCriterion("phone is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneEqualTo(String value) {
+            addCriterion("phone =", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotEqualTo(String value) {
+            addCriterion("phone <>", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneGreaterThan(String value) {
+            addCriterion("phone >", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneGreaterThanOrEqualTo(String value) {
+            addCriterion("phone >=", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLessThan(String value) {
+            addCriterion("phone <", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLessThanOrEqualTo(String value) {
+            addCriterion("phone <=", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLike(String value) {
+            addCriterion("phone like", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotLike(String value) {
+            addCriterion("phone not like", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIn(List<String> values) {
+            addCriterion("phone in", values, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotIn(List<String> values) {
+            addCriterion("phone not in", values, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneBetween(String value1, String value2) {
+            addCriterion("phone between", value1, value2, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotBetween(String value1, String value2) {
+            addCriterion("phone not between", value1, value2, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailIsNull() {
+            addCriterion("email is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailIsNotNull() {
+            addCriterion("email is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailEqualTo(String value) {
+            addCriterion("email =", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailNotEqualTo(String value) {
+            addCriterion("email <>", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailGreaterThan(String value) {
+            addCriterion("email >", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailGreaterThanOrEqualTo(String value) {
+            addCriterion("email >=", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailLessThan(String value) {
+            addCriterion("email <", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailLessThanOrEqualTo(String value) {
+            addCriterion("email <=", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailLike(String value) {
+            addCriterion("email like", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailNotLike(String value) {
+            addCriterion("email not like", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailIn(List<String> values) {
+            addCriterion("email in", values, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailNotIn(List<String> values) {
+            addCriterion("email not in", values, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailBetween(String value1, String value2) {
+            addCriterion("email between", value1, value2, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailNotBetween(String value1, String value2) {
+            addCriterion("email not between", value1, value2, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNull() {
+            addCriterion("create_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNotNull() {
+            addCriterion("create_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByEqualTo(String value) {
+            addCriterion("create_by =", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotEqualTo(String value) {
+            addCriterion("create_by <>", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThan(String value) {
+            addCriterion("create_by >", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThanOrEqualTo(String value) {
+            addCriterion("create_by >=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThan(String value) {
+            addCriterion("create_by <", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThanOrEqualTo(String value) {
+            addCriterion("create_by <=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLike(String value) {
+            addCriterion("create_by like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotLike(String value) {
+            addCriterion("create_by not like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIn(List<String> values) {
+            addCriterion("create_by in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotIn(List<String> values) {
+            addCriterion("create_by not in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByBetween(String value1, String value2) {
+            addCriterion("create_by between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotBetween(String value1, String value2) {
+            addCriterion("create_by not between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelStatusIsNull() {
+            addCriterion("del_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelStatusIsNotNull() {
+            addCriterion("del_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelStatusEqualTo(Byte value) {
+            addCriterion("del_status =", value, "delStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelStatusNotEqualTo(Byte value) {
+            addCriterion("del_status <>", value, "delStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelStatusGreaterThan(Byte value) {
+            addCriterion("del_status >", value, "delStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("del_status >=", value, "delStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelStatusLessThan(Byte value) {
+            addCriterion("del_status <", value, "delStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("del_status <=", value, "delStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelStatusIn(List<Byte> values) {
+            addCriterion("del_status in", values, "delStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelStatusNotIn(List<Byte> values) {
+            addCriterion("del_status not in", values, "delStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelStatusBetween(Byte value1, Byte value2) {
+            addCriterion("del_status between", value1, value2, "delStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("del_status not between", value1, value2, "delStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjIdIsNull() {
+            addCriterion("proj_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjIdIsNotNull() {
+            addCriterion("proj_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjIdEqualTo(Long value) {
+            addCriterion("proj_id =", value, "projId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjIdNotEqualTo(Long value) {
+            addCriterion("proj_id <>", value, "projId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjIdGreaterThan(Long value) {
+            addCriterion("proj_id >", value, "projId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("proj_id >=", value, "projId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjIdLessThan(Long value) {
+            addCriterion("proj_id <", value, "projId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjIdLessThanOrEqualTo(Long value) {
+            addCriterion("proj_id <=", value, "projId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjIdIn(List<Long> values) {
+            addCriterion("proj_id in", values, "projId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjIdNotIn(List<Long> values) {
+            addCriterion("proj_id not in", values, "projId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjIdBetween(Long value1, Long value2) {
+            addCriterion("proj_id between", value1, value2, "projId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjIdNotBetween(Long value1, Long value2) {
+            addCriterion("proj_id not between", value1, value2, "projId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdIsNull() {
+            addCriterion("proj_org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdIsNotNull() {
+            addCriterion("proj_org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdEqualTo(Long value) {
+            addCriterion("proj_org_id =", value, "projOrgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdNotEqualTo(Long value) {
+            addCriterion("proj_org_id <>", value, "projOrgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdGreaterThan(Long value) {
+            addCriterion("proj_org_id >", value, "projOrgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("proj_org_id >=", value, "projOrgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdLessThan(Long value) {
+            addCriterion("proj_org_id <", value, "projOrgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdLessThanOrEqualTo(Long value) {
+            addCriterion("proj_org_id <=", value, "projOrgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdIn(List<Long> values) {
+            addCriterion("proj_org_id in", values, "projOrgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdNotIn(List<Long> values) {
+            addCriterion("proj_org_id not in", values, "projOrgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdBetween(Long value1, Long value2) {
+            addCriterion("proj_org_id between", value1, value2, "projOrgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdNotBetween(Long value1, Long value2) {
+            addCriterion("proj_org_id not between", value1, value2, "projOrgId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,260 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ShsResDevice implements Serializable {
+    private Long id;
+
+    private Long projId;
+
+    private Long projOrgId;
+
+    private String name;
+
+    private String deviceSn;
+
+    private Date purchaseDate;
+
+    private Date networkingDate;
+
+    private String manufacturer;
+
+    private String model;
+
+    private String purchasePrice;
+
+    private String englishName;
+
+    private String introduction;
+
+    private String persion;
+
+    private Long platformId;
+
+    private Long libraryId;
+
+    private String address;
+
+    private Integer sort;
+
+    private String createBy;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte delStatus;
+
+    private String description;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProjId() {
+        return projId;
+    }
+
+    public void setProjId(Long projId) {
+        this.projId = projId;
+    }
+
+    public Long getProjOrgId() {
+        return projOrgId;
+    }
+
+    public void setProjOrgId(Long projOrgId) {
+        this.projOrgId = projOrgId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getDeviceSn() {
+        return deviceSn;
+    }
+
+    public void setDeviceSn(String deviceSn) {
+        this.deviceSn = deviceSn == null ? null : deviceSn.trim();
+    }
+
+    public Date getPurchaseDate() {
+        return purchaseDate;
+    }
+
+    public void setPurchaseDate(Date purchaseDate) {
+        this.purchaseDate = purchaseDate;
+    }
+
+    public Date getNetworkingDate() {
+        return networkingDate;
+    }
+
+    public void setNetworkingDate(Date networkingDate) {
+        this.networkingDate = networkingDate;
+    }
+
+    public String getManufacturer() {
+        return manufacturer;
+    }
+
+    public void setManufacturer(String manufacturer) {
+        this.manufacturer = manufacturer == null ? null : manufacturer.trim();
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+    public String getPurchasePrice() {
+        return purchasePrice;
+    }
+
+    public void setPurchasePrice(String purchasePrice) {
+        this.purchasePrice = purchasePrice == null ? null : purchasePrice.trim();
+    }
+
+    public String getEnglishName() {
+        return englishName;
+    }
+
+    public void setEnglishName(String englishName) {
+        this.englishName = englishName == null ? null : englishName.trim();
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction == null ? null : introduction.trim();
+    }
+
+    public String getPersion() {
+        return persion;
+    }
+
+    public void setPersion(String persion) {
+        this.persion = persion == null ? null : persion.trim();
+    }
+
+    public Long getPlatformId() {
+        return platformId;
+    }
+
+    public void setPlatformId(Long platformId) {
+        this.platformId = platformId;
+    }
+
+    public Long getLibraryId() {
+        return libraryId;
+    }
+
+    public void setLibraryId(Long libraryId) {
+        this.libraryId = libraryId;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address == null ? null : address.trim();
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy == null ? null : createBy.trim();
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getDelStatus() {
+        return delStatus;
+    }
+
+    public void setDelStatus(Byte delStatus) {
+        this.delStatus = delStatus;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", projId=").append(projId);
+        sb.append(", projOrgId=").append(projOrgId);
+        sb.append(", name=").append(name);
+        sb.append(", deviceSn=").append(deviceSn);
+        sb.append(", purchaseDate=").append(purchaseDate);
+        sb.append(", networkingDate=").append(networkingDate);
+        sb.append(", manufacturer=").append(manufacturer);
+        sb.append(", model=").append(model);
+        sb.append(", purchasePrice=").append(purchasePrice);
+        sb.append(", englishName=").append(englishName);
+        sb.append(", introduction=").append(introduction);
+        sb.append(", persion=").append(persion);
+        sb.append(", platformId=").append(platformId);
+        sb.append(", libraryId=").append(libraryId);
+        sb.append(", address=").append(address);
+        sb.append(", sort=").append(sort);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", delStatus=").append(delStatus);
+        sb.append(", description=").append(description);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.research.system.domain.vo;
+
+import com.research.system.domain.po.MetMeetingRecord;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.vo
+ * @Date 2025/8/13 9:40
+ * @description:
+ */
+public class MeetingVo {
+
+    @Data
+    public static class Result {
+        private Long id;
+
+        private Long projId;
+
+        private Long projOrgId;
+
+        private Long ktGroupId;
+
+        private String meetingTitle;
+
+        private String meetingFqr;
+
+        private Date meetingBeginTime;
+
+        private Date meetingEndTime;
+
+        private String meetingAbstract;
+
+        private String meetingNoteUrl;
+
+        private String remark;
+
+        private String createBy;
+
+        private Date createTime;
+
+        private List<ParticipantResult> metMeetingParticipantList;
+
+    }
+
+    @Data
+    public static class ParticipantResult {
+        private Long id;
+
+        private Long meetingId;
+
+        private Long userId;
+        private String userName;
+        private String nickname;
+        private String email;
+        private String phone;
+
+        private String createBy;
+
+        private Date createTime;
+    }
+}

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

@@ -20,6 +20,8 @@ public class OutcomeVo {
     public static class Result {
         private Long id;
 
+        private String ktGroupName;
+
         private Long projId;
 
         private Long projOrgId;
@@ -92,7 +94,7 @@ public class OutcomeVo {
         private String createBy;
 
         private Date createTime;
-        private Integer num;
+        private Integer num = 0;
         private List<CategoryResult> childList;
     }
 

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

@@ -0,0 +1,31 @@
+package com.research.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author zzc
+ * @Package com.ccsens.srsp.system.domain.vo
+ * @Date 2025/8/5 16:08
+ * @description:
+ */
+public class ResPlatformVo {
+
+    @Data
+    public static class Result{
+        @ApiModelProperty("")
+        private Long id;
+        @ApiModelProperty("平台名称")
+        private String name;
+        @ApiModelProperty("管理员")
+        private String administrators;
+        @ApiModelProperty("联系电话")
+        private String phone;
+        @ApiModelProperty("邮箱")
+        private String email;
+        @ApiModelProperty("")
+        private String remark;
+        private Integer deviceNum;
+    }
+
+}

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

@@ -0,0 +1,30 @@
+package com.research.system.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.vo
+ * @Date 2025/8/13 15:46
+ * @description:
+ */
+public class ShsLibInfoVo {
+
+    @Data
+    public static class Result {
+        private Long id;
+
+        private Long projId;
+
+        private Long projOrgId;
+
+        private String title;
+
+        private String intro;
+        private String remark;
+        private String createBy;
+        private Date createTime;
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.research.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.vo
+ * @Date 2025/8/13 16:46
+ * @description:
+ */
+public class ShsResDeviceVo {
+
+    @Data
+    public static class Result {
+        private Long id;
+
+        private Long projId;
+
+        private Long projOrgId;
+
+        private String name;
+
+        private String deviceSn;
+
+        private Date purchaseDate;
+
+        private Date networkingDate;
+
+        private String manufacturer;
+
+        private String model;
+
+        private String purchasePrice;
+
+        private String englishName;
+
+        private String introduction;
+
+        private String persion;
+
+        private Long platformId;
+
+        private Long libraryId;
+
+        private String address;
+
+        private Integer sort;
+
+        private String description;
+        @ApiModelProperty("")
+        private String createBy;
+        @ApiModelProperty("")
+        private Date createTime;
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.research.system.persist.dao;
+
+import com.research.system.domain.dto.FundingDto;
+import com.research.system.domain.vo.FundingVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.persist.dao
+ * @Date 2025/8/12 16:45
+ * @description:
+ */
+public interface FundingDao {
+
+    List<FundingVo.Result> queryList(@Param("dto") FundingDto.Query dto);
+}

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

@@ -0,0 +1,18 @@
+package com.research.system.persist.dao;
+
+import com.research.system.domain.dto.MeetingDto;
+import com.research.system.domain.vo.MeetingVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.persist.dao
+ * @Date 2025/8/12 16:45
+ * @description:
+ */
+public interface MeetingDao {
+
+    List<MeetingVo.Result> queryList(@Param("dto") MeetingDto.Query dto);
+}

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

@@ -19,4 +19,5 @@ public interface OutcomeDao {
 
     List<OutcomeVo.CategoryResult> queryCategoryList(@Param("dto") OutcomeDto.QueryCategory dto);
 
+    int selectNumByCategoryId(@Param("categoryId") Long categoryId, @Param("parentId") Long parentId);
 }

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

@@ -0,0 +1,19 @@
+package com.research.system.persist.dao;
+
+import com.research.system.domain.dto.ResPlatformDto;
+import com.research.system.domain.vo.ResPlatformVo;
+import com.research.system.persist.mapper.ResPlatformMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.ccsens.srsp.system.persist.dao
+ * @Date 2025/8/2 21:38
+ * @description:
+ */
+public interface ResPlatformDao extends ResPlatformMapper {
+
+    List<ResPlatformVo.Result> list(@Param("dto") ResPlatformDto.Query dto);
+}

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

@@ -0,0 +1,18 @@
+package com.research.system.persist.dao;
+
+import com.research.system.domain.dto.ShsLibInfoDto;
+import com.research.system.domain.vo.ShsLibInfoVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.persist.dao
+ * @Date 2025/8/13 15:50
+ * @description:
+ */
+public interface ShsLibInfoDao {
+
+    List<ShsLibInfoVo.Result> queryList(@Param("dto") ShsLibInfoDto.Query dto);
+}

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

@@ -0,0 +1,18 @@
+package com.research.system.persist.dao;
+
+import com.research.system.domain.dto.ShsResDeviceDto;
+import com.research.system.domain.vo.ShsResDeviceVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.persist.dao
+ * @Date 2025/8/13 16:52
+ * @description:
+ */
+public interface ShsResDeviceDao {
+
+    List<ShsResDeviceVo.Result> queryList(@Param("dto") ShsResDeviceDto.Query dto);
+}

research-system/src/main/java/com/research/system/persist/mapper/ResPlatformMapper.java

@@ -0,0 +1,28 @@
+package com.research.system.persist.mapper;
+
+import com.research.system.domain.po.ResPlatform;
+import com.research.system.domain.po.ResPlatformExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ResPlatformMapper {
+    long countByExample(ResPlatformExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ResPlatform record);
+
+    int insertSelective(ResPlatform record);
+
+    List<ResPlatform> selectByExample(ResPlatformExample example);
+
+    ResPlatform selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") ResPlatform record, @Param("example") ResPlatformExample example);
+
+    int updateByExample(@Param("record") ResPlatform record, @Param("example") ResPlatformExample example);
+
+    int updateByPrimaryKeySelective(ResPlatform record);
+
+    int updateByPrimaryKey(ResPlatform record);
+}

research-system/src/main/java/com/research/system/persist/mapper/ShsResDeviceMapper.java

@@ -0,0 +1,34 @@
+package com.research.system.persist.mapper;
+
+import com.research.system.domain.po.ShsResDevice;
+import com.research.system.domain.po.ShsResDeviceExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ShsResDeviceMapper {
+    long countByExample(ShsResDeviceExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ShsResDevice record);
+
+    int insertSelective(ShsResDevice record);
+
+    List<ShsResDevice> selectByExampleWithBLOBs(ShsResDeviceExample example);
+
+    List<ShsResDevice> selectByExample(ShsResDeviceExample example);
+
+    ShsResDevice selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") ShsResDevice record, @Param("example") ShsResDeviceExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") ShsResDevice record, @Param("example") ShsResDeviceExample example);
+
+    int updateByExample(@Param("record") ShsResDevice record, @Param("example") ShsResDeviceExample example);
+
+    int updateByPrimaryKeySelective(ShsResDevice record);
+
+    int updateByPrimaryKeyWithBLOBs(ShsResDevice record);
+
+    int updateByPrimaryKey(ShsResDevice record);
+}

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

@@ -0,0 +1,22 @@
+package com.research.system.service;
+
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.MeetingDto;
+import com.research.system.domain.vo.MeetingVo;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service
+ * @Date 2025/8/13 9:52
+ * @description:
+ */
+public interface MeetingService {
+
+    List<MeetingVo.Result> queryList(MeetingDto.Query query);
+
+    void add(MeetingDto.Add dto);
+
+    void del(CommonDto.DelDto dto);
+}

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

@@ -0,0 +1,23 @@
+package com.research.system.service;
+
+
+import com.research.system.domain.dto.ResPlatformDto;
+import com.research.system.domain.vo.ResPlatformVo;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.ccsens.srsp.system.service
+ * @Date 2025/8/5 16:08
+ * @description:
+ */
+public interface ResPlatformService {
+
+    List<ResPlatformVo.Result> list(ResPlatformDto.Query query);
+
+    void add(ResPlatformDto.Add dto);
+
+    void del(List<Long> idList);
+
+}

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

@@ -0,0 +1,21 @@
+package com.research.system.service;
+
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.ShsLibInfoDto;
+import com.research.system.domain.vo.ShsLibInfoVo;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service
+ * @Date 2025/8/13 15:45
+ * @description:
+ */
+public interface ShsLibInfoService {
+
+    List<ShsLibInfoVo.Result> queryList(ShsLibInfoDto.Query query);
+    void add(ShsLibInfoDto.Add dto);
+    void del(CommonDto.DelDto dto);
+
+}

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

@@ -0,0 +1,25 @@
+package com.research.system.service;
+
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.ShsResDeviceDto;
+import com.research.system.domain.vo.ShsResDeviceVo;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service
+ * @Date 2025/8/13 16:47
+ * @description:
+ */
+public interface ShsResDeviceService {
+
+    List<ShsResDeviceVo.Result> queryList(ShsResDeviceDto.Query query);
+
+    void add(ShsResDeviceDto.Add dto);
+
+    void del(CommonDto.DelDto dto);
+
+
+
+}

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

@@ -1,13 +1,20 @@
 package com.research.system.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.IdUtil;
+import com.research.common.utils.SecurityUtils;
 import com.research.system.domain.dto.CommonDto;
 import com.research.system.domain.dto.FundingDto;
+import com.research.system.domain.po.FudFundRecord;
+import com.research.system.domain.po.FudFundRecordExample;
 import com.research.system.domain.vo.FundingVo;
+import com.research.system.persist.dao.FundingDao;
 import com.research.system.persist.mapper.FudFundRecordMapper;
 import com.research.system.service.FundingService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,19 +28,35 @@ public class FundingServiceImpl implements FundingService {
 
     @Resource
     private FudFundRecordMapper fudFundRecordMapper;
+    @Resource
+    private FundingDao fundingDao;
 
     @Override
     public List<FundingVo.Result> queryList(FundingDto.Query query) {
-        return null;
+        return fundingDao.queryList(query);
     }
 
     @Override
     public void add(FundingDto.Add dto) {
-
+        FudFundRecord fudFundRecord = BeanUtil.copyProperties(dto, FudFundRecord.class);
+        if (dto.getId() == null) {
+            fudFundRecord.setCreateBy(SecurityUtils.getUsername());
+            fudFundRecord.setCreateTime(new Date());
+            fudFundRecord.setId(IdUtil.getSnowflakeNextId());
+            fudFundRecordMapper.insertSelective(fudFundRecord);
+        } else {
+            fudFundRecord.setUpdateBy(SecurityUtils.getUsername());
+            fudFundRecord.setUpdateTime(new Date());
+            fudFundRecordMapper.updateByPrimaryKeySelective(fudFundRecord);
+        }
     }
 
     @Override
     public void del(CommonDto.DelDto dto) {
-
+        FudFundRecordExample fudFundRecordExample = new FudFundRecordExample();
+        fudFundRecordExample.createCriteria().andIdIn(dto.getIdList());
+        FudFundRecord fudFundRecord = new FudFundRecord();
+        fudFundRecord.setDelFlag((byte) 1);
+        fudFundRecordMapper.updateByExampleSelective(fudFundRecord, fudFundRecordExample);
     }
 }

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

@@ -0,0 +1,107 @@
+package com.research.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
+import com.research.common.exception.base.BaseException;
+import com.research.common.utils.SecurityUtils;
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.MeetingDto;
+import com.research.system.domain.po.MetMeetingParticipant;
+import com.research.system.domain.po.MetMeetingParticipantExample;
+import com.research.system.domain.po.MetMeetingRecord;
+import com.research.system.domain.po.PrjProjInfo;
+import com.research.system.domain.vo.MeetingVo;
+import com.research.system.persist.dao.MeetingDao;
+import com.research.system.persist.mapper.MetMeetingParticipantMapper;
+import com.research.system.persist.mapper.MetMeetingRecordMapper;
+import com.research.system.service.ClientPrjProjInfoService;
+import com.research.system.service.MeetingService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service.impl
+ * @Date 2025/8/13 9:53
+ * @description:
+ */
+@Service
+public class MeetingServiceImpl implements MeetingService {
+
+    @Resource
+    private MetMeetingRecordMapper metMeetingRecordMapper;
+    @Resource
+    private MetMeetingParticipantMapper metMeetingParticipantMapper;
+    @Resource
+    private ClientPrjProjInfoService clientPrjProjInfoService;
+    @Resource
+    private MeetingDao meetingDao;
+
+    @Override
+    public List<MeetingVo.Result> queryList(MeetingDto.Query query) {
+        return meetingDao.queryList(query);
+    }
+
+    @Override
+    public void add(MeetingDto.Add dto) {
+        PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+        if (proInfoByTenantId == null) {
+            throw new BaseException("未查询到项目");
+        }
+        MetMeetingRecord metMeetingRecord = BeanUtil.copyProperties(dto, MetMeetingRecord.class);
+        if (dto.getId() == null) {
+            metMeetingRecord.setId(IdUtil.getSnowflakeNextId());
+            metMeetingRecord.setCreateBy(SecurityUtils.getUsername());
+            metMeetingRecord.setCreateTime(new Date());
+            metMeetingRecord.setMeetingFqr(SecurityUtils.getUsername());
+            metMeetingRecord.setProjId(proInfoByTenantId.getId());
+            metMeetingRecordMapper.insertSelective(metMeetingRecord);
+
+            if (CollUtil.isNotEmpty(dto.getMetMeetingParticipantList())) {
+                for (Long aLong : dto.getMetMeetingParticipantList()) {
+                    MetMeetingParticipant metMeetingParticipant = new MetMeetingParticipant();
+                    metMeetingParticipant.setId(IdUtil.getSnowflakeNextId());
+                    metMeetingParticipant.setMeetingId(metMeetingRecord.getId());
+                    metMeetingParticipant.setUserId(aLong);
+                    metMeetingParticipantMapper.insertSelective(metMeetingParticipant);
+                }
+            }
+
+        } else {
+
+            //删除参会人员
+            MetMeetingParticipantExample metMeetingParticipantExample = new MetMeetingParticipantExample();
+            metMeetingParticipantExample.createCriteria().andMeetingIdEqualTo(dto.getId());
+            MetMeetingParticipant metMeetingParticipant = new MetMeetingParticipant();
+            metMeetingParticipant.setDelFlag((byte) 1);
+            metMeetingParticipantMapper.updateByExampleSelective(metMeetingParticipant, metMeetingParticipantExample);
+
+
+            metMeetingRecord.setUpdateBy(SecurityUtils.getUsername());
+            metMeetingRecord.setUpdateTime(new Date());
+            metMeetingRecordMapper.updateByPrimaryKeySelective(metMeetingRecord);
+            if (CollUtil.isNotEmpty(dto.getMetMeetingParticipantList())) {
+                for (Long aLong : dto.getMetMeetingParticipantList()) {
+                    MetMeetingParticipant metMeetingParticipant1 = new MetMeetingParticipant();
+                    metMeetingParticipant1.setId(IdUtil.getSnowflakeNextId());
+                    metMeetingParticipant1.setMeetingId(metMeetingRecord.getId());
+                    metMeetingParticipant1.setUserId(aLong);
+                    metMeetingParticipantMapper.insertSelective(metMeetingParticipant1);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void del(CommonDto.DelDto dto) {
+        MetMeetingParticipantExample metMeetingParticipantExample = new MetMeetingParticipantExample();
+        metMeetingParticipantExample.createCriteria().andMeetingIdIn(dto.getIdList());
+        MetMeetingParticipant metMeetingParticipant = new MetMeetingParticipant();
+        metMeetingParticipant.setDelFlag((byte) 1);
+        metMeetingParticipantMapper.updateByExampleSelective(metMeetingParticipant, metMeetingParticipantExample);
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.research.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import com.research.common.utils.SecurityUtils;
 import com.research.system.domain.dto.CommonDto;
@@ -28,7 +29,6 @@ import java.util.List;
  */
 @Service
 public class OutcomeServiceImpl implements OutcomeService {
-        //https://www.erciyan.com/book/95146757/409170406_2.html
     @Resource
     private OutcomeDao outcomeDao;
     @Resource
@@ -68,7 +68,26 @@ public class OutcomeServiceImpl implements OutcomeService {
 
     @Override
     public List<OutcomeVo.CategoryResult> queryCategoryList(OutcomeDto.QueryCategory query) {
-        return outcomeDao.queryCategoryList(query);
+        List<OutcomeVo.CategoryResult> results = outcomeDao.queryCategoryList(query);
+        if (CollUtil.isNotEmpty(results)) {
+            for (OutcomeVo.CategoryResult result : results) {
+                count(result, result.getChildList());
+            }
+        }
+        return results;
+    }
+
+    private void count(OutcomeVo.CategoryResult result, List<OutcomeVo.CategoryResult> childList){
+        result.setNum(outcomeDao.selectNumByCategoryId(result.getId(),  result.getParentId()));
+        if (CollUtil.isNotEmpty(childList)) {
+            for (OutcomeVo.CategoryResult categoryResult : childList) {
+                categoryResult.setNum(outcomeDao.selectNumByCategoryId(categoryResult.getId(),  categoryResult.getParentId()));
+                if (CollUtil.isNotEmpty(categoryResult.getChildList())) {
+                    count(categoryResult, categoryResult.getChildList());
+                }
+            }
+        }
+
     }
 
     @Override

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

@@ -0,0 +1,68 @@
+package com.research.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.IdUtil;
+import com.research.common.exception.base.BaseException;
+import com.research.common.utils.SecurityUtils;
+import com.research.system.domain.dto.ResPlatformDto;
+import com.research.system.domain.po.PrjProjInfo;
+import com.research.system.domain.po.ResPlatform;
+import com.research.system.domain.po.ResPlatformExample;
+import com.research.system.domain.vo.ResPlatformVo;
+import com.research.system.persist.dao.ResPlatformDao;
+import com.research.system.service.ClientPrjProjInfoService;
+import com.research.system.service.ResPlatformService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.ccsens.srsp.system.service.impl
+ * @Date 2025/8/5 16:12
+ * @description:
+ */
+@Service
+public class ResPlatformServiceImpl implements ResPlatformService {
+
+    @Resource
+    private ResPlatformDao resPlatformDao;
+    @Resource
+    private ClientPrjProjInfoService clientPrjProjInfoService;
+
+    @Override
+    public List<ResPlatformVo.Result> list(ResPlatformDto.Query query) {
+        return resPlatformDao.list(query);
+    }
+
+    @Override
+    public void add(ResPlatformDto.Add dto) {
+        ResPlatform resPlatform = BeanUtil.copyProperties(dto, ResPlatform.class);
+        if (dto.getId() == null) {
+            PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+            if (proInfoByTenantId == null) {
+                throw new BaseException("未查询到项目");
+            }
+            resPlatform.setId(IdUtil.getSnowflake().nextId());
+            resPlatform.setProjOrgId(proInfoByTenantId.getId());
+            resPlatform.setCreateBy(SecurityUtils.getUsername());
+            resPlatform.setCreateTime(new Date());
+            resPlatform.setDelStatus((byte) 0);
+            resPlatformDao.insertSelective(resPlatform);
+        }else {
+            resPlatform.setUpdateTime(new Date());
+            resPlatformDao.updateByPrimaryKeySelective(resPlatform);
+        }
+    }
+
+    @Override
+    public void del(List<Long> idList) {
+        ResPlatformExample resPlatformExample = new ResPlatformExample();
+        resPlatformExample.createCriteria().andIdIn(idList);
+        ResPlatform resPlatform = new ResPlatform();
+        resPlatform.setDelStatus((byte) 1);
+        resPlatformDao.updateByExampleSelective(resPlatform, resPlatformExample);
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.research.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.IdUtil;
+import com.research.common.utils.SecurityUtils;
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.ShsLibInfoDto;
+import com.research.system.domain.po.ShsLibInfo;
+import com.research.system.domain.po.ShsLibInfoExample;
+import com.research.system.domain.vo.ShsLibInfoVo;
+import com.research.system.persist.dao.ShsLibInfoDao;
+import com.research.system.persist.mapper.ShsLibInfoMapper;
+import com.research.system.service.ShsLibInfoService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service.impl
+ * @Date 2025/8/13 15:48
+ * @description:
+ */
+@Service
+public class ShsLibInfoServiceImpl implements ShsLibInfoService {
+
+    @Resource
+    private ShsLibInfoMapper shsLibInfoMapper;
+    @Resource
+    private ShsLibInfoDao shsLibInfoDao;
+
+    @Override
+    public List<ShsLibInfoVo.Result> queryList(ShsLibInfoDto.Query query) {
+        return shsLibInfoDao.queryList(query);
+    }
+
+    @Override
+    public void add(ShsLibInfoDto.Add dto) {
+        ShsLibInfo shsLibInfo = BeanUtil.copyProperties(dto, ShsLibInfo.class);
+        if (dto.getId() == null) {
+            shsLibInfo.setId(IdUtil.getSnowflakeNextId());
+            shsLibInfo.setCreateBy(SecurityUtils.getUsername());
+            shsLibInfo.setCreateTime(new Date());
+            shsLibInfoMapper.insertSelective(shsLibInfo);
+        }else {
+            shsLibInfo.setUpdateBy(SecurityUtils.getUsername());
+            shsLibInfo.setUpdateTime(new Date());
+            shsLibInfoMapper.updateByPrimaryKeySelective(shsLibInfo);
+        }
+
+    }
+
+    @Override
+    public void del(CommonDto.DelDto dto) {
+        ShsLibInfo shsLibInfo = new ShsLibInfo();
+        shsLibInfo.setDelFlag((byte) 1);
+        ShsLibInfoExample shsLibInfoExample = new ShsLibInfoExample();
+        shsLibInfoExample.createCriteria().andIdIn(dto.getIdList());
+        shsLibInfoMapper.updateByExampleSelective(shsLibInfo, shsLibInfoExample);
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.research.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.research.common.exception.base.BaseException;
+import com.research.common.utils.SecurityUtils;
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.ShsResDeviceDto;
+import com.research.system.domain.po.PrjProjInfo;
+import com.research.system.domain.po.ShsResDevice;
+import com.research.system.domain.po.ShsResDeviceExample;
+import com.research.system.domain.vo.ShsResDeviceVo;
+import com.research.system.persist.dao.ShsResDeviceDao;
+import com.research.system.persist.mapper.ShsResDeviceMapper;
+import com.research.system.service.ClientPrjProjInfoService;
+import com.research.system.service.ShsResDeviceService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service.impl
+ * @Date 2025/8/13 16:48
+ * @description:
+ */
+@Service
+public class ShsResDeviceServiceImpl implements ShsResDeviceService {
+
+    @Resource
+    private ShsResDeviceMapper shsResDeviceMapper;
+    @Resource
+    private ClientPrjProjInfoService clientPrjProjInfoService;
+    @Resource
+    private ShsResDeviceDao shsResDeviceDao;
+
+    @Override
+    public List<ShsResDeviceVo.Result> queryList(ShsResDeviceDto.Query query) {
+        return shsResDeviceDao.queryList(query);
+    }
+
+    @Override
+    public void add(ShsResDeviceDto.Add dto) {
+        ShsResDevice shsResDevice = BeanUtil.copyProperties(dto, ShsResDevice.class);
+        if (dto.getId() == null) {
+            PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+            if (proInfoByTenantId == null) {
+                throw new BaseException("未查询到项目");
+            }
+            shsResDevice.setProjId(proInfoByTenantId.getId());
+            shsResDevice.setCreateBy(SecurityUtils.getUsername());
+            shsResDevice.setCreatedAt(new Date());
+            shsResDeviceMapper.insertSelective(shsResDevice);
+        } else {
+            shsResDevice.setUpdatedAt(new Date());
+            shsResDeviceMapper.updateByPrimaryKeySelective(shsResDevice);
+        }
+    }
+
+    @Override
+    public void del(CommonDto.DelDto dto) {
+        ShsResDevice shsResDevice = new ShsResDevice();
+        shsResDevice.setDelStatus((byte) 1);
+        ShsResDeviceExample shsResDeviceExample = new ShsResDeviceExample();
+        shsResDeviceExample.createCriteria().andIdIn(dto.getIdList());
+        shsResDeviceMapper.updateByExampleSelective(shsResDevice, shsResDeviceExample);
+    }
+}

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.research.system.persist.dao.FundingDao">
+
+    <select id="queryList" resultType="com.research.system.domain.vo.FundingVo$Result">
+        select
+        id,
+        proj_id as projId,
+        proj_org_id as projOrgId,
+        kt_group_id as ktGroupId,
+        pay_type as payType,
+        pay_source as paySource,
+        pay_subject as paySubject,
+        pay_abstract as payAbstract,
+        pay_time as payTime,
+        income_amount as incomeAmount,
+        pay_amount as payAmount,
+        jsr,
+        spr,
+        pzh,
+        pzh_url as pzhUrl,
+        remark,
+        create_by as createBy,
+        create_time as createTime
+        from
+        fud_fund_record
+        where
+        del_flag = 0
+        <if test="dto.projOrgid != null">
+            and proj_org_id = #{dto.projOrgid}
+        </if>
+        <if test="dto.ktGroupId != null">
+            and kt_group_id = #{dto.ktGroupId}
+        </if>
+        <if test="dto.payType != null">
+            and pay_type = #{dto.payType}
+        </if>
+    </select>
+</mapper>

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

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.research.system.persist.dao.MeetingDao">
+    <resultMap id="ResuleMap" type="com.research.system.domain.vo.MeetingVo$Result" extends="com.research.system.persist.mapper.MetMeetingRecordMapper.BaseResultMap">
+        <collection property="metMeetingParticipantList" ofType="com.research.system.domain.vo.MeetingVo$ParticipantResult"
+                    select="selectByMeetingId" column="id"/>
+    </resultMap>
+    <select id="queryList" resultMap="ResuleMap">
+        select
+        r.id,
+        r.proj_id,
+        r.proj_org_id,
+        r.kt_group_id,
+        r.meeting_title,
+        r.meeting_fqr,
+        r.meeting_begin_time,
+        r.meeting_end_time,
+        r.meeting_abstract,
+        r.meeting_note_url,
+        r.remark,
+        r.create_by,
+        r.create_time
+        from
+            met_meeting_record r
+        where
+            del_flag = 0
+        <if test="dto.meetingTitle != null and dto.meetingTitle != ''">
+            and meeting_title like concat('%',#{dto.meetingTitle},'%')
+        </if>
+        <if test="dto.projOrgId != null">
+            and proj_org_id = #{dto.projOrgId}
+        </if>
+        <if test="dto.meetingBeginTime != null">
+            and meeting_begin_time >= #{dto.meetingBeginTime}
+        </if>
+        <if test="dto.meetingEndTime != null">
+            and meeting_end_time &lt;= #{dto.meetingEndTime}
+        </if>
+        <if test="dto.ktGroupId != null">
+            and kt_group_id = #{dto.ktGroupId}
+        </if>
+
+    </select>
+
+    <select id="selectByMeetingId" resultType="com.research.system.domain.vo.MeetingVo$ParticipantResult">
+        select
+            p.user_id as userId,
+            p.meeting_id as meetingId,
+            u.nick_name as nickname,
+            u.phonenumber as phone,
+            u.email as email,
+            u.user_name as username
+        from
+            met_meeting_participant p
+        left join
+                sys_user u on p.user_id = u.user_id
+        where
+            p.del_flag = 0
+            and p.meeting_id = #{meetingId}
+    </select>
+</mapper>

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

@@ -20,58 +20,64 @@
 
     <select id="queryList" resultType="com.research.system.domain.vo.OutcomeVo$Result">
         SELECT
-        id,
+        a.id,
-        proj_id as projId,
+        a.proj_id as projId,
-        proj_org_id as projOrgId,
+        a.proj_org_id as projOrgId,
-        kt_group_id as ktGroupId,
+        a.kt_group_id as ktGroupId,
-        category_id_1 as categoryId1,
+        a.category_id_1 as categoryId1,
-        category_id_2 as categoryId2,
+        a.category_id_2 as categoryId2,
-        title,
+        a.title,
-        no,
+        a.no,
-        authors,
+        a.authors,
-        apply_date as applyDate,
+        a.apply_date as applyDate,
-        publish_date as publishDate,
+        a.publish_date as publishDate,
-        place,
+        a.place,
-        ach_type as achType,
+        a.ach_type as achType,
-        source,
+        a.source,
-        paper_source_type as paperSourceType,
+        a.paper_source_type as paperSourceType,
-        yskt_xmfzr as ysktXmfzr,
+        a.yskt_xmfzr as ysktXmfzr,
-        yskt_funds as ysktFunds,
+        a.yskt_funds as ysktFunds,
-        yskt_lxpzwh as ysktLxpzwh,
+        a.yskt_lxpzwh as ysktLxpzwh,
-        yskt_status as ysktStatus,
+        a.yskt_status as ysktStatus,
-        abstracts,
+        a.abstracts,
-        keywords,
+        a.keywords,
-        paper_link as paperLink,
+        a.paper_link as paperLink,
-        pdf_download_url as pdfDownloadUrl,
+        a.pdf_download_url as pdfDownloadUrl,
-        commitment_letter_url as commitmentLetterUrl,
+        a.commitment_letter_url as commitmentLetterUrl,
-        remark,
+        a.remark,
-        create_by as createBy,
+        a.create_by as createBy,
-        create_time as createTime
+        a.create_time as createTime,
-        FROM ach_achievement
+        g.kt_group_name as ktGroupName
-        WHERE del_flag = 0 AND proj_id = #{dto.projId}
+        FROM ach_achievement a
+        left join
+        kts_kt_group g on a.kt_group_id = g.id
+        WHERE a.del_flag = 0
         <if test="dto.title != null and dto.title != ''">
-            AND title LIKE CONCAT('%', #{dto.title}, '%')
+            AND a.title LIKE CONCAT('%', #{dto.title}, '%')
         </if>
         <if test="dto.applyDate != null">
-            AND apply_date = #{dto.applyDate}
+            AND a.apply_date = #{dto.applyDate}
         </if>
         <if test="dto.projOrgId != null">
-            AND proj_org_id = #{dto.projOrgId}
+            AND a.proj_org_id = #{dto.projOrgId}
         </if>
         <if test="dto.categoryId1 != null">
-            AND category_id1 = #{dto.categoryId1}
+            AND a.category_id1 = #{dto.categoryId1}
         </if>
         <if test="dto.categoryId2 != null">
-            AND category_id2 = #{dto.categoryId2}
+            AND a.category_id2 = #{dto.categoryId2}
         </if>
         <if test="dto.achType != null">
-            AND ach_type = #{dto.achType}
+            AND a.ach_type = #{dto.achType}
         </if>
     </select>
 
     <!-- 查询树形结构 -->
     <select id="queryCategoryList" resultMap="categoryResultMap">
-        SELECT * FROM ach_achievement_category
+        SELECT
+        id, proj_id, parent_id, category_code, category_name, sort, remark, create_by,
+        create_time
+        FROM ach_achievement_category b
         WHERE del_flag = 0 AND (parent_id IS NULL OR parent_id = 0)
         <if test="dto.categoryCode != null and dto.categoryCode != ''">
             AND category_code LIKE CONCAT('%', #{dto.categoryCode}, '%')
@@ -88,4 +94,15 @@
         WHERE del_flag = 0 AND parent_id = #{parentId}
         ORDER BY sort ASC
     </select>
+
+    <select id="selectNumByCategoryId" resultType="java.lang.Integer">
+        SELECT COUNT(1) FROM ach_achievement
+        WHERE del_flag = 0
+        <if test="parentId == 0">
+            AND category_id_1 = #{categoryId}
+        </if>
+        <if test="parentId != 0">
+            AND category_id_2 = #{categoryId}
+        </if>
+    </select>
 </mapper>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.research.system.persist.dao.ResPlatformDao">
+    <select id="list" resultType="com.research.system.domain.vo.ResPlatformVo$Result">
+        select
+        d.id,
+        d.name,
+        d.administrators,
+        d.phone,
+        d.email,
+        d.remark,
+        d.create_by as createBy,
+        d.create_time as createTime,
+        d.proj_id as projId ,
+        d.proj_org_id as projOrgId
+        from
+            res_platform d
+        where
+        d.del_status = 0
+        <if test="dto.name != null and dto.name != ''">
+            and  d.name like concat('%',#{dto.name},'%')
+        </if>
+        <if test="dto.administrators != null and dto.administrators != ''">
+            and  d.administrators like concat('%',#{dto.administrators},'%')
+        </if>
+        order by
+            d.id desc
+    </select>
+</mapper>

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.research.system.persist.dao.ShsLibInfoDao">
+
+    <select id="queryList" resultType="com.research.system.domain.vo.ShsLibInfoVo$Result">
+        select
+        r.id,
+        r.proj_id as projId,
+        r.proj_org_id as projOrgId,
+        r.title,
+        r.intro,
+        r.create_by as createBy,
+        r.create_time as createTime,
+        from
+            shs_lib_info r
+        where
+            del_flag = 0
+        <if test="dto.projOrgId != null">
+            and proj_org_id = #{dto.projOrgId}
+        </if>
+        <if test="dto.title != null and dto.title != ''">
+            and title like concat('%',#{dto.title},'%')
+        </if>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.research.system.persist.dao.ShsResDeviceDao">
+
+    <select id="queryList" resultType="com.research.system.domain.vo.ShsResDeviceVo$Result">
+        SELECT
+        id,
+        proj_id AS projId,
+        proj_org_id AS projOrgId,
+        name,
+        device_sn AS deviceSn,
+        purchase_date AS purchaseDate,
+        networking_date AS networkingDate,
+        manufacturer,
+        model,
+        purchase_price AS purchasePrice,
+        english_name AS englishName,
+        introduction,
+        persion,
+        platform_id AS platformId,
+        library_id AS libraryId,
+        address,
+        sort,
+        description
+        FROM shs_res_device
+        WHERE del_status = 0
+        <if test="query.platformId != null">
+            AND platform_id = #{query.platformId}
+        </if>
+        <if test="query.projOrgId != null">
+            AND proj_org_id = #{query.projOrgId}
+        </if>
+    </select>
+</mapper>

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

@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.research.system.persist.mapper.ResPlatformMapper">
+  <resultMap id="BaseResultMap" type="com.research.system.domain.po.ResPlatform">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="administrators" jdbcType="VARCHAR" property="administrators" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="del_status" jdbcType="TINYINT" property="delStatus" />
+    <result column="proj_id" jdbcType="BIGINT" property="projId" />
+    <result column="proj_org_id" jdbcType="BIGINT" property="projOrgId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, name, administrators, phone, email, remark, create_by, create_time, update_time, 
+    del_status, proj_id, proj_org_id
+  </sql>
+  <select id="selectByExample" parameterType="com.research.system.domain.po.ResPlatformExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from res_platform
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from res_platform
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from res_platform
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.research.system.domain.po.ResPlatform">
+    insert into res_platform (id, name, administrators, 
+      phone, email, remark, 
+      create_by, create_time, update_time, 
+      del_status, proj_id, proj_org_id
+      )
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{administrators,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{delStatus,jdbcType=TINYINT}, #{projId,jdbcType=BIGINT}, #{projOrgId,jdbcType=BIGINT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.research.system.domain.po.ResPlatform">
+    insert into res_platform
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="administrators != null">
+        administrators,
+      </if>
+      <if test="phone != null">
+        phone,
+      </if>
+      <if test="email != null">
+        email,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="delStatus != null">
+        del_status,
+      </if>
+      <if test="projId != null">
+        proj_id,
+      </if>
+      <if test="projOrgId != null">
+        proj_org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="administrators != null">
+        #{administrators,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null">
+        #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="delStatus != null">
+        #{delStatus,jdbcType=TINYINT},
+      </if>
+      <if test="projId != null">
+        #{projId,jdbcType=BIGINT},
+      </if>
+      <if test="projOrgId != null">
+        #{projOrgId,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.research.system.domain.po.ResPlatformExample" resultType="java.lang.Long">
+    select count(*) from res_platform
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update res_platform
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.administrators != null">
+        administrators = #{record.administrators,jdbcType=VARCHAR},
+      </if>
+      <if test="record.phone != null">
+        phone = #{record.phone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.email != null">
+        email = #{record.email,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createBy != null">
+        create_by = #{record.createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.delStatus != null">
+        del_status = #{record.delStatus,jdbcType=TINYINT},
+      </if>
+      <if test="record.projId != null">
+        proj_id = #{record.projId,jdbcType=BIGINT},
+      </if>
+      <if test="record.projOrgId != null">
+        proj_org_id = #{record.projOrgId,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update res_platform
+    set id = #{record.id,jdbcType=BIGINT},
+      name = #{record.name,jdbcType=VARCHAR},
+      administrators = #{record.administrators,jdbcType=VARCHAR},
+      phone = #{record.phone,jdbcType=VARCHAR},
+      email = #{record.email,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      del_status = #{record.delStatus,jdbcType=TINYINT},
+      proj_id = #{record.projId,jdbcType=BIGINT},
+      proj_org_id = #{record.projOrgId,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.research.system.domain.po.ResPlatform">
+    update res_platform
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="administrators != null">
+        administrators = #{administrators,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null">
+        email = #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="delStatus != null">
+        del_status = #{delStatus,jdbcType=TINYINT},
+      </if>
+      <if test="projId != null">
+        proj_id = #{projId,jdbcType=BIGINT},
+      </if>
+      <if test="projOrgId != null">
+        proj_org_id = #{projOrgId,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.research.system.domain.po.ResPlatform">
+    update res_platform
+    set name = #{name,jdbcType=VARCHAR},
+      administrators = #{administrators,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      email = #{email,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      del_status = #{delStatus,jdbcType=TINYINT},
+      proj_id = #{projId,jdbcType=BIGINT},
+      proj_org_id = #{projOrgId,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

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

@@ -0,0 +1,548 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.research.system.persist.mapper.ShsResDeviceMapper">
+  <resultMap id="BaseResultMap" type="com.research.system.domain.po.ShsResDevice">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="proj_id" jdbcType="BIGINT" property="projId" />
+    <result column="proj_org_id" jdbcType="BIGINT" property="projOrgId" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="device_sn" jdbcType="VARCHAR" property="deviceSn" />
+    <result column="purchase_date" jdbcType="TIMESTAMP" property="purchaseDate" />
+    <result column="networking_date" jdbcType="TIMESTAMP" property="networkingDate" />
+    <result column="manufacturer" jdbcType="VARCHAR" property="manufacturer" />
+    <result column="model" jdbcType="VARCHAR" property="model" />
+    <result column="purchase_price" jdbcType="VARCHAR" property="purchasePrice" />
+    <result column="english_name" jdbcType="VARCHAR" property="englishName" />
+    <result column="introduction" jdbcType="VARCHAR" property="introduction" />
+    <result column="persion" jdbcType="VARCHAR" property="persion" />
+    <result column="platform_id" jdbcType="BIGINT" property="platformId" />
+    <result column="library_id" jdbcType="BIGINT" property="libraryId" />
+    <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="del_status" jdbcType="TINYINT" property="delStatus" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.research.system.domain.po.ShsResDevice">
+    <result column="description" jdbcType="LONGVARCHAR" property="description" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, proj_id, proj_org_id, name, device_sn, purchase_date, networking_date, manufacturer, 
+    model, purchase_price, english_name, introduction, persion, platform_id, library_id, 
+    address, sort, create_by, created_at, updated_at, del_status
+  </sql>
+  <sql id="Blob_Column_List">
+    description
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.research.system.domain.po.ShsResDeviceExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from shs_res_device
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.research.system.domain.po.ShsResDeviceExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from shs_res_device
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from shs_res_device
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from shs_res_device
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.research.system.domain.po.ShsResDevice">
+    insert into shs_res_device (id, proj_id, proj_org_id, 
+      name, device_sn, purchase_date, 
+      networking_date, manufacturer, model, 
+      purchase_price, english_name, introduction, 
+      persion, platform_id, library_id, 
+      address, sort, create_by, 
+      created_at, updated_at, del_status, 
+      description)
+    values (#{id,jdbcType=BIGINT}, #{projId,jdbcType=BIGINT}, #{projOrgId,jdbcType=BIGINT}, 
+      #{name,jdbcType=VARCHAR}, #{deviceSn,jdbcType=VARCHAR}, #{purchaseDate,jdbcType=TIMESTAMP}, 
+      #{networkingDate,jdbcType=TIMESTAMP}, #{manufacturer,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, 
+      #{purchasePrice,jdbcType=VARCHAR}, #{englishName,jdbcType=VARCHAR}, #{introduction,jdbcType=VARCHAR}, 
+      #{persion,jdbcType=VARCHAR}, #{platformId,jdbcType=BIGINT}, #{libraryId,jdbcType=BIGINT}, 
+      #{address,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{createBy,jdbcType=VARCHAR}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{delStatus,jdbcType=TINYINT}, 
+      #{description,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.research.system.domain.po.ShsResDevice">
+    insert into shs_res_device
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="projId != null">
+        proj_id,
+      </if>
+      <if test="projOrgId != null">
+        proj_org_id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="deviceSn != null">
+        device_sn,
+      </if>
+      <if test="purchaseDate != null">
+        purchase_date,
+      </if>
+      <if test="networkingDate != null">
+        networking_date,
+      </if>
+      <if test="manufacturer != null">
+        manufacturer,
+      </if>
+      <if test="model != null">
+        model,
+      </if>
+      <if test="purchasePrice != null">
+        purchase_price,
+      </if>
+      <if test="englishName != null">
+        english_name,
+      </if>
+      <if test="introduction != null">
+        introduction,
+      </if>
+      <if test="persion != null">
+        persion,
+      </if>
+      <if test="platformId != null">
+        platform_id,
+      </if>
+      <if test="libraryId != null">
+        library_id,
+      </if>
+      <if test="address != null">
+        address,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="delStatus != null">
+        del_status,
+      </if>
+      <if test="description != null">
+        description,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="projId != null">
+        #{projId,jdbcType=BIGINT},
+      </if>
+      <if test="projOrgId != null">
+        #{projOrgId,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceSn != null">
+        #{deviceSn,jdbcType=VARCHAR},
+      </if>
+      <if test="purchaseDate != null">
+        #{purchaseDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="networkingDate != null">
+        #{networkingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="manufacturer != null">
+        #{manufacturer,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null">
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="purchasePrice != null">
+        #{purchasePrice,jdbcType=VARCHAR},
+      </if>
+      <if test="englishName != null">
+        #{englishName,jdbcType=VARCHAR},
+      </if>
+      <if test="introduction != null">
+        #{introduction,jdbcType=VARCHAR},
+      </if>
+      <if test="persion != null">
+        #{persion,jdbcType=VARCHAR},
+      </if>
+      <if test="platformId != null">
+        #{platformId,jdbcType=BIGINT},
+      </if>
+      <if test="libraryId != null">
+        #{libraryId,jdbcType=BIGINT},
+      </if>
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="delStatus != null">
+        #{delStatus,jdbcType=TINYINT},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.research.system.domain.po.ShsResDeviceExample" resultType="java.lang.Long">
+    select count(*) from shs_res_device
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update shs_res_device
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.projId != null">
+        proj_id = #{record.projId,jdbcType=BIGINT},
+      </if>
+      <if test="record.projOrgId != null">
+        proj_org_id = #{record.projOrgId,jdbcType=BIGINT},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceSn != null">
+        device_sn = #{record.deviceSn,jdbcType=VARCHAR},
+      </if>
+      <if test="record.purchaseDate != null">
+        purchase_date = #{record.purchaseDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.networkingDate != null">
+        networking_date = #{record.networkingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.manufacturer != null">
+        manufacturer = #{record.manufacturer,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null">
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.purchasePrice != null">
+        purchase_price = #{record.purchasePrice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.englishName != null">
+        english_name = #{record.englishName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.introduction != null">
+        introduction = #{record.introduction,jdbcType=VARCHAR},
+      </if>
+      <if test="record.persion != null">
+        persion = #{record.persion,jdbcType=VARCHAR},
+      </if>
+      <if test="record.platformId != null">
+        platform_id = #{record.platformId,jdbcType=BIGINT},
+      </if>
+      <if test="record.libraryId != null">
+        library_id = #{record.libraryId,jdbcType=BIGINT},
+      </if>
+      <if test="record.address != null">
+        address = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sort != null">
+        sort = #{record.sort,jdbcType=INTEGER},
+      </if>
+      <if test="record.createBy != null">
+        create_by = #{record.createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.delStatus != null">
+        del_status = #{record.delStatus,jdbcType=TINYINT},
+      </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update shs_res_device
+    set id = #{record.id,jdbcType=BIGINT},
+      proj_id = #{record.projId,jdbcType=BIGINT},
+      proj_org_id = #{record.projOrgId,jdbcType=BIGINT},
+      name = #{record.name,jdbcType=VARCHAR},
+      device_sn = #{record.deviceSn,jdbcType=VARCHAR},
+      purchase_date = #{record.purchaseDate,jdbcType=TIMESTAMP},
+      networking_date = #{record.networkingDate,jdbcType=TIMESTAMP},
+      manufacturer = #{record.manufacturer,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      purchase_price = #{record.purchasePrice,jdbcType=VARCHAR},
+      english_name = #{record.englishName,jdbcType=VARCHAR},
+      introduction = #{record.introduction,jdbcType=VARCHAR},
+      persion = #{record.persion,jdbcType=VARCHAR},
+      platform_id = #{record.platformId,jdbcType=BIGINT},
+      library_id = #{record.libraryId,jdbcType=BIGINT},
+      address = #{record.address,jdbcType=VARCHAR},
+      sort = #{record.sort,jdbcType=INTEGER},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      del_status = #{record.delStatus,jdbcType=TINYINT},
+      description = #{record.description,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update shs_res_device
+    set id = #{record.id,jdbcType=BIGINT},
+      proj_id = #{record.projId,jdbcType=BIGINT},
+      proj_org_id = #{record.projOrgId,jdbcType=BIGINT},
+      name = #{record.name,jdbcType=VARCHAR},
+      device_sn = #{record.deviceSn,jdbcType=VARCHAR},
+      purchase_date = #{record.purchaseDate,jdbcType=TIMESTAMP},
+      networking_date = #{record.networkingDate,jdbcType=TIMESTAMP},
+      manufacturer = #{record.manufacturer,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      purchase_price = #{record.purchasePrice,jdbcType=VARCHAR},
+      english_name = #{record.englishName,jdbcType=VARCHAR},
+      introduction = #{record.introduction,jdbcType=VARCHAR},
+      persion = #{record.persion,jdbcType=VARCHAR},
+      platform_id = #{record.platformId,jdbcType=BIGINT},
+      library_id = #{record.libraryId,jdbcType=BIGINT},
+      address = #{record.address,jdbcType=VARCHAR},
+      sort = #{record.sort,jdbcType=INTEGER},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      del_status = #{record.delStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.research.system.domain.po.ShsResDevice">
+    update shs_res_device
+    <set>
+      <if test="projId != null">
+        proj_id = #{projId,jdbcType=BIGINT},
+      </if>
+      <if test="projOrgId != null">
+        proj_org_id = #{projOrgId,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceSn != null">
+        device_sn = #{deviceSn,jdbcType=VARCHAR},
+      </if>
+      <if test="purchaseDate != null">
+        purchase_date = #{purchaseDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="networkingDate != null">
+        networking_date = #{networkingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="manufacturer != null">
+        manufacturer = #{manufacturer,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null">
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="purchasePrice != null">
+        purchase_price = #{purchasePrice,jdbcType=VARCHAR},
+      </if>
+      <if test="englishName != null">
+        english_name = #{englishName,jdbcType=VARCHAR},
+      </if>
+      <if test="introduction != null">
+        introduction = #{introduction,jdbcType=VARCHAR},
+      </if>
+      <if test="persion != null">
+        persion = #{persion,jdbcType=VARCHAR},
+      </if>
+      <if test="platformId != null">
+        platform_id = #{platformId,jdbcType=BIGINT},
+      </if>
+      <if test="libraryId != null">
+        library_id = #{libraryId,jdbcType=BIGINT},
+      </if>
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="delStatus != null">
+        del_status = #{delStatus,jdbcType=TINYINT},
+      </if>
+      <if test="description != null">
+        description = #{description,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.research.system.domain.po.ShsResDevice">
+    update shs_res_device
+    set proj_id = #{projId,jdbcType=BIGINT},
+      proj_org_id = #{projOrgId,jdbcType=BIGINT},
+      name = #{name,jdbcType=VARCHAR},
+      device_sn = #{deviceSn,jdbcType=VARCHAR},
+      purchase_date = #{purchaseDate,jdbcType=TIMESTAMP},
+      networking_date = #{networkingDate,jdbcType=TIMESTAMP},
+      manufacturer = #{manufacturer,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      purchase_price = #{purchasePrice,jdbcType=VARCHAR},
+      english_name = #{englishName,jdbcType=VARCHAR},
+      introduction = #{introduction,jdbcType=VARCHAR},
+      persion = #{persion,jdbcType=VARCHAR},
+      platform_id = #{platformId,jdbcType=BIGINT},
+      library_id = #{libraryId,jdbcType=BIGINT},
+      address = #{address,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      del_status = #{delStatus,jdbcType=TINYINT},
+      description = #{description,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.research.system.domain.po.ShsResDevice">
+    update shs_res_device
+    set proj_id = #{projId,jdbcType=BIGINT},
+      proj_org_id = #{projOrgId,jdbcType=BIGINT},
+      name = #{name,jdbcType=VARCHAR},
+      device_sn = #{deviceSn,jdbcType=VARCHAR},
+      purchase_date = #{purchaseDate,jdbcType=TIMESTAMP},
+      networking_date = #{networkingDate,jdbcType=TIMESTAMP},
+      manufacturer = #{manufacturer,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      purchase_price = #{purchasePrice,jdbcType=VARCHAR},
+      english_name = #{englishName,jdbcType=VARCHAR},
+      introduction = #{introduction,jdbcType=VARCHAR},
+      persion = #{persion,jdbcType=VARCHAR},
+      platform_id = #{platformId,jdbcType=BIGINT},
+      library_id = #{libraryId,jdbcType=BIGINT},
+      address = #{address,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      del_status = #{delStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>