提交

research-admin/src/main/java/com/research/ResearchServletInitializer.java

@@ -13,6 +13,6 @@ public class ResearchServletInitializer extends SpringBootServletInitializer
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
     {
-        return application.sources(researchApplication.class);
+        return application.sources(ResearchApplication.class);
     }
 }

research-admin/src/main/java/com/research/researchApplication.java

@@ -12,13 +12,13 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  */
 @MapperScan({"com.research.**.mapper", "com.research.**.dao"})
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class researchApplication
+public class ResearchApplication
 {
     public static void main(String[] args)
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(researchApplication.class, args);
+        SpringApplication.run(ResearchApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+        System.out.println("(♥◠‿◠)ﾉﾞ  科研共享平台启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
                 " .-------.       ____     __        \n" +
                 " |  _ _   \\      \\   \\   /  /    \n" +
                 " | ( ' )  |       \\  _. /  '       \n" +

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

@@ -0,0 +1,68 @@
+package com.research.web.controller.client;
+
+import com.research.common.core.domain.JsonResponse;
+import com.research.system.domain.vo.HomeVo;
+import com.research.system.service.HomeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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
+ * @Date 2025/8/21 13:57
+ * @description:
+ */
+@RestController
+@RequestMapping("/home")
+@Api(tags = "首页统计")
+@Slf4j
+public class HomeController {
+
+    @Resource
+    private HomeService homeService;
+
+    @ApiOperation(value = "查询项目统计")
+    @RequestMapping(value = "/queryHomeInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<HomeVo.Result> queryHomeInfo(){
+        return JsonResponse.ok(homeService.queryHomeInfo());
+    }
+
+    @ApiOperation(value = "查询课题统计")
+    @RequestMapping(value = "/queryGroupList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<HomeVo.GroupResult>> queryGroupList(){
+        return JsonResponse.ok(homeService.queryGroupList());
+    }
+
+    @ApiOperation(value = "查询任务统计")
+    @RequestMapping(value = "/queryTaskList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<HomeVo.TaskResult>> queryTaskList(){
+        return JsonResponse.ok(homeService.queryTaskList());
+    }
+
+    @ApiOperation(value = "查询合作单位成员统计")
+    @RequestMapping(value = "/queryProjressMemberList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<HomeVo.ProjressMemberResult> queryProjressMemberList(){
+        return JsonResponse.ok(homeService.queryProjressMemberList());
+    }
+
+    @ApiOperation(value = "查询科研成功统计")
+    @RequestMapping(value = "/queryAchievementList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<HomeVo.AchievementResult>> queryAchievementList(){
+        return JsonResponse.ok(homeService.queryAchievementList());
+    }
+
+    @ApiOperation(value = "查询会议统计")
+    @RequestMapping(value = "/queryMeetingList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<HomeVo.MeetingResult>> queryMeetingList(){
+        return JsonResponse.ok(homeService.queryMeetingList());
+    }
+
+
+}

research-flowable/src/main/java/com/research/flowable/controller/FlowDefinitionController.java → research-admin/src/main/java/com/research/web/controller/client/flow/FlowDefinitionController.java

@@ -1,4 +1,4 @@
-package com.research.flowable.controller;
+package com.research.web.controller.client.flow;
 
 import com.research.common.annotation.Log;
 import com.research.common.core.controller.BaseController;

research-flowable/src/main/java/com/research/flowable/controller/FlowInstanceController.java → research-admin/src/main/java/com/research/web/controller/client/flow/FlowInstanceController.java

@@ -1,4 +1,4 @@
-package com.research.flowable.controller;
+package com.research.web.controller.client.flow;
 
 
 import com.research.common.annotation.Log;

research-flowable/src/main/java/com/research/flowable/controller/FlowTaskController.java → research-admin/src/main/java/com/research/web/controller/client/flow/FlowTaskController.java

@@ -1,9 +1,11 @@
-package com.research.flowable.controller;
+package com.research.web.controller.client.flow;
 
+import com.research.common.annotation.DataSource;
 import com.research.common.annotation.Log;
 import com.research.common.core.controller.BaseController;
 import com.research.common.core.domain.AjaxResult;
 import com.research.common.enums.BusinessType;
+import com.research.common.enums.DataSourceType;
 import com.research.flowable.domain.dto.FlowTaskDto;
 import com.research.flowable.domain.vo.FlowQueryVo;
 import com.research.flowable.domain.vo.FlowTaskVo;

research-flowable/src/main/java/com/research/flowable/controller/SysExpressionController.java → research-admin/src/main/java/com/research/web/controller/client/flow/SysExpressionController.java

@@ -1,4 +1,4 @@
-package com.research.flowable.controller;
+package com.research.web.controller.client.flow;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;

research-flowable/src/main/java/com/research/flowable/controller/SysFormController.java → research-admin/src/main/java/com/research/web/controller/client/flow/SysFormController.java

@@ -1,4 +1,4 @@
-package com.research.flowable.controller;
+package com.research.web.controller.client.flow;
 
 import java.util.List;
 

research-flowable/src/main/java/com/research/flowable/controller/SysListenerController.java → research-admin/src/main/java/com/research/web/controller/client/flow/SysListenerController.java

@@ -1,4 +1,4 @@
-package com.research.flowable.controller;
+package com.research.web.controller.client.flow;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;

research-admin/src/main/java/com/research/web/controller/client/pro/ProgressController.java

@@ -0,0 +1,64 @@
+package com.research.web.controller.client.pro;
+
+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.ProProgressDto;
+import com.research.system.domain.vo.ProProgressVo;
+import com.research.system.service.ProgressService;
+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.pro
+ * @Date 2025/8/20 16:06
+ * @description:
+ */
+@Slf4j
+@Api(tags = "项目")
+@RestController
+@RequestMapping("/progress")
+public class ProgressController {
+
+    @Resource
+    private ProgressService progressService;
+
+    @PostMapping("/query")
+    public JsonResponse<PageInfo<ProProgressVo.Result>> queryProgressList(@RequestBody @Validated BaseDto<ProProgressDto.Query> query){
+        if (query.getPageNum() >0) {
+            PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(progressService.queryProgressList(query.getParam())));
+    }
+
+    @PostMapping("/queryProgressOrgList")
+    public JsonResponse<PageInfo<ProProgressVo.OrgResult>> queryProgressOrgList(@RequestBody @Validated BaseDto<ProProgressDto.Query> query){
+        if (query.getPageNum() >0) {
+            PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(progressService.queryProgressOrgList(query.getParam())));
+    }
+
+    @PostMapping("/add")
+    public JsonResponse<Integer> addProgress(@RequestBody @Validated ProProgressDto.Add dto){
+        return JsonResponse.ok(progressService.addProgress(dto));
+
+    }
+
+    @PostMapping("/del")
+    public JsonResponse<Integer> delProgress(@RequestBody @Validated CommonDto.DelDto dto){
+        return JsonResponse.ok(progressService.delProgress(dto));
+    }
+
+}

research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java

@@ -1,15 +1,30 @@
 package com.research.web.controller.client.project;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.research.common.core.domain.AjaxResult;
 import com.research.common.core.domain.BaseDto;
 import com.research.common.core.domain.JsonResponse;
+import com.research.common.core.domain.entity.SysUser;
+import com.research.common.utils.SecurityUtils;
+import com.research.flowable.service.IFlowDefinitionService;
+import com.research.flowable.service.IFlowTaskService;
 import com.research.system.domain.dto.CommonDto;
 import com.research.system.domain.dto.GroupDto;
+import com.research.system.domain.po.KtsKtGroupMember;
+import com.research.system.domain.po.PrjProjInfo;
+import com.research.system.domain.po.PrjProjOrg;
 import com.research.system.domain.vo.GroupVO;
+import com.research.system.service.ClientPrjProjInfoService;
+import com.research.system.service.ISysUserService;
 import com.research.system.service.KtsGroupService;
 import io.swagger.annotations.Api;
+import liquibase.pro.packaged.J;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,7 +32,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author zzc
@@ -29,10 +46,19 @@ import java.util.List;
 @Api(tags = "课题组")
 @RestController
 @RequestMapping("/group")
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 public class GroupController {
 
     @Resource
     private KtsGroupService ktsGroupService;
+    @Resource
+    private IFlowTaskService flowTaskService;
+    @Resource
+    private ClientPrjProjInfoService clientPrjProjInfoService;
+    @Resource
+    private ISysUserService sysUserService;
+    @Resource
+    private IFlowDefinitionService flowDefinitionService;
 
     @PostMapping("/query")
     public JsonResponse<PageInfo<GroupVO.Result>> queryGroupList(@RequestBody @Validated BaseDto<GroupDto.Query> query){
@@ -64,8 +90,9 @@ public class GroupController {
         return JsonResponse.ok(new PageInfo<>(ktsGroupService.queryMemberList(query.getParam())));
     }
     @PostMapping("/member/add")
-    public JsonResponse<Integer> addMember(@RequestBody @Validated GroupDto.AddMember dto){
+    public JsonResponse<Integer> addMember(@RequestBody @Validated GroupDto.AddMember dto) throws Exception {
-        ktsGroupService.addMember(dto);
+        KtsKtGroupMember ktsKtGroupMember = ktsGroupService.addMember(dto);
+//        aduit(ktsKtGroupMember.getId());
         return JsonResponse.ok();
     }
 
@@ -74,4 +101,36 @@ public class GroupController {
         ktsGroupService.delMember(dto);
         return JsonResponse.ok();
     }
+
+    private void aduit(Long memberId) throws Exception {
+
+        //1.流程初始化表单
+        AjaxResult ajaxResult = flowTaskService.flowFormData("7505");
+        if (!ajaxResult.isSuccess()) {
+            return;
+        }
+        Object data = ajaxResult.get("data");
+        String formData = JSONObject.toJSONString(data);
+
+        //查询审批人 合作单位负责人
+        PrjProjOrg prjProjOrgByTenantId = clientPrjProjInfoService.getPrjProjOrgByTenantId(SecurityUtils.getTenantId());
+
+        if (prjProjOrgByTenantId == null) {
+            throw new Exception("未找到合作单位信息");
+        }
+        String leader = prjProjOrgByTenantId.getOrgLeader();
+        String leaderPhone = prjProjOrgByTenantId.getOrgLeaderPhone();
+        //根据手机号获取用户
+        SysUser sysUser = sysUserService.selectUserByUserName(leaderPhone);
+        if (sysUser == null) {
+            throw new Exception("未找到审核用户");
+        }
+        //2.流程发起时获取下一节点
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("approval", sysUser.getUserId());
+        variables.put("formData", formData);
+        variables.put("memberId", memberId);
+        AjaxResult ajaxResult1 = flowDefinitionService.startProcessInstanceById("flow_eyb0ytij:2:7508", variables);
+        log.info("{}", ajaxResult1);
+    }
 }

research-admin/src/main/java/com/research/web/controller/client/project/ProjDocumentController.java

@@ -0,0 +1,58 @@
+package com.research.web.controller.client.project;
+
+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.DocumentDto;
+import com.research.system.domain.vo.DocumentVo;
+import com.research.system.service.ProjDocumentService;
+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.pro
+ * @Date 2025/8/25 14:22
+ * @description:
+ */
+@Slf4j
+@Api(tags = "项目文书")
+@RestController
+@RequestMapping("/document")
+public class ProjDocumentController {
+
+    @Resource
+    private ProjDocumentService projDocumentService;
+
+    @PostMapping("/query")
+    public JsonResponse<PageInfo<DocumentVo.Result>> query(@RequestBody @Validated BaseDto<DocumentDto.Query> dto){
+        if (dto.getPageNum() > 0) {
+            PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(projDocumentService.query(dto.getParam())));
+    }
+
+    @PostMapping("/add")
+    public JsonResponse add(@RequestBody @Validated DocumentDto.Add dto){
+        projDocumentService.add(dto);
+        return JsonResponse.ok();
+    }
+
+    @PostMapping("/del")
+    public JsonResponse del(@RequestBody @Validated CommonDto.DelDto dto){
+        projDocumentService.del(dto);
+        return JsonResponse.ok();
+    }
+
+
+}

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

@@ -45,14 +45,14 @@ public class ResDeviceController {
     }
 
     @ApiOperation(value = "新增")
-    @RequestMapping(value = "/add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    @RequestMapping(value = "/addDevice", 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"})
+    @RequestMapping(value = "/delDevice", 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

@@ -28,7 +28,7 @@ import javax.annotation.Resource;
  * @description:
  */
 @RestController
-@RequestMapping("/resPlatform")
+@RequestMapping("/platform")
 @Api(tags = "平台相关")
 @Slf4j
 public class ResPlatformController  {

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

@@ -1,5 +1,6 @@
 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;

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

@@ -10,8 +10,11 @@ import com.research.system.domain.vo.ShsLibInfoVo;
 import com.research.system.service.ShsLibInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import liquibase.pro.packaged.J;
 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;
@@ -36,7 +39,7 @@ public class ShsLibInfoController {
 
     @ApiOperation(value = "查询实验室")
     @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<PageInfo<ShsLibInfoVo.Result>> queryList(BaseDto<ShsLibInfoDto.Query> query){
+    public JsonResponse<PageInfo<ShsLibInfoVo.Result>> queryList(@ApiParam @Validated @RequestBody BaseDto<ShsLibInfoDto.Query> query){
         if (query.getPageNum() > 0) {
             PageHelper.startPage(query.getPageNum(), query.getPageSize());
         }
@@ -45,14 +48,14 @@ public class ShsLibInfoController {
 
     @ApiOperation(value = "新增")
     @RequestMapping(value = "/add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse add(ShsLibInfoDto.Add dto){
+    public JsonResponse add(@ApiParam @Validated @RequestBody 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){
+    public JsonResponse del(@ApiParam @Validated @RequestBody CommonDto.DelDto dto){
         shsLibInfoService.del(dto);
         return JsonResponse.ok();
     }

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

@@ -0,0 +1,82 @@
+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.ShsSyffCategoryDto;
+import com.research.system.domain.vo.ShsSyffCategoryVo;
+import com.research.system.service.ShsSyffCategoryService;
+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;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.web.controller.client.shs
+ * @Date 2025/8/18 17:30
+ * @description:
+ */
+@RestController
+@RequestMapping("/method")
+@Api(tags = "实验方法")
+@Slf4j
+public class ShsSyffCategoryController {
+
+    @Resource
+    private ShsSyffCategoryService shsSyffCategoryService;
+
+    @ApiOperation(value = "查询")
+    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<PageInfo<ShsSyffCategoryVo.Result>> query(@ApiParam @Validated @RequestBody BaseDto<ShsSyffCategoryDto.Query> query){
+        if (query.getPageNum() > 0) {
+            PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(shsSyffCategoryService.query(query.getParam())));
+    }
+
+    @ApiOperation(value = "新增")
+    @RequestMapping(value = "/add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> add(@ApiParam @Validated @RequestBody ShsSyffCategoryDto.Add add){
+        return JsonResponse.ok(shsSyffCategoryService.add(add));
+    }
+
+    @ApiOperation(value = "删除")
+    @RequestMapping(value = "/del", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> del(@ApiParam @Validated @RequestBody CommonDto.DelDto dto){
+        return JsonResponse.ok(shsSyffCategoryService.del(dto));
+    }
+
+    @ApiOperation(value = "分类查询")
+    @RequestMapping(value = "/classify/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<PageInfo<ShsSyffCategoryVo.CategoryResult>> queryCategory(@ApiParam @Validated @RequestBody BaseDto<ShsSyffCategoryDto.CategoryQuery> query){
+        if (query.getPageNum() > 0) {
+            PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(shsSyffCategoryService.queryCategory(query.getParam())));
+    }
+
+    @ApiOperation(value = "分类新增")
+    @RequestMapping(value = "/classify/add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> addCategory(@ApiParam @Validated @RequestBody ShsSyffCategoryDto.CategoryAdd add){
+        return JsonResponse.ok(shsSyffCategoryService.addCategory(add));
+    }
+
+    @ApiOperation(value = "分类删除")
+    @RequestMapping(value = "/classify/del", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> delCategory(@ApiParam @Validated @RequestBody CommonDto.DelDto dto){
+        return JsonResponse.ok(shsSyffCategoryService.delCategory(dto));
+    }
+
+
+}

research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java

@@ -0,0 +1,109 @@
+package com.research.web.controller.client.task;
+
+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.TaskDto;
+import com.research.system.domain.vo.TaskVo;
+import com.research.system.service.TaskService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import liquibase.pro.packaged.J;
+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;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.web.controller.client
+ * @Date 2025/8/17 15:49
+ * @description:
+ */
+@RestController
+@RequestMapping("/task")
+@Api(tags = "任务相关")
+@Slf4j
+public class TaskController {
+
+    @Resource
+    private TaskService taskService;
+
+    @ApiOperation(value = "查询实验室")
+    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<PageInfo<TaskVo.TaskResult>> queryList(@ApiParam @Validated @RequestBody BaseDto<TaskDto.QueryTask> query) {
+        if (query.getPageNum() > 0) {
+            PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(taskService.queryList(query.getParam())));
+    }
+
+    @ApiOperation(value = "查询实验室")
+    @RequestMapping(value = "/add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> add(@ApiParam @Validated @RequestBody TaskDto.AddTask dto) {
+        taskService.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) {
+        taskService.del(dto);
+        return JsonResponse.ok();
+    }
+
+    @ApiOperation(value = "查询实验室")
+    @RequestMapping(value = "/queryExecutorList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<PageInfo<TaskVo.ExecutorResult>> queryExecutorList(@ApiParam @Validated @RequestBody BaseDto<TaskDto.QueryExecutor> query) {
+        if (query.getPageNum() > 0) {
+            PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(taskService.queryExecutorList(query.getParam())));
+    }
+
+    @ApiOperation(value = "查询实验室")
+    @RequestMapping(value = "/addExecutor", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> addExecutor(@ApiParam @Validated @RequestBody TaskDto.AddExecutor dto) {
+        taskService.addExecutor(dto);
+        return JsonResponse.ok();
+    }
+
+    @ApiOperation(value = "查询实验室")
+    @RequestMapping(value = "/delExecutor", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> delExecutor(@ApiParam @Validated @RequestBody CommonDto.DelDto dto) {
+        taskService.delExecutor(dto);
+        return JsonResponse.ok();
+    }
+
+    @ApiOperation(value = "查询实验室")
+    @RequestMapping(value = "/queryDeliverableList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<PageInfo<TaskVo.DeliverableResult>> queryDeliverableList(@ApiParam @Validated @RequestBody BaseDto<TaskDto.QueryDeliverable> query) {
+        if (query.getPageNum() > 0) {
+            PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(taskService.queryDeliverableList(query.getParam())));
+    }
+
+    @ApiOperation(value = "查询实验室")
+    @RequestMapping(value = "/addDeliverable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> addDeliverable(@ApiParam @Validated @RequestBody TaskDto.AddDeliverable dto) {
+        taskService.addDeliverable(dto);
+        return JsonResponse.ok();
+    }
+
+    @ApiOperation(value = "查询实验室")
+    @RequestMapping(value = "/delDeliverable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> delDeliverable(@ApiParam @Validated @RequestBody CommonDto.DelDto dto) {
+        taskService.delDeliverable(dto);
+        return JsonResponse.ok();
+    }
+
+}

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

@@ -59,3 +59,6 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 8080

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

@@ -0,0 +1,64 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://127.0.0.1:3306/open_research?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                username: root
+                password: Sxinf18aA!
+            # 从库数据源
+            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
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 38081

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

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

research-flowable/src/main/java/com/research/flowable/service/impl/FlowDefinitionServiceImpl.java

@@ -199,7 +199,7 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
 
             // 流程发起时 跳过发起人节点
             ProcessInstance processInstance = runtimeService.startProcessInstanceById(procDefId, variables);
-            // 给第一步申请人节点设置任务执行人和意见
+            // 给第一步申请人节点设置任务执行人和意见 x
             Task task = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).singleResult();
             if (Objects.nonNull(task)) {
                 taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.NORMAL.getType(), sysUser.getNickName() + "发起流程申请");

research-flowable/src/main/java/com/research/flowable/service/impl/FlowTaskServiceImpl.java

@@ -25,6 +25,7 @@ import com.research.flowable.service.ISysFormService;
 import com.research.system.domain.SysForm;
 import com.research.system.service.ISysRoleService;
 import com.research.system.service.ISysUserService;
+import com.research.system.service.KtsGroupService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
@@ -79,6 +80,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     private ISysDeployFormService sysInstanceFormService;
     @Resource
     private ISysFormService sysFormService;
+    @Resource
+    private KtsGroupService ktsGroupService;
 
     /**
      * 完成任务
@@ -93,13 +96,17 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             return AjaxResult.error("任务不存在");
         }
         if (DelegationState.PENDING.equals(task.getDelegationState())) {
+            //审核未结束，继续审核
             taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment());
             taskService.resolveTask(taskVo.getTaskId(), taskVo.getVariables());
         } else {
+            //审核结束，需要添加业务逻辑
             taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getType(), taskVo.getComment());
             Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
             taskService.setAssignee(taskVo.getTaskId(), userId.toString());
             taskService.complete(taskVo.getTaskId(), taskVo.getVariables());
+
+            ktsGroupService.aduitMember(Long.parseLong(task.getAssignee()), Byte.valueOf("1"));
         }
         return AjaxResult.success();
     }

research-framework/src/main/java/com/research/framework/aspectj/AdminGlobalDataSourceAspect.java

@@ -1,5 +1,6 @@
 package com.research.framework.aspectj;
 
+import com.research.common.annotation.DataSource;
 import com.research.common.constant.UserConstants;
 import com.research.common.exception.base.BaseException;
 import com.research.common.utils.SecurityUtils;
@@ -40,6 +41,7 @@ public class AdminGlobalDataSourceAspect {
     private static final String DATASOURCE_NOT_FOUND = "未找到数据源";
 
         @Pointcut("((execution(* com.research.web.controller..*.*(..)))  && !@annotation(com.research.common.annotation.DataSource))")
+//    @Pointcut("((execution(* com.research.web.controller..*.*(..)) || execution(* com.research.flowable..*.*(..))) && !@annotation(com.research.common.annotation.DataSource))")
     public void dsPointCut() {
 
     }
@@ -100,6 +102,6 @@ public class AdminGlobalDataSourceAspect {
             }
             return dataSource.getDataSourceKey();
         }
-        return null;
+        return "MASTER";
     }
 }

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

@@ -75,13 +75,19 @@
 <!--        <table tableName="prj_proj_org" domainObjectName="PrjProjOrg" enableDeleteByExample="false"/>-->
 <!--        <table tableName="shs_ckwx_category" domainObjectName="ShsCkwxCategory" enableDeleteByExample="false"/>-->
 <!--        <table tableName="shs_ckwx_info" domainObjectName="ShsCkwxInfo" enableDeleteByExample="false"/>-->
+        <table tableName="shs_device_pic" domainObjectName="ShsDevicePic" enableDeleteByExample="false"/>
 <!--        <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"/>-->
-        <table tableName="res_research_integrity_template" domainObjectName="ResResearchIntegrityTemplate" enableDeleteByExample="false"/>
+<!--        <table tableName="res_research_integrity_template" domainObjectName="ResResearchIntegrityTemplate" enableDeleteByExample="false"/>-->
-        <table tableName="res_research_integrity" domainObjectName="ResResearchIntegrity" enableDeleteByExample="false"/>
+<!--        <table tableName="res_research_integrity" domainObjectName="ResResearchIntegrity" enableDeleteByExample="false"/>-->
+<!--        <table tableName="task_list" domainObjectName="TaskList" enableDeleteByExample="false"/>-->
+<!--        <table tableName="task_executor" domainObjectName="TaskExecutor" enableDeleteByExample="false"/>-->
+<!--        <table tableName="task_deliverable" domainObjectName="TaskDeliverable" enableDeleteByExample="false"/>-->
+<!--        <table tableName="shs_syff_info" domainObjectName="ShsSyffInfo" enableDeleteByExample="false"/>-->
+<!--        <table tableName="pro_progress" domainObjectName="ProProgress" enableDeleteByExample="false"/>-->
         <!-- 有些表的字段需要指定java类型
          <table schema="" tableName="">
             <columnOverride column="" javaType="" />

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

@@ -93,6 +93,21 @@ public class ClientPrjProjInfoDto {
 
         private String projRespIntro;
         private String orgIntro;
+        private Integer xslw;
+
+        private Integer zlsqysq;
+
+        private Integer rjzzq;
+
+        private Integer xszz;
+
+        private Integer bzzd;
+
+        private Integer yskt;
+
+        private Integer jscgzh;
+
+        private Integer xsjl;
     }
 
     @Data

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

@@ -0,0 +1,48 @@
+package com.research.system.domain.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.vo
+ * @Date 2025/8/25 14:12
+ * @description:
+ */
+public class DocumentDto {
+
+    @Data
+    public static class Query{
+        private Long projId;
+        protected String docName;
+    }
+
+    @Data
+    public static class Add {
+        private Long id;
+
+        private Long projId;
+
+        private String docName;
+
+        private String docType;
+
+        private String docVisitPath;
+
+        private String docPreviewImg;
+
+        private String docLabels;
+
+        private String uploader;
+
+        private String uploadTime;
+
+        private Byte delFlag;
+
+        private String createBy;
+
+        private Date createTime;
+    }
+
+}

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

@@ -0,0 +1,10 @@
+package com.research.system.domain.dto;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.dto
+ * @Date 2025/8/21 13:58
+ * @description:
+ */
+public class HomeDto {
+}

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

@@ -0,0 +1,57 @@
+package com.research.system.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.research.system.domain.po.ProProgress;
+import com.research.system.domain.po.ProProgressWithBLOBs;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.dto
+ * @Date 2025/8/20 9:00
+ * @description:
+ */
+public class ProProgressDto {
+
+    @Data
+    public static class Query {
+        private Long projId;
+    }
+
+    @Data
+    public static class Add{
+        private Long id;
+
+        private Long projId;
+
+        private Long projOrgId;
+
+        private Long ktGroupId;
+
+        private Long parentId;
+
+        private String projectName;
+        private String fzr;
+
+        private String stageName;
+        private String stageGoal;
+
+        private String stageResult;
+
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private Date startDate;
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private Date plannedEndDate;
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private Date actualEndDate;
+
+        private String completionPercentage;
+
+        private Byte status = 0;
+    }
+
+
+
+}

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

@@ -16,7 +16,7 @@ public class ShsCkwxDto {
     public static class Query {
         private String title;
 
-        private Byte categoryId;
+        private Long categoryId;
         private String keyword;
     }
 
@@ -26,7 +26,7 @@ public class ShsCkwxDto {
 
         private Long projId;
 
-        private Byte categoryId;
+        private Long categoryId;
 
         private String title;
 

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author zzc
@@ -63,6 +64,7 @@ public class ShsResDeviceDto {
         private Integer sort;
 
         private String description;
+        private List<String> picList;
     }
 
 

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

@@ -0,0 +1,90 @@
+package com.research.system.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.research.system.domain.po.ShsCkwxCategory;
+import com.research.system.domain.po.ShsSyffCategory;
+import com.research.system.domain.po.ShsSyffInfo;
+import com.research.system.domain.po.ShsSyffInfoWithBLOBs;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.dto
+ * @Date 2025/8/18 17:31
+ * @description:
+ */
+public class ShsSyffCategoryDto {
+
+    @Data
+    public static class Query{
+        private String categoryCode;
+
+        private String categoryName;
+    }
+
+    @Data
+    public static class Add {
+        private Long id;
+
+        private Long projId;
+
+        private Long categoryId;
+
+        private String title;
+
+        private String code;
+
+        private String version;
+
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private Date validDate;
+
+        private String authors;
+
+        private String authorsOrg;
+
+        private String purpose;
+
+        private String principle;
+
+        private String parameters;
+
+        private String pdfDownloadUrl;
+
+        private Long uploaderName;
+
+        private Long uploaderOrg;
+        private String materialList;
+
+        private String steps;
+
+        private String result;
+    }
+
+    @Data
+    public static class CategoryQuery {
+        private String categoryCode;
+
+        private String categoryName;
+    }
+
+    @Data
+    public static class CategoryAdd {
+        private Long id;
+
+        private Long projId;
+
+        private Long parentId;
+
+        private String categoryCode;
+
+        private String categoryName;
+
+        private Integer sort;
+
+        private String remark;
+    }
+
+}

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

@@ -0,0 +1,124 @@
+package com.research.system.domain.dto;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.research.system.domain.po.TaskDeliverable;
+import com.research.system.domain.po.TaskExecutor;
+import com.research.system.domain.po.TaskList;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.dto
+ * @Date 2025/8/17 15:49
+ * @description:
+ */
+public class TaskDto {
+
+    @Data
+    public static class QueryTask{
+        private String taskName;
+    }
+
+    @Data
+    public static class AddTask{
+        private Long id;
+
+        private Long projId;
+
+        private Long projOrgId;
+
+        private Long ktGroupId;
+
+        private String taskName;
+
+        private String taskType;
+
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private Date cycleStart;
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private Date cycleEnd;
+
+        private String cyclePeriod;
+
+        private String generationCycle;
+
+        private Integer batchSize;
+
+        private Integer parentId;
+
+        private String relatedProject;
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private Date startTime;
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private Date endTime;
+
+        private String initiator;
+
+        private Integer priority;
+
+        private Byte status;
+        private String description;
+        private List<AddExecutor> executorList;
+
+        @ApiModelProperty("应交付物")
+        private List<String> deliverables;
+
+        public String getDeliverables() {
+            if (CollectionUtil.isNotEmpty(deliverables)) {
+                StringBuilder sb = new StringBuilder();
+                for (String deliverable : deliverables) {
+                    sb.append(deliverable).append(",");
+                }
+                return sb.toString();
+            }
+            return null;
+        }
+    }
+
+    @Data
+    public static class QueryExecutor{
+
+    }
+
+    @Data
+    public static class AddExecutor{
+        private Long id;
+
+        private Long taskId;
+
+        private Long executorId;
+
+    }
+
+    @Data
+    public static class QueryDeliverable{
+        private Long taskId;
+    }
+
+    @Data
+    public static class AddDeliverable{
+        private Long id;
+
+        private String taskId;
+
+        private String deliverableName;
+
+        private String deliverableUrl;
+
+        private Byte deliveryStatus;
+
+        private String submitterAccount;
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private Date submissionTime;
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private String reviewerAccount;
+
+        private Date reviewTime;
+    }
+
+}

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

@@ -34,6 +34,22 @@ public class PrjProjOrg implements Serializable {
 
     private String remark;
 
+    private Integer xslw;
+
+    private Integer zlsqysq;
+
+    private Integer rjzzq;
+
+    private Integer xszz;
+
+    private Integer bzzd;
+
+    private Integer yskt;
+
+    private Integer jscgzh;
+
+    private Integer xsjl;
+
     private String orgIntro;
 
     private static final long serialVersionUID = 1L;
@@ -158,6 +174,70 @@ public class PrjProjOrg implements Serializable {
         this.remark = remark == null ? null : remark.trim();
     }
 
+    public Integer getXslw() {
+        return xslw;
+    }
+
+    public void setXslw(Integer xslw) {
+        this.xslw = xslw;
+    }
+
+    public Integer getZlsqysq() {
+        return zlsqysq;
+    }
+
+    public void setZlsqysq(Integer zlsqysq) {
+        this.zlsqysq = zlsqysq;
+    }
+
+    public Integer getRjzzq() {
+        return rjzzq;
+    }
+
+    public void setRjzzq(Integer rjzzq) {
+        this.rjzzq = rjzzq;
+    }
+
+    public Integer getXszz() {
+        return xszz;
+    }
+
+    public void setXszz(Integer xszz) {
+        this.xszz = xszz;
+    }
+
+    public Integer getBzzd() {
+        return bzzd;
+    }
+
+    public void setBzzd(Integer bzzd) {
+        this.bzzd = bzzd;
+    }
+
+    public Integer getYskt() {
+        return yskt;
+    }
+
+    public void setYskt(Integer yskt) {
+        this.yskt = yskt;
+    }
+
+    public Integer getJscgzh() {
+        return jscgzh;
+    }
+
+    public void setJscgzh(Integer jscgzh) {
+        this.jscgzh = jscgzh;
+    }
+
+    public Integer getXsjl() {
+        return xsjl;
+    }
+
+    public void setXsjl(Integer xsjl) {
+        this.xsjl = xsjl;
+    }
+
     public String getOrgIntro() {
         return orgIntro;
     }
@@ -187,6 +267,14 @@ public class PrjProjOrg implements Serializable {
         sb.append(", updateBy=").append(updateBy);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", remark=").append(remark);
+        sb.append(", xslw=").append(xslw);
+        sb.append(", zlsqysq=").append(zlsqysq);
+        sb.append(", rjzzq=").append(rjzzq);
+        sb.append(", xszz=").append(xszz);
+        sb.append(", bzzd=").append(bzzd);
+        sb.append(", yskt=").append(yskt);
+        sb.append(", jscgzh=").append(jscgzh);
+        sb.append(", xsjl=").append(xsjl);
         sb.append(", orgIntro=").append(orgIntro);
         sb.append("]");
         return sb.toString();

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

@@ -1084,6 +1084,486 @@ public class PrjProjOrgExample {
             addCriterion("remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
+
+        public Criteria andXslwIsNull() {
+            addCriterion("xslw is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andXslwIsNotNull() {
+            addCriterion("xslw is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andXslwEqualTo(Integer value) {
+            addCriterion("xslw =", value, "xslw");
+            return (Criteria) this;
+        }
+
+        public Criteria andXslwNotEqualTo(Integer value) {
+            addCriterion("xslw <>", value, "xslw");
+            return (Criteria) this;
+        }
+
+        public Criteria andXslwGreaterThan(Integer value) {
+            addCriterion("xslw >", value, "xslw");
+            return (Criteria) this;
+        }
+
+        public Criteria andXslwGreaterThanOrEqualTo(Integer value) {
+            addCriterion("xslw >=", value, "xslw");
+            return (Criteria) this;
+        }
+
+        public Criteria andXslwLessThan(Integer value) {
+            addCriterion("xslw <", value, "xslw");
+            return (Criteria) this;
+        }
+
+        public Criteria andXslwLessThanOrEqualTo(Integer value) {
+            addCriterion("xslw <=", value, "xslw");
+            return (Criteria) this;
+        }
+
+        public Criteria andXslwIn(List<Integer> values) {
+            addCriterion("xslw in", values, "xslw");
+            return (Criteria) this;
+        }
+
+        public Criteria andXslwNotIn(List<Integer> values) {
+            addCriterion("xslw not in", values, "xslw");
+            return (Criteria) this;
+        }
+
+        public Criteria andXslwBetween(Integer value1, Integer value2) {
+            addCriterion("xslw between", value1, value2, "xslw");
+            return (Criteria) this;
+        }
+
+        public Criteria andXslwNotBetween(Integer value1, Integer value2) {
+            addCriterion("xslw not between", value1, value2, "xslw");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlsqysqIsNull() {
+            addCriterion("zlsqysq is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlsqysqIsNotNull() {
+            addCriterion("zlsqysq is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlsqysqEqualTo(Integer value) {
+            addCriterion("zlsqysq =", value, "zlsqysq");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlsqysqNotEqualTo(Integer value) {
+            addCriterion("zlsqysq <>", value, "zlsqysq");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlsqysqGreaterThan(Integer value) {
+            addCriterion("zlsqysq >", value, "zlsqysq");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlsqysqGreaterThanOrEqualTo(Integer value) {
+            addCriterion("zlsqysq >=", value, "zlsqysq");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlsqysqLessThan(Integer value) {
+            addCriterion("zlsqysq <", value, "zlsqysq");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlsqysqLessThanOrEqualTo(Integer value) {
+            addCriterion("zlsqysq <=", value, "zlsqysq");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlsqysqIn(List<Integer> values) {
+            addCriterion("zlsqysq in", values, "zlsqysq");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlsqysqNotIn(List<Integer> values) {
+            addCriterion("zlsqysq not in", values, "zlsqysq");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlsqysqBetween(Integer value1, Integer value2) {
+            addCriterion("zlsqysq between", value1, value2, "zlsqysq");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlsqysqNotBetween(Integer value1, Integer value2) {
+            addCriterion("zlsqysq not between", value1, value2, "zlsqysq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRjzzqIsNull() {
+            addCriterion("rjzzq is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRjzzqIsNotNull() {
+            addCriterion("rjzzq is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRjzzqEqualTo(Integer value) {
+            addCriterion("rjzzq =", value, "rjzzq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRjzzqNotEqualTo(Integer value) {
+            addCriterion("rjzzq <>", value, "rjzzq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRjzzqGreaterThan(Integer value) {
+            addCriterion("rjzzq >", value, "rjzzq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRjzzqGreaterThanOrEqualTo(Integer value) {
+            addCriterion("rjzzq >=", value, "rjzzq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRjzzqLessThan(Integer value) {
+            addCriterion("rjzzq <", value, "rjzzq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRjzzqLessThanOrEqualTo(Integer value) {
+            addCriterion("rjzzq <=", value, "rjzzq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRjzzqIn(List<Integer> values) {
+            addCriterion("rjzzq in", values, "rjzzq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRjzzqNotIn(List<Integer> values) {
+            addCriterion("rjzzq not in", values, "rjzzq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRjzzqBetween(Integer value1, Integer value2) {
+            addCriterion("rjzzq between", value1, value2, "rjzzq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRjzzqNotBetween(Integer value1, Integer value2) {
+            addCriterion("rjzzq not between", value1, value2, "rjzzq");
+            return (Criteria) this;
+        }
+
+        public Criteria andXszzIsNull() {
+            addCriterion("xszz is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andXszzIsNotNull() {
+            addCriterion("xszz is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andXszzEqualTo(Integer value) {
+            addCriterion("xszz =", value, "xszz");
+            return (Criteria) this;
+        }
+
+        public Criteria andXszzNotEqualTo(Integer value) {
+            addCriterion("xszz <>", value, "xszz");
+            return (Criteria) this;
+        }
+
+        public Criteria andXszzGreaterThan(Integer value) {
+            addCriterion("xszz >", value, "xszz");
+            return (Criteria) this;
+        }
+
+        public Criteria andXszzGreaterThanOrEqualTo(Integer value) {
+            addCriterion("xszz >=", value, "xszz");
+            return (Criteria) this;
+        }
+
+        public Criteria andXszzLessThan(Integer value) {
+            addCriterion("xszz <", value, "xszz");
+            return (Criteria) this;
+        }
+
+        public Criteria andXszzLessThanOrEqualTo(Integer value) {
+            addCriterion("xszz <=", value, "xszz");
+            return (Criteria) this;
+        }
+
+        public Criteria andXszzIn(List<Integer> values) {
+            addCriterion("xszz in", values, "xszz");
+            return (Criteria) this;
+        }
+
+        public Criteria andXszzNotIn(List<Integer> values) {
+            addCriterion("xszz not in", values, "xszz");
+            return (Criteria) this;
+        }
+
+        public Criteria andXszzBetween(Integer value1, Integer value2) {
+            addCriterion("xszz between", value1, value2, "xszz");
+            return (Criteria) this;
+        }
+
+        public Criteria andXszzNotBetween(Integer value1, Integer value2) {
+            addCriterion("xszz not between", value1, value2, "xszz");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzzdIsNull() {
+            addCriterion("bzzd is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzzdIsNotNull() {
+            addCriterion("bzzd is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzzdEqualTo(Integer value) {
+            addCriterion("bzzd =", value, "bzzd");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzzdNotEqualTo(Integer value) {
+            addCriterion("bzzd <>", value, "bzzd");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzzdGreaterThan(Integer value) {
+            addCriterion("bzzd >", value, "bzzd");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzzdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("bzzd >=", value, "bzzd");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzzdLessThan(Integer value) {
+            addCriterion("bzzd <", value, "bzzd");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzzdLessThanOrEqualTo(Integer value) {
+            addCriterion("bzzd <=", value, "bzzd");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzzdIn(List<Integer> values) {
+            addCriterion("bzzd in", values, "bzzd");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzzdNotIn(List<Integer> values) {
+            addCriterion("bzzd not in", values, "bzzd");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzzdBetween(Integer value1, Integer value2) {
+            addCriterion("bzzd between", value1, value2, "bzzd");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzzdNotBetween(Integer value1, Integer value2) {
+            addCriterion("bzzd not between", value1, value2, "bzzd");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsktIsNull() {
+            addCriterion("yskt is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsktIsNotNull() {
+            addCriterion("yskt is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsktEqualTo(Integer value) {
+            addCriterion("yskt =", value, "yskt");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsktNotEqualTo(Integer value) {
+            addCriterion("yskt <>", value, "yskt");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsktGreaterThan(Integer value) {
+            addCriterion("yskt >", value, "yskt");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsktGreaterThanOrEqualTo(Integer value) {
+            addCriterion("yskt >=", value, "yskt");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsktLessThan(Integer value) {
+            addCriterion("yskt <", value, "yskt");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsktLessThanOrEqualTo(Integer value) {
+            addCriterion("yskt <=", value, "yskt");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsktIn(List<Integer> values) {
+            addCriterion("yskt in", values, "yskt");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsktNotIn(List<Integer> values) {
+            addCriterion("yskt not in", values, "yskt");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsktBetween(Integer value1, Integer value2) {
+            addCriterion("yskt between", value1, value2, "yskt");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsktNotBetween(Integer value1, Integer value2) {
+            addCriterion("yskt not between", value1, value2, "yskt");
+            return (Criteria) this;
+        }
+
+        public Criteria andJscgzhIsNull() {
+            addCriterion("jscgzh is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJscgzhIsNotNull() {
+            addCriterion("jscgzh is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJscgzhEqualTo(Integer value) {
+            addCriterion("jscgzh =", value, "jscgzh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJscgzhNotEqualTo(Integer value) {
+            addCriterion("jscgzh <>", value, "jscgzh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJscgzhGreaterThan(Integer value) {
+            addCriterion("jscgzh >", value, "jscgzh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJscgzhGreaterThanOrEqualTo(Integer value) {
+            addCriterion("jscgzh >=", value, "jscgzh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJscgzhLessThan(Integer value) {
+            addCriterion("jscgzh <", value, "jscgzh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJscgzhLessThanOrEqualTo(Integer value) {
+            addCriterion("jscgzh <=", value, "jscgzh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJscgzhIn(List<Integer> values) {
+            addCriterion("jscgzh in", values, "jscgzh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJscgzhNotIn(List<Integer> values) {
+            addCriterion("jscgzh not in", values, "jscgzh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJscgzhBetween(Integer value1, Integer value2) {
+            addCriterion("jscgzh between", value1, value2, "jscgzh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJscgzhNotBetween(Integer value1, Integer value2) {
+            addCriterion("jscgzh not between", value1, value2, "jscgzh");
+            return (Criteria) this;
+        }
+
+        public Criteria andXsjlIsNull() {
+            addCriterion("xsjl is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andXsjlIsNotNull() {
+            addCriterion("xsjl is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andXsjlEqualTo(Integer value) {
+            addCriterion("xsjl =", value, "xsjl");
+            return (Criteria) this;
+        }
+
+        public Criteria andXsjlNotEqualTo(Integer value) {
+            addCriterion("xsjl <>", value, "xsjl");
+            return (Criteria) this;
+        }
+
+        public Criteria andXsjlGreaterThan(Integer value) {
+            addCriterion("xsjl >", value, "xsjl");
+            return (Criteria) this;
+        }
+
+        public Criteria andXsjlGreaterThanOrEqualTo(Integer value) {
+            addCriterion("xsjl >=", value, "xsjl");
+            return (Criteria) this;
+        }
+
+        public Criteria andXsjlLessThan(Integer value) {
+            addCriterion("xsjl <", value, "xsjl");
+            return (Criteria) this;
+        }
+
+        public Criteria andXsjlLessThanOrEqualTo(Integer value) {
+            addCriterion("xsjl <=", value, "xsjl");
+            return (Criteria) this;
+        }
+
+        public Criteria andXsjlIn(List<Integer> values) {
+            addCriterion("xsjl in", values, "xsjl");
+            return (Criteria) this;
+        }
+
+        public Criteria andXsjlNotIn(List<Integer> values) {
+            addCriterion("xsjl not in", values, "xsjl");
+            return (Criteria) this;
+        }
+
+        public Criteria andXsjlBetween(Integer value1, Integer value2) {
+            addCriterion("xsjl between", value1, value2, "xsjl");
+            return (Criteria) this;
+        }
+
+        public Criteria andXsjlNotBetween(Integer value1, Integer value2) {
+            addCriterion("xsjl not between", value1, value2, "xsjl");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -0,0 +1,216 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ProProgress implements Serializable {
+    private Long id;
+
+    private Long projId;
+
+    private Long projOrgId;
+
+    private Long ktGroupId;
+
+    private Long parentId;
+
+    private String projectName;
+
+    private String fzr;
+
+    private String stageName;
+
+    private Date startDate;
+
+    private Date plannedEndDate;
+
+    private Date actualEndDate;
+
+    private String completionPercentage;
+
+    private Byte status;
+
+    private Byte delFlag;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    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 Long getKtGroupId() {
+        return ktGroupId;
+    }
+
+    public void setKtGroupId(Long ktGroupId) {
+        this.ktGroupId = ktGroupId;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName == null ? null : projectName.trim();
+    }
+
+    public String getFzr() {
+        return fzr;
+    }
+
+    public void setFzr(String fzr) {
+        this.fzr = fzr == null ? null : fzr.trim();
+    }
+
+    public String getStageName() {
+        return stageName;
+    }
+
+    public void setStageName(String stageName) {
+        this.stageName = stageName == null ? null : stageName.trim();
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getPlannedEndDate() {
+        return plannedEndDate;
+    }
+
+    public void setPlannedEndDate(Date plannedEndDate) {
+        this.plannedEndDate = plannedEndDate;
+    }
+
+    public Date getActualEndDate() {
+        return actualEndDate;
+    }
+
+    public void setActualEndDate(Date actualEndDate) {
+        this.actualEndDate = actualEndDate;
+    }
+
+    public String getCompletionPercentage() {
+        return completionPercentage;
+    }
+
+    public void setCompletionPercentage(String completionPercentage) {
+        this.completionPercentage = completionPercentage == null ? null : completionPercentage.trim();
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public Byte getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Byte delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    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 String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @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(", ktGroupId=").append(ktGroupId);
+        sb.append(", parentId=").append(parentId);
+        sb.append(", projectName=").append(projectName);
+        sb.append(", fzr=").append(fzr);
+        sb.append(", stageName=").append(stageName);
+        sb.append(", startDate=").append(startDate);
+        sb.append(", plannedEndDate=").append(plannedEndDate);
+        sb.append(", actualEndDate=").append(actualEndDate);
+        sb.append(", completionPercentage=").append(completionPercentage);
+        sb.append(", status=").append(status);
+        sb.append(", delFlag=").append(delFlag);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+
+public class ProProgressWithBLOBs extends ProProgress implements Serializable {
+    private String stageGoal;
+
+    private String stageResult;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getStageGoal() {
+        return stageGoal;
+    }
+
+    public void setStageGoal(String stageGoal) {
+        this.stageGoal = stageGoal == null ? null : stageGoal.trim();
+    }
+
+    public String getStageResult() {
+        return stageResult;
+    }
+
+    public void setStageResult(String stageResult) {
+        this.stageResult = stageResult == null ? null : stageResult.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", stageGoal=").append(stageGoal);
+        sb.append(", stageResult=").append(stageResult);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -8,7 +8,7 @@ public class ShsCkwxInfo implements Serializable {
 
     private Long projId;
 
-    private Byte categoryId;
+    private Long categoryId;
 
     private String title;
 
@@ -56,11 +56,11 @@ public class ShsCkwxInfo implements Serializable {
         this.projId = projId;
     }
 
-    public Byte getCategoryId() {
+    public Long getCategoryId() {
         return categoryId;
     }
 
-    public void setCategoryId(Byte categoryId) {
+    public void setCategoryId(Long categoryId) {
         this.categoryId = categoryId;
     }
 

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

@@ -235,52 +235,52 @@ public class ShsCkwxInfoExample {
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdEqualTo(Byte value) {
+        public Criteria andCategoryIdEqualTo(Long value) {
             addCriterion("category_id =", value, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdNotEqualTo(Byte value) {
+        public Criteria andCategoryIdNotEqualTo(Long value) {
             addCriterion("category_id <>", value, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdGreaterThan(Byte value) {
+        public Criteria andCategoryIdGreaterThan(Long value) {
             addCriterion("category_id >", value, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdGreaterThanOrEqualTo(Byte value) {
+        public Criteria andCategoryIdGreaterThanOrEqualTo(Long value) {
             addCriterion("category_id >=", value, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdLessThan(Byte value) {
+        public Criteria andCategoryIdLessThan(Long value) {
             addCriterion("category_id <", value, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdLessThanOrEqualTo(Byte value) {
+        public Criteria andCategoryIdLessThanOrEqualTo(Long value) {
             addCriterion("category_id <=", value, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdIn(List<Byte> values) {
+        public Criteria andCategoryIdIn(List<Long> values) {
             addCriterion("category_id in", values, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdNotIn(List<Byte> values) {
+        public Criteria andCategoryIdNotIn(List<Long> values) {
             addCriterion("category_id not in", values, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdBetween(Byte value1, Byte value2) {
+        public Criteria andCategoryIdBetween(Long value1, Long value2) {
             addCriterion("category_id between", value1, value2, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdNotBetween(Byte value1, Byte value2) {
+        public Criteria andCategoryIdNotBetween(Long value1, Long value2) {
             addCriterion("category_id not between", value1, value2, "categoryId");
             return (Criteria) this;
         }

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

@@ -0,0 +1,106 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ShsDevicePic implements Serializable {
+    private Long id;
+
+    private Long deviceId;
+
+    private String imgUrl;
+
+    private Integer primaryStatus;
+
+    private String operator;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte delStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(Long deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl == null ? null : imgUrl.trim();
+    }
+
+    public Integer getPrimaryStatus() {
+        return primaryStatus;
+    }
+
+    public void setPrimaryStatus(Integer primaryStatus) {
+        this.primaryStatus = primaryStatus;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator == null ? null : operator.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;
+    }
+
+    @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(", deviceId=").append(deviceId);
+        sb.append(", imgUrl=").append(imgUrl);
+        sb.append(", primaryStatus=").append(primaryStatus);
+        sb.append(", operator=").append(operator);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", delStatus=").append(delStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,701 @@
+package com.research.system.domain.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ShsDevicePicExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public ShsDevicePicExample() {
+        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 andDeviceIdIsNull() {
+            addCriterion("device_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceIdIsNotNull() {
+            addCriterion("device_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceIdEqualTo(Long value) {
+            addCriterion("device_id =", value, "deviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceIdNotEqualTo(Long value) {
+            addCriterion("device_id <>", value, "deviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceIdGreaterThan(Long value) {
+            addCriterion("device_id >", value, "deviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("device_id >=", value, "deviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceIdLessThan(Long value) {
+            addCriterion("device_id <", value, "deviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceIdLessThanOrEqualTo(Long value) {
+            addCriterion("device_id <=", value, "deviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceIdIn(List<Long> values) {
+            addCriterion("device_id in", values, "deviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceIdNotIn(List<Long> values) {
+            addCriterion("device_id not in", values, "deviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceIdBetween(Long value1, Long value2) {
+            addCriterion("device_id between", value1, value2, "deviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceIdNotBetween(Long value1, Long value2) {
+            addCriterion("device_id not between", value1, value2, "deviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlIsNull() {
+            addCriterion("img_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlIsNotNull() {
+            addCriterion("img_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlEqualTo(String value) {
+            addCriterion("img_url =", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotEqualTo(String value) {
+            addCriterion("img_url <>", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlGreaterThan(String value) {
+            addCriterion("img_url >", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("img_url >=", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlLessThan(String value) {
+            addCriterion("img_url <", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlLessThanOrEqualTo(String value) {
+            addCriterion("img_url <=", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlLike(String value) {
+            addCriterion("img_url like", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotLike(String value) {
+            addCriterion("img_url not like", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlIn(List<String> values) {
+            addCriterion("img_url in", values, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotIn(List<String> values) {
+            addCriterion("img_url not in", values, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlBetween(String value1, String value2) {
+            addCriterion("img_url between", value1, value2, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotBetween(String value1, String value2) {
+            addCriterion("img_url not between", value1, value2, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrimaryStatusIsNull() {
+            addCriterion("primary_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrimaryStatusIsNotNull() {
+            addCriterion("primary_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrimaryStatusEqualTo(Integer value) {
+            addCriterion("primary_status =", value, "primaryStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrimaryStatusNotEqualTo(Integer value) {
+            addCriterion("primary_status <>", value, "primaryStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrimaryStatusGreaterThan(Integer value) {
+            addCriterion("primary_status >", value, "primaryStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrimaryStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("primary_status >=", value, "primaryStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrimaryStatusLessThan(Integer value) {
+            addCriterion("primary_status <", value, "primaryStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrimaryStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("primary_status <=", value, "primaryStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrimaryStatusIn(List<Integer> values) {
+            addCriterion("primary_status in", values, "primaryStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrimaryStatusNotIn(List<Integer> values) {
+            addCriterion("primary_status not in", values, "primaryStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrimaryStatusBetween(Integer value1, Integer value2) {
+            addCriterion("primary_status between", value1, value2, "primaryStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrimaryStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("primary_status not between", value1, value2, "primaryStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNull() {
+            addCriterion("operator is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNotNull() {
+            addCriterion("operator is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorEqualTo(String value) {
+            addCriterion("operator =", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotEqualTo(String value) {
+            addCriterion("operator <>", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThan(String value) {
+            addCriterion("operator >", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThanOrEqualTo(String value) {
+            addCriterion("operator >=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThan(String value) {
+            addCriterion("operator <", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThanOrEqualTo(String value) {
+            addCriterion("operator <=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLike(String value) {
+            addCriterion("operator like", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotLike(String value) {
+            addCriterion("operator not like", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIn(List<String> values) {
+            addCriterion("operator in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotIn(List<String> values) {
+            addCriterion("operator not in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorBetween(String value1, String value2) {
+            addCriterion("operator between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotBetween(String value1, String value2) {
+            addCriterion("operator not between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            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 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/ShsSyffInfo.java

@@ -0,0 +1,238 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ShsSyffInfo implements Serializable {
+    private Long id;
+
+    private Long projId;
+
+    private Long categoryId;
+
+    private String title;
+
+    private String code;
+
+    private String version;
+
+    private Date validDate;
+
+    private String authors;
+
+    private String authorsOrg;
+
+    private String purpose;
+
+    private String principle;
+
+    private String parameters;
+
+    private String pdfDownloadUrl;
+
+    private Long uploaderName;
+
+    private Long uploaderOrg;
+
+    private Byte delFlag;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    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 getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(Long categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title == null ? null : title.trim();
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version == null ? null : version.trim();
+    }
+
+    public Date getValidDate() {
+        return validDate;
+    }
+
+    public void setValidDate(Date validDate) {
+        this.validDate = validDate;
+    }
+
+    public String getAuthors() {
+        return authors;
+    }
+
+    public void setAuthors(String authors) {
+        this.authors = authors == null ? null : authors.trim();
+    }
+
+    public String getAuthorsOrg() {
+        return authorsOrg;
+    }
+
+    public void setAuthorsOrg(String authorsOrg) {
+        this.authorsOrg = authorsOrg == null ? null : authorsOrg.trim();
+    }
+
+    public String getPurpose() {
+        return purpose;
+    }
+
+    public void setPurpose(String purpose) {
+        this.purpose = purpose == null ? null : purpose.trim();
+    }
+
+    public String getPrinciple() {
+        return principle;
+    }
+
+    public void setPrinciple(String principle) {
+        this.principle = principle == null ? null : principle.trim();
+    }
+
+    public String getParameters() {
+        return parameters;
+    }
+
+    public void setParameters(String parameters) {
+        this.parameters = parameters == null ? null : parameters.trim();
+    }
+
+    public String getPdfDownloadUrl() {
+        return pdfDownloadUrl;
+    }
+
+    public void setPdfDownloadUrl(String pdfDownloadUrl) {
+        this.pdfDownloadUrl = pdfDownloadUrl == null ? null : pdfDownloadUrl.trim();
+    }
+
+    public Long getUploaderName() {
+        return uploaderName;
+    }
+
+    public void setUploaderName(Long uploaderName) {
+        this.uploaderName = uploaderName;
+    }
+
+    public Long getUploaderOrg() {
+        return uploaderOrg;
+    }
+
+    public void setUploaderOrg(Long uploaderOrg) {
+        this.uploaderOrg = uploaderOrg;
+    }
+
+    public Byte getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Byte delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    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 String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @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(", categoryId=").append(categoryId);
+        sb.append(", title=").append(title);
+        sb.append(", code=").append(code);
+        sb.append(", version=").append(version);
+        sb.append(", validDate=").append(validDate);
+        sb.append(", authors=").append(authors);
+        sb.append(", authorsOrg=").append(authorsOrg);
+        sb.append(", purpose=").append(purpose);
+        sb.append(", principle=").append(principle);
+        sb.append(", parameters=").append(parameters);
+        sb.append(", pdfDownloadUrl=").append(pdfDownloadUrl);
+        sb.append(", uploaderName=").append(uploaderName);
+        sb.append(", uploaderOrg=").append(uploaderOrg);
+        sb.append(", delFlag=").append(delFlag);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+
+public class ShsSyffInfoWithBLOBs extends ShsSyffInfo implements Serializable {
+    private String materialList;
+
+    private String steps;
+
+    private String result;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getMaterialList() {
+        return materialList;
+    }
+
+    public void setMaterialList(String materialList) {
+        this.materialList = materialList == null ? null : materialList.trim();
+    }
+
+    public String getSteps() {
+        return steps;
+    }
+
+    public void setSteps(String steps) {
+        this.steps = steps == null ? null : steps.trim();
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result == null ? null : result.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", materialList=").append(materialList);
+        sb.append(", steps=").append(steps);
+        sb.append(", result=").append(result);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,172 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TaskDeliverable implements Serializable {
+    private Long id;
+
+    private String taskId;
+
+    private String deliverableName;
+
+    private String deliverableUrl;
+
+    private Byte deliveryStatus;
+
+    private String submitterAccount;
+
+    private Date submissionTime;
+
+    private String reviewerAccount;
+
+    private Date reviewTime;
+
+    private Byte delFlag;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId == null ? null : taskId.trim();
+    }
+
+    public String getDeliverableName() {
+        return deliverableName;
+    }
+
+    public void setDeliverableName(String deliverableName) {
+        this.deliverableName = deliverableName == null ? null : deliverableName.trim();
+    }
+
+    public String getDeliverableUrl() {
+        return deliverableUrl;
+    }
+
+    public void setDeliverableUrl(String deliverableUrl) {
+        this.deliverableUrl = deliverableUrl == null ? null : deliverableUrl.trim();
+    }
+
+    public Byte getDeliveryStatus() {
+        return deliveryStatus;
+    }
+
+    public void setDeliveryStatus(Byte deliveryStatus) {
+        this.deliveryStatus = deliveryStatus;
+    }
+
+    public String getSubmitterAccount() {
+        return submitterAccount;
+    }
+
+    public void setSubmitterAccount(String submitterAccount) {
+        this.submitterAccount = submitterAccount == null ? null : submitterAccount.trim();
+    }
+
+    public Date getSubmissionTime() {
+        return submissionTime;
+    }
+
+    public void setSubmissionTime(Date submissionTime) {
+        this.submissionTime = submissionTime;
+    }
+
+    public String getReviewerAccount() {
+        return reviewerAccount;
+    }
+
+    public void setReviewerAccount(String reviewerAccount) {
+        this.reviewerAccount = reviewerAccount == null ? null : reviewerAccount.trim();
+    }
+
+    public Date getReviewTime() {
+        return reviewTime;
+    }
+
+    public void setReviewTime(Date reviewTime) {
+        this.reviewTime = reviewTime;
+    }
+
+    public Byte getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Byte delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    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 String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @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(", taskId=").append(taskId);
+        sb.append(", deliverableName=").append(deliverableName);
+        sb.append(", deliverableUrl=").append(deliverableUrl);
+        sb.append(", deliveryStatus=").append(deliveryStatus);
+        sb.append(", submitterAccount=").append(submitterAccount);
+        sb.append(", submissionTime=").append(submissionTime);
+        sb.append(", reviewerAccount=").append(reviewerAccount);
+        sb.append(", reviewTime=").append(reviewTime);
+        sb.append(", delFlag=").append(delFlag);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+
+public class TaskDeliverableWithBLOBs extends TaskDeliverable implements Serializable {
+    private String referenceMaterials;
+
+    private String deliveryInstructions;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getReferenceMaterials() {
+        return referenceMaterials;
+    }
+
+    public void setReferenceMaterials(String referenceMaterials) {
+        this.referenceMaterials = referenceMaterials == null ? null : referenceMaterials.trim();
+    }
+
+    public String getDeliveryInstructions() {
+        return deliveryInstructions;
+    }
+
+    public void setDeliveryInstructions(String deliveryInstructions) {
+        this.deliveryInstructions = deliveryInstructions == null ? null : deliveryInstructions.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", referenceMaterials=").append(referenceMaterials);
+        sb.append(", deliveryInstructions=").append(deliveryInstructions);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TaskExecutor implements Serializable {
+    private Long id;
+
+    private Long taskId;
+
+    private Long executorId;
+
+    private Byte delFlag;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
+    public Long getExecutorId() {
+        return executorId;
+    }
+
+    public void setExecutorId(Long executorId) {
+        this.executorId = executorId;
+    }
+
+    public Byte getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Byte delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    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 String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @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(", taskId=").append(taskId);
+        sb.append(", executorId=").append(executorId);
+        sb.append(", delFlag=").append(delFlag);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,701 @@
+package com.research.system.domain.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TaskExecutorExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TaskExecutorExample() {
+        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 andTaskIdIsNull() {
+            addCriterion("task_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNotNull() {
+            addCriterion("task_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdEqualTo(Long value) {
+            addCriterion("task_id =", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotEqualTo(Long value) {
+            addCriterion("task_id <>", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThan(Long value) {
+            addCriterion("task_id >", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("task_id >=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThan(Long value) {
+            addCriterion("task_id <", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThanOrEqualTo(Long value) {
+            addCriterion("task_id <=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIn(List<Long> values) {
+            addCriterion("task_id in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotIn(List<Long> values) {
+            addCriterion("task_id not in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdBetween(Long value1, Long value2) {
+            addCriterion("task_id between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotBetween(Long value1, Long value2) {
+            addCriterion("task_id not between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutorIdIsNull() {
+            addCriterion("executor_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutorIdIsNotNull() {
+            addCriterion("executor_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutorIdEqualTo(Long value) {
+            addCriterion("executor_id =", value, "executorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutorIdNotEqualTo(Long value) {
+            addCriterion("executor_id <>", value, "executorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutorIdGreaterThan(Long value) {
+            addCriterion("executor_id >", value, "executorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutorIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("executor_id >=", value, "executorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutorIdLessThan(Long value) {
+            addCriterion("executor_id <", value, "executorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutorIdLessThanOrEqualTo(Long value) {
+            addCriterion("executor_id <=", value, "executorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutorIdIn(List<Long> values) {
+            addCriterion("executor_id in", values, "executorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutorIdNotIn(List<Long> values) {
+            addCriterion("executor_id not in", values, "executorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutorIdBetween(Long value1, Long value2) {
+            addCriterion("executor_id between", value1, value2, "executorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutorIdNotBetween(Long value1, Long value2) {
+            addCriterion("executor_id not between", value1, value2, "executorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagIsNull() {
+            addCriterion("del_flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagIsNotNull() {
+            addCriterion("del_flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagEqualTo(Byte value) {
+            addCriterion("del_flag =", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotEqualTo(Byte value) {
+            addCriterion("del_flag <>", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagGreaterThan(Byte value) {
+            addCriterion("del_flag >", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagGreaterThanOrEqualTo(Byte value) {
+            addCriterion("del_flag >=", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLessThan(Byte value) {
+            addCriterion("del_flag <", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLessThanOrEqualTo(Byte value) {
+            addCriterion("del_flag <=", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagIn(List<Byte> values) {
+            addCriterion("del_flag in", values, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotIn(List<Byte> values) {
+            addCriterion("del_flag not in", values, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagBetween(Byte value1, Byte value2) {
+            addCriterion("del_flag between", value1, value2, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotBetween(Byte value1, Byte value2) {
+            addCriterion("del_flag not between", value1, value2, "delFlag");
+            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 andUpdateByIsNull() {
+            addCriterion("update_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNotNull() {
+            addCriterion("update_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByEqualTo(String value) {
+            addCriterion("update_by =", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotEqualTo(String value) {
+            addCriterion("update_by <>", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThan(String value) {
+            addCriterion("update_by >", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThanOrEqualTo(String value) {
+            addCriterion("update_by >=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThan(String value) {
+            addCriterion("update_by <", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThanOrEqualTo(String value) {
+            addCriterion("update_by <=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLike(String value) {
+            addCriterion("update_by like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotLike(String value) {
+            addCriterion("update_by not like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIn(List<String> values) {
+            addCriterion("update_by in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotIn(List<String> values) {
+            addCriterion("update_by not in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByBetween(String value1, String value2) {
+            addCriterion("update_by between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotBetween(String value1, String value2) {
+            addCriterion("update_by not between", value1, value2, "updateBy");
+            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 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/TaskList.java

@@ -0,0 +1,227 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TaskList implements Serializable {
+    private Long id;
+
+    private Long projId;
+
+    private Long projOrgId;
+
+    private Long ktGroupId;
+
+    private String taskName;
+
+    private Integer taskType;
+
+    private Integer parentId;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    private String initiator;
+
+    private Integer priority;
+
+    private String deliverables;
+
+    private Byte status;
+
+    private Byte delFlag;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    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 Long getKtGroupId() {
+        return ktGroupId;
+    }
+
+    public void setKtGroupId(Long ktGroupId) {
+        this.ktGroupId = ktGroupId;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName == null ? null : taskName.trim();
+    }
+
+    public Integer getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(Integer taskType) {
+        this.taskType = taskType;
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getInitiator() {
+        return initiator;
+    }
+
+    public void setInitiator(String initiator) {
+        this.initiator = initiator == null ? null : initiator.trim();
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public String getDeliverables() {
+        return deliverables;
+    }
+
+    public void setDeliverables(String deliverables) {
+        this.deliverables = deliverables == null ? null : deliverables.trim();
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public Byte getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Byte delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    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 String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    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(", ktGroupId=").append(ktGroupId);
+        sb.append(", taskName=").append(taskName);
+        sb.append(", taskType=").append(taskType);
+        sb.append(", parentId=").append(parentId);
+        sb.append(", startTime=").append(startTime);
+        sb.append(", endTime=").append(endTime);
+        sb.append(", initiator=").append(initiator);
+        sb.append(", priority=").append(priority);
+        sb.append(", deliverables=").append(deliverables);
+        sb.append(", status=").append(status);
+        sb.append(", delFlag=").append(delFlag);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", description=").append(description);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+
+public class TaskListWithBLOBs extends TaskList implements Serializable {
+    private String description;
+
+    private String executors;
+
+    private String reviewers;
+
+    private String deliverables;
+
+    private String references;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    public String getExecutors() {
+        return executors;
+    }
+
+    public void setExecutors(String executors) {
+        this.executors = executors == null ? null : executors.trim();
+    }
+
+    public String getReviewers() {
+        return reviewers;
+    }
+
+    public void setReviewers(String reviewers) {
+        this.reviewers = reviewers == null ? null : reviewers.trim();
+    }
+
+    public String getDeliverables() {
+        return deliverables;
+    }
+
+    public void setDeliverables(String deliverables) {
+        this.deliverables = deliverables == null ? null : deliverables.trim();
+    }
+
+    public String getReferences() {
+        return references;
+    }
+
+    public void setReferences(String references) {
+        this.references = references == null ? null : references.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", description=").append(description);
+        sb.append(", executors=").append(executors);
+        sb.append(", reviewers=").append(reviewers);
+        sb.append(", deliverables=").append(deliverables);
+        sb.append(", references=").append(references);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.research.system.domain.vo;
 
 import com.research.system.domain.dto.ClientPrjProjInfoDto;
+import com.research.system.domain.po.PrjProjOrg;
 import lombok.Data;
 
 import java.util.Date;
@@ -92,6 +93,24 @@ public class ClientPrjProjInfoVo {
         private String orgIntro;
         private String createBy;
         private Date createTime;
+
+        private Integer xslw;
+
+        private Integer zlsqysq;
+
+        private Integer rjzzq;
+
+        private Integer xszz;
+
+        private Integer bzzd;
+
+        private Integer yskt;
+
+        private Integer jscgzh;
+
+        private Integer xsjl;
+        private Integer total;
+
     }
 
     @Data

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

@@ -0,0 +1,43 @@
+package com.research.system.domain.vo;
+
+import com.research.system.domain.po.PrjProjDocument;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.vo
+ * @Date 2025/8/25 14:12
+ * @description:
+ */
+public class DocumentVo {
+
+    @Data
+    public static class Result {
+        private Long id;
+
+        private Long projId;
+
+        private String docName;
+
+        private String docType;
+
+        private String docVisitPath;
+
+        private String docPreviewImg;
+
+        private String docLabels;
+
+        private String uploader;
+
+        private String uploadTime;
+
+        private Byte delFlag;
+
+        private String createBy;
+
+        private Date createTime;
+    }
+
+}

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

@@ -51,5 +51,8 @@ public class FundingVo {
         private String createBy;
 
         private Date createTime;
+
+        private String projOrgName;
+        private String ktGroupName;
     }
 }

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

@@ -38,6 +38,7 @@ public class GroupVO {
 
         private Date createTime;
         private String projOrgName;
+        private String completionPercentage= "0";
     }
 
     @Data

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

@@ -0,0 +1,155 @@
+package com.research.system.domain.vo;
+
+import com.research.system.domain.dto.GroupDto;
+import com.research.system.domain.po.PrjProjInfo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.vo
+ * @Date 2025/8/21 13:59
+ * @description:
+ */
+public class HomeVo {
+
+    @Data
+    public static class Result {
+        private Long id;
+        private String title;
+        private String titleEn;
+
+        private String code;
+
+        private String org;
+        private Date beginTime;
+
+        private Date endTime;
+
+        private String intro;
+
+        private List<OrgVO> orgList;
+
+        @Data
+        public static class OrgVO {
+            private Long id;
+            private String orgName;
+        }
+    }
+
+    @Data
+    public static class GroupResult {
+        private Long id;
+        private String ktGroupName;
+        private String orgName;
+        private String completionPercentage = "0";
+        private List<GroupVO.Result> groupList;
+    }
+
+    @Data
+    public static class TaskResult {
+        private Long id;
+
+        private Long projId;
+
+        private Long projOrgId;
+
+        private Long ktGroupId;
+
+        private String taskName;
+
+        private String taskType;
+
+        private Date cycleStart;
+
+        private Date cycleEnd;
+
+        private String cyclePeriod;
+
+        private String generationCycle;
+
+        private Integer batchSize;
+
+        private Integer parentId;
+
+        private String relatedProject;
+
+        private Date startTime;
+
+        private Date endTime;
+
+        private String initiator;
+
+        private Integer priority;
+
+        private Byte status;
+        private String description;
+
+        private String executors;
+
+        private String reviewers;
+
+        private String deliverables;
+
+        private String references;
+        private String createBy;
+
+        private Date createTime;
+    }
+
+    @Data
+    public static class ProjressMemberResult{
+
+        private List<OrgMemberResult> orgMemberList;
+        private List<TitleResult> titleList;
+        private List<XlResult> xlList;
+
+        @Data
+        public static class OrgMemberResult {
+            private String orgName;
+            private Integer num;
+        }
+
+        @Data
+        public static class TitleResult {
+            private String title;
+            private Integer num;
+        }
+
+        @Data
+        public static class XlResult {
+            private String xl;
+            private Integer num;
+        }
+
+    }
+
+    @Data
+    @ApiModel("科研成果统计")
+    public static class AchievementResult{
+            private String categoryName;
+            private Integer num;
+
+    }
+
+    @Data
+    @ApiModel("会议统计")
+    public static class MeetingResult{
+
+            private String yearMonth;
+            private Integer num;
+
+            private String year;
+            private String month;
+
+            public String getYearMonth() {
+                return year + "-" + month;
+            }
+
+    }
+
+
+}

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

@@ -42,6 +42,9 @@ public class MeetingVo {
 
         private Date createTime;
 
+        private String projOrgName;
+        private String  ktGroupName;
+
         private List<ParticipantResult> metMeetingParticipantList;
 
     }
@@ -51,6 +54,7 @@ public class MeetingVo {
         private Long id;
 
         private Long meetingId;
+        private String orgName;
 
         private Long userId;
         private String userName;

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

@@ -71,6 +71,7 @@ public class OutcomeVo {
         private String createBy;
 
         private Date createTime;
+        private String projOrgName;
     }
 
     @Data

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

@@ -0,0 +1,105 @@
+package com.research.system.domain.vo;
+
+import cn.hutool.core.date.DateUtil;
+import com.research.system.domain.po.ProProgress;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.vo
+ * @Date 2025/8/20 9:05
+ * @description:
+ */
+public class ProProgressVo {
+
+    @Data
+    public static class Result{
+        private Long id;
+
+        private Long projId;
+
+        private Long projOrgId;
+
+        private Long ktGroupId;
+
+        private Long parentId;
+
+        private String projectName;
+
+        private String fzr;
+
+        private String stageName;
+
+        private Date startDate;
+
+        private Date plannedEndDate;
+
+        private Date actualEndDate;
+
+        private String completionPercentage;
+
+        private Byte status;
+
+        private String createBy;
+
+        private Date createTime;
+        private String ktGroupName;
+        private String stageGoal;
+        private String stageResult;
+
+        public Byte getStatus() {
+            if (actualEndDate != null && DateUtil.compare(new Date(), actualEndDate) > 0) {
+                return 2;
+            }
+            if (startDate != null) {
+                if (DateUtil.compare(new Date(), startDate) > 0) {
+                    return 1;
+                }else {
+                    return 0;
+                }
+            }
+            return status;
+        }
+    }
+
+    @Data
+    public static class OrgResult{
+        private Integer orgId;
+        private String orgName;
+        private Integer xslw;
+
+        private Integer zlsqysq;
+
+        private Integer rjzzq;
+
+        private Integer xszz;
+
+        private Integer bzzd;
+
+        private Integer yskt;
+
+        private Integer jscgzh;
+
+        private Integer xsjl;
+
+        private Integer xslwNum;
+
+        private Integer zlsqysqNum;
+
+        private Integer rjzzqNum;
+
+        private Integer xszzNum;
+
+        private Integer bzzdNum;
+
+        private Integer ysktNum;
+
+        private Integer jscgzhNum;
+
+        private Integer xsjlNum;
+
+    }
+
+}

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

@@ -2,6 +2,8 @@ package com.research.system.domain.vo;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Author zzc
  * @Package com.research.system.domain.dto
@@ -48,5 +50,7 @@ public class ResResearchIntegrityVo {
         private String tplDownloadUrl;
 
         private Byte status;
+        private String createBy;
+        private Date createTime;
     }
 }

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

@@ -18,7 +18,7 @@ public class ShsCkwxVo {
 
         private Long projId;
 
-        private Byte categoryId;
+        private Long categoryId;
 
         private String title;
 
@@ -42,6 +42,7 @@ public class ShsCkwxVo {
 
         private Date createTime;
         private String categoryName;
+        private String uploaderOrgName;
     }
 
     @Data

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

@@ -26,5 +26,9 @@ public class ShsLibInfoVo {
         private String remark;
         private String createBy;
         private Date createTime;
+        private String projOrgName;
+
+        private String categoryName;
+
     }
 }

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

@@ -3,7 +3,9 @@ package com.research.system.domain.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author zzc
@@ -54,5 +56,8 @@ public class ShsResDeviceVo {
         private String createBy;
         @ApiModelProperty("")
         private Date createTime;
+        private String platformName;
+        @ApiModelProperty("图片列表")
+        private List<String> picList = new ArrayList<>();
     }
 }

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

@@ -0,0 +1,85 @@
+package com.research.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.dto
+ * @Date 2025/8/18 17:31
+ * @description:
+ */
+public class ShsSyffCategoryVo {
+
+    @Data
+    public static class Result {
+        private Long id;
+
+        private Long projId;
+
+        private Long categoryId;
+
+        private String title;
+
+        private String code;
+
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private String version;
+
+        private Date validDate;
+
+        private String authors;
+
+        private String authorsOrg;
+
+        private String purpose;
+
+        private String principle;
+
+        private String parameters;
+
+        private String pdfDownloadUrl;
+
+        private Long uploaderName;
+
+        private Long uploaderOrg;
+
+        private String createBy;
+
+        private Date createTime;
+        private String categoryName;
+        private String materialList;
+
+        private String steps;
+
+        private String result;
+    }
+
+
+    @Data
+    public static class CategoryResult {
+        private Long id;
+
+        private Long projId;
+
+        private Long parentId;
+
+        private String categoryCode;
+
+        private String categoryName;
+
+        private Integer sort;
+
+        private String remark;
+
+        @ApiModelProperty("")
+        private String createBy;
+        @ApiModelProperty("")
+        private Date createTime;
+        private String parentCategoryName;
+    }
+
+}

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

@@ -0,0 +1,104 @@
+package com.research.system.domain.vo;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.research.system.domain.po.TaskList;
+import com.research.system.domain.po.TaskListWithBLOBs;
+import lombok.Data;
+import org.apache.poi.hssf.record.WSBoolRecord;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.domain.dto
+ * @Date 2025/8/17 15:49
+ * @description:
+ */
+public class TaskVo {
+
+    @Data
+    public static class TaskResult{
+        private Long id;
+
+        private Long projId;
+
+        private Long projOrgId;
+
+        private String taskName;
+
+        private Integer taskType;
+        private Integer parentId;
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT")
+        private Date startTime;
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT")
+        private Date endTime;
+
+        private String ktGroupName;
+
+        private String initiator;
+
+        private Integer priority;
+
+        private Byte status;
+        private String description;
+
+        private String createBy;
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT")
+        private Date createTime;
+
+        //实际完成时间
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT")
+        private Date actualEndTime;
+
+        private List<ExecutorResult> executorList;
+
+        private List<DeliverableResult> deliverableList;
+
+        private String deliverables;
+
+        public List<String> getDeliverables() {
+            if (StrUtil.isNotEmpty(deliverables)) {
+                return ListUtil.toList(deliverables.split(","));
+            }
+            return CollectionUtil.newArrayList();
+        }
+    }
+
+    @Data
+    public static class ExecutorResult{
+        private Long id;
+
+        private Long taskId;
+
+        private Long executorId;
+
+        private String memberName;
+
+    }
+    @Data
+    public static class DeliverableResult{
+        private Long id;
+
+        private String taskId;
+
+        private String deliverableName;
+
+        private String deliverableUrl;
+
+        private Byte deliveryStatus;
+
+        private String submitterAccount;
+
+        private Date submissionTime;
+
+        private String reviewerAccount;
+
+        private Date reviewTime;
+    }
+
+}

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

@@ -0,0 +1,28 @@
+package com.research.system.persist.dao;
+
+import com.research.system.domain.vo.HomeVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.persist.dao
+ * @Date 2025/8/21 14:24
+ * @description:
+ */
+public interface HomeDao {
+    HomeVo.Result queryHomeInfo();
+
+    List<HomeVo.GroupResult> queryGroupList();
+
+    List<HomeVo.TaskResult> queryTaskList(@Param("userId")Long userId);
+
+    List<HomeVo.ProjressMemberResult.OrgMemberResult> orgMemberList();
+    List<HomeVo.ProjressMemberResult.TitleResult> titleList();
+    List<HomeVo.ProjressMemberResult.XlResult> resultList();
+
+    List<HomeVo.AchievementResult> queryAchievementList();
+
+    List<HomeVo.MeetingResult> queryMeetingList();
+}

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

@@ -0,0 +1,20 @@
+package com.research.system.persist.dao;
+
+import com.research.system.domain.dto.ProProgressDto;
+import com.research.system.domain.vo.ProProgressVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.persist.dao
+ * @Date 2025/8/20 14:19
+ * @description:
+ */
+public interface ProgressDao {
+
+    List<ProProgressVo.Result> queryProgressList(@Param("dto") ProProgressDto.Query dto);
+
+    List<ProProgressVo.OrgResult> queryProgressOrgList(@Param("dto") ProProgressDto.Query dto);
+}

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

@@ -0,0 +1,18 @@
+package com.research.system.persist.dao;
+
+import com.research.system.domain.dto.DocumentDto;
+import com.research.system.domain.vo.DocumentVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.persist.dao
+ * @Date 2025/8/25 14:19
+ * @description:
+ */
+public interface ProjDocumentDao {
+
+    public List<DocumentVo.Result> query(@Param("dto") DocumentDto.Query dto);
+}

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

@@ -0,0 +1,22 @@
+package com.research.system.persist.dao;
+
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.ShsSyffCategoryDto;
+import com.research.system.domain.vo.ShsSyffCategoryVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.persist.dao
+ * @Date 2025/8/19 8:57
+ * @description:
+ */
+public interface ShsSyffDao {
+
+    List<ShsSyffCategoryVo.Result> query(@Param("dto") ShsSyffCategoryDto.Query dto);
+
+    List<ShsSyffCategoryVo.CategoryResult> queryCategory(@Param("dto") ShsSyffCategoryDto.CategoryQuery dto);
+
+}

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

@@ -0,0 +1,24 @@
+package com.research.system.persist.dao;
+
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.TaskDto;
+import com.research.system.domain.vo.TaskVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.persist.dao
+ * @Date 2025/8/18 16:04
+ * @description:
+ */
+public interface TaskDao {
+
+    List<TaskVo.TaskResult> queryList(@Param("dto") TaskDto.QueryTask dto);
+
+    List<TaskVo.ExecutorResult> queryExecutorList(@Param("dto") TaskDto.QueryExecutor dto);
+
+    List<TaskVo.DeliverableResult> queryDeliverableList(@Param("id") Long id);
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,6 +2,7 @@ package com.research.system.service;
 
 import com.research.system.domain.dto.ClientPrjProjInfoDto;
 import com.research.system.domain.po.PrjProjInfo;
+import com.research.system.domain.po.PrjProjOrg;
 import com.research.system.domain.vo.ClientPrjProjInfoVo;
 
 import java.util.List;
@@ -19,4 +20,6 @@ public interface ClientPrjProjInfoService {
     List<ClientPrjProjInfoVo.Result> query();
 
     PrjProjInfo getProInfoByTenantId(Long tenantId);
+
+    PrjProjOrg getPrjProjOrgByTenantId(Long tenantId);
 }

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

@@ -0,0 +1,10 @@
+package com.research.system.service;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service
+ * @Date 2025/8/26 10:58
+ * @description:
+ */
+public interface FlowService {
+}

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

@@ -0,0 +1,29 @@
+package com.research.system.service;
+
+import com.research.system.domain.vo.HomeVo;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service
+ * @Date 2025/8/21 13:58
+ * @description:
+ */
+public interface HomeService {
+
+    HomeVo.Result queryHomeInfo();
+
+    List<HomeVo.GroupResult> queryGroupList();
+
+    List<HomeVo.TaskResult> queryTaskList();
+
+    HomeVo.ProjressMemberResult queryProjressMemberList();
+
+    List<HomeVo.AchievementResult> queryAchievementList();
+
+    List<HomeVo.MeetingResult> queryMeetingList();
+
+
+
+}

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

@@ -3,11 +3,13 @@ package com.research.system.service;
 import com.research.common.core.domain.JsonResponse;
 import com.research.system.domain.dto.CommonDto;
 import com.research.system.domain.dto.GroupDto;
+import com.research.system.domain.po.KtsKtGroupMember;
 import com.research.system.domain.vo.GroupVO;
 
 import java.util.List;
 
 /**
+ *
  * @Author zzc
  * @Package com.research.system.service
  * @Date 2025/8/12 9:00
@@ -25,8 +27,10 @@ public interface KtsGroupService {
 
     List<GroupVO.MemberResult> queryMemberList(GroupDto.MemberQuery query);
 
-    JsonResponse<Integer> addMember(GroupDto.AddMember dto);
+    KtsKtGroupMember addMember(GroupDto.AddMember dto);
 
     void delMember(CommonDto.DelDto dto);
 
+    void aduitMember(Long memberId, Byte status);
+
 }

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

@@ -0,0 +1,25 @@
+package com.research.system.service;
+
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.ProProgressDto;
+import com.research.system.domain.vo.ProProgressVo;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service
+ * @Date 2025/8/20 9:20
+ * @description:
+ */
+public interface ProgressService {
+
+    List<ProProgressVo.Result> queryProgressList(ProProgressDto.Query query);
+
+    List<ProProgressVo.OrgResult> queryProgressOrgList(ProProgressDto.Query query);
+
+    Integer addProgress(ProProgressDto.Add dto);
+
+    Integer delProgress(CommonDto.DelDto dto);
+
+}

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

@@ -0,0 +1,23 @@
+package com.research.system.service;
+
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.DocumentDto;
+import com.research.system.domain.vo.DocumentVo;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service
+ * @Date 2025/8/25 14:15
+ * @description:
+ */
+public interface ProjDocumentService {
+
+    List<DocumentVo.Result> query(DocumentDto.Query dto);
+
+    void add(DocumentDto.Add dto);
+
+    void del(CommonDto.DelDto dto);
+
+}

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

@@ -0,0 +1,29 @@
+package com.research.system.service;
+
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.ShsSyffCategoryDto;
+import com.research.system.domain.vo.ShsSyffCategoryVo;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service
+ * @Date 2025/8/18 17:31
+ * @description:
+ */
+public interface ShsSyffCategoryService {
+
+    List<ShsSyffCategoryVo.Result> query(ShsSyffCategoryDto.Query query);
+
+    Integer add(ShsSyffCategoryDto.Add add);
+
+    Integer del(CommonDto.DelDto dto);
+
+    List<ShsSyffCategoryVo.CategoryResult> queryCategory(ShsSyffCategoryDto.CategoryQuery query);
+
+    Integer addCategory(ShsSyffCategoryDto.CategoryAdd add);
+
+    Integer delCategory(CommonDto.DelDto dto);
+
+}

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

@@ -0,0 +1,35 @@
+package com.research.system.service;
+
+import com.research.system.domain.dto.CommonDto;
+import com.research.system.domain.dto.TaskDto;
+import com.research.system.domain.vo.TaskVo;
+
+import java.util.List;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service
+ * @Date 2025/8/17 15:52
+ * @description:
+ */
+public interface TaskService {
+
+    List<TaskVo.TaskResult> queryList(TaskDto.QueryTask query);
+
+    void add(TaskDto.AddTask dto);
+
+    void del(CommonDto.DelDto dto);
+
+    List<TaskVo.ExecutorResult> queryExecutorList(TaskDto.QueryExecutor query);
+
+    void addExecutor(TaskDto.AddExecutor dto);
+
+    void delExecutor(CommonDto.DelDto dto);
+
+    List<TaskVo.DeliverableResult> queryDeliverableList(TaskDto.QueryDeliverable query);
+
+    void addDeliverable(TaskDto.AddDeliverable dto);
+
+    void delDeliverable(CommonDto.DelDto dto);
+
+}

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

@@ -4,13 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 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.ClientPrjProjInfoDto;
 import com.research.system.domain.po.*;
 import com.research.system.domain.vo.ClientPrjProjInfoVo;
-import com.research.system.persist.mapper.PrjProjDocumentMapper;
+import com.research.system.persist.mapper.*;
-import com.research.system.persist.mapper.PrjProjInfoMapper;
-import com.research.system.persist.mapper.PrjProjOrgMapper;
 import com.research.system.service.ClientPrjProjInfoService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -36,6 +35,10 @@ public class ClientPrjProjInfoServiceImpl implements ClientPrjProjInfoService {
     private PrjProjOrgMapper prjProjOrgMapper;
     @Resource
     private PrjProjDocumentMapper prjProjDocumentMapper;
+    @Resource
+    private KtsKtGroupMemberMapper ktsKtGroupMemberMapper;
+    @Resource
+    private KtsKtGroupMapper ktsKtGroupMapper;
 
 
     @Override
@@ -126,4 +129,27 @@ public class ClientPrjProjInfoServiceImpl implements ClientPrjProjInfoService {
         }
         return null;
     }
+
+    @Override
+    public PrjProjOrg getPrjProjOrgByTenantId(Long tenantId) {
+        //根据当前登录人身份获取课题组
+        KtsKtGroupMemberExample ktsKtGroupMemberExample = new KtsKtGroupMemberExample();
+        ktsKtGroupMemberExample.createCriteria().andUserIdEqualTo(SecurityUtils.getUserId());
+        List<KtsKtGroupMember> ktsKtGroupMembers = ktsKtGroupMemberMapper.selectByExample(ktsKtGroupMemberExample);
+        if (CollUtil.isNotEmpty(ktsKtGroupMembers)) {
+            //根据课题组获取合作单位
+            KtsKtGroupMember ktsKtGroupMember = ktsKtGroupMembers.get(0);
+            KtsKtGroupExample ktsKtGroupExample = new KtsKtGroupExample();
+            ktsKtGroupExample.createCriteria().andIdEqualTo(ktsKtGroupMember.getKtGroupId());
+            List<KtsKtGroup> ktsKtGroups = ktsKtGroupMapper.selectByExample(ktsKtGroupExample);
+            if (CollUtil.isNotEmpty(ktsKtGroups)) {
+                KtsKtGroup ktsKtGroup = ktsKtGroups.get(0);
+                if (ktsKtGroup != null) {
+                    return prjProjOrgMapper.selectByPrimaryKey(ktsKtGroup.getProjOrgId());
+                }
+            }
+        }
+
+        return null;
+    }
 }

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

@@ -33,6 +33,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
+ *https://www.22biqu.com/biqu79073/39115438.html
  * @Author zzc
  * @Package com.research.system.service.impl
  * @Date 2025/8/11 13:58
@@ -57,25 +58,38 @@ public class CooperatorServiceImpl implements CooperatorService {
     public void add(ClientPrjProjInfoDto.OrgDto dto) {
 
 //        //根据租户查询项目
-//        PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+        PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
-//        if (proInfoByTenantId == null) {
+        if (proInfoByTenantId == null) {
-//            throw new BaseException("未查询到租户");
+            throw new BaseException("未查询到租户");
-//        }
+        }
-
         PrjProjOrg prjProjOrg = BeanUtil.copyProperties(dto, PrjProjOrg.class);
+        if (dto.getId() == null) {
             prjProjOrg.setId(IdUtil.getSnowflakeNextId());
-//        prjProjOrg.setProjId(proInfoByTenantId.getId());
+            prjProjOrg.setProjId(proInfoByTenantId.getId());
             prjProjOrg.setCreateBy(SecurityUtils.getUsername());
+            prjProjOrg.setDelFlag((byte) 0);
             prjProjOrg.setCreateTime(new Date());
             prjProjOrgMapper.insertSelective(prjProjOrg);
+        } else {
+            prjProjOrg.setProjId(proInfoByTenantId.getId());
+            prjProjOrg.setUpdateBy(SecurityUtils.getUsername());
+            prjProjOrg.setUpdateTime(new Date());
+            prjProjOrg.setDelFlag((byte) 0);
+            prjProjOrgMapper.updateByPrimaryKeyWithBLOBs(prjProjOrg);
+        }
     }
 
     @Override
     public void update(ClientPrjProjInfoDto.OrgDto dto) {
+        PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+        if (proInfoByTenantId == null) {
+            throw new BaseException("未查询到租户");
+        }
         PrjProjOrg prjProjOrg = BeanUtil.copyProperties(dto, PrjProjOrg.class);
-        prjProjOrg.setProjId(SecurityUtils.getTenantId());
+        prjProjOrg.setProjId(proInfoByTenantId.getId());
         prjProjOrg.setUpdateBy(SecurityUtils.getUsername());
         prjProjOrg.setUpdateTime(new Date());
+        prjProjOrg.setDelFlag((byte) 0);
         prjProjOrgMapper.updateByPrimaryKeyWithBLOBs(prjProjOrg);
     }
 
@@ -100,22 +114,26 @@ public class CooperatorServiceImpl implements CooperatorService {
         }
         BigExcelWriter writer = new BigExcelWriter();
         List<String> header = new ArrayList<>();
-        header.add("项目名称");
+        header.add("序号");
         header.add("单位名称");
+        header.add("类型");
         header.add("单位负责人");
         header.add("负责人电话");
         header.add("项目中承担任务简介");
         header.add("单位简介");
+        header.add("创建时间");
         writer.writeHeadRow(header);
         int row = 0;
         for (int i = 0; i < query.size(); i++) {
             row += 1;
-            writer.writeCellValue(0, row, query.get(i).getProjId());
+            writer.writeCellValue(0, row, row);
             writer.writeCellValue(1, row, query.get(i).getOrgName());
-            writer.writeCellValue(2, row, query.get(i).getOrgLeader());
+            writer.writeCellValue(2, row, query.get(i).getCategory() == 0 ? "申报单位" : "合作单位");
-            writer.writeCellValue(3, row, query.get(i).getOrgLeaderPhone());
+            writer.writeCellValue(3, row, query.get(i).getOrgLeader());
-            writer.writeCellValue(4, row, query.get(i).getProjRespIntro());
+            writer.writeCellValue(4, row, query.get(i).getOrgLeaderPhone());
             writer.writeCellValue(5, row, query.get(i).getProjRespIntro());
+            writer.writeCellValue(6, row, query.get(i).getOrgIntro());
+            writer.writeCellValue(7, row, DateUtil.format(query.get(i).getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
         }
 
 

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

@@ -2,14 +2,17 @@ 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.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.po.PrjProjInfo;
 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.ClientPrjProjInfoService;
 import com.research.system.service.FundingService;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +33,8 @@ public class FundingServiceImpl implements FundingService {
     private FudFundRecordMapper fudFundRecordMapper;
     @Resource
     private FundingDao fundingDao;
+    @Resource
+    private ClientPrjProjInfoService clientPrjProjInfoService;
 
     @Override
     public List<FundingVo.Result> queryList(FundingDto.Query query) {
@@ -40,6 +45,11 @@ public class FundingServiceImpl implements FundingService {
     public void add(FundingDto.Add dto) {
         FudFundRecord fudFundRecord = BeanUtil.copyProperties(dto, FudFundRecord.class);
         if (dto.getId() == null) {
+            PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+            if (proInfoByTenantId == null) {
+                throw new BaseException("未查询到项目");
+            }
+            fudFundRecord.setProjId(proInfoByTenantId.getId());
             fudFundRecord.setCreateBy(SecurityUtils.getUsername());
             fudFundRecord.setCreateTime(new Date());
             fudFundRecord.setId(IdUtil.getSnowflakeNextId());

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

@@ -0,0 +1,105 @@
+package com.research.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.research.common.utils.SecurityUtils;
+import com.research.system.domain.po.*;
+import com.research.system.domain.vo.GroupVO;
+import com.research.system.domain.vo.HomeVo;
+import com.research.system.persist.dao.HomeDao;
+import com.research.system.persist.mapper.KtsKtGroupMapper;
+import com.research.system.persist.mapper.PrjProjOrgMapper;
+import com.research.system.persist.mapper.ProProgressMapper;
+import com.research.system.service.HomeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Author zzc
+ * @Package com.research.system.service.impl
+ * @Date 2025/8/21 14:24
+ * @description:
+ */
+@Service
+public class HomeServiceImpl implements HomeService {
+    //
+    @Resource
+    private HomeDao homeDao;
+    @Resource
+    private PrjProjOrgMapper prjProjOrgMapper;
+    @Resource
+    private ProProgressMapper proProgressMapper;
+    @Resource
+    private KtsKtGroupMapper ktsKtGroupMapper;
+
+    @Override
+    public HomeVo.Result queryHomeInfo() {
+        HomeVo.Result result = homeDao.queryHomeInfo();
+        if (result != null && result.getId() != null) {
+            PrjProjOrgExample prjProjOrgExample = new PrjProjOrgExample();
+            prjProjOrgExample.createCriteria().andProjIdEqualTo(result.getId()).andDelFlagEqualTo((byte) 0);
+            prjProjOrgExample.setOrderByClause("sort");
+            List<PrjProjOrg> prjProjOrgs = prjProjOrgMapper.selectByExample(prjProjOrgExample);
+            if (CollUtil.isNotEmpty(prjProjOrgs)) {
+                result.setOrgList(BeanUtil.copyToList(prjProjOrgs, HomeVo.Result.OrgVO.class));
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public List<HomeVo.GroupResult> queryGroupList() {
+        List<HomeVo.GroupResult> groupResults = homeDao.queryGroupList();
+        if (CollUtil.isNotEmpty(groupResults)) {
+            for (HomeVo.GroupResult groupResult : groupResults) {
+                //查询子课题组
+                KtsKtGroupExample ktsKtGroupExample = new KtsKtGroupExample();
+                ktsKtGroupExample.createCriteria().andParentKtIdEqualTo(groupResult.getId()).andDelFlagEqualTo((byte) 0);
+                List<KtsKtGroup> ktsKtGroups = ktsKtGroupMapper.selectByExample(ktsKtGroupExample);
+                if (CollUtil.isNotEmpty(ktsKtGroups)) {
+                    List<GroupVO.Result> results = BeanUtil.copyToList(ktsKtGroups, GroupVO.Result.class);
+                    if (CollUtil.isNotEmpty(results)) {
+                        for (GroupVO.Result result : results) {
+                            //查询进度
+                            ProProgressExample proProgressExample = new ProProgressExample();
+                            proProgressExample.createCriteria().andKtGroupIdEqualTo(result.getId()).andDelFlagEqualTo((byte) 0);
+                            List<ProProgress> proProgresses = proProgressMapper.selectByExample(proProgressExample);
+                            if (CollUtil.isNotEmpty(proProgresses)) {
+                                result.setCompletionPercentage(proProgresses.get(0).getCompletionPercentage());
+                            }
+                        }
+                    }
+                    groupResult.setGroupList(results);
+                }
+            }
+        }
+        return groupResults;
+    }
+
+    @Override
+    public List<HomeVo.TaskResult> queryTaskList() {
+        return homeDao.queryTaskList(SecurityUtils.getUserId());
+    }
+
+    @Override
+    public HomeVo.ProjressMemberResult queryProjressMemberList() {
+        HomeVo.ProjressMemberResult projressMemberResult = new HomeVo.ProjressMemberResult();
+        projressMemberResult.setOrgMemberList(homeDao.orgMemberList());
+        projressMemberResult.setXlList(homeDao.resultList());
+        projressMemberResult.setTitleList(homeDao.titleList());
+        return projressMemberResult;
+    }
+
+    @Override
+    public List<HomeVo.AchievementResult> queryAchievementList() {
+        return homeDao.queryAchievementList();
+    }
+
+    @Override
+    public List<HomeVo.MeetingResult> queryMeetingList() {
+        return homeDao.queryMeetingList();
+    }
+}

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

@@ -19,6 +19,8 @@ import com.research.system.service.ISysUserService;
 import com.research.system.service.KtsGroupService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Date;
@@ -31,6 +33,7 @@ import java.util.List;
  * @description:
  */
 @Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 public class KtsGroupServiceImpl implements KtsGroupService {
 
     @Resource
@@ -97,13 +100,13 @@ public class KtsGroupServiceImpl implements KtsGroupService {
     }
 
     @Override
-    public JsonResponse<Integer> addMember(GroupDto.AddMember dto) {
+    public KtsKtGroupMember addMember(GroupDto.AddMember dto) {
         KtsKtGroupMember ktsKtGroupMember = BeanUtil.copyProperties(dto, KtsKtGroupMember.class);
         if (dto.getId() == null) {
             //查询手机号是否已有用户
             SysUser sysUser = sysUserService.selectUserByUserName(dto.getMemberPhone());
             if (sysUser != null && "0".equals(sysUser.getDelFlag()) && dto.getConfirm() == 0) {
-                return JsonResponse.ok().fail(201, "手机号已存在，请确认是否添加该用户！");
+                throw new BaseException("手机号已存在，请确认是否添加该用户！");
             }
             ktsKtGroupMember.setId(IdUtil.getSnowflakeNextId());
             ktsKtGroupMember.setCreateBy(SecurityUtils.getUsername());
@@ -111,32 +114,37 @@ public class KtsGroupServiceImpl implements KtsGroupService {
             ktsKtGroupMember.setAuditStatus((byte) 0);
             ktsKtGroupMember.setCreateTime(new Date());
             ktsKtGroupMember.setDelFlag((byte) 0);
+
             if (sysUser == null) {
                 sysUser = new SysUser();
                 sysUser.setUserId(IdUtil.getSnowflakeNextId());
-                sysUser.setNickName(dto.getMemberName());
+                sysUser.setNickName(ktsKtGroupMember.getMemberName());
-                sysUser.setUserName(dto.getMemberPhone());
+                sysUser.setUserName(ktsKtGroupMember.getMemberPhone());
                 sysUser.setPassword(SecurityUtils.encryptPassword(UserConstants.DEFALT_PASSWORD));
                 sysUser.setStatus(UserConstants.NORMAL);
                 sysUser.setCreateBy(SecurityUtils.getUsername());
-                sysUser.setEmail(dto.getMemberEmail());
+                sysUser.setEmail(ktsKtGroupMember.getMemberEmail());
-                sysUser.setPhonenumber(dto.getMemberPhone());
+                sysUser.setPhonenumber(ktsKtGroupMember.getMemberPhone());
                 sysUser.setCreateTime(new Date());
                 sysUserService.insertUser(sysUser);
-
             }
+
             ktsKtGroupMember.setUserId(sysUser.getUserId());
 
             ktsKtGroupMemberMapper.insertSelective(ktsKtGroupMember);
-            return JsonResponse.ok();
+
+            //发起审核
+            return ktsKtGroupMember;
         } else {
             ktsKtGroupMember.setUpdateBy(SecurityUtils.getUsername());
             ktsKtGroupMember.setUpdateTime(new Date());
             ktsKtGroupMemberMapper.updateByPrimaryKeySelective(ktsKtGroupMember);
-            return JsonResponse.ok();
+            return ktsKtGroupMember;
         }
     }
 
+
+
     @Override
     public void delMember(CommonDto.DelDto dto) {
         KtsKtGroupMemberExample ktsKtGroupMemberExample = new KtsKtGroupMemberExample();
@@ -146,4 +154,41 @@ public class KtsGroupServiceImpl implements KtsGroupService {
         ktsKtGroupMemberMapper.updateByExampleSelective(ktsKtGroupMember, ktsKtGroupMemberExample);
 
     }
+
+    @Override
+    public void aduitMember(Long memberId, Byte status) {
+        //根据手机号查询课题组成员
+        KtsKtGroupMember ktsKtGroupMember = ktsKtGroupMemberMapper.selectByPrimaryKey(memberId);
+        if (ktsKtGroupMember == null) {
+            return;
+        }
+
+        if (status == 1) {
+            //审核成功 新增用户
+            SysUser sysUser = sysUserService.selectUserByUserName(ktsKtGroupMember.getMemberPhone());
+            if (sysUser != null && "0".equals(sysUser.getDelFlag())) {
+                return;
+            }
+            sysUser = new SysUser();
+            sysUser.setUserId(IdUtil.getSnowflakeNextId());
+            sysUser.setNickName(ktsKtGroupMember.getMemberName());
+            sysUser.setUserName(ktsKtGroupMember.getMemberPhone());
+            sysUser.setPassword(SecurityUtils.encryptPassword(UserConstants.DEFALT_PASSWORD));
+            sysUser.setStatus(UserConstants.NORMAL);
+            sysUser.setCreateBy(SecurityUtils.getUsername());
+            sysUser.setEmail(ktsKtGroupMember.getMemberEmail());
+            sysUser.setPhonenumber(ktsKtGroupMember.getMemberPhone());
+            sysUser.setCreateTime(new Date());
+            sysUserService.insertUser(sysUser);
+
+            ktsKtGroupMember.setAuditStatus((byte) 2);
+            ktsKtGroupMember.setUserId(sysUser.getUserId());
+            ktsKtGroupMemberMapper.updateByPrimaryKeySelective(ktsKtGroupMember);
+        }else {
+            ktsKtGroupMember.setAuditStatus((byte) 1);
+            ktsKtGroupMemberMapper.updateByPrimaryKeySelective(ktsKtGroupMember);
+        }
+    }
+
+
 }

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

@@ -0,0 +1,80 @@
+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.CommonDto;
+import com.research.system.domain.dto.ProProgressDto;
+import com.research.system.domain.po.PrjProjInfo;
+import com.research.system.domain.po.ProProgress;
+import com.research.system.domain.po.ProProgressExample;
+import com.research.system.domain.po.ProProgressWithBLOBs;
+import com.research.system.domain.vo.ProProgressVo;
+import com.research.system.persist.dao.ProgressDao;
+import com.research.system.persist.mapper.ProProgressMapper;
+import com.research.system.service.ClientPrjProjInfoService;
+import com.research.system.service.ProgressService;
+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/20 9:32
+ * @description:
+ */
+@Service
+public class ProgressServiceImpl implements ProgressService {
+
+    @Resource
+    private ProProgressMapper proProgressMapper;
+    @Resource
+    private ClientPrjProjInfoService clientPrjProjInfoService;
+    @Resource
+    private ProgressDao progressDao;
+
+    @Override
+    public List<ProProgressVo.Result> queryProgressList(ProProgressDto.Query query) {
+        return progressDao.queryProgressList( query);
+    }
+
+    @Override
+    public List<ProProgressVo.OrgResult> queryProgressOrgList(ProProgressDto.Query query) {
+        return progressDao.queryProgressOrgList( query);
+    }
+
+    @Override
+    public Integer addProgress(ProProgressDto.Add dto) {
+        ProProgressWithBLOBs proProgress = BeanUtil.copyProperties(dto, ProProgressWithBLOBs.class);
+        if (dto.getId() == null) {
+            PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+            if (proInfoByTenantId == null) {
+                throw new BaseException("未查询到项目");
+            }
+            proProgress.setCreateBy(SecurityUtils.getUsername());
+            proProgress.setProjId(proInfoByTenantId.getId());
+            proProgress.setCreateTime(new Date());
+            proProgress.setId(IdUtil.getSnowflakeNextId());
+            return proProgressMapper.insertSelective(proProgress);
+        }else {
+            proProgress.setUpdateBy(SecurityUtils.getUsername());
+            proProgress.setUpdateTime(new Date());
+            proProgress.setId(dto.getId());
+            proProgress.setDelFlag((byte) 0);
+            return proProgressMapper.updateByPrimaryKeyWithBLOBs(proProgress);
+        }
+    }
+
+    @Override
+    public Integer delProgress(CommonDto.DelDto dto) {
+        ProProgressWithBLOBs proProgress = new ProProgressWithBLOBs();
+        proProgress.setDelFlag((byte) 1);
+        ProProgressExample proProgressExample = new ProProgressExample();
+        proProgressExample.createCriteria().andIdIn(dto.getIdList());
+        return proProgressMapper.updateByExampleSelective(proProgress, proProgressExample);
+    }
+}

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

@@ -0,0 +1,72 @@
+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.CommonDto;
+import com.research.system.domain.dto.DocumentDto;
+import com.research.system.domain.po.PrjProjDocument;
+import com.research.system.domain.po.PrjProjDocumentExample;
+import com.research.system.domain.po.PrjProjInfo;
+import com.research.system.domain.vo.DocumentVo;
+import com.research.system.persist.dao.ProjDocumentDao;
+import com.research.system.persist.mapper.PrjProjDocumentMapper;
+import com.research.system.service.ClientPrjProjInfoService;
+import com.research.system.service.ProjDocumentService;
+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/25 14:16
+ * @description:
+ */
+@Service
+public class ProjDocumentServiceImpl implements ProjDocumentService {
+
+    @Resource
+    private PrjProjDocumentMapper projDocumentMapper;
+    @Resource
+    private ClientPrjProjInfoService clientPrjProjInfoService;
+    @Resource
+    private ProjDocumentDao projDocumentDao;
+
+    @Override
+    public List<DocumentVo.Result> query(DocumentDto.Query dto) {
+        return projDocumentDao.query(dto);
+    }
+
+    @Override
+    public void add(DocumentDto.Add dto) {
+        PrjProjDocument prjProjDocument = BeanUtil.copyProperties(dto, PrjProjDocument.class);
+        if (dto.getId() == null) {
+            PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+            if (proInfoByTenantId == null) {
+                throw new BaseException("未查询到项目");
+            }
+            prjProjDocument.setProjId(proInfoByTenantId.getId());
+            prjProjDocument.setCreateBy(SecurityUtils.getUsername());
+            prjProjDocument.setCreateTime(new Date());
+            prjProjDocument.setId(IdUtil.getSnowflake().nextId());
+            projDocumentMapper.insertSelective(prjProjDocument);
+        }else {
+            prjProjDocument.setUpdateBy(SecurityUtils.getUsername());
+            prjProjDocument.setUpdateTime(new Date());
+            projDocumentMapper.updateByPrimaryKeySelective(prjProjDocument);
+        }
+    }
+
+    @Override
+    public void del(CommonDto.DelDto dto) {
+        PrjProjDocument prjProjDocument = new PrjProjDocument();
+        prjProjDocument.setDelFlag((byte) 1);
+        PrjProjDocumentExample prjProjDocumentExample = new PrjProjDocumentExample();
+        prjProjDocumentExample.createCriteria().andIdIn(dto.getIdList());
+        projDocumentMapper.updateByExampleSelective(prjProjDocument, prjProjDocumentExample);
+    }
+}

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

@@ -44,7 +44,9 @@ public class ShsCkwxServiceImpl implements ShsCkwxService {
         if (proInfoByTenantId == null) {
             throw new BaseException("未查询到项目");
         }
+        if (pageNum > 0) {
             PageHelper.startPage(pageNum, pageSize);
+        }
         return shsCkwxDao.queryList(query, proInfoByTenantId.getId());
     }
 
@@ -84,7 +86,9 @@ public class ShsCkwxServiceImpl implements ShsCkwxService {
         if (proInfoByTenantId == null) {
             throw new BaseException("未查询到项目");
         }
+        if (pageNum > 0) {
             PageHelper.startPage(pageNum, pageSize);
+        }
         return shsCkwxDao.queryCategoryList(query, proInfoByTenantId.getId());
     }
 

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

@@ -2,14 +2,17 @@ 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.CommonDto;
 import com.research.system.domain.dto.ShsLibInfoDto;
+import com.research.system.domain.po.PrjProjInfo;
 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.ClientPrjProjInfoService;
 import com.research.system.service.ShsLibInfoService;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +33,8 @@ public class ShsLibInfoServiceImpl implements ShsLibInfoService {
     private ShsLibInfoMapper shsLibInfoMapper;
     @Resource
     private ShsLibInfoDao shsLibInfoDao;
+    @Resource
+    private ClientPrjProjInfoService clientPrjProjInfoService;
 
     @Override
     public List<ShsLibInfoVo.Result> queryList(ShsLibInfoDto.Query query) {
@@ -40,7 +45,12 @@ public class ShsLibInfoServiceImpl implements ShsLibInfoService {
     public void add(ShsLibInfoDto.Add dto) {
         ShsLibInfo shsLibInfo = BeanUtil.copyProperties(dto, ShsLibInfo.class);
         if (dto.getId() == null) {
+            PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+            if (proInfoByTenantId == null) {
+                throw new BaseException("未查询到项目");
+            }
             shsLibInfo.setId(IdUtil.getSnowflakeNextId());
+            shsLibInfo.setProjId(proInfoByTenantId.getId());
             shsLibInfo.setCreateBy(SecurityUtils.getUsername());
             shsLibInfo.setCreateTime(new Date());
             shsLibInfoMapper.insertSelective(shsLibInfo);

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

@@ -1,15 +1,16 @@
 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.ShsResDeviceDto;
-import com.research.system.domain.po.PrjProjInfo;
+import com.research.system.domain.po.*;
-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.ShsDevicePicMapper;
 import com.research.system.persist.mapper.ShsResDeviceMapper;
 import com.research.system.service.ClientPrjProjInfoService;
 import com.research.system.service.ShsResDeviceService;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author zzc
@@ -34,10 +36,23 @@ public class ShsResDeviceServiceImpl implements ShsResDeviceService {
     private ClientPrjProjInfoService clientPrjProjInfoService;
     @Resource
     private ShsResDeviceDao shsResDeviceDao;
+    @Resource
+    private ShsDevicePicMapper shsDevicePicMapper;
 
     @Override
     public List<ShsResDeviceVo.Result> queryList(ShsResDeviceDto.Query query) {
-        return shsResDeviceDao.queryList(query);
+        List<ShsResDeviceVo.Result> results = shsResDeviceDao.queryList(query);
+        if (CollUtil.isNotEmpty(results)) {
+            for (ShsResDeviceVo.Result result : results) {
+                ShsDevicePicExample shsDevicePicExample = new ShsDevicePicExample();
+                shsDevicePicExample.createCriteria().andDeviceIdEqualTo(result.getId());
+                List<ShsDevicePic> shsDevicePics = shsDevicePicMapper.selectByExample(shsDevicePicExample);
+                if (CollUtil.isNotEmpty(shsDevicePics)) {
+                    result.setPicList(shsDevicePics.stream().map(ShsDevicePic::getImgUrl).collect(Collectors.toList()));
+                }
+            }
+        }
+        return results;
     }
 
     @Override
@@ -55,6 +70,24 @@ public class ShsResDeviceServiceImpl implements ShsResDeviceService {
         } else {
             shsResDevice.setUpdatedAt(new Date());
             shsResDeviceMapper.updateByPrimaryKeySelective(shsResDevice);
+
+            ShsDevicePicExample shsDevicePicExample = new ShsDevicePicExample();
+            shsDevicePicExample.createCriteria().andDeviceIdEqualTo(dto.getId());
+            List<ShsDevicePic> shsDevicePics = shsDevicePicMapper.selectByExample(shsDevicePicExample);
+            if (CollUtil.isNotEmpty(shsDevicePics)) {
+                for (ShsDevicePic shsDevicePic : shsDevicePics) {
+                    shsDevicePicMapper.deleteByPrimaryKey(shsDevicePic.getId());
+                }
+            }
+        }
+        if (CollUtil.isNotEmpty(dto.getPicList())) {
+            for (String s : dto.getPicList()) {
+                ShsDevicePic shsDevicePic = new ShsDevicePic();
+                shsDevicePic.setId(IdUtil.getSnowflakeNextId());
+                shsDevicePic.setDeviceId(shsResDevice.getId());
+                shsDevicePic.setImgUrl(s);
+                shsDevicePicMapper.insertSelective(shsDevicePic);
+            }
         }
     }
 

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

@@ -0,0 +1,107 @@
+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.ShsSyffCategoryDto;
+import com.research.system.domain.po.*;
+import com.research.system.domain.vo.ShsSyffCategoryVo;
+import com.research.system.persist.dao.ShsSyffDao;
+import com.research.system.persist.mapper.ShsSyffCategoryMapper;
+import com.research.system.persist.mapper.ShsSyffInfoMapper;
+import com.research.system.service.ClientPrjProjInfoService;
+import com.research.system.service.ShsSyffCategoryService;
+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/19 8:51
+ * @description:
+ */
+@Service
+public class ShsSyffCategoryServiceImpl implements ShsSyffCategoryService {
+
+    @Resource
+    private ShsSyffCategoryMapper shsSyffCategoryMapper;
+    @Resource
+    private ShsSyffInfoMapper shsSyffInfoMapper;
+    @Resource
+    private ClientPrjProjInfoService clientPrjProjInfoService;
+    @Resource
+    private ShsSyffDao shsSyffDao;
+
+    @Override
+    public List<ShsSyffCategoryVo.Result> query(ShsSyffCategoryDto.Query query) {
+        return shsSyffDao.query(query);
+    }
+
+    @Override
+    public Integer add(ShsSyffCategoryDto.Add add) {
+        ShsSyffInfoWithBLOBs shsSyffInfo = BeanUtil.copyProperties(add, ShsSyffInfoWithBLOBs.class);
+        if (add.getId() == null) {
+            PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+            if (proInfoByTenantId == null) {
+                throw new RuntimeException("未查询到项目");
+            }
+            shsSyffInfo.setId(IdUtil.getSnowflakeNextId());
+            shsSyffInfo.setProjId(proInfoByTenantId.getId());
+            shsSyffInfo.setCreateBy(SecurityUtils.getUsername());
+            shsSyffInfo.setCreateTime(new Date());
+            return shsSyffInfoMapper.insertSelective(shsSyffInfo);
+        } else {
+            shsSyffInfo.setUpdateBy(SecurityUtils.getUsername());
+            shsSyffInfo.setDelFlag((byte) 0);
+            shsSyffInfo.setUpdateTime(new Date());
+            return shsSyffInfoMapper.updateByPrimaryKeyWithBLOBs(shsSyffInfo);
+        }
+    }
+
+    @Override
+    public Integer del(CommonDto.DelDto dto) {
+        ShsSyffInfoWithBLOBs shsSyffInfo = new ShsSyffInfoWithBLOBs();
+        shsSyffInfo.setDelFlag((byte) 1);
+        ShsSyffInfoExample shsSyffInfoExample = new ShsSyffInfoExample();
+        shsSyffInfoExample.createCriteria().andIdIn(dto.getIdList());
+        return shsSyffInfoMapper.updateByExampleSelective(shsSyffInfo, shsSyffInfoExample);
+    }
+
+    @Override
+    public List<ShsSyffCategoryVo.CategoryResult> queryCategory(ShsSyffCategoryDto.CategoryQuery query) {
+        return shsSyffDao.queryCategory(query);
+    }
+
+    @Override
+    public Integer addCategory(ShsSyffCategoryDto.CategoryAdd add) {
+        ShsSyffCategory shsSyffCategory = BeanUtil.copyProperties(add, ShsSyffCategory.class);
+        if (add.getId() == null) {
+            PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+            if (proInfoByTenantId == null) {
+                throw new RuntimeException("未查询到项目");
+            }
+            shsSyffCategory.setId(IdUtil.getSnowflakeNextId());
+            shsSyffCategory.setProjId(proInfoByTenantId.getId());
+            shsSyffCategory.setCreateBy(SecurityUtils.getUsername());
+            shsSyffCategory.setCreateTime(new Date());
+            return shsSyffCategoryMapper.insertSelective(shsSyffCategory);
+        } else {
+            shsSyffCategory.setUpdateBy(SecurityUtils.getUsername());
+            shsSyffCategory.setUpdateTime(new Date());
+            return shsSyffCategoryMapper.updateByPrimaryKeySelective(shsSyffCategory);
+        }
+    }
+
+    @Override
+    public Integer delCategory(CommonDto.DelDto dto) {
+        ShsSyffCategory shsSyffInfo = new ShsSyffCategory();
+        shsSyffInfo.setDelFlag((byte) 1);
+        ShsSyffCategoryExample shsSyffCategoryExample = new ShsSyffCategoryExample();
+        shsSyffCategoryExample.createCriteria().andIdIn(dto.getIdList());
+        return shsSyffCategoryMapper.updateByExampleSelective(shsSyffInfo, shsSyffCategoryExample);
+    }
+}

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

@@ -0,0 +1,171 @@
+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.CommonDto;
+import com.research.system.domain.dto.TaskDto;
+import com.research.system.domain.po.*;
+import com.research.system.domain.vo.TaskVo;
+import com.research.system.persist.dao.TaskDao;
+import com.research.system.persist.mapper.TaskDeliverableMapper;
+import com.research.system.persist.mapper.TaskExecutorMapper;
+import com.research.system.persist.mapper.TaskListMapper;
+import com.research.system.service.ClientPrjProjInfoService;
+import com.research.system.service.TaskService;
+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/17 15:53
+ * @description:
+ */
+@Service
+public class TaskServiceImpl implements TaskService {
+
+    @Resource
+    private TaskListMapper taskListMapper;
+    @Resource
+    private TaskExecutorMapper taskExecutorMapper;
+    @Resource
+    private TaskDeliverableMapper taskDeliverableMapper;
+    @Resource
+    private ClientPrjProjInfoService clientPrjProjInfoService;
+    @Resource
+    private TaskDao taskDao;
+
+    @Override
+    public List<TaskVo.TaskResult> queryList(TaskDto.QueryTask query) {
+        return taskDao.queryList(query);
+    }
+
+    @Override
+    public void add(TaskDto.AddTask dto) {
+        TaskListWithBLOBs taskList = BeanUtil.copyProperties(dto, TaskListWithBLOBs.class);
+        if (dto.getId() == null) {
+            PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+            if (proInfoByTenantId == null) {
+                throw new BaseException("未查询到项目");
+            }
+            taskList.setCreateBy(SecurityUtils.getUsername());
+            taskList.setCreateTime(new Date());
+            taskList.setProjId(proInfoByTenantId.getId());
+            taskList.setDelFlag((byte) 0);
+            taskList.setInitiator(SecurityUtils.getUsername());
+            taskList.setId(IdUtil.getSnowflake().nextId());
+            taskListMapper.insertSelective(taskList);
+
+            if (dto.getExecutorList() != null) {
+                for (TaskDto.AddExecutor addExecutor : dto.getExecutorList()) {
+                    TaskExecutor taskExecutor = new TaskExecutor();
+                    taskExecutor.setTaskId(taskList.getId());
+                    taskExecutor.setExecutorId(addExecutor.getExecutorId());
+                    taskExecutor.setCreateBy(SecurityUtils.getUsername());
+                    taskExecutor.setCreateTime(new Date());
+                    taskExecutor.setId(IdUtil.getSnowflake().nextId());
+                    taskExecutor.setDelFlag((byte) 0);
+                    taskExecutorMapper.insertSelective(taskExecutor);
+                }
+            }
+        }else {
+            taskList.setUpdateBy(SecurityUtils.getUsername());
+            taskList.setUpdateTime(new Date());
+            taskList.setDelFlag((byte) 0);
+            taskListMapper.updateByPrimaryKeyWithBLOBs(taskList);
+
+            TaskExecutor taskExecutor1 = new TaskExecutor();
+            taskExecutor1.setDelFlag((byte) 0);
+            TaskExecutorExample taskExecutorExample = new TaskExecutorExample();
+            taskExecutorExample.createCriteria().andTaskIdEqualTo(taskList.getId());
+            taskExecutorMapper.updateByExampleSelective(taskExecutor1, taskExecutorExample);
+
+            if (dto.getExecutorList() != null) {
+                for (TaskDto.AddExecutor addExecutor : dto.getExecutorList()) {
+                    TaskExecutor taskExecutor = new TaskExecutor();
+                    taskExecutor.setTaskId(taskList.getId());
+                    taskExecutor.setExecutorId(addExecutor.getExecutorId());
+                    taskExecutor.setCreateBy(SecurityUtils.getUsername());
+                    taskExecutor.setCreateTime(new Date());
+                    taskExecutor.setDelFlag((byte) 0);
+                    taskExecutorMapper.insertSelective(taskExecutor);
+                }
+            }
+
+        }
+    }
+
+    @Override
+    public void del(CommonDto.DelDto dto) {
+        TaskListExample taskListExample = new TaskListExample();
+        taskListExample.createCriteria().andIdIn(dto.getIdList());
+        TaskListWithBLOBs taskListWithBLOBs = new TaskListWithBLOBs();
+        taskListWithBLOBs.setDelFlag(Byte.valueOf("1"));
+        taskListMapper.updateByExampleSelective(taskListWithBLOBs, taskListExample);
+    }
+
+    @Override
+    public List<TaskVo.ExecutorResult> queryExecutorList(TaskDto.QueryExecutor query) {
+        return taskDao.queryExecutorList( query);
+    }
+
+    @Override
+    public void addExecutor(TaskDto.AddExecutor dto) {
+        TaskExecutor taskExecutor = BeanUtil.copyProperties(dto, TaskExecutor.class);
+        if (taskExecutor.getId() == null) {
+            taskExecutor.setDelFlag(Byte.valueOf("0"));
+            taskExecutor.setCreateBy(SecurityUtils.getUsername());
+            taskExecutor.setCreateTime(new Date());
+            taskExecutorMapper.insertSelective(taskExecutor);
+        }else {
+            taskExecutor.setUpdateBy(SecurityUtils.getUsername());
+            taskExecutor.setUpdateTime(new Date());
+            taskExecutorMapper.updateByPrimaryKeySelective(taskExecutor);
+        }
+    }
+
+    @Override
+    public void delExecutor(CommonDto.DelDto dto) {
+        TaskExecutor taskExecutor1 = new TaskExecutor();
+        taskExecutor1.setDelFlag((byte) 0);
+        TaskExecutorExample taskExecutorExample = new TaskExecutorExample();
+        taskExecutorExample.createCriteria().andIdIn(dto.getIdList());
+        taskExecutorMapper.updateByExampleSelective(taskExecutor1, taskExecutorExample);
+
+    }
+
+    @Override
+    public List<TaskVo.DeliverableResult> queryDeliverableList(TaskDto.QueryDeliverable query) {
+        return taskDao.queryDeliverableList( query.getTaskId());
+    }
+
+    @Override
+    public void addDeliverable(TaskDto.AddDeliverable dto) {
+        TaskDeliverableWithBLOBs taskDeliverable = BeanUtil.copyProperties(dto, TaskDeliverableWithBLOBs.class);
+        if (taskDeliverable.getId() == null) {
+            taskDeliverable.setDelFlag(Byte.valueOf("0"));
+            taskDeliverable.setCreateBy(SecurityUtils.getUsername());
+            taskDeliverable.setCreateTime(new Date());
+            taskDeliverableMapper.insertSelective(taskDeliverable);
+        }else {
+            taskDeliverable.setUpdateBy(SecurityUtils.getUsername());
+            taskDeliverable.setUpdateTime(new Date());
+            taskDeliverableMapper.updateByPrimaryKeySelective(taskDeliverable);
+        }
+    }
+
+    @Override
+    public void delDeliverable(CommonDto.DelDto dto) {
+        TaskDeliverableWithBLOBs taskDeliverableWithBLOBs = new TaskDeliverableWithBLOBs();
+        taskDeliverableWithBLOBs.setDelFlag((byte) 0);
+        TaskDeliverableExample taskDeliverableExample = new TaskDeliverableExample();
+        taskDeliverableExample.createCriteria().andIdIn(dto.getIdList());
+        taskDeliverableMapper.updateByExampleSelective(taskDeliverableWithBLOBs, taskDeliverableExample);
+
+    }
+}

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

@@ -16,7 +16,15 @@
             o.org_intro as orgIntro,
             p.title,
             o.create_by as createBy,
-            o.create_time as createTime
+            o.create_time as createTime,
+            o.xslw,
+            o.zlsqysq,
+            o.rjzzq,
+            o.xszz,
+            o.bzzd,
+            o.yskt,
+            o.jscgzh,
+            o.xsjl
         from
             prj_proj_org o
         left join

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

@@ -4,36 +4,42 @@
 
     <select id="queryList" resultType="com.research.system.domain.vo.FundingVo$Result">
         select
-        id,
+        r.id,
-        proj_id as projId,
+        r.proj_id as projId,
-        proj_org_id as projOrgId,
+        r.proj_org_id as projOrgId,
-        kt_group_id as ktGroupId,
+        r.kt_group_id as ktGroupId,
-        pay_type as payType,
+        r.pay_type as payType,
-        pay_source as paySource,
+        r.pay_source as paySource,
-        pay_subject as paySubject,
+        r.pay_subject as paySubject,
-        pay_abstract as payAbstract,
+        r.pay_abstract as payAbstract,
-        pay_time as payTime,
+        r.pay_time as payTime,
-        income_amount as incomeAmount,
+        r.income_amount as incomeAmount,
-        pay_amount as payAmount,
+        r.pay_amount as payAmount,
-        jsr,
+        r.jsr,
-        spr,
+        r.spr,
-        pzh,
+        r.pzh,
-        pzh_url as pzhUrl,
+        r.pzh_url as pzhUrl,
-        remark,
+        r.remark,
-        create_by as createBy,
+        r.create_by as createBy,
-        create_time as createTime
+        r.create_time as createTime,
+        o.org_name as projOrgName,
+        g.kt_group_name as ktGroupName
         from
-        fud_fund_record
+        fud_fund_record r
+        left join
+            prj_proj_org o on r.proj_org_id = o.id
+        left join
+            kts_kt_group g on r.kt_group_id = g.id
         where
-        del_flag = 0
+        r.del_flag = 0
         <if test="dto.projOrgid != null">
-            and proj_org_id = #{dto.projOrgid}
+            and r.proj_org_id = #{dto.projOrgid}
         </if>
         <if test="dto.ktGroupId != null">
-            and kt_group_id = #{dto.ktGroupId}
+            and r.kt_group_id = #{dto.ktGroupId}
         </if>
         <if test="dto.payType != null">
-            and pay_type = #{dto.payType}
+            and r.pay_type = #{dto.payType}
         </if>
     </select>
 </mapper>