xmy vor 1 Woche
Ursprung
Commit
a86350e895

+ 25 - 0
mjava-ounuo/src/main/java/com/malk/tuosi/entity/AnnualSeasonalCategory.java

@@ -0,0 +1,25 @@
+package com.malk.tuosi.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户实体类
+ * 注意:实体类使用驼峰命名,对应数据库的下划线命名
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AnnualSeasonalCategory {
+    /*任务id*/
+    private String taskId;
+    /*任务名称*/
+    private String taskName;
+    /*客户*/
+    private String customer;
+    /*设计等级*/
+    private String designLevel;
+    /*设计类别*/
+    private String designType;
+}

+ 2 - 0
mjava-ounuo/src/main/java/com/malk/tuosi/entity/EmployeeWeeklyTasks.java

@@ -26,4 +26,6 @@ public class EmployeeWeeklyTasks {
     private String taskType;
     /*任务状态*/
     private String status;
+    /*所属部门*/
+    private String department;
 }

+ 2 - 0
mjava-ounuo/src/main/java/com/malk/tuosi/entity/NewprocessImplementation.java

@@ -22,4 +22,6 @@ public class NewprocessImplementation {
     private String designLevel;
     /*设计类别*/
     private String designType;
+    /*遍数*/
+    private String repetitionCount;
 }

+ 9 - 0
mjava-ounuo/src/main/java/com/malk/tuosi/mapper/AnnualSeasonalCategoryMapper.java

@@ -0,0 +1,9 @@
+package com.malk.tuosi.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.malk.tuosi.entity.AnnualSeasonalCategory;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AnnualSeasonalCategoryMapper extends BaseMapper<AnnualSeasonalCategory> {
+}

Datei-Diff unterdrückt, da er zu groß ist
+ 292 - 113
mjava-ounuo/src/main/java/com/malk/tuosi/schedule/ScheduleTask.java


+ 7 - 0
mjava-ounuo/src/main/java/com/malk/tuosi/service/AnnualSeasonalCategoryService.java

@@ -0,0 +1,7 @@
+package com.malk.tuosi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.malk.tuosi.entity.AnnualSeasonalCategory;
+
+public interface AnnualSeasonalCategoryService extends IService<AnnualSeasonalCategory> {
+}

+ 16 - 0
mjava-ounuo/src/main/java/com/malk/tuosi/service/impl/AnnualSeasonalCategoryServiceImpl.java

@@ -0,0 +1,16 @@
+package com.malk.tuosi.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.malk.tuosi.entity.AnnualSeasonalCategory;
+import com.malk.tuosi.entity.AnnualSeasonalSample;
+import com.malk.tuosi.mapper.AnnualSeasonalCategoryMapper;
+import com.malk.tuosi.mapper.AnnualSeasonalSampleMapper;
+import com.malk.tuosi.service.AnnualSeasonalCategoryService;
+import com.malk.tuosi.service.AnnualSeasonalSampleService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class AnnualSeasonalCategoryServiceImpl extends ServiceImpl<AnnualSeasonalCategoryMapper, AnnualSeasonalCategory> implements AnnualSeasonalCategoryService {
+}

+ 5 - 1
mjava-ounuo/src/main/java/com/malk/tuosi/service/impl/TbServiceImpl.java

@@ -461,8 +461,12 @@ public class TbServiceImpl implements TBService {
                     message.put("openSpaceId", "dtv1.card//IM_GROUP.cid+J9H07847VNwIYiLpNay0Q==");
                 }else if ("赵宇娟".equals(businessManager)) {
                     message.put("openSpaceId", "dtv1.card//IM_GROUP.cidaUtMTIjDHM60UXFfHegKtg==");
-                } else if ("陈晶".equals(businessManager) || "郝俊秀".equals(businessManager)) {
+                } else if ("陈晶".equals(businessManager) || "郝俊秀".equals(businessManager) || "鲁萍".equals(businessManager)) {
                     message.put("openSpaceId", "dtv1.card//IM_GROUP.cidTppONwRCrkshRlCt28O+NA==");
+                }else if ("张曼".equals(businessManager)){
+                    message.put("openSpaceId","dtv1.card//IM_GROUP.cidXES2AIusSs+mb9gD8i4w1w==");
+                }else if("张昆".equals(businessManager)){
+                    message.put("openSpaceId","dtv1.card//IM_GROUP.cidI3G/EnCvlem5w3+qKfTMDA==");
                 }
 //                message.put("openSpaceId", "dtv1.card//IM_GROUP.cidTppONwRCrkshRlCt28O+NA==");//正式群id:cidTppONwRCrkshRlCt28O+NA==   测试群id:cidKoVDKhvynnj+73h0uxSJBA==
                 message.put("cardTemplateId", "160b26bf-d699-49fc-a6dc-9cd20eed7750.schema");

+ 1 - 1
mjava-ounuo/src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: dev
+    active: prod