【工作日志】1.修复：只能自己看自己的。2.修复：flyway serviceTime字段类型改为varchar。3.增加入参校验

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;
 
     /**

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;
 
     /**

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();
     }

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<Workdiary
         LambdaQueryWrapper<WorkdiaryServiceRecordEntity> 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);

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.已删除',