外包履职评价

project_data/sql/0.0.2/soc/soc.sql

@@ -1788,7 +1788,7 @@ INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type
 
 
 
-DELETE from `sys_dict_data` WHERE dict_type in ('post_no_pass','question_confirm_status','question_reform_status','send_status','message_type','send_time_type','evaluate_cycle','evaluate_type');
+DELETE from `sys_dict_data` WHERE dict_type in ('post_no_pass','question_confirm_status','question_reform_status','send_status','message_type','send_time_type','evaluate_cycle','evaluate_type','evaluate_task_status');
 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_cycle', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:15:44', '', 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`)
@@ -1875,6 +1875,30 @@ 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 (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(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', '');
+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 (01717079254782545922, '外包评价', 00000000000000002000, 2, 'wbpj', 'resumptionEvaluate/evaluatePlan/index', NULL, 1, 1, 'C', '0', '0', 'core:evaluateTask:list', '1', 'checkbox', 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 (01717080888703033346, '新增履职评价计划', 1717076927401005058, 3, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluatePlan:add', '1', NULL, 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 (01717081123747635202, '删除履职评价计划', 1717076927401005058, 4, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluatePlan:remove', '1', NULL, 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 (01717081262801395714, '履职评价详情', 1717076927401005058, 5, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluatePlan:query', '1', NULL, 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 (01717081426194702337, '修改履职评价计划', 1717076927401005058, 6, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluatePlan:edit', '1', NULL, 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 (01717081639428923393, '下发', 1717076927401005058, 7, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluatePlan:add', '1', NULL, 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 (01717081756911378434, '撤回', 1717076927401005058, 8, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluatePlan:remove', '1', NULL, 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 (01717081940877746178, '修改状态', 1717076927401005058, 9, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluatePlan:edit', '1', NULL, 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 (01717082281321013249, '评价任务详细信息', 1717079254782545922, 10, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluateTask:query', '1', NULL, 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 (01717082444588490754, '评价', 1717079254782545922, 11, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluateTask:edit', '1', NULL, NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
+
 DELETE FROM sys_menu WHERE id IN(2359,2360,2361,2362,2363,2364,2365,2207);
 delete  from  sys_menu where  menu_name in ('消息发送管理','业务提醒配置');
 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`)
@@ -1893,6 +1917,63 @@ INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `co
 VALUES (2364, '业务提醒配置', 2207, 3, 'configuration', 'core/configuration/index', NULL, 1, 1, 'C', '0', '0', 'core:configuration:query', '1', 'dashboard', 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 (2365, '提交', 2364, 1, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:configuration:add', '1', NULL, NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
+delete from sys_role_menu where menu_id IN(01717082444588490754,01717082281321013249,01717081940877746178,01717081756911378434,01717076927401005058,01717079254782545922,01717080888703033346,01717081123747635202,01717081262801395714,01717081426194702337,01717081639428923393);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01717081639428923393);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (118, 01717081639428923393);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01717081639428923393);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01717081639428923393);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01717081426194702337);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (118, 01717081426194702337);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01717081426194702337);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01717081426194702337);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01717081262801395714);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (118, 01717081262801395714);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01717081262801395714);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01717081262801395714);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01717081123747635202);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (118, 01717081123747635202);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01717081123747635202);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01717081123747635202);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01717080888703033346);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (118, 01717080888703033346);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01717080888703033346);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01717080888703033346);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01717079254782545922);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (118, 01717079254782545922);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01717079254782545922);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01717079254782545922);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01717076927401005058);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (118, 01717076927401005058);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01717076927401005058);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01717076927401005058);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01717081756911378434);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (118, 01717081756911378434);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01717081756911378434);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01717081756911378434);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01717081940877746178);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (118, 01717081940877746178);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01717081940877746178);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01717081940877746178);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01717082281321013249);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (118, 01717082281321013249);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01717082281321013249);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01717082281321013249);
+
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01717082444588490754);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (118, 01717082444588490754);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01717082444588490754);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01717082444588490754);
 delete from sys_role_menu where menu_id in(2359,2360,2361,2362,2363,2364,2365,2201) ;
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2359);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2360);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/TMonitoringRetrievalPlanController.java

@@ -18,9 +18,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.text.ParseException;
-import java.util.Set;
+
 
 /**
  * 监控调阅计划Controller
@@ -70,7 +69,6 @@ public class TMonitoringRetrievalPlanController extends BaseController {
         }
         ajax.put("check", admin);
         ajax.put("isEdit", sysOrg.getId());
-        //ajax.put("xf",sysOrg.getType());
         return ajax;
     }
 
@@ -89,7 +87,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
     @ApiOperation(value = "撤回")
     @RequiresPermissions("core:accessPlan:add")
     @GetMapping(value = "/withdraw/{id}")
-    public AjaxResult withdraw(@PathVariable(value = "id", required = false) Long id) throws ParseException {
+    public AjaxResult withdraw(@PathVariable(value = "id", required = false) Long id) {
         return success(tMonitoringRetrievalPlanService.withdraw(id));
     }
     /**

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

@@ -2,7 +2,6 @@ package com.xunmei.core.access.service.impl;
 
 
 import com.alibaba.nacos.common.utils.CollectionUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,9 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
-import com.xunmei.common.core.enums.CycleCommonEnum;
 import com.xunmei.common.core.exception.ServiceException;
-import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
 
@@ -60,7 +57,6 @@ import java.util.stream.Collectors;
 @Lazy
 @Service
 public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoringRetrievalPlanMapper, TMonitoringRetrievalPlan> implements ITMonitoringRetrievalPlanService {
-    private static final Integer MINUS_ONE = -1;
     private static final Integer ZERO = 0;
     private static final String PARENT_ID = "parent_id";
     @Autowired
@@ -109,7 +105,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         if (tMonitoringRetrievalPlan.getParams().get("beginTime") != null && tMonitoringRetrievalPlan.getParams().get("endTime") != null) {
             query.between("create_time", tMonitoringRetrievalPlan.getParams().get("beginTime"), tMonitoringRetrievalPlan.getParams().get("endTime"));
         }
-        query.orderByAsc("parent_id");
+        query.orderByAsc(PARENT_ID);
         query.orderByDesc("create_time");
         //获取数据
 
@@ -156,7 +152,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         tMonitoringRetrievalPlan.setIsDistribute("1");
         tMonitoringRetrievalPlan.setPlanStatus(1);
         tMonitoringRetrievalPlanMapper.updateById(tMonitoringRetrievalPlan);
-        Integer i = ZERO;
+        Integer i = 1;
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq(PARENT_ID, id);
         List<TMonitoringRetrievalPlan> list1 = tMonitoringRetrievalPlanMapper.selectList(queryWrapper);
@@ -182,9 +178,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                             int amount = 0;
                             LocalDate lastDayOfMonth;
                             switch (tMonitoringRetrievalPlan.getPlanCycle()) {
-                                case "1":
-                                    amount = 1;
-                                    break;
+
                                 case "2":
                                     amount = 7;
                                     break;
@@ -202,6 +196,9 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                                 case "6":
                                     amount = getDayNum(12);
                                     break;
+                                default:
+                                    amount = 1;
+                                    break;
                             }
                             Calendar cal = Calendar.getInstance();
                             cal.setTime(new Date());
@@ -242,9 +239,6 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                                 int amount = 0;
                                 LocalDate lastDayOfMonth;
                                 switch (tMonitoringRetrievalPlan.getPlanCycle()) {
-                                    case "1":
-                                        amount = 1;
-                                        break;
                                     case "2":
                                         amount = 7;
                                         break;
@@ -262,6 +256,9 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                                     case "6":
                                         amount = getDayNum(12);
                                         break;
+                                    default:
+                                        amount = 1;
+                                        break;
                                 }
                                 Calendar cal = Calendar.getInstance();
                                 cal.setTime(new Date());
@@ -301,9 +298,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                             int amount = 0;
                             LocalDate lastDayOfMonth;
                             switch (tMonitoringRetrievalPlan.getPlanCycle()) {
-                                case "1":
-                                    amount = 1;
-                                    break;
+
                                 case "2":
                                     amount = 7;
                                     break;
@@ -321,6 +316,9 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                                 case "6":
                                     amount = getDayNum(12);
                                     break;
+                                default:
+                                    amount = 1;
+                                    break;
                             }
                             Calendar cal = Calendar.getInstance();
                             cal.setTime(new Date());
@@ -362,9 +360,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                                 int amount = 0;
                                 LocalDate lastDayOfMonth;
                                 switch (tMonitoringRetrievalPlan.getPlanCycle()) {
-                                    case "1":
-                                        amount = 1;
-                                        break;
+
                                     case "2":
                                         amount = 7;
                                         break;
@@ -382,6 +378,9 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                                     case "6":
                                         amount = getDayNum(12);
                                         break;
+                                    default:
+                                        amount = 1;
+                                        break;
                                 }
                                 Calendar cal = Calendar.getInstance();
                                 cal.setTime(new Date());
@@ -428,9 +427,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                     int amount = 0;
                     LocalDate lastDayOfMonth;
                     switch (tMonitoringRetrievalPlan.getPlanCycle()) {
-                        case "1":
-                            amount = 1;
-                            break;
+
                         case "2":
                             amount = 7;
                             break;
@@ -448,6 +445,9 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                         case "6":
                             amount = getDayNum(12);
                             break;
+                        default:
+                            amount = 1;
+                            break;
                     }
                     Calendar cal = Calendar.getInstance();
                     cal.setTime(new Date());
@@ -465,73 +465,9 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                 throw new ServiceException("下发任务异常，请联系管理员");
             }
         }
-        return 1;
+        return i;
     }
 
-    private List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans(String path, Integer type, TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
-        List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
-        SysOrg sysOrg = new SysOrg();
-        sysOrg.setPath(path);
-        sysOrg.setType(Integer.valueOf(type));
-        List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);
-        for (SysOrg s : sysOrgs) {
-            TMonitoringRetrievalPlan plan = new TMonitoringRetrievalPlan();
-            BeanUtils.copyProperties(tMonitoringRetrievalPlan, plan);
-            plan.setPlanName(tMonitoringRetrievalPlan.getPlanName());
-            plan.setOrgId(s.getId());
-            plan.setOrgName(s.getShortName());
-            plan.setRoleId(tMonitoringRetrievalPlan.getRoleId());
-            plan.setRoleName(tMonitoringRetrievalPlan.getRoleName());
-            plan.setOrgPath(s.getPath());
-            plan.setOrgType(tMonitoringRetrievalPlan.getOrgType());
-            plan.setPlanCycle(tMonitoringRetrievalPlan.getPlanCycle());
-            plan.setPlanFrequency(tMonitoringRetrievalPlan.getPlanFrequency());
-            plan.setPlanStatus(ZERO);
-            plan.setCreateBy(SecurityUtils.getUsername());
-            plan.setUpdateTime(DateUtils.getNowDate());
-            plan.setUpdateBy(SecurityUtils.getUsername());
-            plan.setCreateTime(DateUtils.getNowDate());
-            plan.setDescription(tMonitoringRetrievalPlan.getDescription());
-            plan.setCreateType(1);
-            plan.setParentId(tMonitoringRetrievalPlan.getId());
-            plan.setIsDistribute("1");
-            if (!tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString()) &&
-                    tMonitoringRetrievalPlan.getImmediately().equals(Boolean.TRUE)) {
-                plan.setStartTime(new Date());
-                int amount = 0;
-                LocalDate lastDayOfMonth;
-                switch (tMonitoringRetrievalPlan.getPlanCycle()) {
-                    case "1":
-                        amount = 1;
-                        break;
-                    case "2":
-                        amount = 7;
-                        break;
-                    case "3":
-                        LocalDate currentDate = LocalDate.now();
-                        lastDayOfMonth = currentDate.withDayOfMonth(currentDate.lengthOfMonth());
-                        amount = lastDayOfMonth.getDayOfMonth() - currentDate.getDayOfMonth();
-                        break;
-                    case "4":
-                        amount = getDayNum(3);
-                        break;
-                    case "5":
-                        amount = getDayNum(6);
-                        break;
-                    case "6":
-                        amount = getDayNum(12);
-                        break;
-                }
-                Calendar cal = Calendar.getInstance();
-                cal.setTime(new Date());
-                cal.add(Calendar.DATE, amount);
-                Date time = cal.getTime();
-                plan.setEndTime(time);
-            }
-            tMonitoringRetrievalPlans.add(plan);
-        }
-        return tMonitoringRetrievalPlans;
-    }
 
     @Override
     public int withdraw(Long id) {
@@ -661,6 +597,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
      * @param tMonitoringRetrievalPlan 监控调阅计划
      * @return 结果
      */
+    @Transactional
     @Override
     public int updateTMonitoringRetrievalPlan(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectComplete(tMonitoringRetrievalPlan.getId());
@@ -676,7 +613,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             iCoreMonitoringRetrievalTaskService.deleteTaskByPlanId(tMonitoringRetrievalPlan.getId());
             try {
                 QueryWrapper queryWrapper = new QueryWrapper();
-                queryWrapper.eq("parent_id", plan.getId());
+                queryWrapper.eq(PARENT_ID, plan.getId());
                 baseMapper.delete(queryWrapper);
                 SysOrg sysOrg1 = remoteOrgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
                 List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
@@ -714,9 +651,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                             int amount = 0;
                             LocalDate lastDayOfMonth;
                             switch (tMonitoringRetrievalPlan.getPlanCycle()) {
-                                case "1":
-                                    amount = 1;
-                                    break;
+
                                 case "2":
                                     amount = 7;
                                     break;
@@ -734,6 +669,9 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                                 case "6":
                                     amount = getDayNum(12);
                                     break;
+                                default:
+                                    amount = 1;
+                                    break;
                             }
                             Calendar cal = Calendar.getInstance();
                             cal.setTime(new Date());

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

@@ -106,7 +106,12 @@ public class CoreEvaluatePlanController extends BaseController {
     public AjaxResult distribute(@PathVariable(value = "id", required = false) Long id) {
         return toAjax(coreEvaluatePlanService.distribute(id));
     }
-
+    @ApiOperation(value = "取消下发")
+    @RequiresPermissions("core:evaluatePlan:remove")
+    @GetMapping(value = "/withdraw/{id}")
+    public AjaxResult withdraw(@PathVariable(value = "id", required = false) Long id) {
+        return toAjax(coreEvaluatePlanService.withdraw(id));
+    }
     /**
      * 删除外包评价计划
      */

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

@@ -10,6 +10,7 @@ import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.core.evaluate.domain.CoreEvaluateTask;
 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.service.ICoreEvaluateTaskService;
 import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 import io.swagger.annotations.Api;
@@ -33,24 +34,33 @@ public class CoreEvaluateTaskController extends BaseController {
     /**
      * 查询外包评价任务列表
      */
-    @ApiOperation(value = "查询CoreEvaluateTask列表")
-    @RequiresPermissions("core:task:list")
+    @ApiOperation(value = "查询评价任务列表")
+    @RequiresPermissions("core:evaluateTask:list")
     @GetMapping("/list")
     public TableDataInfo<CoreEvaluateTaskVO> list(EvaluateTaskDTO coreEvaluateTask) {
         return coreEvaluateTaskService.selectPage(coreEvaluateTask);
     }
-
+    /**
+     * 查询外包评价任务列表app
+     */
+    @ApiOperation(value = "查询评价任务列表app")
+    @RequiresPermissions("core:evaluateTask:list")
+    @GetMapping("/appList")
+    public TableDataInfo<CoreEvaluateTaskVO> appList(EvaluateTaskDTO coreEvaluateTask) {
+        return coreEvaluateTaskService.selectAPPPage(coreEvaluateTask);
+    }
     @ApiOperation(value = "统计")
-    @RequiresPermissions("core:task:list")
+    @RequiresPermissions("core:evaluateTask:list")
     @GetMapping("/statistics")
-    public TableDataInfo statistics(EvaluateTaskDTO coreEvaluateTask) {
-        return coreEvaluateTaskService.selectPage(coreEvaluateTask);
+    public TableDataInfo statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
+        return coreEvaluateTaskService.statistics(evaluateTaskStatisticsDTO);
     }
+
     /**
      * 获取外包评价任务详细信息
      */
-    @ApiOperation(value = "获取CoreEvaluateTask详细信息")
-    @RequiresPermissions("core:task:query")
+    @ApiOperation(value = "获取评价任务详细信息")
+    @RequiresPermissions("core:evaluateTask:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreEvaluateTaskService.selectCoreEvaluateTaskById(id));
@@ -60,7 +70,7 @@ public class CoreEvaluateTaskController extends BaseController {
      * 新增外包评价任务
      */
     @ApiOperation(value = "新增CoreEvaluateTask")
-    @RequiresPermissions("core:task:add")
+    @RequiresPermissions("core:evaluateTask:add")
     @Log(title = "外包评价任务", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreEvaluateTask coreEvaluateTask) {
@@ -70,8 +80,8 @@ public class CoreEvaluateTaskController extends BaseController {
     /**
      * 修改外包评价任务
      */
-    @ApiOperation(value = "修改CoreEvaluateTask")
-    @RequiresPermissions("core:task:edit")
+    @ApiOperation(value = "评价")
+    @RequiresPermissions("core:evaluateTask:edit")
     @Log(title = "外包评价任务", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody EvaluateTaskContentDTO evaluateTaskContentDTO) {
@@ -82,7 +92,7 @@ public class CoreEvaluateTaskController extends BaseController {
      * 删除外包评价任务
      */
     @ApiOperation(value = "删除CoreEvaluateTask")
-    @RequiresPermissions("core:task:remove")
+    @RequiresPermissions("core:evaluateTask:remove")
     @Log(title = "外包评价任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/dto/EvaluateTaskStatisticsDTO.java

@@ -0,0 +1,26 @@
+package com.xunmei.core.evaluate.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/10/25
+ */
+@Data
+public class EvaluateTaskStatisticsDTO {
+    @ApiModelProperty(value = "计划id")
+    private Long planId;
+    @ApiModelProperty(value = "机构id")
+    private Long orgId;
+    private String orgPath;
+    @ApiModelProperty(value = "外包评价名称")
+    private String evaluateName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "页数")
+    private Long pageNum;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "每页大小")
+    private Long pageSize;
+}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.core.evaluate.domain.CoreEvaluateTask;
 import com.xunmei.core.evaluate.dto.EvaluateQueryDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskDTO;
+import com.xunmei.core.evaluate.dto.EvaluateTaskStatisticsDTO;
 import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
 import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 import org.apache.ibatis.annotations.Param;
@@ -69,8 +70,8 @@ public interface CoreEvaluateTaskMapper extends BaseMapper<CoreEvaluateTask> {
     int deleteCoreEvaluateTaskByIds(Long[] ids);
 
     Page<CoreEvaluateTaskVO> selectPageList(@Param("page") Page<CoreEvaluateTaskVO> page, @Param("request") EvaluateTaskDTO request);
+    Page<CoreEvaluateTaskVO> selectAppPageList(@Param("page") Page<CoreEvaluateTaskVO> page, @Param("request") EvaluateTaskDTO request);
+    Page<Map> statistics(@Param("page") Page<Map> page, @Param("request") EvaluateTaskStatisticsDTO request);
 
-    Page<Map> statistics(@Param("page") Page<Map> page, @Param("request") EvaluateTaskDTO request);
-
-    List<Map>getContentByTaskId(@Param("taskId") Long taskId);
+    List<Map> getContentByTaskId(@Param("taskId") Long taskId);
 }

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

@@ -58,7 +58,7 @@ public interface ICoreEvaluatePlanService extends IService<CoreEvaluatePlan> {
      * @return
      */
     int distribute(Long id);
-
+int withdraw(Long id);
     /**
      * 定时
      * @param cycle

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

@@ -6,6 +6,7 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.evaluate.domain.CoreEvaluateTask;
 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.vo.CoreEvaluateTaskVO;
 
 import java.util.List;
@@ -58,7 +59,7 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      */
     int deleteCoreEvaluateTaskByIds(Long[] ids);
 
-    int deleteCoreEvaluateTaskByEvaluatePlanId(Long evaluatePlanId,List status);
+    int deleteCoreEvaluateTaskByEvaluatePlanId(Long evaluatePlanId, List status);
 
     /**
      * 删除外包评价任务信息
@@ -75,11 +76,18 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @return Page
      */
     TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO);
-
+    /**
+     * 查询外包评价任务分页数据
+     *
+     * @param evaluateTaskDTO 查询条件对象
+     * @return Page
+     */
+    TableDataInfo<CoreEvaluateTaskVO> selectAPPPage(EvaluateTaskDTO evaluateTaskDTO);
     /**
      * 统计
+     *
      * @param evaluateTaskDTO
      * @return
      */
-    TableDataInfo<Map> statistics(EvaluateTaskDTO evaluateTaskDTO);
+    TableDataInfo<Map> statistics(EvaluateTaskStatisticsDTO evaluateTaskDTO);
 }

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

@@ -2,6 +2,7 @@ package com.xunmei.core.evaluate.service.impl;
 
 
 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;
@@ -36,10 +37,8 @@ import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 外包评价计划Service业务层处理
@@ -115,10 +114,22 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
         if (!check(SecurityUtils.getUserId())) {
             throw new RuntimeException("该角色没有新增权限");
         }
+        List<CoreEvaluateContent> coreEvaluateContentList = coreEvaluatePlanDTO.getCoreEvaluateContentList();
+        List<Long> collect = coreEvaluateContentList.stream().map(CoreEvaluateContent::getCode).collect(Collectors.toList());
+        Set<Long> set = new HashSet<>(collect);
+        if (collect.size() != set.size()) {
+            throw new RuntimeException("内容编号重复！");
+        }
+        SysUser sysUser = remoteUserService.getUserById(SecurityUtils.getUserId(), SecurityConstants.INNER);
         CoreEvaluatePlan coreEvaluatePlan = new CoreEvaluatePlan();
+        coreEvaluatePlan.setOrgId(sysUser.getOrgId());
+        coreEvaluatePlan.setEvaluateName(coreEvaluatePlanDTO.getEvaluateName());
+        List<CoreEvaluatePlan> coreEvaluatePlans = coreEvaluatePlanMapper.selectCoreEvaluatePlanList(coreEvaluatePlan);
+        if (CollectionUtils.isNotEmpty(coreEvaluatePlans)) {
+            throw new RuntimeException("计划名称重复！");
+        }
         BeanUtils.copyProperties(coreEvaluatePlanDTO, coreEvaluatePlan);
         coreEvaluatePlan.setCreateTime(DateUtils.getNowDate());
-        SysUser sysUser = remoteUserService.getUserById(SecurityUtils.getUserId(), SecurityConstants.INNER);
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(sysUser.getOrgId(), SecurityConstants.INNER);
         coreEvaluatePlan.setCreateBy(SecurityUtils.getUsername());
         coreEvaluatePlan.setOrgId(sysUser.getOrgId());
@@ -147,7 +158,7 @@ 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("被评价外包公司名称");
@@ -158,6 +169,7 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
         coreEvaluatePlanContentMapper.insert(coreEvaluatePlanContent);
         return insert;
     }
+
     private boolean check(Long userId) {
         String s = remoteRoleService.selectRoleNameByUserId(userId, SecurityConstants.INNER);
         boolean admin = false;
@@ -193,12 +205,19 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
         if (!check(SecurityUtils.getUserId())) {
             throw new RuntimeException("该角色没有修改权限");
         }
+        CoreEvaluatePlan coreEvaluatePlan = coreEvaluatePlanMapper.selectCoreEvaluatePlanById(coreEvaluatePlanDTO.getId());
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("org_id", coreEvaluatePlan.getOrgId());
+        queryWrapper.eq("evaluate_name", coreEvaluatePlanDTO.getEvaluateName());
+        CoreEvaluatePlan coreEvaluatePlan1 = coreEvaluatePlanMapper.selectOne(queryWrapper);
+        if (null != coreEvaluatePlan1 && !coreEvaluatePlan1.getId().equals(coreEvaluatePlan.getId())) {
+            throw new RuntimeException("计划名称重复");
+        }
         //删除未完成任务
         List status = new ArrayList();
         status.add("0");
         status.add("1");
         coreEvaluateTaskService.deleteCoreEvaluateTaskByEvaluatePlanId(coreEvaluatePlanDTO.getId(), status);
-        CoreEvaluatePlan coreEvaluatePlan = new CoreEvaluatePlan();
         BeanUtils.copyProperties(coreEvaluatePlanDTO, coreEvaluatePlan);
         coreEvaluatePlan.setUpdateTime(DateUtils.getNowDate());
         coreEvaluatePlan.setUpdateBy(SecurityUtils.getUsername());
@@ -299,6 +318,7 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
         return i;
     }
 
+
     @Override
     public void generate(String cycle) {
         List<CoreEvaluatePlan> coreEvaluatePlans = baseMapper.selectPlanByCycle(cycle);
@@ -314,6 +334,20 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
         return lastDayOfMonth;
     }
 
+    @Override
+    public int withdraw(Long id) {
+        int withdraw = 1;
+        List status = new ArrayList();
+        status.add("0");
+        status.add("1");
+        //删除未完成
+        coreEvaluateTaskService.deleteCoreEvaluateTaskByEvaluatePlanId(id, status);
+        CoreEvaluatePlan coreEvaluatePlan = coreEvaluatePlanMapper.selectById(id);
+        coreEvaluatePlan.setIsDistribute("0");
+        withdraw = coreEvaluatePlanMapper.updateById(coreEvaluatePlan);
+        return withdraw;
+    }
+
     /**
      * 批量删除外包评价计划
      *

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

@@ -16,6 +16,7 @@ import com.xunmei.core.evaluate.domain.CoreEvaluateTask;
 import com.xunmei.core.evaluate.domain.CoreEvaluateTaskContent;
 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;
@@ -65,18 +66,6 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
 
     @Override
     public TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO) {
-/*        TableDataInfo<Map> statistics = statistics(evaluateTaskDTO);
-        List<Map> rows = statistics.getRows();
-        for (int i = 0; i < rows.size(); i++) {
-            Object taskId = rows.get(i).get("taskId");
-            List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) taskId);
-            if (CollectionUtils.isNotEmpty(contentByTaskId)) {
-                for (int l = 0; l < contentByTaskId.size(); l++) {
-                    rows.get(i).put(contentByTaskId.get(l).get("content"), contentByTaskId.get(l).get("score"));
-                }
-            }
-        }*/
-        statistics(evaluateTaskDTO);
         Page<CoreEvaluateTaskVO> page;
         //分页
         if (evaluateTaskDTO.getPageNum() != null && evaluateTaskDTO.getPageSize() != null) {
@@ -91,36 +80,40 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
             evaluateTaskDTO.setOrgId(null);
         }
         page = baseMapper.selectPageList(page, evaluateTaskDTO);
-        List<CoreEvaluateTaskVO> records = page.getRecords();
-        // List<CoreEvaluateTaskVO> coreEvaluateTaskVOS = new ArrayList<>();
-/*        for (CoreEvaluateTaskVO c : records) {
-            CoreEvaluateTaskVO coreEvaluateTaskVO = new CoreEvaluateTaskVO();
-            BeanUtils.copyProperties(c, coreEvaluateTaskVO);
-            List<Long> roleIds = new ArrayList<>();
-            if (c.getRoleName().indexOf(",") == -1) {
-                roleIds.add(Long.valueOf(c.getRoleName()));
-            } else {
-                String[] split = c.getRoleName().split(",");
-                for (int i = 0; i < split.length; i++) {
-                    roleIds.add(Long.valueOf(split[i]));
-                }
-            }
-     c.setRoleList(roleIds);
-        }*/
-        //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
     }
 
     @Override
-    public TableDataInfo<Map> statistics(EvaluateTaskDTO evaluateTaskDTO) {
-        Page<Map> page;
+    public TableDataInfo<CoreEvaluateTaskVO> selectAPPPage(EvaluateTaskDTO evaluateTaskDTO) {
+        Page<CoreEvaluateTaskVO> page;
         //分页
         if (evaluateTaskDTO.getPageNum() != null && evaluateTaskDTO.getPageSize() != null) {
             page = new Page<>(evaluateTaskDTO.getPageNum(), evaluateTaskDTO.getPageSize());
         } else {
             page = new Page<>();
         }
-        Page<Map> statistics = baseMapper.statistics(page, evaluateTaskDTO);
+        //下穿
+        if (evaluateTaskDTO.getCheckSub()) {
+            SysOrg sysOrg = orgService.selectSysOrgById(evaluateTaskDTO.getOrgId(), SecurityConstants.INNER);
+            evaluateTaskDTO.setOrgPath(sysOrg.getPath());
+            evaluateTaskDTO.setOrgId(null);
+        }
+        page = baseMapper.selectAppPageList(page, evaluateTaskDTO);
+        return TableDataInfo.build(page);
+    }
+
+    @Override
+    public TableDataInfo<Map> statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
+        Page<Map> page;
+        //分页
+        if (evaluateTaskStatisticsDTO.getPageNum() != null && evaluateTaskStatisticsDTO.getPageSize() != null) {
+            page = new Page<>(evaluateTaskStatisticsDTO.getPageNum(), evaluateTaskStatisticsDTO.getPageSize());
+        } else {
+            page = new Page<>();
+        }
+        SysOrg sysOrg = remoteOrgService.selectSysOrgById(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
+        evaluateTaskStatisticsDTO.setOrgPath(sysOrg.getPath());
+        Page<Map> statistics = baseMapper.statistics(page, evaluateTaskStatisticsDTO);
         List<Map> rows = statistics.getRecords();
         for (int i = 0; i < rows.size(); i++) {
             Object taskId = rows.get(i).get("taskId");
@@ -232,6 +225,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
      */
     @Override
     public int updateCoreEvaluateTask(EvaluateTaskContentDTO evaluateTaskContentDTO) {
+        //查询任务
         CoreEvaluateTask coreEvaluateTask = coreEvaluateTaskMapper.selectById(evaluateTaskContentDTO.getId());
         if (!SecurityUtils.getLoginUser().getOrgId().equals(coreEvaluateTask.getOrgId())) {
             throw new RuntimeException("您没有该任务的评价权限");
@@ -248,10 +242,13 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
                 }
             }
         }
+        //判断角色
         if (!admin) {
             throw new RuntimeException("您没有该任务的评价权限");
         }
+        //根据任务删除任务内容
         coreEvaluateTaskContentMapper.deleteByTaskId(evaluateTaskContentDTO.getId());
+        //再重新添加任务内容
         evaluateTaskContentDTO.getCoreEvaluateTaskContentList().forEach(e -> {
             e.setTaskId(evaluateTaskContentDTO.getId());
             coreEvaluateTaskContentMapper.insert(e);

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

@@ -18,6 +18,8 @@ public class CoreEvaluatePlanListVO {
     private Long orgId;
     private String orgName;
     private int buildTaskNow;
+    @ApiModelProperty(value = "是否下发")
+    private String isDistribute;
     /**
      * 外包评价名称
      */

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

@@ -1,11 +1,13 @@
 package com.xunmei.core.evaluate.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xunmei.core.evaluate.domain.CoreEvaluateContent;
 import com.xunmei.core.evaluate.domain.CoreEvaluateTask;
 import com.xunmei.core.evaluate.domain.CoreEvaluateTaskContent;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -13,7 +15,74 @@ import java.util.List;
  * @date : 2023/10/12
  */
 @Data
-public class CoreEvaluateTaskVO extends CoreEvaluateTask {
+public class CoreEvaluateTaskVO  {
     @ApiModelProperty(value = "内容")
     List<CoreEvaluateTaskContent> coreEvaluateContentList;
+    private Long id;
+
+    /**
+     * 评价计划id
+     */
+    @ApiModelProperty(value = "评价计划id")
+    private Long planId;
+
+    /**
+     * 机构id
+     */
+    @ApiModelProperty(value = "机构id")
+    private Long orgId;
+    @ApiModelProperty(value = "评价人")
+    private String evaluateBy;
+    /**
+     * 状态0待1中2完成
+     */
+    @ApiModelProperty(value = "状态0待1中2完成")
+    private String status;
+
+    /**
+     * 机构名称
+     */
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+    @ApiModelProperty(value = "机构路径")
+    private String orgPath;
+    /**
+     * 外包评价名称
+     */
+    @ApiModelProperty(value = "外包评价名称")
+    private String evaluateName;
+    @ApiModelProperty(value = "角色")
+    private String roleName;
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+
+    /**
+     * 完成时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "完成时间")
+    private Date completeTime;
+    @ApiModelProperty(value = "周期")
+    private String evaluateCycle;
+    @ApiModelProperty(value = "被评价机构名称")
+    private String evaluateOrg;
+    @ApiModelProperty(value = "平均分")
+    private Integer averageScore;
 }

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

@@ -66,7 +66,8 @@
         e.dict_label AS evaluateCycle,
         a.create_by,
         a.`status`,
-        a.create_time
+        a.create_time,
+               a.is_distribute
         FROM
         core_evaluate_plan a
         LEFT JOIN core_evaluate_role b ON a.id = b.evaluate_id

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

@@ -5,25 +5,38 @@
 <mapper namespace="com.xunmei.core.evaluate.mapper.CoreEvaluateTaskMapper">
 
     <resultMap type="com.xunmei.core.evaluate.domain.CoreEvaluateTask" id="CoreEvaluateTaskResult">
-                <result property="id" column="id"/>
-                <result property="planId" column="plan_id"/>
-                <result property="orgId" column="org_id"/>
+        <result property="id" column="id"/>
+        <result property="planId" column="plan_id"/>
+        <result property="orgId" column="org_id"/>
         <result property="evaluateBy" column="evaluate_by"/>
-                <result property="status" column="status"/>
-                <result property="orgName" column="org_name"/>
-                <result property="evaluateName" column="evaluate_name"/>
-                <result property="createTime" column="create_time"/>
-                <result property="updateTime" column="update_time"/>
-                <result property="isDeleted" column="is_deleted"/>
-                <result property="startTime" column="start_time"/>
-                <result property="endTime" column="end_time"/>
-                <result property="completeTime" column="complete_time"/>
-                <result property="createBy" column="create_by"/>
-                <result property="updateBy" column="update_by"/>
+        <result property="status" column="status"/>
+        <result property="orgName" column="org_name"/>
+        <result property="evaluateName" column="evaluate_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="isDeleted" column="is_deleted"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="completeTime" column="complete_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
     </resultMap>
 
     <sql id="selectCoreEvaluateTaskVo">
-        select id, plan_id, org_id, status, org_name, evaluate_name, create_time, update_time, is_deleted, start_time, end_time, complete_time, create_by, update_by
+        select id,
+               plan_id,
+               org_id,
+               status,
+               org_name,
+               evaluate_name,
+               create_time,
+               update_time,
+               is_deleted,
+               start_time,
+               end_time,
+               complete_time,
+               create_by,
+               update_by
         from core_evaluate_task
     </sql>
 
@@ -31,43 +44,43 @@
             resultMap="CoreEvaluateTaskResult">
         <include refid="selectCoreEvaluateTaskVo"/>
         <where>
-                        <if test="planId != null ">
-                            and plan_id = #{planId}
-                        </if>
-                        <if test="orgId != null ">
-                            and org_id = #{orgId}
-                        </if>
-                        <if test="status != null  and status != ''">
-                            and status = #{status}
-                        </if>
-                        <if test="orgName != null  and orgName != ''">
-                            and org_name like concat('%', #{orgName}, '%')
-                        </if>
-                        <if test="evaluateName != null  and evaluateName != ''">
-                            and evaluate_name like concat('%', #{evaluateName}, '%')
-                        </if>
-                        <if test="isDeleted != null  and isDeleted != ''">
-                            and is_deleted = #{isDeleted}
-                        </if>
-                        <if test="startTime != null ">
-                            and start_time = #{startTime}
-                        </if>
-                        <if test="endTime != null ">
-                            and end_time = #{endTime}
-                        </if>
-                        <if test="completeTime != null ">
-                            and complete_time = #{completeTime}
-                        </if>
+            <if test="planId != null ">
+                and plan_id = #{planId}
+            </if>
+            <if test="orgId != null ">
+                and org_id = #{orgId}
+            </if>
+            <if test="status != null  and status != ''">
+                and status = #{status}
+            </if>
+            <if test="orgName != null  and orgName != ''">
+                and org_name like concat('%', #{orgName}, '%')
+            </if>
+            <if test="evaluateName != null  and evaluateName != ''">
+                and evaluate_name like concat('%', #{evaluateName}, '%')
+            </if>
+            <if test="isDeleted != null  and isDeleted != ''">
+                and is_deleted = #{isDeleted}
+            </if>
+            <if test="startTime != null ">
+                and start_time = #{startTime}
+            </if>
+            <if test="endTime != null ">
+                and end_time = #{endTime}
+            </if>
+            <if test="completeTime != null ">
+                and complete_time = #{completeTime}
+            </if>
         </where>
     </select>
 
     <select id="selectCoreEvaluateTaskById" parameterType="Long"
             resultMap="CoreEvaluateTaskResult">
-            <include refid="selectCoreEvaluateTaskVo"/>
-            where id = #{id}
+        <include refid="selectCoreEvaluateTaskVo"/>
+        where id = #{id}
     </select>
     <select id="selectPageList" resultType="com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO">
-SELECT
+        SELECT
         a.id,
         a.org_name,
         GROUP_CONCAT( c.role_name ) as roleName,
@@ -82,155 +95,199 @@ SELECT
         LEFT JOIN core_evaluate_role b ON b.evaluate_id = a.plan_id
         LEFT JOIN sys_role c ON c.id = b.role_id
         WHERE
-        a.	is_deleted =0
+        a. is_deleted =0
         <if test="request.orgId != null ">
-            and   a.org_id = #{request.orgId}
+            and a.org_id = #{request.orgId}
         </if>
         <if test="request.orgPath != null  and request.orgPath != ''">
-            and   a.org_path like concat( #{request.orgPath}, '%')
+            and a.org_path like concat( #{request.orgPath}, '%')
         </if>
         <if test="request.evaluateName != null  and request.evaluateName != ''">
-            and   a.evaluate_name like concat('%', #{request.evaluateName}, '%')
+            and a.evaluate_name like concat('%', #{request.evaluateName}, '%')
         </if>
         <if test="request.status != null ">
-            and   a.status = #{request.status}
+            and a.status = #{request.status}
         </if>
         <if test="request.startTime != null and request.endTime != null">
-            and   a.start_time &gt;= #{request.startTime} AND   a.end_time &lt;= #{request.endTime}
+            and a.start_time &gt;= #{request.startTime} AND a.end_time &lt;= #{request.endTime}
         </if>
         GROUP BY a.id
     </select>
     <select id="statistics" resultType="java.util.Map">
         SELECT
-            a.id AS taskId,
-            a.org_name AS '评价机构',
-                a.evaluate_org AS '被评价机构名称'
+        a.id AS taskId,
+        a.org_name AS '评价机构',
+        a.evaluate_org AS '被评价机构名称'
         FROM
-            core_evaluate_task a
-                LEFT JOIN core_evaluate_plan b ON a.plan_id = b.id
+        core_evaluate_task a
+        LEFT JOIN core_evaluate_plan b ON a.plan_id = b.id
         WHERE
-            a.`status` = 2
---           AND a.id = '1716653246680956930'
-          AND b.id = '1716653207053172738'
+        a.`status` = 2
+        <if test="orgPath != null  and orgPath != ''">
+            AND a.org_path like concat(#{orgPath}, '%')
+        </if>
+        <if test="planId != null">
+            AND b.id = #{planId}
+        </if>
+
     </select>
     <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 content, IF(content_type = 1, 0, score) score
+        FROM core_evaluate_task_content
+        WHERE task_id = #{taskId}
+    </select>
+    <select id="selectAppPageList" resultType="com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO">
+        SELECT
+        a.id,
+        a.org_name,
+        GROUP_CONCAT( c.role_name ) as roleName,
+        a.evaluate_name,
+        a.start_time,
+        a.end_time,
+        a.evaluate_by,
+        a.complete_time,
+        a.`status`,
+        IFNULL( SUM( d.score )/ COUNT( d.id ), 0 )  AS averageScore
+        FROM
+        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
+        WHERE
+        a. is_deleted =0
+        <if test="request.orgId != null ">
+            and a.org_id = #{request.orgId}
+        </if>
+        <if test="request.orgPath != null  and request.orgPath != ''">
+            and a.org_path like concat( #{request.orgPath}, '%')
+        </if>
+        <if test="request.evaluateName != null  and request.evaluateName != ''">
+            and a.evaluate_name like concat('%', #{request.evaluateName}, '%')
+        </if>
+        <if test="request.status != null ">
+            and a.status = #{request.status}
+        </if>
+        <if test="request.startTime != null and request.endTime != null">
+            and a.start_time &gt;= #{request.startTime} AND a.end_time &lt;= #{request.endTime}
+        </if>
+        GROUP BY a.id
     </select>
 
 
     <insert id="insertCoreEvaluateTask" parameterType="com.xunmei.core.evaluate.domain.CoreEvaluateTask">
         insert into core_evaluate_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="id != null">id,
-                    </if>
-                    <if test="planId != null">plan_id,
-                    </if>
-                    <if test="orgId != null">org_id,
-                    </if>
-                    <if test="status != null">status,
-                    </if>
-                    <if test="orgName != null">org_name,
-                    </if>
-                    <if test="evaluateName != null">evaluate_name,
-                    </if>
-                    <if test="createTime != null">create_time,
-                    </if>
-                    <if test="updateTime != null">update_time,
-                    </if>
-                    <if test="isDeleted != null">is_deleted,
-                    </if>
-                    <if test="startTime != null">start_time,
-                    </if>
-                    <if test="endTime != null">end_time,
-                    </if>
-                    <if test="completeTime != null">complete_time,
-                    </if>
-                    <if test="createBy != null">create_by,
-                    </if>
-                    <if test="updateBy != null">update_by,
-                    </if>
+            <if test="id != null">id,
+            </if>
+            <if test="planId != null">plan_id,
+            </if>
+            <if test="orgId != null">org_id,
+            </if>
+            <if test="status != null">status,
+            </if>
+            <if test="orgName != null">org_name,
+            </if>
+            <if test="evaluateName != null">evaluate_name,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="isDeleted != null">is_deleted,
+            </if>
+            <if test="startTime != null">start_time,
+            </if>
+            <if test="endTime != null">end_time,
+            </if>
+            <if test="completeTime != null">complete_time,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="id != null">#{id},
-                    </if>
-                    <if test="planId != null">#{planId},
-                    </if>
-                    <if test="orgId != null">#{orgId},
-                    </if>
-                    <if test="status != null">#{status},
-                    </if>
-                    <if test="orgName != null">#{orgName},
-                    </if>
-                    <if test="evaluateName != null">#{evaluateName},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="isDeleted != null">#{isDeleted},
-                    </if>
-                    <if test="startTime != null">#{startTime},
-                    </if>
-                    <if test="endTime != null">#{endTime},
-                    </if>
-                    <if test="completeTime != null">#{completeTime},
-                    </if>
-                    <if test="createBy != null">#{createBy},
-                    </if>
-                    <if test="updateBy != null">#{updateBy},
-                    </if>
+            <if test="id != null">#{id},
+            </if>
+            <if test="planId != null">#{planId},
+            </if>
+            <if test="orgId != null">#{orgId},
+            </if>
+            <if test="status != null">#{status},
+            </if>
+            <if test="orgName != null">#{orgName},
+            </if>
+            <if test="evaluateName != null">#{evaluateName},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="isDeleted != null">#{isDeleted},
+            </if>
+            <if test="startTime != null">#{startTime},
+            </if>
+            <if test="endTime != null">#{endTime},
+            </if>
+            <if test="completeTime != null">#{completeTime},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
         </trim>
     </insert>
 
     <update id="updateCoreEvaluateTask" parameterType="com.xunmei.core.evaluate.domain.CoreEvaluateTask">
         update core_evaluate_task
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="planId != null">plan_id =
-                        #{planId},
-                    </if>
-                    <if test="orgId != null">org_id =
-                        #{orgId},
-                    </if>
-                    <if test="status != null">status =
-                        #{status},
-                    </if>
-                    <if test="orgName != null">org_name =
-                        #{orgName},
-                    </if>
-                    <if test="evaluateName != null">evaluate_name =
-                        #{evaluateName},
-                    </if>
-                    <if test="createTime != null">create_time =
-                        #{createTime},
-                    </if>
-                    <if test="updateTime != null">update_time =
-                        #{updateTime},
-                    </if>
-                    <if test="isDeleted != null">is_deleted =
-                        #{isDeleted},
-                    </if>
-                    <if test="startTime != null">start_time =
-                        #{startTime},
-                    </if>
-                    <if test="endTime != null">end_time =
-                        #{endTime},
-                    </if>
-                    <if test="completeTime != null">complete_time =
-                        #{completeTime},
-                    </if>
-                    <if test="createBy != null">create_by =
-                        #{createBy},
-                    </if>
-                    <if test="updateBy != null">update_by =
-                        #{updateBy},
-                    </if>
+            <if test="planId != null">plan_id =
+                #{planId},
+            </if>
+            <if test="orgId != null">org_id =
+                #{orgId},
+            </if>
+            <if test="status != null">status =
+                #{status},
+            </if>
+            <if test="orgName != null">org_name =
+                #{orgName},
+            </if>
+            <if test="evaluateName != null">evaluate_name =
+                #{evaluateName},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="isDeleted != null">is_deleted =
+                #{isDeleted},
+            </if>
+            <if test="startTime != null">start_time =
+                #{startTime},
+            </if>
+            <if test="endTime != null">end_time =
+                #{endTime},
+            </if>
+            <if test="completeTime != null">complete_time =
+                #{completeTime},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteCoreEvaluateTaskById" parameterType="Long">
         delete
-        from core_evaluate_task where id = #{id}
+        from core_evaluate_task
+        where id = #{id}
     </delete>
 
     <delete id="deleteCoreEvaluateTaskByIds" parameterType="String">

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysNfcBindController.java

@@ -62,7 +62,7 @@ public class SysNfcBindController extends BaseController {
     @GetMapping(value = {"/appGetInfo/{code}"})
     public AjaxResult appGetInfo(@PathVariable(value = "code", required = false) String code) {
         AjaxResult ajax = AjaxResult.success();
-        if (StringUtils.isEmpty(code)){
+        if (StringUtils.isEmpty(code)) {
             ajax.put(AjaxResult.DATA_TAG, null);
         }
         ajax.put(AjaxResult.DATA_TAG, sysNfcBindService.selectSysNfcBindByCode(code));
@@ -78,15 +78,15 @@ public class SysNfcBindController extends BaseController {
     public AjaxResult getInfo(@PathVariable(value = "id", required = false) Long id) {
         AjaxResult ajax = AjaxResult.success();
         SysNfcBind sysNfcBind = sysNfcBindService.selectSysNfcBindById(id);
-        Long checkId = null;
+        List<SysArea> sysAreas = null;
+        List<SysAreaCheck> areaCheck = null;
         if (null != sysNfcBind) {
-            checkId = sysNfcBind.getCheckId();
+            sysAreas = sysAreaService.getAreaByOrg(sysNfcBind.getOrgId());
+            areaCheck = sysAreaCheckService.selectByOrgId(sysNfcBind.getOrgId());
         }
-        List<SysArea> sysAreas = sysAreaService.selectSysAreaList(new SysArea());
-        List<SysAreaCheck> areaCheck = sysAreaCheckService.selectSysAreaCheckList(new SysAreaCheck().setId(checkId));
-        ajax.put(AjaxResult.DATA_TAG, sysNfcBind);
         ajax.put("areas", sysAreas);
         ajax.put("checks", areaCheck);
+        ajax.put(AjaxResult.DATA_TAG, sysNfcBind);
         return ajax;
     }