欧诺

mjava-ounuo/src/main/java/com/malk/tuosi/entity/PersonalMonthlySuccessrate.java

@@ -0,0 +1,27 @@
+package com.malk.tuosi.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户实体类
+ * 注意：实体类使用驼峰命名，对应数据库的下划线命名
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PersonalMonthlySuccessrate {
+    /*任务id*/
+    private String taskId;
+    /*任务名称*/
+    private String taskName;
+    /*任务类型*/
+    private String taskType;
+    /*设计人员*/
+    private String designPerson;
+    /*客户*/
+    private String customer;
+    /*时间*/
+    private String time;
+}

mjava-ounuo/src/main/java/com/malk/tuosi/mapper/PersonalMonthlySuccessrateMapper.java

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

mjava-ounuo/src/main/java/com/malk/tuosi/schedule/ScheduleTask.java

@@ -474,12 +474,20 @@ public class ScheduleTask {
             for (int j = 0; j < allIds.size(); j++) {
                 String taskId1 = allIds.get(j);
                 HashMap params3 = new HashMap();
-
+                String status = "";//状态
                 String doneGet = UtilHttp.doGet("https://open.teambition.com/api/v3/task/" + taskId1 + "/node/list", header, new HashMap());
                 JSONObject response = JSON.parseObject(doneGet);
                 JSONArray resultArray = response.getJSONArray("result");
-//                String targetId = "6875f58cf512415e5944c652,6879e63c9cf1bbad8460b777";//【设计单的工作流节点：设计接单（1） 设计接单（2）】
                 String targetName = "设计接";
+                //这里只是遍历每一条任务是否完成status状态
+                for(int n = 0;n < resultArray.size();n++){
+                    JSONObject node = resultArray.getJSONObject(n);
+                    String nodeName = node.getString("name");
+                    if("已完成".equals(nodeName)){
+                       status = node.getString("status");
+                       break;
+                    }
+                }
                 for (int k = 0; k < resultArray.size(); k++) {
                     JSONObject node = resultArray.getJSONObject(k);
                     String currentNodeId = node.getString("name");
@@ -494,9 +502,7 @@ public class ScheduleTask {
                             String time_start = "";//开始时间
                             String time_end = "";//结束时间
                             String task_type = "";//任务类型
-                            String status = "";//状态
                             String department = "";//所属部门
-                            status = node.getString("status");
                             time_start = node.getString("startDate");
                             time_end = node.getString("dueDate");
                             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z");
@@ -585,7 +591,7 @@ public class ScheduleTask {
                                                     e.printStackTrace();
                                                 }
                                                 UpdateWrapper<EmployeeWeeklyTasks> updateWrapper = new UpdateWrapper<>();
-                                                updateWrapper.eq("task_id", taskId);
+                                                updateWrapper.eq("task_id", taskId).eq("manager",manager);
                                                 if (EmployeeWeeklyTasksList != null && EmployeeWeeklyTasksList.size() > 0) {
                                                     updateWrapper.set("task_name", taskName);
                                                     updateWrapper.set("manager", manager);
@@ -1336,6 +1342,13 @@ public class ScheduleTask {
         return McR.success();
     }
 
+    /*todo:个人月度成功率*/
+    @SneakyThrows
+    @PostMapping("/personalmonthlySuccessrate")
+    McR personalmonthlySuccessrate(){
+        return McR.success();
+    }
+
     /*todo:人员获取部门*/
     @SneakyThrows
     @PostMapping("/UserGetDeprt")

mjava-ounuo/src/main/java/com/malk/tuosi/service/PersonalMonthlySuccessrateService.java

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

mjava-ounuo/src/main/java/com/malk/tuosi/service/impl/PersonalMonthlySuccessrateServiceImpl.java

@@ -0,0 +1,14 @@
+package com.malk.tuosi.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.malk.tuosi.entity.PersonalMonthlySuccessrate;
+import com.malk.tuosi.mapper.PersonalMonthlySuccessrateMapper;
+import com.malk.tuosi.service.PersonalMonthlySuccessrateService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class PersonalMonthlySuccessrateServiceImpl extends ServiceImpl<PersonalMonthlySuccessrateMapper, PersonalMonthlySuccessrate> implements PersonalMonthlySuccessrateService {
+
+}

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

@@ -467,6 +467,8 @@ public class TbServiceImpl implements TBService {
                     message.put("openSpaceId","dtv1.card//IM_GROUP.cidXES2AIusSs+mb9gD8i4w1w==");
                 }else if("张昆".equals(businessManager)){
                     message.put("openSpaceId","dtv1.card//IM_GROUP.cidI3G/EnCvlem5w3+qKfTMDA==");
+                }else if("谷晨单".equals(businessManager)){
+                    message.put("openSpaceId","dtv1.card//IM_GROUP.cidqXtqGAN+Es7L/5m3uaZzSg==");
                 }
 //                message.put("openSpaceId", "dtv1.card//IM_GROUP.cidTppONwRCrkshRlCt28O+NA==");//正式群id：cidTppONwRCrkshRlCt28O+NA==   测试群id:cidKoVDKhvynnj+73h0uxSJBA==
                 message.put("cardTemplateId", "160b26bf-d699-49fc-a6dc-9cd20eed7750.schema");