From d7554b49dc755e6f3f5c2d176fc4725d4b46de2e Mon Sep 17 00:00:00 2001 From: wxr Date: Mon, 10 Nov 2025 20:10:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E7=99=BB=E8=AE=B0=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=BB=99=E5=88=B0=E9=94=90=E6=B5=AA=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/service/SampleEntrustServiceImpl.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleEntrustServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleEntrustServiceImpl.java index a483c2a..de5792d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleEntrustServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleEntrustServiceImpl.java @@ -9,7 +9,9 @@ import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONFactory; import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.JSONWriter; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.flow.LiteflowResponse; @@ -97,12 +99,17 @@ public class SampleEntrustServiceImpl implements SampleEntrustService { } @Override - public JSONObject reportDetail(Long id) { + public JSONObject reportDetail(Long id) { + JSONWriter.Context context = JSONFactory.createWriteContext(); + context.setDateFormat("yyyy-MM-dd HH:mm:ss"); + JSONObject result = new JSONObject(); BusinessSampleEntrustRegistrationDO businessSampleEntrustRegistrationDO = businessSampleEntrustRegistrationMapper.selectById(id); String externalInfomation = businessSampleEntrustRegistrationDO.getExternalInfomation(); JSONObject extInfJsonObject = JSON.parseObject(externalInfomation); - JSONObject sampleEntrustRegistration = (JSONObject) JSON.toJSON(businessSampleEntrustRegistrationDO); + + String jsonString = JSON.toJSONString(businessSampleEntrustRegistrationDO, context); + JSONObject sampleEntrustRegistration = JSON.parseObject(jsonString); extInfJsonObject.forEach((key, value) -> { sampleEntrustRegistration.put(key, value); }); @@ -122,9 +129,10 @@ public class SampleEntrustServiceImpl implements SampleEntrustService { sampleEntrustDetailExtendRespVOList.add(businessSampleEntrustDetailExtendRespVO); } - + + String sampleEntrustDetailJsonString = JSON.toJSONString(sampleEntrustDetailExtendRespVOList, context); result.put("sampleEntrustRegistration", jsonArray); - result.put("sampleEntrustDetail", sampleEntrustDetailExtendRespVOList); + result.put("sampleEntrustDetail", JSON.parseArray(sampleEntrustDetailJsonString)); return result; }