From bbbf9053b1df6695b1dade8503d9e6d3205f462c Mon Sep 17 00:00:00 2001 From: pengwei Date: Mon, 26 May 2025 10:27:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:1=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=8C=BA=E5=B1=95=E7=A4=BA=E4=B8=8D=E5=85=A8?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E5=B1=95=E7=A4=BA=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?(=E5=AE=8C=E6=88=90)=20=20=20=20=202=E3=80=81=E7=A6=81=E9=97=AD?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=94=AF=E6=8C=81=E7=AD=9B=E9=80=89=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=9D=A1=E4=BB=B6=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=88?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=89=20=20=20=20=203=E3=80=81=E6=96=87?= =?UTF-8?q?=E5=8C=96=E7=A8=8B=E5=BA=A6=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=EF=BC=9A=E9=AB=98=E4=B8=AD=E3=80=81=E5=A4=A7?= =?UTF-8?q?=E4=B8=93=E3=80=81=E6=9C=AC=E7=A7=91=E3=80=81=E7=A0=94=E7=A9=B6?= =?UTF-8?q?=E7=94=9F=E5=8F=8A=E4=BB=A5=E4=B8=8A(=E5=AE=8C=E6=88=90)=20=20?= =?UTF-8?q?=20=20=204=E3=80=81=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E5=A7=93=E5=90=8D=E5=9B=9E=E6=98=BE=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=20(=E5=AE=8C=E6=88=90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/controller/work/ConfinementController.java | 1 + .../com/biutag/supervision/mapper/NegativeBlameMapper.java | 3 ++- .../com/biutag/supervision/pojo/vo/ExPortConfinement.java | 3 +++ .../com/biutag/supervision/service/ConfinementService.java | 6 ++++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java b/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java index 7525e03..bd567de 100644 --- a/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java +++ b/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java @@ -145,6 +145,7 @@ public class ConfinementController { if(StrUtil.isNotEmpty(s.getIsVisit())){ exPortConfinement.setIsVisit(s.getIsVisit().equals("0")?"是":"否"); } + return exPortConfinement; }).toList(); diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeBlameMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeBlameMapper.java index 6e37fd7..1291149 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeBlameMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeBlameMapper.java @@ -55,7 +55,8 @@ public interface NegativeBlameMapper extends BaseMapper { " and blameIdCode is not null and blameDepartId is not null and length(blameIdCode) > 0 and length(blameDepartId) > 0 and length(blameName) > 0 and ivPersonTypeCode != '1'") List selectBlameListNotIvPerson(); - @Select("select a.handleResultName as resultName, count(*) as resultCount FROM `negative_blame` as a LEFT JOIN negative as b on a.negativeId = b.id where a.handleResultName is NOT NULL and a.handleResultCode is NOT NULL and a.crtTime BETWEEN #{beginTime} AND #{endTime} GROUP BY resultName" + @Select("select a.handleResultName as resultName, count(*) as resultCount FROM `negative_blame` as a LEFT JOIN negative as b on a.negativeId = b.id where a.handleResultName is NOT NULL and a.handleResultCode is NOT NULL and b.problemSourcesCode in (21,22,23,24,25) " + + " and a.crtTime BETWEEN #{beginTime} AND #{endTime} GROUP BY resultName" ) List selectBlameStatsCount(Date beginTime, Date endTime); } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java b/src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java index e8335b6..9cd6885 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java @@ -1,6 +1,7 @@ package com.biutag.supervision.pojo.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; import lombok.Setter; @@ -34,9 +35,11 @@ public class ExPortConfinement { private String confinementTime; @ExcelProperty({"开始日期"}) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") private LocalDateTime startTime; @ExcelProperty({"结束时间"}) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") private LocalDateTime endTime; @ExcelProperty({"看护单位"}) diff --git a/src/main/java/com/biutag/supervision/service/ConfinementService.java b/src/main/java/com/biutag/supervision/service/ConfinementService.java index 6402d0a..85df639 100644 --- a/src/main/java/com/biutag/supervision/service/ConfinementService.java +++ b/src/main/java/com/biutag/supervision/service/ConfinementService.java @@ -50,10 +50,12 @@ public class ConfinementService extends ServiceImpl= '2025-04-30T00:00') + // if (StrUtil.isNotEmpty(param.getOrgId())) { if (param.getDepartBranch()) { List orgIds = departService.getAllNodeIds(param.getOrgId());