流程修改

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

@@ -1,5 +1,6 @@
 package com.qmth.sop.business.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -464,14 +465,31 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
         List<FlowFormWidgetResult> formProperty = flowTaskResult.getFormProperty();
         for (FlowFormWidgetResult f : formProperty) {
             if (f.getFormId().contains(SystemConstant.REGION_USER_ID) && Objects.nonNull(f.getValue())) {
-                regionUserId = Long.parseLong(f.getValue());
+                if (f.getInputType() == WidgetInputTypeEnum.STRING || f.getInputType() == WidgetInputTypeEnum.LONG) {
+                    JSONObject jsonObject = JSONObject.parseObject(f.getValue());
+                    String value = jsonObject.getString(SystemConstant.VALUE);
+                    regionUserId = Long.parseLong(value);
+                }
             }
             if (f.getFormId().contains(SystemConstant.ENGINEER_USER_ID) && Objects.nonNull(f.getValue())) {
-                engineerUserId = Long.parseLong(f.getValue());
+                if (f.getInputType() == WidgetInputTypeEnum.STRING || f.getInputType() == WidgetInputTypeEnum.LONG) {
+                    JSONObject jsonObject = JSONObject.parseObject(f.getValue());
+                    String value = jsonObject.getString(SystemConstant.VALUE);
+                    engineerUserId = Long.parseLong(value);
+                }
             }
             if (f.getFormId().contains(SystemConstant.ASSISTANT_ENGINEER_USER_ID) && Objects.nonNull(f.getValue())) {
-                String string = f.getValue().replaceAll("\\[", "").replaceAll("\\]", "");
-                assistantEngineerUserIds = StringUtils.join(Arrays.asList(string), SystemConstant.LIST_JOIN_SPLIT);
+//                String string = f.getValue().replaceAll("\\[", "").replaceAll("\\]", "");
+//                assistantEngineerUserIds = StringUtils.join(Arrays.asList(string), SystemConstant.LIST_JOIN_SPLIT);
+                if (f.getInputType() == WidgetInputTypeEnum.ARRAY) {
+                    JSONObject jsonObject = JSONObject.parseObject(f.getValue());
+                    JSONArray jsonArray = jsonObject.getJSONArray(SystemConstant.VALUE);
+                    StringJoiner stringJoiner = new StringJoiner(",");
+                    for (int i = 0; i < jsonArray.size(); i++) {
+                        stringJoiner.add(jsonArray.getString(i));
+                    }
+                    assistantEngineerUserIds = stringJoiner.toString();
+                }
             }
             if (Objects.nonNull(regionUserId) && Objects.nonNull(engineerUserId) && Objects.nonNull(assistantEngineerUserIds)) {
                 break;

sop-common/src/main/java/com/qmth/sop/common/contant/SystemConstant.java

@@ -104,21 +104,12 @@ public class SystemConstant {
     //    public static final String APPROVE_MAP_VAR = "approve_map_var";
 //    public static final String APPROVE_AUTO = "auto";
     public static final String SYSTEM_AUTO_APPROVE = "系统自动审批";
+    public static final String VALUE = "value";
 
     /**
      * 微信app
      */
-    public static final String AUTHORIZATION_CODE = "authorization_code";
-    public static final String APP_ID = "appid";
-    public static final String SECRET = "secret";
-    public static final String JS_CODE = "js_code";
-    public static final String GRANT_TYPE = "grant_type";
-    public static final String OPEN_ID = "openid";
-    public static final String SESSION_KEY = "session_key";
-    public static final String PHONE_INFO = "phone_info";
     public static final String PURE_PHONE_NUMBER = "purePhoneNumber";
-    public static final String ERR_CODE = "errcode";
-    public static final String ERR_MSG = "errmsg";
     public static final String AES_CBC_PKCS5 = "AES/CBC/PKCS5Padding";
     public static final String AES = "AES";