Merge branch 'V0.0.3' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.3

project_data/sql/0.0.3/soc/soc.sql

@@ -822,6 +822,7 @@ update sys_dict_data set dict_label='防盗应急预案'  where dict_type='core_
 update sys_dict_data set dict_label='反诈应急预案'  where dict_type='core_drill_type' and dict_value=3;
 update sys_dict_data set dict_label='消防及疏散应急预案'  where dict_type='core_drill_type' and dict_value=4;
 update sys_dict_data set dict_label='防自然灾害应急预案'  where dict_type='core_drill_type' and dict_value=5;
+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 (6, '其他应急预案', '6', 'core_drill_type', null, 'default', 'N', '0',  null, now(), null, now(), null);
 
 -- 报警控制器
 ALTER TABLE `core_protection_log`
@@ -1049,9 +1050,10 @@ INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value
 -- 修改/新增教育培训类型字典信息
 update sys_dict_data set dict_label='行社安全保卫教育培训' where dict_label='每月安全培训教育' and dict_type='edu_training_type' limit 1;
 update sys_dict_data set dict_label='行社消防安全培训' where dict_label='专项安全培训教育' and dict_type='edu_training_type' limit 1;
-delete from sys_dict_data where dict_type='edu_training_type' and dict_label in ('营业网点安全保卫教育培训','营业网点消防安全培训');
+delete from sys_dict_data where dict_type='edu_training_type' and dict_label in ('营业网点安全保卫教育培训','营业网点消防安全培训','其他');
 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', 'edu_training_type', null, 'default', 'N', '0', null, now(), null, 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 (3, '营业网点消防安全培训', '3', 'edu_training_type', null, 'default', 'N', '0',  null, now(), null, 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 (4, '其他', '4', 'edu_training_type', null, 'default', 'N', '0',  null, now(), null, now(), null);
 
 
 -- 履职任务类型增加其它，履职时间增加工作时间

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -262,6 +262,9 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         //立即生效的计划要排除截至时间在当前时间之前的数据
         List<CoreMonitoringRetrievalTask> lista = taskList.stream().filter(r -> r.getPlanEndTime().after(new Date())).collect(Collectors.toList());
         if (CollectionUtil.isNotEmpty(lista)) {
+            this.saveBatch(lista);
+        }
+/*        if (CollectionUtil.isNotEmpty(lista)) {
             List<CoreMonitoringRetrievalTask> listAll = new ArrayList<>();
             //对list进行重新编号和保存
             //对lista 按机构进行分组
@@ -282,7 +285,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
             }
 
             this.saveBatch(listAll);
-        }
+        }*/
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafetyTaskServiceImpl.java

@@ -99,12 +99,12 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
             page.getRecords().forEach(r -> {
                 if (ObjectUtil.notEqual(r.getSourceType(), SafetyTaskSourceType.TempTask.getCode().longValue())) {
                     List<SafetyPlanRoleVo> roles = planRoles.stream().filter(pr -> ObjectUtil.equal(r.getPlanId(), pr.getPlanId())).collect(Collectors.toList());
-                    if (coreSafetyTask.getRoleId() != null) {
-                        roles = roles.stream().filter(e -> e.getRoleId().equals(coreSafetyTask.getRoleId())).collect(Collectors.toList());
+//                    if (coreSafetyTask.getRoleId() != null) {
+//                        roles = roles.stream().filter(e -> e.getRoleId().equals(coreSafetyTask.getRoleId())).collect(Collectors.toList());
                         r.setRoles(roles);
-                    } else {
-                        r.setRoles(roles);
-                    }
+//                    } else {
+//                        r.setRoles(roles);
+//                    }
                 } else {
                     Optional<IdNameVo> opt = tempTaskRoles.stream().filter(role -> ObjectUtil.equal(r.getRoleId(), role.getId())).findFirst();
                     if (opt.isPresent()) {

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -224,10 +224,14 @@
         LEFT JOIN sys_org o2 ON o2.id = t.check_org_id
         LEFT JOIN sys_user u1 ON u1.id = t.submit_by
         LEFT JOIN sys_role r1 ON r1.id = t.role_id
+        left join core_safecheck_plan_to_role csptr on csptr.plan_id = t.plan_id
         WHERE t.deleted = 0
         <if test="task.title != null  and task.title != ''">
             and t.title like concat('%', #{task.title}, '%')
         </if>
+        <if test="task.roleId != null  and task.roleId != ''">
+            and csptr.role_id =#{task.roleId}
+        </if>
         <if test="task.planStartTime != null ">
             and DATE_FORMAT(t.plan_start_time, '%Y-%m-%d') = DATE_FORMAT(#{task.planStartTime}, '%Y-%m-%d')
         </if>