3.0需求同步4。0

gic-platform-udesk-service/src/main/java/com/gic/udesk/service/outer/impl/TapdMessageApiServiceImpl.java

@@ -128,7 +128,8 @@ public class TapdMessageApiServiceImpl implements TapdMessageApiService {
         JSONObject udeskTicketUpdate = new JSONObject();
         JSONObject customFields = new JSONObject();
         //suspended:跟踪 PM_audited：pm审核  变成已处理状态
-        if ("suspended".equals(latestBugFromTAPD.getStatus()) || "PM_audited".equals(latestBugFromTAPD.getStatus())) {
+        boolean needToBeResolved = "suspended".equals(latestBugFromTAPD.getStatus()) || "PM_audited".equals(latestBugFromTAPD.getStatus());
+        if (needToBeResolved) {
             udeskTicketUpdate.put("status_id", udeskTapdRelMap.get("resolved" + UdeskConstant.MAP_UDESK_ID_VALUE_SUFFIX));
         } else {
             udeskTicketUpdate.put("status_id", udeskTapdRelMap.get(latestBugFromTAPD.getStatus() + UdeskConstant.MAP_UDESK_ID_VALUE_SUFFIX));
@@ -150,8 +151,12 @@ public class TapdMessageApiServiceImpl implements TapdMessageApiService {
             udeskEnterpriseService.updateStatus(dataBaseTicket.getId(), statusEn);
         }
         // 更新数据库中的数据  注: 放在udesk操作完成之后
-        dataBaseTicket
-                .setStatusEn(udeskTapdRelMap.get(latestBugFromTAPD.getStatus() + UdeskConstant.MAP_UDESK_NAME_SUFFIX));
+        if (needToBeResolved) {
+            dataBaseTicket.setStatusEn(udeskTapdRelMap.get("resolved" + UdeskConstant.MAP_UDESK_NAME_SUFFIX));
+        } else {
+            dataBaseTicket
+                    .setStatusEn(udeskTapdRelMap.get(latestBugFromTAPD.getStatus() + UdeskConstant.MAP_UDESK_NAME_SUFFIX));
+        }
         dataBaseTicket.setPriority(priorityCN);
         dataBaseTicket.setSeverity(severityCN);
         dataBaseTicket.setStatusTapd(latestBugFromTAPD.getStatus());

gic-platform-udesk-service/src/main/java/com/gic/udesk/service/outer/impl/UdeskMessageApiServiceImpl.java

@@ -105,16 +105,7 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
                     tabUdeskTicket.setWorkspaceId(
                             udeskTapdRelMap.get(UdeskConstant.UDESK_FIELD_WORKSPACE + ":" + workspaceValue));
                     //TPAD当前处理人
-                    String transactorValue = customFields.get(UdeskConstant.UDESK_FIELD_TRANSACTOR);
-                    if (StringUtils.isNotBlank(transactorValue)) {
-                        String[] transactors = transactorValue.split(",");
-                        StringBuilder builder = new StringBuilder();
-                        for (String transactor : transactors) {
-                            builder.append(udeskTapdRelMap.get(UdeskConstant.UDESK_FIELD_TRANSACTOR + ":" + transactor))
-                                    .append(";");
-                        }
-                        tabUdeskTicket.setCurrentOwner(builder.toString());
-                    }
+                    tabUdeskTicket.setCurrentOwner(getCurrentOwner(customFields));
 
                     //发现版本添加
                     String versionReportCode = customFields.get(UdeskConstant.UDESK_FIELD_VERSION_3);
@@ -170,6 +161,8 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
                 tapdBug.setStatus(tabUdeskTicket.getStatusTapd());
 
                 this.setDescription(ticket, tapdBug);
+                //udesk创建到tapd的缺陷，发现阶段值写死
+                tapdBug.setOriginphase("生产环境");
 
                 String bugStr = JSON.toJSONString(tapdBug);
                 logger.info("添加TAPDbug入参为{}", bugStr);
@@ -472,6 +465,9 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
                     } else if ("1".equals(value)) {
                         value = "否";
                     }
+                } else if (UdeskConstant.UDESK_FIELD_TRANSACTOR.equals(tabUdeskTapdRel.getUdeskIdKey())) {
+                    //测试负责人
+                    value = getCurrentOwner(customFields);
                 } else {
                     Method udeskMethod = TabUdeskTicket.class.getMethod(tabUdeskTapdRel.getUdeskIdKey());
                     value = (String) udeskMethod.invoke(tabUdeskTicket);
@@ -512,6 +508,9 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
                     } else if ("1".equals(value)) {
                         value = "否";
                     }
+                } else if (UdeskConstant.UDESK_FIELD_TRANSACTOR.equals(tabUdeskTapdRel.getUdeskIdKey())) {
+                    //测试负责人
+                    value = getCurrentOwner(customFields);
                 } else {
                     Method udeskMethod = TabUdeskTicket.class.getMethod(udeskIdKey);
                     value = (String) udeskMethod.invoke(tabUdeskTicket);
@@ -596,4 +595,22 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
             udeskEnterpriseService.updateStatus(ticketId, status);
         }
     }
+
+    /**
+     * 获取处理人
+     * @param customFields
+     * @return
+     */
+    private String getCurrentOwner(Map<String, String> customFields) {
+        String transactorValue = customFields.get(UdeskConstant.UDESK_FIELD_TRANSACTOR);
+        if(StringUtils.isNotBlank(transactorValue)){
+            String[] transactors = transactorValue.split(",");
+            StringBuilder builder = new StringBuilder();
+            for (String transactor : transactors) {
+                builder.append(udeskTapdRelMap.get(UdeskConstant.UDESK_FIELD_TRANSACTOR + ":" + transactor)).append(";");
+            }
+            return builder.toString();
+        }
+        return null;
+    }
 }