Merge branch 'dev_workdiary_service' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_workdiary_service

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

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java

@@ -2,8 +2,13 @@ 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;
+import javax.validation.constraints.NotNull;
+
 
 /**
  * 工作日志(服务)-记录
@@ -16,9 +21,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 +38,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable {
     /**
      * 服务类型
      */
+	@NotNull(message = "服务类型为必填项", groups = { Save.class })
 	private Short serviceType;
 	private String serviceTypeName;
 
@@ -40,6 +50,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable {
     /**
      * 网格ID
      */
+    @NotBlank(message = "网格为必填项", groups = { Save.class })
 	private String gridId;
 	private String gridName;
 
@@ -51,6 +62,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable {
     /**
      * 申请人ID
      */
+	@NotBlank(message = "申请人为必填项", groups = { Save.class })
 	private String applicantId;
 
     /**
@@ -61,21 +73,25 @@ public class WorkdiaryServiceRecordDTO implements Serializable {
     /**
      * 申请人住址
      */
+	@NotBlank(message = "住址为必填项", groups = { Save.class })
 	private String applicantAddress;
 
     /**
      * 申请人联系电话
      */
+	@NotBlank(message = "联系电话为必填项", groups = { Save.class })
 	private String applicantMobile;
 
     /**
      * 服务内容
      */
+	@NotBlank(message = "服务内容为必填项", groups = { Save.class })
 	private String serviceContent;
 
     /**
      * 服务时间
      */
+	@NotBlank(message = "服务时间为必填项", groups = { Save.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();
     }
@@ -133,7 +133,18 @@ public class WorkdiaryServiceController {
      */
     @RequestMapping("/serviceType/page")
     public Result<PageData<WorkdiaryServiceTypeDTO>> serviceTypePage(@RequestBody PageFormDTO input){
-        PageData<WorkdiaryServiceTypeDTO> page = workdiaryServiceTypeService.page(input.getPageNo(), input.getPageSize());
+        PageData<WorkdiaryServiceTypeDTO> page = workdiaryServiceTypeService.page(null, input.getPageNo(), input.getPageSize());
+        return new Result<PageData<WorkdiaryServiceTypeDTO>>().ok(page);
+    }
+
+    /**
+     * 列出启用了的类型列表
+     * @param input
+     * @return
+     */
+    @RequestMapping("/serviceType/avaliableList")
+    public Result<PageData<WorkdiaryServiceTypeDTO>> listAvaliableServiceType(@RequestBody PageFormDTO input){
+        PageData<WorkdiaryServiceTypeDTO> page = workdiaryServiceTypeService.listAvaliableServiceType(input.getPageNo(), input.getPageSize());
         return new Result<PageData<WorkdiaryServiceTypeDTO>>().ok(page);
     }
 
@@ -155,7 +166,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 +179,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/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();

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkdiaryServiceTypeService.java

@@ -23,7 +23,7 @@ public interface WorkdiaryServiceTypeService extends BaseService<WorkdiaryServic
      * @author generator
      * @date 2022-08-23
      */
-    PageData<WorkdiaryServiceTypeDTO> page(Integer pageNo, Integer pageSize);
+    PageData<WorkdiaryServiceTypeDTO> page(Short enabled, Integer pageNo, Integer pageSize);
 
     /**
      * 默认查询
@@ -35,7 +35,7 @@ public interface WorkdiaryServiceTypeService extends BaseService<WorkdiaryServic
      */
     List<WorkdiaryServiceTypeDTO> list(Map<String, Object> params);
 
-    List<WorkdiaryServiceTypeDTO> list(Integer pageNo, Integer pageSize);
+    List<WorkdiaryServiceTypeDTO> list(Short enabled, Integer pageNo, Integer pageSize);
 
     /**
      * 单条查询
@@ -76,4 +76,6 @@ public interface WorkdiaryServiceTypeService extends BaseService<WorkdiaryServic
      * @date 2022-08-23
      */
     int delete(String[] ids);
+
+    PageData<WorkdiaryServiceTypeDTO> listAvaliableServiceType(Integer pageNo, Integer pageSize);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java

@@ -80,13 +80,14 @@ 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);
         query.like(StringUtils.isNotBlank(applicantMobile), WorkdiaryServiceRecordEntity::getApplicantMobile, applicantMobile);
 
         // 查找类型列表
-        List<WorkdiaryServiceTypeDTO> stList = SpringContextUtils.getBean(WorkdiaryServiceTypeService.class).list(1, 100);
+        List<WorkdiaryServiceTypeDTO> stList = SpringContextUtils.getBean(WorkdiaryServiceTypeService.class).list(null, 1, 100);
         Map<Short, String> stMap = stList.stream().collect(Collectors.toMap(WorkdiaryServiceTypeDTO::getServiceType, WorkdiaryServiceTypeDTO::getServiceTypeName));
 
         // 查找服务记录
@@ -146,7 +147,18 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl<Workdiary
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(WorkdiaryServiceRecordDTO dto) {
-        WorkdiaryServiceRecordEntity entity = ConvertUtils.sourceToTarget(dto, WorkdiaryServiceRecordEntity.class);
+        WorkdiaryServiceRecordEntity entity = new WorkdiaryServiceRecordEntity();
+
+        entity.setId(dto.getId());
+        entity.setServiceType(dto.getServiceType());
+        entity.setGridId(dto.getGridId());
+        entity.setApplicantId(dto.getApplicantId());
+        entity.setApplicantAddress(dto.getApplicantAddress());
+        entity.setServiceContent(dto.getServiceContent());
+        entity.setApplicantMobile(dto.getApplicantMobile());
+        entity.setPrincipalName(dto.getPrincipalName());
+        entity.setServiceTime(dto.getServiceTime());
+        entity.setRemark(dto.getRemark());
 
         // orgidPath
         if (StringUtils.isNotBlank(dto.getGridId())) {
@@ -181,7 +193,7 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl<Workdiary
 
         if (stMap == null || stMap.size() == 0) {
             // 查找类型列表
-            List<WorkdiaryServiceTypeDTO> list = SpringContextUtils.getBean(WorkdiaryServiceTypeService.class).list(1, 100);
+            List<WorkdiaryServiceTypeDTO> list = SpringContextUtils.getBean(WorkdiaryServiceTypeService.class).list(null, 1, 100);
             stMap = list.stream().collect(Collectors.toMap(WorkdiaryServiceTypeDTO::getServiceType, WorkdiaryServiceTypeDTO::getServiceTypeName));
         }
 

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<WorkdiarySe
     private DistributedLock distributedLock;
 
     @Override
-    public PageData<WorkdiaryServiceTypeDTO> page(Integer pageNo, Integer pageSize) {
-        List<WorkdiaryServiceTypeDTO> list = list(pageNo, pageSize);
+    public PageData<WorkdiaryServiceTypeDTO> page(Short enabled, Integer pageNo, Integer pageSize) {
+        List<WorkdiaryServiceTypeDTO> list = list(enabled, pageNo, pageSize);
         return new PageData<>(list, new PageInfo<>(list).getTotal(), pageSize);
     }
 
@@ -61,9 +61,10 @@ public class WorkdiaryServiceTypeServiceImpl extends BaseServiceImpl<WorkdiarySe
     }
 
     @Override
-    public List<WorkdiaryServiceTypeDTO> list(Integer pageNo, Integer pageSize) {
+    public List<WorkdiaryServiceTypeDTO> list(Short enabled, Integer pageNo, Integer pageSize) {
         LambdaQueryWrapper<WorkdiaryServiceTypeEntity> stQuery = new LambdaQueryWrapper<>();
         stQuery.eq(WorkdiaryServiceTypeEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId());
+        stQuery.eq(enabled != null, WorkdiaryServiceTypeEntity::getEnabled, enabled);
         List<WorkdiaryServiceTypeDTO> ds = baseDao.selectList(stQuery).stream().map((e) -> {
             WorkdiaryServiceTypeDTO d = new WorkdiaryServiceTypeDTO();
             d.setId(e.getId());
@@ -75,6 +76,11 @@ public class WorkdiaryServiceTypeServiceImpl extends BaseServiceImpl<WorkdiarySe
         return ds;
     }
 
+    @Override
+    public PageData<WorkdiaryServiceTypeDTO> listAvaliableServiceType(Integer pageNo, Integer pageSize) {
+        return this.page(Short.valueOf("1"), pageNo, pageSize);
+    }
+
     private QueryWrapper<WorkdiaryServiceTypeEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql → 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.已删除',
@@ -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 ='工作日志(服务)-记录';
 
 
 # 工作日志-服务分类