Merge branch 'develop' into FOTON

This commit is contained in:
super_liu
2022-01-22 08:30:54 +08:00
@@ -1,7 +1,9 @@
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.tmsps.fk.common.util.JsonUtil;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -130,6 +132,13 @@ public class StartSurveyAfter implements TaskListener {
} catch (Exception e) {
e.printStackTrace();
}
JSONArray res=new JSONArray();
JSONArray object1=JSONArray.parseArray(object.getString("filesId"));
object1.forEach(o -> {
JSONObject object2=JSONObject.parseObject(o.toString());
object2.put("standFileClassify",object.getString("textType"));
res.add(object2);
});
//发起公开征求意见
SarPublicIdea sarPublicIdea = SarPublicIdea.builder()
.id(UUID.randomUUID().toString())
@@ -141,7 +150,7 @@ public class StartSurveyAfter implements TaskListener {
.standType(object.getString("standType"))
.standId(object.getString("standId"))
.uniques(uniques)
.files(object.getString("filesId"))
.files(JsonUtil.toJson(res))
.filesName(object.getString("filesName"))
.wkfiles(object.getJSONArray("modelList").toJSONString())
.build();