From c0c802c8de3b8ad4f3a106c6183cc19b559c04d2 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Aug 2022 13:34:43 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91flyway=E8=B5=8B=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{workdiary_service.sql => V0.0.28__workdiary_service.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/{workdiary_service.sql => V0.0.28__workdiary_service.sql} (100%) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql similarity index 100% rename from epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql rename to epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql From cfe04406b33232dcfe50880cc3057c6aaca57163 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Aug 2022 13:45:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91flyway=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.28__workdiary_service.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql index d825fba47e..0b42aeac0f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql @@ -23,7 +23,7 @@ CREATE TABLE `workdiary_service_record` `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', PRIMARY KEY (`ID`) ) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='工作日志(服务)-记录' + DEFAULT CHARSET = utf8mb4 COMMENT ='工作日志(服务)-记录'; # 工作日志-服务分类 From be350ccf6f2d077d17a375d8522d1b300ebfa2da Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Aug 2022 14:19:49 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=911.=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E8=87=AA=E5=B7=B1=E7=9C=8B=E8=87=AA=E5=B7=B1=E7=9A=84?= =?UTF-8?q?=E3=80=822.=E4=BF=AE=E5=A4=8D=EF=BC=9Aflyway=20serviceTime?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BAvarchar?= =?UTF-8?q?=E3=80=823.=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/WorkdiaryServiceTypeDTO.java | 8 ++++++++ .../dto/result/WorkdiaryServiceRecordDTO.java | 15 +++++++++++++++ .../controller/WorkdiaryServiceController.java | 8 ++++---- .../impl/WorkdiaryServiceRecordServiceImpl.java | 1 + .../db/migration/V0.0.28__workdiary_service.sql | 2 +- 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java index 4f8c936bf7..1f9d7abc3e 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java @@ -1,7 +1,10 @@ package com.epmet.dto; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.dto.result.WorkdiaryServiceRecordDTO; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; @@ -16,9 +19,13 @@ public class WorkdiaryServiceTypeDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface Save extends CustomerClientShowGroup {} + public interface Update extends CustomerClientShowGroup {} + /** * 主键 */ + @NotBlank(message = "未选中任何数据", groups = { Update.class }) private String id; /** @@ -34,6 +41,7 @@ public class WorkdiaryServiceTypeDTO implements Serializable { /** * 服务类型名称 */ + @NotBlank(message = "服务类型名称必填", groups = { Save.class, Update.class }) private String serviceTypeName; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java index 95fcdcc88a..7a440ec79e 100755 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java @@ -2,8 +2,12 @@ package com.epmet.dto.result; import java.io.Serializable; import java.util.Date; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 工作日志(服务)-记录 @@ -16,9 +20,13 @@ public class WorkdiaryServiceRecordDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface Save extends CustomerClientShowGroup {} + public interface Update extends CustomerClientShowGroup {} + /** * 主键 */ + @NotBlank(message = "未选中任何数据", groups = { Update.class }) private String id; /** @@ -29,6 +37,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 服务类型 */ + @NotBlank(message = "服务类型为必填项", groups = { Save.class, Update.class }) private Short serviceType; private String serviceTypeName; @@ -40,6 +49,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 网格ID */ + @NotBlank(message = "网格为必填项", groups = { Save.class, Update.class }) private String gridId; private String gridName; @@ -51,6 +61,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 申请人ID */ + @NotBlank(message = "申请人为必填项", groups = { Save.class, Update.class }) private String applicantId; /** @@ -61,21 +72,25 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 申请人住址 */ + @NotBlank(message = "住址为必填项", groups = { Save.class, Update.class }) private String applicantAddress; /** * 申请人联系电话 */ + @NotBlank(message = "联系电话为必填项", groups = { Save.class, Update.class }) private String applicantMobile; /** * 服务内容 */ + @NotBlank(message = "服务内容为必填项", groups = { Save.class, Update.class }) private String serviceContent; /** * 服务时间 */ + @NotBlank(message = "服务时间为必填项", groups = { Save.class, Update.class }) private String serviceTime; /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java index cdd26b8794..03893f9955 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java @@ -81,7 +81,7 @@ public class WorkdiaryServiceController { @PostMapping("/record/save") public Result recordSave(@RequestBody WorkdiaryServiceRecordDTO dto){ //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, WorkdiaryServiceRecordDTO.Save.class); workdiaryServiceRecordService.save(dto); return new Result(); } @@ -95,7 +95,7 @@ public class WorkdiaryServiceController { @PostMapping("/record/update") public Result recordUpdate(@RequestBody WorkdiaryServiceRecordDTO dto){ //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, WorkdiaryServiceRecordDTO.Update.class); workdiaryServiceRecordService.update(dto); return new Result(); } @@ -155,7 +155,7 @@ public class WorkdiaryServiceController { @PostMapping("/serviceType/save") public Result serviceTypeSave(@RequestBody WorkdiaryServiceTypeDTO dto){ //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, WorkdiaryServiceTypeDTO.Save.class); workdiaryServiceTypeService.save(dto); return new Result(); } @@ -168,7 +168,7 @@ public class WorkdiaryServiceController { @PostMapping("/serviceType/update") public Result serviceTypeUpdate(@RequestBody WorkdiaryServiceTypeDTO dto){ //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, WorkdiaryServiceTypeDTO.Update.class); workdiaryServiceTypeService.update(dto); return new Result(); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java index ffd71c8489..6603b01f4d 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java @@ -80,6 +80,7 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl query = new LambdaQueryWrapper<>(); query.eq(StringUtils.isNotBlank(gridId), WorkdiaryServiceRecordEntity::getGridId, gridId); query.eq(serviceType != null, WorkdiaryServiceRecordEntity::getServiceType, serviceType); + query.eq(WorkdiaryServiceRecordEntity::getCreatedBy, EpmetRequestHolder.getLoginUserId()); query.like(StringUtils.isNotBlank(applicantName), WorkdiaryServiceRecordEntity::getApplicantName, applicantName); query.like(StringUtils.isNotBlank(applicantAddress), WorkdiaryServiceRecordEntity::getApplicantAddress, applicantAddress); query.like(StringUtils.isNotBlank(serviceContent), WorkdiaryServiceRecordEntity::getServiceContent, serviceContent); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql index 0b42aeac0f..7631087ce3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.28__workdiary_service.sql @@ -12,7 +12,7 @@ CREATE TABLE `workdiary_service_record` `APPLICANT_ADDRESS` varchar(32) NOT NULL COMMENT '申请人住址', `APPLICANT_MOBILE` varchar(20) NOT NULL COMMENT '申请人联系电话', `SERVICE_CONTENT` varchar(255) NOT NULL COMMENT '服务内容', - `SERVICE_TIME` datetime NOT NULL COMMENT '服务时间', + `SERVICE_TIME` varchar(32) NOT NULL COMMENT '服务时间', `PRINCIPAL_NAME` varchar(10) NOT NULL COMMENT '负责人姓名', `REMARK` varchar(255) NOT NULL COMMENT '备注', `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', From 3675bb71c792469d2385e8370637652321303685 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Aug 2022 14:36:32 +0800 Subject: [PATCH 4/6] 1 --- .../java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java index 7a440ec79e..58be0bae12 100755 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** @@ -37,7 +38,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 服务类型 */ - @NotBlank(message = "服务类型为必填项", groups = { Save.class, Update.class }) + @NotNull(message = "服务类型为必填项", groups = { Save.class, Update.class }) private Short serviceType; private String serviceTypeName; From 8ed15e36e35dbbe195d96f110f28a98bcb29f253 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Aug 2022 14:48:47 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E5=80=99?= =?UTF-8?q?=E8=BD=ACexcel=E6=96=87=E4=BB=B6=EF=BC=8C=E4=B8=A2=E5=A4=B1mobi?= =?UTF-8?q?le=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java index 8a2f2cf454..7da0010c82 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java @@ -56,8 +56,7 @@ public class WorkdiaryServiceRecordExcel { this.applicantName = dto.getApplicantName(); this.applicantAddress = dto.getApplicantAddress(); this.serviceContent = dto.getServiceContent(); - this.serviceContent = dto.getServiceContent(); - this.principal = dto.getPrincipalName(); + this.applicantMobile = dto.getApplicantMobile(); this.principal = dto.getPrincipalName(); this.serviceTime = dto.getServiceTime(); this.remark = dto.getRemark(); From 6dbb245ff66fc6807cfc5d30e9d579d314120e69 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Aug 2022 15:56:34 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E6=96=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9A=E5=8F=AF=E7=94=A8=E7=9A=84=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/WorkdiaryServiceTypeDTO.java | 1 - .../dto/result/WorkdiaryServiceRecordDTO.java | 14 +++++++------- .../controller/WorkdiaryServiceController.java | 13 ++++++++++++- .../service/WorkdiaryServiceTypeService.java | 6 ++++-- .../impl/WorkdiaryServiceRecordServiceImpl.java | 17 ++++++++++++++--- .../impl/WorkdiaryServiceTypeServiceImpl.java | 12 +++++++++--- 6 files changed, 46 insertions(+), 17 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java index 1f9d7abc3e..664465c7ae 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java @@ -41,7 +41,6 @@ public class WorkdiaryServiceTypeDTO implements Serializable { /** * 服务类型名称 */ - @NotBlank(message = "服务类型名称必填", groups = { Save.class, Update.class }) private String serviceTypeName; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java index 58be0bae12..98d4eacb1e 100755 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java @@ -38,7 +38,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 服务类型 */ - @NotNull(message = "服务类型为必填项", groups = { Save.class, Update.class }) + @NotNull(message = "服务类型为必填项", groups = { Save.class }) private Short serviceType; private String serviceTypeName; @@ -50,7 +50,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 网格ID */ - @NotBlank(message = "网格为必填项", groups = { Save.class, Update.class }) + @NotBlank(message = "网格为必填项", groups = { Save.class }) private String gridId; private String gridName; @@ -62,7 +62,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 申请人ID */ - @NotBlank(message = "申请人为必填项", groups = { Save.class, Update.class }) + @NotBlank(message = "申请人为必填项", groups = { Save.class }) private String applicantId; /** @@ -73,25 +73,25 @@ public class WorkdiaryServiceRecordDTO implements Serializable { /** * 申请人住址 */ - @NotBlank(message = "住址为必填项", groups = { Save.class, Update.class }) + @NotBlank(message = "住址为必填项", groups = { Save.class }) private String applicantAddress; /** * 申请人联系电话 */ - @NotBlank(message = "联系电话为必填项", groups = { Save.class, Update.class }) + @NotBlank(message = "联系电话为必填项", groups = { Save.class }) private String applicantMobile; /** * 服务内容 */ - @NotBlank(message = "服务内容为必填项", groups = { Save.class, Update.class }) + @NotBlank(message = "服务内容为必填项", groups = { Save.class }) private String serviceContent; /** * 服务时间 */ - @NotBlank(message = "服务时间为必填项", groups = { Save.class, Update.class }) + @NotBlank(message = "服务时间为必填项", groups = { Save.class }) private String serviceTime; /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java index 03893f9955..1b73a301a4 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceController.java @@ -133,7 +133,18 @@ public class WorkdiaryServiceController { */ @RequestMapping("/serviceType/page") public Result> serviceTypePage(@RequestBody PageFormDTO input){ - PageData page = workdiaryServiceTypeService.page(input.getPageNo(), input.getPageSize()); + PageData page = workdiaryServiceTypeService.page(null, input.getPageNo(), input.getPageSize()); + return new Result>().ok(page); + } + + /** + * 列出启用了的类型列表 + * @param input + * @return + */ + @RequestMapping("/serviceType/avaliableList") + public Result> listAvaliableServiceType(@RequestBody PageFormDTO input){ + PageData page = workdiaryServiceTypeService.listAvaliableServiceType(input.getPageNo(), input.getPageSize()); return new Result>().ok(page); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceTypeService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceTypeService.java index e12e45755b..255b1db312 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceTypeService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceTypeService.java @@ -23,7 +23,7 @@ public interface WorkdiaryServiceTypeService extends BaseService page(Integer pageNo, Integer pageSize); + PageData page(Short enabled, Integer pageNo, Integer pageSize); /** * 默认查询 @@ -35,7 +35,7 @@ public interface WorkdiaryServiceTypeService extends BaseService list(Map params); - List list(Integer pageNo, Integer pageSize); + List list(Short enabled, Integer pageNo, Integer pageSize); /** * 单条查询 @@ -76,4 +76,6 @@ public interface WorkdiaryServiceTypeService extends BaseService listAvaliableServiceType(Integer pageNo, Integer pageSize); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java index 6603b01f4d..64505ae54a 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java @@ -87,7 +87,7 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl stList = SpringContextUtils.getBean(WorkdiaryServiceTypeService.class).list(1, 100); + List stList = SpringContextUtils.getBean(WorkdiaryServiceTypeService.class).list(null, 1, 100); Map stMap = stList.stream().collect(Collectors.toMap(WorkdiaryServiceTypeDTO::getServiceType, WorkdiaryServiceTypeDTO::getServiceTypeName)); // 查找服务记录 @@ -147,7 +147,18 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl list = SpringContextUtils.getBean(WorkdiaryServiceTypeService.class).list(1, 100); + List list = SpringContextUtils.getBean(WorkdiaryServiceTypeService.class).list(null, 1, 100); stMap = list.stream().collect(Collectors.toMap(WorkdiaryServiceTypeDTO::getServiceType, WorkdiaryServiceTypeDTO::getServiceTypeName)); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceTypeServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceTypeServiceImpl.java index 8c34a9b93c..fea0eeaa84 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceTypeServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceTypeServiceImpl.java @@ -48,8 +48,8 @@ public class WorkdiaryServiceTypeServiceImpl extends BaseServiceImpl page(Integer pageNo, Integer pageSize) { - List list = list(pageNo, pageSize); + public PageData page(Short enabled, Integer pageNo, Integer pageSize) { + List list = list(enabled, pageNo, pageSize); return new PageData<>(list, new PageInfo<>(list).getTotal(), pageSize); } @@ -61,9 +61,10 @@ public class WorkdiaryServiceTypeServiceImpl extends BaseServiceImpl list(Integer pageNo, Integer pageSize) { + public List list(Short enabled, Integer pageNo, Integer pageSize) { LambdaQueryWrapper stQuery = new LambdaQueryWrapper<>(); stQuery.eq(WorkdiaryServiceTypeEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); + stQuery.eq(enabled != null, WorkdiaryServiceTypeEntity::getEnabled, enabled); List ds = baseDao.selectList(stQuery).stream().map((e) -> { WorkdiaryServiceTypeDTO d = new WorkdiaryServiceTypeDTO(); d.setId(e.getId()); @@ -75,6 +76,11 @@ public class WorkdiaryServiceTypeServiceImpl extends BaseServiceImpl listAvaliableServiceType(Integer pageNo, Integer pageSize) { + return this.page(Short.valueOf("1"), pageNo, pageSize); + } + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP);