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

project_data/sql/0.0.8/soc/soc.sql

@@ -297,4 +297,5 @@ WHERE
   AND `field_code` = '4183_1';
 
 -- 新增计划任务补偿运维界面
+DELETE from `sys_menu` where id in(1782245721165127681);
 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 (1782245721165127681, '任务数据补偿', 2, 5, 'compensate', 'system/compensate/index', null, 1, 0, 'C', '0', '0', null, '1', 'edit', null, '超级管理员', '2024-04-22 11:11:54', '', null, '');

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUser.java

@@ -266,6 +266,12 @@ public class SysUser{
     private Integer orgType;
     @TableField(exist = false)
     private String orgShortName;
+
+    @TableField(exist = false)
+    private String affiliatedArea;
+
+    @TableField(exist = false)
+    private String affiliatedBank;
     @TableField(exist = false)
     private List<Long> parentOrgIds;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/drill/DrillRecStatus.java

@@ -22,11 +22,11 @@ public enum DrillRecStatus {
 
     PROVINCE_EXCELLENT_CASE(5, "省级优秀案例"),
 
-    UNREC_NORMAL_CASE(6, "不推荐(保留普通案例)"),
+    UNREC_NORMAL_CASE(6, "普通案例(不推荐行优)"),
 
-    UNREC_HS_EXCELLENT_CASE(7, "不推荐(保留行社优秀案例)"),
+    UNREC_HS_EXCELLENT_CASE(7, "行社优秀案例(不推荐地区)"),
 
-    UNREC_REGION_EXCELLENT_CASE(8, "不推荐(保留地区优秀案例)"),
+    UNREC_REGION_EXCELLENT_CASE(8, "地区优秀案例(不推荐省级)"),
 
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -952,11 +952,11 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             record.setTypeText(DictUtils.getDictLabel(DictConstants.CORE_DRILL_TYPE, record.getType()));
             // 6 不推荐(保留普通案例) 7   不推荐(保留行社优秀案例) 8 不推荐(保留地区优秀案例)
             if (ObjectUtil.equal(6, record.getUnrecStatus())) {
-                record.setRecStatusText("不推荐(保留普通案例)");
+                record.setRecStatusText("普通案例(不推荐行优)");
             } else if (ObjectUtil.equal(7, record.getUnrecStatus())) {
-                record.setRecStatusText("不推荐(保留行社优秀案例)");
+                record.setRecStatusText("行社优秀案例(不推荐地区)");
             } else if (ObjectUtil.equal(8, record.getUnrecStatus())) {
-                record.setRecStatusText("不推荐(保留地区优秀案例)");
+                record.setRecStatusText("地区优秀案例(不推荐省级)");
             } else {
                 //处理演练任务推荐状态字典
                 record.setRecStatusText(DictUtils.getDictLabel(DictConstants.DRILL_TASK_REC_STATUS, record.getRecStatus()));

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeServiceImpl.java

@@ -470,6 +470,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
                 .ge(SysWorkTime::getYmdDate, workTimeDto.getStartTime())
                 .le(SysWorkTime::getYmdDate, workTimeDto.getEndTime())
                 .in(SysWorkTime::getOrgId, workTimeDto.getOrgIdList())
+                .eq(SysWorkTime::getIsEnable,1L)
                 .select(SysWorkTime::getId,
                         SysWorkTime::getIsEnable,
                         SysWorkTime::getYmdDate,

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -434,6 +434,9 @@
         u.last_time,
         o.short_NAME AS org_name,
         o.path AS org_path,
+        o.affiliated_area,
+        o.affiliated_bank,
+        o.type as orgType,
         u.image,
         u.card,
         u.gender,