提供新接口：可用的服务类型列表

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

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

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

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

@@ -87,7 +87,7 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl<Workdiary
         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));
 
         // 查找服务记录
@@ -147,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())) {
@@ -182,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);