diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 5bca3cc..a6f0429 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -100,6 +100,9 @@ if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } + if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); + } return ResponseData.success(judgmentService.save(judgment)); } @@ -141,6 +144,9 @@ if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } + if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); + } return ResponseData.success(judgmentService.updateById(judgment)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 5bca3cc..a6f0429 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -100,6 +100,9 @@ if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } + if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); + } return ResponseData.success(judgmentService.save(judgment)); } @@ -141,6 +144,9 @@ if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } + if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); + } return ResponseData.success(judgmentService.updateById(judgment)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index d79ae26..ee3b738 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -82,6 +82,20 @@ List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); summary.setDiscoveryResultList(list); } + + if (ObjectUtil.isNotEmpty(summary.getForeignDetail())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignDetail()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setForeignDetailList(list); + }if (ObjectUtil.isNotEmpty(summary.getProcessDetail())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getProcessDetail()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setProcessDetailList(list); + }if (ObjectUtil.isNotEmpty(summary.getDiscoveryDetail())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryDetail()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setDiscoveryDetailList(list); + } }); return ResponseData.success(summaryList); @@ -115,6 +129,15 @@ if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryDetailList())) { + summary.setDiscoveryDetail(JSON.toJSONString(summary.getDiscoveryDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) { + summary.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { + summary.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); + } return summaryService.add(summary); } @@ -148,7 +171,18 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return summaryService.update(summary); + Summary summaryDetail = summaryService.getById(summary.getId()); + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { + summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryDetailList())) { + summaryDetail.setDiscoveryDetail(JSON.toJSONString(summary.getDiscoveryDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) { + summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); + } + + return ResponseData.success(summaryService.update(summary)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 5bca3cc..a6f0429 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -100,6 +100,9 @@ if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } + if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); + } return ResponseData.success(judgmentService.save(judgment)); } @@ -141,6 +144,9 @@ if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } + if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); + } return ResponseData.success(judgmentService.updateById(judgment)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index d79ae26..ee3b738 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -82,6 +82,20 @@ List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); summary.setDiscoveryResultList(list); } + + if (ObjectUtil.isNotEmpty(summary.getForeignDetail())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignDetail()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setForeignDetailList(list); + }if (ObjectUtil.isNotEmpty(summary.getProcessDetail())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getProcessDetail()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setProcessDetailList(list); + }if (ObjectUtil.isNotEmpty(summary.getDiscoveryDetail())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryDetail()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setDiscoveryDetailList(list); + } }); return ResponseData.success(summaryList); @@ -115,6 +129,15 @@ if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryDetailList())) { + summary.setDiscoveryDetail(JSON.toJSONString(summary.getDiscoveryDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) { + summary.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { + summary.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); + } return summaryService.add(summary); } @@ -148,7 +171,18 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return summaryService.update(summary); + Summary summaryDetail = summaryService.getById(summary.getId()); + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { + summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryDetailList())) { + summaryDetail.setDiscoveryDetail(JSON.toJSONString(summary.getDiscoveryDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) { + summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); + } + + return ResponseData.success(summaryService.update(summary)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml index bffddd8..a548568 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml @@ -20,12 +20,13 @@ + ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, - DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult + DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult,KEY_NOTE AS keyNote diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index 8b8e9fc..8e88387 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -116,6 +116,9 @@ //标签分类统计 @TableField(exist = false) private List tagList; + //备注动态详情 + @TableField(exist = false) + private CommonRequest descDetail; @Override public String toString() { return "Judgment{" + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 5bca3cc..a6f0429 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -100,6 +100,9 @@ if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } + if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); + } return ResponseData.success(judgmentService.save(judgment)); } @@ -141,6 +144,9 @@ if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } + if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); + } return ResponseData.success(judgmentService.updateById(judgment)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index d79ae26..ee3b738 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -82,6 +82,20 @@ List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); summary.setDiscoveryResultList(list); } + + if (ObjectUtil.isNotEmpty(summary.getForeignDetail())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignDetail()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setForeignDetailList(list); + }if (ObjectUtil.isNotEmpty(summary.getProcessDetail())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getProcessDetail()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setProcessDetailList(list); + }if (ObjectUtil.isNotEmpty(summary.getDiscoveryDetail())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryDetail()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setDiscoveryDetailList(list); + } }); return ResponseData.success(summaryList); @@ -115,6 +129,15 @@ if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryDetailList())) { + summary.setDiscoveryDetail(JSON.toJSONString(summary.getDiscoveryDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) { + summary.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { + summary.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); + } return summaryService.add(summary); } @@ -148,7 +171,18 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return summaryService.update(summary); + Summary summaryDetail = summaryService.getById(summary.getId()); + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { + summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryDetailList())) { + summaryDetail.setDiscoveryDetail(JSON.toJSONString(summary.getDiscoveryDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) { + summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); + } + + return ResponseData.success(summaryService.update(summary)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml index bffddd8..a548568 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml @@ -20,12 +20,13 @@ + ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, - DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult + DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult,KEY_NOTE AS keyNote diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index 8b8e9fc..8e88387 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -116,6 +116,9 @@ //标签分类统计 @TableField(exist = false) private List tagList; + //备注动态详情 + @TableField(exist = false) + private CommonRequest descDetail; @Override public String toString() { return "Judgment{" + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index 5f8e15b..f6acec9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -97,6 +97,13 @@ private String description; /** + * 重点 + */ + @TableField("KEY_NOTE") + private String keyNote; + + + /** * 专项名称 */ @TableField("SPECIAL_NAME") @@ -115,6 +122,22 @@ private String discoveryResult; /** + * 发现量统计 + */ + @TableField("DISCOVERY_DETAIL") + private String discoveryDetail; + /** + * 外媒量统计 + */ + @TableField("FOREIGN_DETAIL") + private String foreignDetail; + /** + * 处置量统计 + */ + @TableField("PROCESS_DETAIL") + private String processDetail; + + /** * 外媒时间趋势 */ @TableField("FOREIGN_RESULT") @@ -139,6 +162,17 @@ @TableField(exist = false) private List spreadResultList; + + @TableField(exist = false) + private List foreignDetailList; + + @TableField(exist = false) + private List discoveryDetailList; + + @TableField(exist = false) + private List processDetailList; + + //供大屏显示用 @TableField(exist = false) private List dpList; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java index 7d413f8..21a54cd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java @@ -310,6 +310,11 @@ List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list); } + + if (ObjectUtil.isNotEmpty(judgment.getDescription())) { + JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); + judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); + } }); //用于大屏回显 judgmentResult.setStartTime(judgmentRequest.getBeginTime()); @@ -559,6 +564,11 @@ JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle()); judgment.setTitle3List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); } + + if (ObjectUtil.isNotEmpty(judgment.getDescription())) { + JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); + judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); + } }); return judgmentList; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 5bca3cc..a6f0429 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -100,6 +100,9 @@ if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } + if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); + } return ResponseData.success(judgmentService.save(judgment)); } @@ -141,6 +144,9 @@ if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } + if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); + } return ResponseData.success(judgmentService.updateById(judgment)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index d79ae26..ee3b738 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -82,6 +82,20 @@ List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); summary.setDiscoveryResultList(list); } + + if (ObjectUtil.isNotEmpty(summary.getForeignDetail())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignDetail()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setForeignDetailList(list); + }if (ObjectUtil.isNotEmpty(summary.getProcessDetail())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getProcessDetail()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setProcessDetailList(list); + }if (ObjectUtil.isNotEmpty(summary.getDiscoveryDetail())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryDetail()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setDiscoveryDetailList(list); + } }); return ResponseData.success(summaryList); @@ -115,6 +129,15 @@ if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryDetailList())) { + summary.setDiscoveryDetail(JSON.toJSONString(summary.getDiscoveryDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) { + summary.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { + summary.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); + } return summaryService.add(summary); } @@ -148,7 +171,18 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return summaryService.update(summary); + Summary summaryDetail = summaryService.getById(summary.getId()); + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { + summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryDetailList())) { + summaryDetail.setDiscoveryDetail(JSON.toJSONString(summary.getDiscoveryDetailList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) { + summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); + } + + return ResponseData.success(summaryService.update(summary)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml index bffddd8..a548568 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml @@ -20,12 +20,13 @@ + ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, - DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult + DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult,KEY_NOTE AS keyNote