Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
+10
-1
@@ -1,7 +1,9 @@
|
|||||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
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_auth.LawsUserInfoService;
|
||||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||||
@@ -130,6 +132,13 @@ public class StartSurveyAfter implements TaskListener {
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
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()
|
SarPublicIdea sarPublicIdea = SarPublicIdea.builder()
|
||||||
.id(UUID.randomUUID().toString())
|
.id(UUID.randomUUID().toString())
|
||||||
@@ -141,7 +150,7 @@ public class StartSurveyAfter implements TaskListener {
|
|||||||
.standType(object.getString("standType"))
|
.standType(object.getString("standType"))
|
||||||
.standId(object.getString("standId"))
|
.standId(object.getString("standId"))
|
||||||
.uniques(uniques)
|
.uniques(uniques)
|
||||||
.files(object.getString("filesId"))
|
.files(JsonUtil.toJson(res))
|
||||||
.filesName(object.getString("filesName"))
|
.filesName(object.getString("filesName"))
|
||||||
.wkfiles(object.getJSONArray("modelList").toJSONString())
|
.wkfiles(object.getJSONArray("modelList").toJSONString())
|
||||||
.build();
|
.build();
|
||||||
|
|||||||
Reference in New Issue
Block a user