diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java index 1cd3a75..bb65e3f 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java @@ -32,7 +32,6 @@ public class ReportItemController extends BaseController { @ApiOperation("查询检验项目列表") @GetMapping("/query") - @Anonymous public TableDataInfo query(XmInfoNew xmInfoNew) { startPage(); List xmInfoNewList = reportItemService.query(xmInfoNew); @@ -42,7 +41,6 @@ public class ReportItemController extends BaseController { @ApiOperation("查询检验项目明细") @GetMapping("/queryDetail") - @Anonymous public Result queryDetail(String xmid,String yq,String xmdh){ XmInfoNewDTO xmInfoNewDTO = reportItemService.queryDetail(xmid,yq,xmdh); return new Result("0","查询成功!",xmInfoNewDTO); diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/HistoryResultDTO.java b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/HistoryResultDTO.java index c1bf9fd..4d852e8 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/HistoryResultDTO.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/HistoryResultDTO.java @@ -20,4 +20,5 @@ public class HistoryResultDTO { private List seven; private List eight; private List nine; + private List first; } diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java b/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java index d816e8a..64fdf8e 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java @@ -23,6 +23,8 @@ public class HistoryResult { private String brxm; private String result_flag; private String yljg; + private String cksx; + private String ckxx; } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java index 30f29e6..2f9d5a9 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java @@ -103,6 +103,8 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { Date jyrqTemp = null; int i = 0; HistoryResultDTO historyResultDTO = new HistoryResultDTO(); + //本次结果 + historyResultDTO.setFirst(hisResultThisList); List jyrqList = new ArrayList<>(); for (HistoryResult historyResult : hisResultList) { Date jyrq1 = historyResult.getJyrq(); diff --git a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml index 24ae6ce..b386e6f 100644 --- a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml @@ -85,6 +85,7 @@