丰凯利更新

mjava-aiwei/src/main/java/com/malk/aiwei/service/impl/AWImplClient.java

@@ -39,7 +39,7 @@ public class AWImplClient implements AWClint {
     // 项目主数据表
     String _matchFormUuid(String code) {
         Map<String, String> formUuid = UtilMap.empty();
-        if (true || UtilEnv.getActiveProfile().equals(UtilEnv.ENV_PROD)) {
+        if (UtilEnv.getActiveProfile().equals(UtilEnv.ENV_PROD)) {
             formUuid.put("REVIEW", "FORM-812FD46AF391449A8F206EDB3221B38840UQ"); // 交付物审批记录
             formUuid.put("REVIEW_PROCESS", "TPROC--RJC66SC1NEFHXJ0H770K0CF4WN1K21HQ706RL5"); // 交付物审批记录
             formUuid.put("PROJECT", "FORM-141E21DF183846028E21727CE43CD1C75CLZ"); // 项目主数据
@@ -488,6 +488,7 @@ public class AWImplClient implements AWClint {
         McException.assertAccessException(pList.isEmpty(), "未匹配到项目主数据");
         List<Map> rList = (List<Map>) pList.get(0).get("tableField_lqxtykcf");
 
+        log.info("分配项目角色 projectId = {}, 项目数量 = {}, 角色列表 = {}", projectId, pList.size(), rList);
         // 任务编码字段ID
         List<Map> customField = tbClient.queryProjectCustomField(projectId, null);
         // prd 非未完成任务, 不执行人员匹配更新
@@ -511,6 +512,7 @@ public class AWImplClient implements AWClint {
                 if (!optional.isPresent()) {
                     continue;
                 }
+                log.info("分配项目角色 taskId = {}, 资源名称 = {}, 项目角色 = {}", UtilMap.getString(task, "id"), roleName, optional.get());
                 List<String> roleIds = (List<String>) UtilMap.getList((Map) optional.get(), "employeeField_lqxtykch_id");
                 if (roleIds.size() == 1) {
                     String tbUserId = _convertUserId(roleIds.get(0), false);

mjava-aiwei/src/main/resources/application-dev.yml

@@ -57,10 +57,10 @@ dingtalk:
   token:
   operator: ""   # OA管理员账号
 
-## aliwork
-#aliwork:
-#  appType: "APP_H7WUJTKB448F9IBDC6C4"
-#  systemToken: "DHA66081DN6GRFNC6GTRW5NIJS082ZF0UN9PLLF"
+# aliwork
+aliwork:
+  appType: "APP_H7WUJTKB448F9IBDC6C4"
+  systemToken: "DHA66081DN6GRFNC6GTRW5NIJS082ZF0UN9PLLF"
 
 # teambition
 teambition:
@@ -80,7 +80,7 @@ teambition:
 #  operator: ""   # OA管理员账号
 #
 # aliwork
-aliwork:
-  appType: "APP_R5EBUF2FPN3Y8DRF93M4"
-  systemToken: "ON566NC1VNIHPANP9TNVHB3TBIWS3E0TUZ5RLF3"
+#aliwork:
+#  appType: "APP_R5EBUF2FPN3Y8DRF93M4"
+#  systemToken: "ON566NC1VNIHPANP9TNVHB3TBIWS3E0TUZ5RLF3"
 

mjava-fengkaili/src/main/java/com/malk/fengkaili/service/impl/FKLImplService.java

@@ -395,16 +395,19 @@ public class FKLImplService implements FKLService {
                                         String[] arr = status.split(" ");
                                         int sstart = Integer.valueOf(status.split(" ")[1].split("到")[0].replace(":", ""));
                                         float day = Float.valueOf((arr[arr.length - 1].replace("天", "")));
+                                        boolean sDate = date.equals(status.split(" ")[0].replace(tmp, ""));
+                                        boolean eDate = date.equals(status.split(" ")[1].split("到")[1]);
                                         type = tmp;
-                                        if (day == 0.5) {
-                                            if (sstart >= 1200) {
+                                        // 兼容跨天请假场景
+                                        if ((day == 1.0f && sDate && eDate) || !sDate && !eDate) {
+                                            day_1 = type;
+                                            day_2 = type;
+                                        } else {
+                                            if (sstart >= 1200 && sDate) {
                                                 day_2 = type;
                                             } else {
                                                 day_1 = type;
                                             }
-                                        } else {
-                                            day_1 = type;
-                                            day_2 = type;
                                         }
                                     }
                                 }

mjava-taisen/src/main/java/com/malk/taisen/controller/TSController.java

@@ -62,6 +62,28 @@ public class TSController {
         return McR.success();
     }
 
+    /**
+     * 2.26 流程异常重新发起
+     */
+    @PostMapping("restart")
+    McR restart(HttpServletRequest request) {
+
+        Map data = UtilServlet.getParamMap(request);
+        log.info("流程异常重新发起, {}", data);
+
+        Map<String, Object> formData = JSON.parseObject(UtilMap.getString(data, "formData"));
+        log.info("流程异常重新发起, {}", formData);
+
+        for (String key : formData.keySet()) {
+            if (key.startsWith("employeeField_")) {
+                formData.put(key, JSON.parse(String.valueOf(formData.get(key))));
+            }
+        }
+        ydService.mirrorFormData(String.valueOf(formData.get("textField_lt2bkgqa")), "FORM-UX866Q61LRK2LACIB8A6M6T1ZOLM2VY5NYB6LZ", "TPROC--UX866Q61LRK2LACIB8A6M6T1ZOLM2YY5NYB6L01", formData, null);
+        return McR.success(formData);
+    }
+
+
     /**
      * 恢复报销明细
      */

mjava/src/main/java/com/malk/service/aliwork/impl/YDServiceImpl.java

@@ -286,7 +286,7 @@ public class YDServiceImpl implements YDService {
             return ydClient.operateData(YDParam.builder()
                     .formUuid(formUuid)
                     .processCode(processCode)
-                    .userId(String.valueOf(UtilMap.getList(formData, "employeeField_l843wfsm").get(0)))
+                    .userId(String.valueOf(UtilMap.getList(formData, "employeeField_l843wfsm_id").get(0)))
                     .formDataJson(JSON.toJSONString(dataForm))
                     .build(), type);
         }