Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -7,7 +7,6 @@ DROP TABLE
 CREATE TABLE `core_evaluate_plan` (
                                       `id` BIGINT NOT NULL,
                                       `org_id` BIGINT DEFAULT NULL COMMENT '机构id',
-
                                       `build_task_now` VARCHAR ( 1 ) CHARACTER
                                           SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 0 COMMENT '是否立即生效',
                                       `status` VARCHAR ( 2 ) CHARACTER
@@ -109,7 +108,17 @@ CREATE TABLE `core_evaluate_plan_content` (
                                               `content_id` BIGINT DEFAULT NULL COMMENT '内容id',
                                               PRIMARY KEY ( `id` )
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '外包评价计划和内容绑定';
-
+DROP TABLE
+    IF
+    EXISTS `core_evaluate_task_user`;
+CREATE TABLE `core_evaluate_task_user` (
+                                           `id` bigint NOT NULL AUTO_INCREMENT,
+                                           `task_id` bigint DEFAULT NULL COMMENT '任务id',
+                                           `user_id` bigint DEFAULT NULL COMMENT '评价人id',
+                                           `complete_time` datetime DEFAULT NULL COMMENT '评价时间',
+                                           `evaluate_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '评价人名称',
+                                           PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='外包评价任务评价人信息表';
 DROP TABLE
     IF
     EXISTS `core_evaluate_task`;
@@ -143,10 +152,10 @@ CREATE TABLE `core_evaluate_task` (
 
 DROP TABLE
     IF
-    EXISTS `core_evaluate_task_content`;
-CREATE TABLE `core_evaluate_task_content` (
+    EXISTS `core_evaluate_task_user_content`;
+CREATE TABLE `core_evaluate_task_user_content` (
                                               `id` BIGINT NOT NULL,
-                                              `task_id` BIGINT DEFAULT NULL COMMENT '评价任务id',
+                                              `task_user_id` bigint DEFAULT NULL COMMENT '评价任务人员中间表id',
                                               `u_id` VARCHAR ( 255 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '前端需要的',
                                               `code` BIGINT DEFAULT NULL COMMENT '编号',
                                               `content_type` VARCHAR ( 2 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '评价类型',
@@ -1873,8 +1882,8 @@ INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `co
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (00000000000000002318, '检查任务', 2326, 4, 'check/task/index', 'check/task/index', NULL, 1, 0, 'C', '0', '0', '', '1', 'documentation', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01706239529069875202, '下发', 2317, 6, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:checkplan:distribute', '1', '#', NULL, '超级管理员', '2023-09-26 09:56:04', '', NULL, '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (00000000000000002214, '隐患问题清单', 2136, 4, '/problemItem', NULL, NULL, 1, 0, 'M', '0', '0', '', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABWCAMAAACNSvr7AAAAM1BMVEVHcEzNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXc/5sSAAAAEHRSTlMA4NAQ8DBgQIDAoHAgUJCwaDv5MQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAltJREFUWIXtmN12qyAQRkf+FUx4/6c9C4QaZQYwC08v6neTNqm7hIHNKDx58uSXwlfzRXRrsEb4b2Ia2OUrapNrv8S2uJP3flJuHszVAcsBRnON917BPVx94moytpv78t7DiVuftT7ufBM3jFfewOWzn+8Yb84d3OCdaTy38M4YbumdIVxVYMdww8QKI0fXDfPOCC7mnVHc/+Wdvlz3zggu5p0RXDeV3hnB/ZyP4Vx99M4grn36HQAQ0TuaDeaGHS8u9TtsZh3c4Afbu86m18rjVU4t4rp3iMyxk47+cYHd5EIPl2mAdflZ5rOpc3u9YwDUae8sNfLS5R2hQJYrRlia6ybPmuMVEjtevfdvXp2MFlcRWO9ZFaxt1TuGxPrty+KxDZcxkJVPX7XKVaMB/cevpEHi/rDpnTmu8SIKpKjNRPSOqnhnRYcbeo4EXtGSbcuIXg8TrAQ2g98Yt3mftWAF2LDAt2+JrbWmdxSUU5SwLn2CVa7pHQ35J5HPwYSV+XfMmE3vcJexMoHOWJTb9E7uIUNxAyq8HrFbY3OKbHkncTecFAgW5X7OBxrH47sJ5xAsfdLJlfZOqttRXAcsxV2r3jFpnTG5X6GPHRJuiIZ33rGV9XvBylsoFEurNYVnS2bw+Qp0H0epsJp37I93NrA+/wE6De3nO9M+QKHOJSNXWcfzHfNhCFVgiap19DvCfZxDBZZYZD39DqsUl9prXf3Ocv2c7+t3KPBCtg9SbN6R9M1rCAdd7spaH9XqN/fw83MVerBXo957vewwaozU1ljdfFb95M/nSQoA/AN/gr7nzB2jDwAAAABJRU5ErkJggg==', NULL, '超级管理员', '2023-09-20 15:14:35', '超级管理员', '2023-09-20 17:47:12', '');
-
-
+DELETE FROM sys_menu WHERE id in(01717447477334949890);
+INSERT INTO `sys_menu` VALUES (01717447477334949890, '外包评价', 2136, 1, '/resumptionEvaluate', NULL, NULL, 1, 0, 'M', '0', '0', '', '0', '/statics/2023/09/16/20230916232743A004.png', NULL, '超级管理员', '2023-09-08 11:20:51', '超级管理员', '2023-09-16 23:27:44', '');
 DELETE FROM sys_menu WHERE id IN(01717082444588490754,01717082281321013249,01717081940877746178,01717081756911378434,01717076927401005058,01717079254782545922,01717080888703033346,01717081123747635202,01717081262801395714,01717081426194702337,01717081639428923393);
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES (01717076927401005058, '评价计划管理', 00000000000000002000, 1, 'resumption', 'resumptionEvaluate/evaluate/index', NULL, 1, 1, 'C', '0', '0', 'core:evaluatePlan:list', '1', 'excel', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
@@ -2101,7 +2110,13 @@ INSERT INTO core_safety_index_calculate_rule_item (id, rule_id, indicator_note,
 INSERT INTO core_safety_index_calculate_rule_item (id, rule_id, indicator_note, calculate_type, indicator_days, item_type, item_value, order_num, create_time, create_by, update_time, update_by) VALUES (1717123345560989697, 1714172822255894529, '连续三次未登', 2, 3, null, 1, 0, now(), null, now(), null);
 INSERT INTO core_safety_index_calculate_rule_item (id, rule_id, indicator_note, calculate_type, indicator_days, item_type, item_value, order_num, create_time, create_by, update_time, update_by) VALUES (1717123345565184002, 1714172822255894529, '连续五次未登', 2, 5, null, 1, 0, now(), null, now(), null);
 INSERT INTO core_safety_index_calculate_rule_item (id, rule_id, indicator_note, calculate_type, indicator_days, item_type, item_value, order_num, create_time, create_by, update_time, update_by) VALUES (1717123345569378306, 1714172822255894529, '连续十次未登', 2, 10, null, 1, 0, now(), null, now(), null);
-
+delete from sys_dict_type where dict_type='evaluate_status';
+delete from sys_dict_data where dict_type='evaluate_status';
+INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES ('评价状态', 'evaluate_status', '0', 'slsjyc', now(), '', null, null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
+VALUES (0, '未评价', '0', 'evaluate_status', null, 'default', 'N', '0', 'slsjyc', now(), 'slsjyc', now(), null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
+VALUES (2, '已评价', '2', 'evaluate_status', null, 'default', 'N', '0', 'slsjyc', now(), 'slsjyc', now(), null);
 
 -- 新增教育培训资料类型字典
 delete from sys_dict_type where dict_type='edu_materials_type';

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -126,7 +126,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         TMonitoringRetrievalPlan plan = tMonitoringRetrievalPlanMapper.selectById(id);
         BeanUtils.copyProperties(plan, tMonitoringRetrievalPlanVO);
         tMonitoringRetrievalPlanVO.setParentFrequency(plan.getPlanFrequency());
-        if (null!=plan.getParentId()){
+        if (null != plan.getParentId()) {
             TMonitoringRetrievalPlan plan1 = tMonitoringRetrievalPlanMapper.selectById(plan.getParentId());
             tMonitoringRetrievalPlanVO.setParentFrequency(plan1.getPlanFrequency());
         }
@@ -505,7 +505,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                         break;
                 }
             }
-        } else if (plan.getOrgType().equals("3")) {
+        } else if (plan.getOrgType().equals("3") || plan.getOrgType().equals("4")) {
             collect.add(id);
             if (plan.getPlanCycle().equals("0")) {
                 iCoreMonitoringRetrievalTaskService.deleteAllTaskByPlanIds(collect);
@@ -570,7 +570,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         } else {
             data = remoteOrgService.selectSysOrgById(sysUser.getOrgId(), SecurityConstants.INNER);
         }
-        if (null==tMonitoringRetrievalPlan.getOrgName()){
+        if (null == tMonitoringRetrievalPlan.getOrgName()) {
             tMonitoringRetrievalPlan.setOrgName(data.getShortName());
         }
         tMonitoringRetrievalPlan.setOrgId(data.getId());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluateTaskController.java

@@ -59,13 +59,21 @@ public class CoreEvaluateTaskController extends BaseController {
     /**
      * 获取外包评价任务详细信息
      */
-    @ApiOperation(value = "获取评价任务详细信息")
+    @ApiOperation(value = "获取评价任务详细信息评价用")
     @RequiresPermissions("core:evaluateTask:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(coreEvaluateTaskService.selectCoreEvaluateTaskContentById(id));
+    }
+    /**
+     * 获取外包评价任务详细信息
+     */
+    @ApiOperation(value = "获取评价任务详细信息详情用")
+    @RequiresPermissions("core:evaluateTask:query")
+    @GetMapping(value = "/details/{id}")
+    public AjaxResult details(@PathVariable("id") Long id) {
         return success(coreEvaluateTaskService.selectCoreEvaluateTaskById(id));
     }
-
     /**
      * 新增外包评价任务
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/domain/CoreEvaluateTaskContent.java

@@ -14,15 +14,15 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("core_evaluate_task_content")
+@TableName("core_evaluate_task_user_content")
 @ApiModel(value = "CoreEvaluateTaskContent对象", description = "外包评价任务绑定内容")
 public class CoreEvaluateTaskContent {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "ID")
     private Long id;
-    @ApiModelProperty(value = "评价任务id")
-    private Long taskId;
+    @ApiModelProperty(value = "评价任务人员中间表id")
+    private Long taskUserId;
     @ApiModelProperty(value = "前端id")
     private String uId;
     @ApiModelProperty(value = "编号")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/domain/CoreEvaluateTaskUser.java

@@ -0,0 +1,26 @@
+package com.xunmei.core.evaluate.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/10/26
+ */
+@Data
+public class CoreEvaluateTaskUser {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private Long id;
+    private Long taskId;
+    private Long userId;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "完成时间")
+    private Date completeTime;
+    @ApiModelProperty(value = "评价人")
+    private String evaluateBy;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluateTaskContentMapper.java

@@ -13,6 +13,6 @@ import java.util.List;
  */
 @Mapper
 public interface CoreEvaluateTaskContentMapper extends BaseMapper<CoreEvaluateTaskContent> {
-  List<CoreEvaluateTaskContent>  selectByTaskId(Long taskId);
-  int deleteByTaskId(Long taskId);
+  List<CoreEvaluateTaskContent>  selectByTaskUserId(Long taskUserId);
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluateTaskUserMapper.java

@@ -0,0 +1,17 @@
+package com.xunmei.core.evaluate.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.core.evaluate.domain.CoreEvaluateTaskContent;
+import com.xunmei.core.evaluate.domain.CoreEvaluateTaskUser;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/10/26
+ */
+@Mapper
+public interface CoreEvaluateTaskUserMapper extends BaseMapper<CoreEvaluateTaskUser> {
+    List<CoreEvaluateTaskUser>getInfoByTaskId(Long taskId);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/ICoreEvaluateTaskService.java

@@ -26,7 +26,13 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @return 外包评价任务
      */
     CoreEvaluateTaskVO selectCoreEvaluateTaskById(Long id);
-
+    /**
+     * 查询外包评价任务评价按钮用
+     *
+     * @param id 外包评价任务主键
+     * @return 外包评价任务
+     */
+    CoreEvaluateTaskVO selectCoreEvaluateTaskContentById(Long id);
     /**
      * 查询外包评价任务列表
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluatePlanServiceImpl.java

@@ -158,15 +158,15 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
             coreEvaluatePlanContentMapper.insert(coreEvaluatePlanContent);
         });
         //固定
-        CoreEvaluateContent coreEvaluateContent = new CoreEvaluateContent();
+/*        CoreEvaluateContent coreEvaluateContent = new CoreEvaluateContent();
         coreEvaluateContent.setCode(1L);
         coreEvaluateContent.setContentType("1");
         coreEvaluateContent.setContent("被评价外包公司名称");
-        coreEvaluateContentMapper.insert(coreEvaluateContent);
-        CoreEvaluatePlanContent coreEvaluatePlanContent = new CoreEvaluatePlanContent();
+        coreEvaluateContentMapper.insert(coreEvaluateContent);*/
+    /*    CoreEvaluatePlanContent coreEvaluatePlanContent = new CoreEvaluatePlanContent();
         coreEvaluatePlanContent.setContentId(coreEvaluateContent.getId());
         coreEvaluatePlanContent.setEvaluateId(planId);
-        coreEvaluatePlanContentMapper.insert(coreEvaluatePlanContent);
+        coreEvaluatePlanContentMapper.insert(coreEvaluatePlanContent);*/
         return insert;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -4,6 +4,7 @@ package com.xunmei.core.evaluate.service.impl;
 import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
@@ -14,19 +15,14 @@ import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.evaluate.domain.CoreEvaluateContent;
 import com.xunmei.core.evaluate.domain.CoreEvaluateTask;
 import com.xunmei.core.evaluate.domain.CoreEvaluateTaskContent;
+import com.xunmei.core.evaluate.domain.CoreEvaluateTaskUser;
 import com.xunmei.core.evaluate.dto.EvaluateTaskContentDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskStatisticsDTO;
-import com.xunmei.core.evaluate.mapper.CoreEvaluateContentMapper;
-import com.xunmei.core.evaluate.mapper.CoreEvaluateRoleMapper;
-import com.xunmei.core.evaluate.mapper.CoreEvaluateTaskContentMapper;
-import com.xunmei.core.evaluate.mapper.CoreEvaluateTaskMapper;
+import com.xunmei.core.evaluate.mapper.*;
 import com.xunmei.core.evaluate.service.ICoreEvaluatePlanService;
 import com.xunmei.core.evaluate.service.ICoreEvaluateTaskService;
-import com.xunmei.core.evaluate.vo.CoreEvaluateContentVO;
-import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
-import com.xunmei.core.evaluate.vo.CoreEvaluatePlanVO;
-import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
+import com.xunmei.core.evaluate.vo.*;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.RemoteUserService;
@@ -63,6 +59,8 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
     private RemoteRoleService remoteRoleService;
     @Autowired
     private CoreEvaluateRoleMapper coreEvaluateRoleMapper;
+    @Autowired
+    private CoreEvaluateTaskUserMapper coreEvaluateTaskUserMapper;
 
     @Override
     public TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO) {
@@ -131,6 +129,33 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         return TableDataInfo.build(statistics);
     }
 
+    @Override
+    public CoreEvaluateTaskVO selectCoreEvaluateTaskContentById(Long id) {
+        CoreEvaluateTaskVO coreEvaluateTaskVO = new CoreEvaluateTaskVO();
+        CoreEvaluateTask coreEvaluateTask = coreEvaluateTaskMapper.selectById(id);
+        BeanUtils.copyProperties(coreEvaluateTask, coreEvaluateTaskVO);
+        switch (coreEvaluateTaskVO.getEvaluateCycle()) {
+            case "0":
+                coreEvaluateTaskVO.setEvaluateCycle("每月");
+                break;
+            case "1":
+                coreEvaluateTaskVO.setEvaluateCycle("每季度");
+                break;
+            default:
+                coreEvaluateTaskVO.setEvaluateCycle("每年");
+                break;
+        }
+        List<CoreEvaluateContent> byEvaluateId = coreEvaluateContentMapper.getByEvaluateId(coreEvaluateTask.getPlanId());
+        List<CoreEvaluateTaskContent> coreEvaluateContentList = new ArrayList<>();
+        for (CoreEvaluateContent c : byEvaluateId) {
+            CoreEvaluateTaskContent coreEvaluateTaskContent = new CoreEvaluateTaskContent();
+            BeanUtils.copyProperties(c, coreEvaluateTaskContent);
+            coreEvaluateContentList.add(coreEvaluateTaskContent);
+        }
+        coreEvaluateTaskVO.setCoreEvaluateContentList(coreEvaluateContentList);
+        return coreEvaluateTaskVO;
+    }
+
     /**
      * 查询外包评价任务
      *
@@ -176,23 +201,25 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
                 coreEvaluateTaskVO.setEvaluateCycle("每年");
                 break;
         }
-
-        List<CoreEvaluateTaskContent> coreEvaluateContentList = new ArrayList<>();
         //已完成
+        List<CoreEvaluateTaskUserContentVO> coreEvaluateTaskUserContentVOS = new ArrayList<>();
         if (coreEvaluateTask.getStatus().equals("2")) {
-            coreEvaluateContentList = coreEvaluateTaskContentMapper.selectByTaskId(id);
-        } else {
-            List<CoreEvaluateContent> byEvaluateId = coreEvaluateContentMapper.getByEvaluateId(coreEvaluateTask.getPlanId());
-            for (CoreEvaluateContent c : byEvaluateId) {
-                CoreEvaluateTaskContent coreEvaluateTaskContent = new CoreEvaluateTaskContent();
-                BeanUtils.copyProperties(c, coreEvaluateTaskContent);
-                coreEvaluateContentList.add(coreEvaluateTaskContent);
-            }
+            //评价人中间表
+            List<CoreEvaluateTaskUser> infoByTaskId = coreEvaluateTaskUserMapper.getInfoByTaskId(id);
+            for (CoreEvaluateTaskUser coreEvaluateTaskUser : infoByTaskId) {
+                CoreEvaluateTaskUserContentVO coreEvaluateTaskUserContentVO=new CoreEvaluateTaskUserContentVO();
+                List<CoreEvaluateTaskContent> coreEvaluateTaskContents = coreEvaluateTaskContentMapper.selectByTaskUserId(coreEvaluateTaskUser.getId());
+                coreEvaluateTaskUserContentVO.setCoreEvaluateTaskContentList(coreEvaluateTaskContents);
+                coreEvaluateTaskUserContentVO.setCompleteTime(coreEvaluateTaskUser.getCompleteTime());
+                coreEvaluateTaskUserContentVO.setEvaluateBy(coreEvaluateTaskUser.getEvaluateBy());
+                coreEvaluateTaskUserContentVOS.add(coreEvaluateTaskUserContentVO);
+           }
         }
-        coreEvaluateTaskVO.setCoreEvaluateContentList(coreEvaluateContentList);
+        coreEvaluateTaskVO.setCoreEvaluateTaskUserContentVOS(coreEvaluateTaskUserContentVOS);
         return coreEvaluateTaskVO;
     }
 
+
     /**
      * 查询外包评价任务列表
      *
@@ -227,9 +254,9 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
     public int updateCoreEvaluateTask(EvaluateTaskContentDTO evaluateTaskContentDTO) {
         //查询任务
         CoreEvaluateTask coreEvaluateTask = coreEvaluateTaskMapper.selectById(evaluateTaskContentDTO.getId());
-        if (!SecurityUtils.getLoginUser().getOrgId().equals(coreEvaluateTask.getOrgId())) {
+ /*       if (!SecurityUtils.getLoginUser().getOrgId().equals(coreEvaluateTask.getOrgId())) {
             throw new RuntimeException("您没有该任务的评价权限");
-        }
+        }*/
         List<Long> roleByEvaluateId = coreEvaluateRoleMapper.getRoleByEvaluateId(coreEvaluateTask.getPlanId());
         List<SysRole> roleByUserId = remoteRoleService.getRoleByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER);
         List<Long> collect = roleByUserId.stream().map(SysRole::getId).collect(Collectors.toList());
@@ -247,10 +274,18 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
             throw new RuntimeException("您没有该任务的评价权限");
         }
         //根据任务删除任务内容
-        coreEvaluateTaskContentMapper.deleteByTaskId(evaluateTaskContentDTO.getId());
+        //  coreEvaluateTaskContentMapper.deleteByTaskId(evaluateTaskContentDTO.getId());
+        //评级人信息表
+        CoreEvaluateTaskUser coreEvaluateTaskUser = new CoreEvaluateTaskUser();
+        coreEvaluateTaskUser.setTaskId(evaluateTaskContentDTO.getId());
+        coreEvaluateTaskUser.setUserId(SecurityUtils.getUserId());
+        coreEvaluateTaskUser.setEvaluateBy(SecurityUtils.getUsername());
+        coreEvaluateTaskUser.setCompleteTime(DateUtils.getNowDate());
+        coreEvaluateTaskUserMapper.insert(coreEvaluateTaskUser);
         //再重新添加任务内容
         evaluateTaskContentDTO.getCoreEvaluateTaskContentList().forEach(e -> {
-            e.setTaskId(evaluateTaskContentDTO.getId());
+            e.setId(IdWorker.getId());
+            e.setTaskUserId(coreEvaluateTaskUser.getId());
             coreEvaluateTaskContentMapper.insert(e);
         });
         coreEvaluateTask.setUpdateTime(DateUtils.getNowDate());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/vo/CoreEvaluateTaskUserContentVO.java

@@ -0,0 +1,23 @@
+package com.xunmei.core.evaluate.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xunmei.core.evaluate.domain.CoreEvaluateTaskContent;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/10/26
+ */
+@Data
+public class CoreEvaluateTaskUserContentVO {
+    @ApiModelProperty(value = "评价人")
+    private String evaluateBy;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "完成时间")
+    private Date completeTime;
+    List<CoreEvaluateTaskContent>coreEvaluateTaskContentList;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/vo/CoreEvaluateTaskVO.java

@@ -15,9 +15,11 @@ import java.util.List;
  * @date : 2023/10/12
  */
 @Data
-public class CoreEvaluateTaskVO  {
-    @ApiModelProperty(value = "内容")
+public class CoreEvaluateTaskVO {
+    @ApiModelProperty(value = "评价用内容")
     List<CoreEvaluateTaskContent> coreEvaluateContentList;
+    @ApiModelProperty(value = "详情用内容")
+    List<CoreEvaluateTaskUserContentVO> coreEvaluateTaskUserContentVOS;
     private Long id;
 
     /**

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskContentMapper.xml

@@ -3,17 +3,15 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.evaluate.mapper.CoreEvaluateTaskContentMapper">
-    <delete id="deleteByTaskId">
-        DELETE FROM core_evaluate_task_content WHERE task_id=#{taskId}
-    </delete>
 
-
-    <select id="selectByTaskId" resultType="com.xunmei.core.evaluate.domain.CoreEvaluateTaskContent">
+    <select id="selectByTaskUserId" resultType="com.xunmei.core.evaluate.domain.CoreEvaluateTaskContent">
         SELECT
             *
         FROM
-            core_evaluate_task_content
+            core_evaluate_task_user_content
         WHERE
-            task_id=#{taskId}
+            task_user_id =#{taskUserId}
+        ORDER BY
+            `code`
     </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -131,11 +131,11 @@
         </if>
 
     </select>
-    <select id="getContentByTaskId" resultType="java.util.Map">
+<!--    <select id="getContentByTaskId" resultType="java.util.Map">
         SELECT content, IF(content_type = 1, 0, score) score
         FROM core_evaluate_task_content
         WHERE task_id = #{taskId}
-    </select>
+    </select>-->
     <select id="selectAppPageList" resultType="com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO">
         SELECT
         a.id,
@@ -152,7 +152,8 @@
         core_evaluate_task a
         LEFT JOIN core_evaluate_role b ON b.evaluate_id = a.plan_id
         LEFT JOIN sys_role c ON c.id = b.role_id
-        LEFT JOIN core_evaluate_task_content d on d.task_id=a.id
+        LEFT JOIN core_evaluate_task_user e ON e.task_id=a.id
+        LEFT JOIN core_evaluate_task_user_content d on d.task_user_id=e.id
         WHERE
         a. is_deleted =0
         <if test="request.orgId != null ">

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskUserMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.core.evaluate.mapper.CoreEvaluateTaskUserMapper">
+
+    <select id="getInfoByTaskId" resultType="com.xunmei.core.evaluate.domain.CoreEvaluateTaskUser">
+        SELECT
+            *
+        FROM
+            core_evaluate_task_user
+        WHERE
+            task_id =#{taskId}
+    </select>
+</mapper>