Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-api/src/main/java/com/qmth/sop/server/api/SysController.java

@@ -561,6 +561,12 @@ public class SysController {
                     map.put(processLimitedEnum, processLimitedEnum.getTitle());
                 }
                 break;
+            case TASK_TYPE_ENUM://任务枚举类型
+                TaskTypeEnum[] taskTypeEnums = TaskTypeEnum.values();
+                for (TaskTypeEnum taskTypeEnum : taskTypeEnums) {
+                    map.put(taskTypeEnum, taskTypeEnum.getTitle());
+                }
+                break;
             default:
                 break;
         }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TDFormWidgetMetadataServiceImpl.java

@@ -80,7 +80,6 @@ public class TDFormWidgetMetadataServiceImpl extends ServiceImpl<TDFormWidgetMet
         if (type != TFCustomTypeEnum.OFFICE_SOP_FLOW && type != TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW) {
             throw ExceptionResultEnum.ERROR.exception("流程类型只能为教务处或研究生");
         }
-//        return this.list(new QueryWrapper<TDFormWidgetMetadata>().lambda().eq(TDFormWidgetMetadata::getType, type).eq(TDFormWidgetMetadata::getVersion, version).orderByAsc(TDFormWidgetMetadata::getSetup));
         return this.baseMapper.getFormWidgetMetadataResult(Objects.nonNull(type) ? type.name() : null, version);
     }
 

sop-business/src/main/resources/mapper/SysMessageMapper.xml

@@ -83,10 +83,11 @@
         sys_message m
         LEFT JOIN sys_notice n ON n.id = m.notice_id
         LEFT JOIN sys_user u ON u.id = m.form_user_id
-        LEFT JOIN sys_custom c ON c.manager_id = m.receive_user_id
         LEFT JOIN t_b_service bs ON bs.id = m.service_id
-<!--        left join t_b_delay_warn w on w.crm_no=m.crm_no-->
-        left join t_b_delay_warn w on w.message_id=m.id
+        left join t_b_delay_warn w on w.crm_no=m.crm_no
+<!--        left join t_b_delay_warn w on w.message_id=m.id-->
+        left join t_b_crm crm on crm.crm_no=m.crm_no
+        LEFT JOIN sys_custom c ON c.id = crm.custom_id
         <where>
             <if test="userId != null and userId != ''">
                 and m.receive_user_id = #{userId}

sop-common/src/main/java/com/qmth/sop/common/enums/EnumList.java

@@ -51,7 +51,9 @@ public enum EnumList {
 
     PROJECT_EXCHANGE_APPROVE_ENUM(ProjectExchangeApproveEnum.class),
 
-    PROCESS_LIMITED_ENUM(ProcessLimitedEnum.class);
+    PROCESS_LIMITED_ENUM(ProcessLimitedEnum.class),
+
+    TASK_TYPE_ENUM(TaskTypeEnum.class);
 
     private Object obj;
 

sop-common/src/main/java/com/qmth/sop/common/enums/ProcessLimitedEnum.java

@@ -13,7 +13,7 @@ public enum ProcessLimitedEnum {
 
     APPROVE_RADIO("approve_radio", "内审"),
 
-    SCAN_START_TIME("project_key_info_date", "扫描开始时间"),
+    SCAN_START_TIME("scan_start_time", "扫描开始时间"),
 
     SCAN_END_TIME("scan_end_time", "扫描结束时间"),