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

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceEditFormDTO.java

@@ -0,0 +1,49 @@
+package com.epmet.dto.form;
+
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 【服务项目记录】修改
+ */
+@Data
+public class IcServiceEditFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "", groups = AddUserInternalGroup.class)
+    private String serviceRecordId;
+    private String principalName;
+    private String principalContact;
+    /**
+     * 服务时间
+     */
+    @NotNull(message = "起始服务时间不能为空", groups = AddUserShowGroup.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date serviceTimeStart;
+
+    /**
+     * 服务截止时间
+     */
+    @NotNull(message = "截止服务时间不能为空", groups = AddUserShowGroup.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date serviceTimeEnd;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceOrgAddEditFormDTO.java

@@ -63,7 +63,7 @@ public class IcServiceOrgAddEditFormDTO implements Serializable {
     /**
      * 备注信息
      */
-    private String remarks;
+    private String remark;
 
     private String customerId;
     private String userId;

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceOrgListFormDTO.java

@@ -27,7 +27,7 @@ public class IcServiceOrgListFormDTO implements Serializable {
     /**
      * 备注信息
      */
-    private String remarks;
+    private String remark;
     /**
      * 页码
      */

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

@@ -60,7 +60,7 @@ public class IcServiceOrgListResultDTO implements Serializable {
     /**
      * 备注
      */
-    private String remarks;
+    private String remark;
 
     @Data
     public static class ServiceType {

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

@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 【组织】服务组织列表_下拉框使用--接口返参
+ * @Author sun
+ */
+@Data
+public class IcServiceOrgSelectListResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 服务组织Id
+     */
+    private String icServiceOrgId;
+    /**
+     * 服务组织名称
+     */
+    private String orgName;
+
+}

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

@@ -0,0 +1,81 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class IcServiceRecDetailRes implements Serializable {
+
+
+    /**
+     * 联系方式
+     */
+    private String principalContact;
+
+    /**
+     * 经办人姓名
+     */
+    private String principalName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 服务类别ID
+     */
+    private String serviceCategoryKey;
+
+    /**
+     * 服务类别ID
+     */
+    private String serviceCategoryName;
+
+    /**
+     * 服务组织ID
+     */
+    private String serviceOrgId;
+
+    /**
+     * 服务组织名称
+     */
+    private String serviceOrgName;
+
+    /**
+     * 服务项目ID
+     */
+    private String serviceProjectId;
+
+    /**
+     * 服务项目名称
+     */
+    private String serviceProjectName;
+
+    /**
+     * 服务时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date serviceTimeStart;
+
+    /**
+     * 服务截止时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date serviceTimeEnd;
+
+    /**
+     * in_service服务中；completed:已完成
+     */
+    private String serviceStatus;
+
+    /**
+     * 发布范围
+     */
+    private List<IcServiceScopeDTO> serviceScope;
+
+}

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

@@ -0,0 +1,15 @@
+package com.epmet.dto.result;
+
+
+import lombok.Data;
+
+@Data
+public class IcServiceScopeDTO {
+    private String objectId;
+    private String objectName;
+    private String objectType;
+    /**
+     * 发布范围的组织ID PATH
+     */
+    private String objectIdPath;
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceOrgController.java

@@ -13,10 +13,13 @@ import com.epmet.dto.IcServiceOrgDTO;
 import com.epmet.dto.form.IcServiceOrgAddEditFormDTO;
 import com.epmet.dto.form.IcServiceOrgListFormDTO;
 import com.epmet.dto.result.IcServiceOrgListResultDTO;
+import com.epmet.dto.result.IcServiceOrgSelectListResultDTO;
 import com.epmet.service.IcServiceOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * 服务组织表
@@ -56,19 +59,33 @@ public class IcServiceOrgController {
 
     @NoRepeatSubmit
     @PostMapping("edit")
-    public Result edit(@RequestBody IcServiceOrgAddEditFormDTO dto){
+    public Result edit(@LoginUser TokenDto tokenDto, @RequestBody IcServiceOrgAddEditFormDTO dto){
-        //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        dto.setCustomerId(tokenDto.getCustomerId());
+        dto.setUserId(tokenDto.getUserId());
         icServiceOrgService.update(dto);
         return new Result();
     }
 
     @PostMapping("del")
-    public Result delete(@RequestBody IcServiceOrgAddEditFormDTO formDTO){
+    public Result delete(@LoginUser TokenDto tokenDto, @RequestBody IcServiceOrgAddEditFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, IcServiceOrgAddEditFormDTO.Del.class);
-        icServiceOrgService.delete(formDTO.getIcServiceOrgId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        icServiceOrgService.delete(formDTO);
         return new Result();
     }
 
+    @RequestMapping("detail")
+    public Result<IcServiceOrgListResultDTO> detail(@RequestBody IcServiceOrgListFormDTO formDTO) {
+        return new Result<IcServiceOrgListResultDTO>().ok(icServiceOrgService.detail(formDTO));
+    }
+
+    @RequestMapping("selectlist")
+    public Result<List<IcServiceOrgSelectListResultDTO>> selectList(@LoginUser TokenDto tokenDto, @RequestBody IcServiceOrgListFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        return new Result<List<IcServiceOrgSelectListResultDTO>>().ok(icServiceOrgService.selectList(formDTO));
+    }
 
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceProjectController.java

@@ -4,21 +4,22 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcServiceProjectDTO;
+import com.epmet.dto.form.IcServiceEditFormDTO;
 import com.epmet.dto.form.ServiceProjectFormDTO;
 import com.epmet.dto.form.ServiceProjectListFormDTO;
+import com.epmet.dto.result.IcServiceRecDetailRes;
 import com.epmet.service.IcServiceProjectService;
+import com.epmet.service.IcServiceRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -35,6 +36,9 @@ public class IcServiceProjectController {
 
     @Autowired
     private IcServiceProjectService icServiceProjectService;
+    @Autowired
+    private IcServiceRecordService icServiceRecordService;
+
 
     @RequestMapping("page")
     public Result<PageData<IcServiceProjectDTO>> page(@RequestParam Map<String, Object> params){
@@ -129,4 +133,38 @@ public class IcServiceProjectController {
         return new Result();
     }
 
+    /**
+     * http://yapi.elinkservice.cn/project/245/interface/api/7820
+     *
+     * @param serviceId
+     * @return 【服务项目记录】取消：进行中的项目可以取消。删除该记录
+     */
+    @PostMapping("service/cancel/{service-id}")
+    public Result cancelService(@PathVariable("service-id") String serviceId) {
+        icServiceRecordService.cancelService(serviceId, "yzm");
+        return new Result();
+    }
+
+    /**
+     * http://yapi.elinkservice.cn/project/245/interface/api/7821
+     * @param serviceId
+     * @return 【服务项目记录】详情
+     */
+    @PostMapping("service/detail/{service-id}")
+    public Result<IcServiceRecDetailRes> queryServiceDetail(@PathVariable("service-id") String serviceId) {
+        return new Result<IcServiceRecDetailRes>().ok(icServiceRecordService.queryServiceDetail(serviceId));
+    }
+
+    /**
+     * 【服务项目记录】修改
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("service/update")
+    public Result updateServiceRecord(@RequestBody IcServiceEditFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, IcServiceEditFormDTO.AddUserShowGroup.class, IcServiceEditFormDTO.AddUserInternalGroup.class);
+        icServiceRecordService.updateServiceRecord(formDTO);
+        return new Result();
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceOrgDao.java

@@ -3,6 +3,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.IcServiceOrgListFormDTO;
 import com.epmet.dto.result.IcServiceOrgListResultDTO;
+import com.epmet.dto.result.IcServiceOrgSelectListResultDTO;
 import com.epmet.entity.IcServiceOrgEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -22,4 +23,12 @@ public interface IcServiceOrgDao extends BaseDao<IcServiceOrgEntity> {
      * @Description 服务组织-列表查询
      **/
     List<IcServiceOrgListResultDTO> selectServiceOrgList(IcServiceOrgListFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 服务组织列表_下拉框
+     **/
+    List<IcServiceOrgSelectListResultDTO> selectServiceOrgSelectList(IcServiceOrgListFormDTO formDTO);
+
+    void del(IcServiceOrgEntity entity);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceRecordDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcServiceRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+@Mapper
+public interface IcServiceRecordDao extends BaseDao<IcServiceRecordEntity> {
+	
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceScopeDao.java

@@ -0,0 +1,23 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.IcServiceScopeDTO;
+import com.epmet.entity.IcServiceScopeEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+@Mapper
+public interface IcServiceScopeDao extends BaseDao<IcServiceScopeEntity> {
+
+    int update(@Param("serviceId") String serviceId, @Param("userId") String userId);
+
+    List<IcServiceScopeDTO> selectList(String serviceRecordId);
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceRecordEntity.java

@@ -0,0 +1,79 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_service_record")
+public class IcServiceRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 服务类别ID
+     */
+	private String serviceCategoryKey;
+
+    /**
+     * 服务项目ID
+     */
+	private String serviceProjectId;
+
+    /**
+     * 服务项目名称
+     */
+	private String serviceProjectName;
+
+    /**
+     * 服务组织ID
+     */
+	private String serviceOrgId;
+
+    /**
+     * 服务组织名称
+     */
+	private String serviceOrgName;
+
+    /**
+     * 经办人姓名
+     */
+	private String principalName;
+
+    /**
+     * 联系方式
+     */
+	private String principalContact;
+
+    /**
+     * 服务时间
+     */
+	private Date serviceTimeStart;
+
+    /**
+     * 服务截止时间
+     */
+	private Date serviceTimeEnd;
+
+    /**
+     * in_service服务中；completed:已完成
+     */
+	private String serviceStatus;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceScopeEntity.java

@@ -0,0 +1,69 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_service_scope")
+public class IcServiceScopeEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 服务类别ID
+     */
+	private String serviceCategoryKey;
+
+    /**
+     * 服务项目ID
+     */
+	private String serviceProjectId;
+
+    /**
+     * 服务组织ID
+     */
+	private String serviceOrgId;
+
+    /**
+     * 服务记录的ID
+     */
+	private String serviceRecordId;
+
+    /**
+     * agency单位；grid网格；neighborhood小区
+     */
+	private String objectType;
+
+    /**
+     * 选中的组织的ID
+     */
+	private String objectId;
+
+    /**
+     * 发布范围的组织ID PATH
+     */
+	private String objectIdPath;
+
+    /**
+     * 
+     */
+	private String objectName;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+}

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

@@ -6,8 +6,11 @@ import com.epmet.dto.IcServiceOrgDTO;
 import com.epmet.dto.form.IcServiceOrgAddEditFormDTO;
 import com.epmet.dto.form.IcServiceOrgListFormDTO;
 import com.epmet.dto.result.IcServiceOrgListResultDTO;
+import com.epmet.dto.result.IcServiceOrgSelectListResultDTO;
 import com.epmet.entity.IcServiceOrgEntity;
 
+import java.util.List;
+
 /**
  * 服务组织表
  *
@@ -56,13 +59,10 @@ public interface IcServiceOrgService extends BaseService<IcServiceOrgEntity> {
      */
     void update(IcServiceOrgAddEditFormDTO dto);
 
-    /**
+    void delete(IcServiceOrgAddEditFormDTO formDTO);
-     * 批量删除
+
-     *
+    IcServiceOrgListResultDTO detail(IcServiceOrgListFormDTO formDTO);
-     * @param icServiceOrgId
+
-     * @return void
+    List<IcServiceOrgSelectListResultDTO> selectList(IcServiceOrgListFormDTO formDTO);
-     * @author generator
+
-     * @date 2022-05-27
-     */
-    void delete(String icServiceOrgId);
 }

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

@@ -0,0 +1,35 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.IcServiceEditFormDTO;
+import com.epmet.dto.result.IcServiceRecDetailRes;
+import com.epmet.entity.IcServiceRecordEntity;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+public interface IcServiceRecordService extends BaseService<IcServiceRecordEntity> {
+
+    /**
+     * http://yapi.elinkservice.cn/project/245/interface/api/7820
+     * @param serviceId
+     * 【服务项目记录】取消：进行中的项目可以取消。删除该记录
+     */
+    void cancelService(String serviceId,String userId);
+
+    /**
+     * 【服务项目记录】详情
+     * @param serviceId
+     * @return
+     */
+    IcServiceRecDetailRes queryServiceDetail(String serviceId);
+
+    /**
+     * 【服务项目记录】修改
+     * @param formDTO
+     */
+    void updateServiceRecord(IcServiceEditFormDTO formDTO);
+}

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

@@ -0,0 +1,14 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.IcServiceScopeEntity;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+public interface IcServiceScopeService extends BaseService<IcServiceScopeEntity> {
+
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -17,6 +18,7 @@ import com.epmet.dto.IcServiceOrgDTO;
 import com.epmet.dto.form.IcServiceOrgAddEditFormDTO;
 import com.epmet.dto.form.IcServiceOrgListFormDTO;
 import com.epmet.dto.result.IcServiceOrgListResultDTO;
+import com.epmet.dto.result.IcServiceOrgSelectListResultDTO;
 import com.epmet.entity.IcServiceOrgEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.service.IcServiceOrgService;
@@ -115,7 +117,7 @@ public class IcServiceOrgServiceImpl extends BaseServiceImpl<IcServiceOrgDao, Ic
         //3.新增服务组织数据
         IcServiceOrgEntity entity = ConvertUtils.sourceToTarget(formDTO, IcServiceOrgEntity.class);
         entity.setAgencyId(staffInfo.getAgencyId());
-        entity.setAgencyIdPath(staffInfo.getAgencyPIds());
+        entity.setAgencyIdPath(StringUtils.isEmpty(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds() + ":" + staffInfo.getAgencyId());
         insert(entity);
     }
 
@@ -144,9 +146,50 @@ public class IcServiceOrgServiceImpl extends BaseServiceImpl<IcServiceOrgDao, Ic
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(String icServiceOrgId) {
+    public void delete(IcServiceOrgAddEditFormDTO formDTO) {
-        // 逻辑删除（@TableLogic 注解）
+        IcServiceOrgEntity entity = new IcServiceOrgEntity();
-        baseDao.deleteById(icServiceOrgId);
+        entity.setId(formDTO.getIcServiceOrgId());
+        entity.setUpdatedBy(formDTO.getUserId());
+        baseDao.del(entity);
+    }
+
+    @Override
+    public IcServiceOrgListResultDTO detail(IcServiceOrgListFormDTO formDTO) {
+        IcServiceOrgListResultDTO resultDTO = new IcServiceOrgListResultDTO();
+        //1.查询服务组织信息
+        List<IcServiceOrgListResultDTO> list = baseDao.selectServiceOrgList(formDTO);
+
+        //封装服务类别数据
+        if (!CollectionUtils.isEmpty(list)) {
+            resultDTO = list.get(NumConstant.ZERO);
+            //服务类别字典表数据
+            Result<Map<String, String>> statusRes = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.IC_SERVICE_TYPE.getCode());
+            Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
+            List<IcServiceOrgListResultDTO.ServiceType> stList = new ArrayList<>();
+            IcServiceOrgListResultDTO.ServiceType st = null;
+            for (String str : resultDTO.getServiceType().split(",")) {
+                st = new IcServiceOrgListResultDTO.ServiceType();
+                st.setValue(str);
+                st.setName(null != statusMap.get(str) ? statusMap.get(str) : "");
+                stList.add(st);
+            }
+            resultDTO.setServiceTypeList(stList);
+        }
+
+        return resultDTO;
+    }
+
+    @Override
+    public List<IcServiceOrgSelectListResultDTO> selectList(IcServiceOrgListFormDTO formDTO) {
+        //1.获取当前工作人员缓存信息
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null == staffInfo) {
+            throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getStaffId()));
+        }
+        //2.按条件查询当前组织及下级服务组织数据
+        List<IcServiceOrgSelectListResultDTO> resultList = baseDao.selectServiceOrgSelectList(formDTO);
+
+        return resultList;
     }
 
 }

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

@@ -0,0 +1,104 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.enums.DictTypeEnum;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.IcServiceRecordDao;
+import com.epmet.dao.IcServiceScopeDao;
+import com.epmet.dto.form.IcServiceEditFormDTO;
+import com.epmet.dto.result.IcServiceRecDetailRes;
+import com.epmet.entity.IcServiceRecordEntity;
+import com.epmet.feign.EpmetAdminOpenFeignClient;
+import com.epmet.service.IcServiceRecordService;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+@Service
+public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordDao, IcServiceRecordEntity> implements IcServiceRecordService {
+    @Autowired
+    private IcServiceScopeDao icServiceScopeDao;
+    @Autowired
+    private EpmetAdminOpenFeignClient adminOpenFeignClient;
+    /**
+     * http://yapi.elinkservice.cn/project/245/interface/api/7820
+     *
+     * @param serviceId 【服务项目记录】取消：进行中的项目可以取消。删除该记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelService(String serviceId,String userId) {
+        IcServiceRecordEntity icServiceRecordEntity = baseDao.selectById(serviceId);
+        if (null == icServiceRecordEntity) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),String.format("服务记录不存在，serviceId:%s",serviceId),"服务记录不存在");
+        }
+        if (!"in_service".equals(icServiceRecordEntity.getServiceStatus())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("服务状态：%s", icServiceRecordEntity.getServiceStatus()), "只有服务中的项目可以取消");
+        }
+        baseDao.deleteById(serviceId);
+        icServiceScopeDao.update(serviceId,userId);
+    }
+
+    /**
+     * 【服务项目记录】详情
+     *
+     * @param serviceId
+     * @return
+     */
+    @Override
+    public IcServiceRecDetailRes queryServiceDetail(String serviceId) {
+        IcServiceRecordEntity icServiceRecordEntity = baseDao.selectById(serviceId);
+        IcServiceRecDetailRes res = ConvertUtils.sourceToTarget(icServiceRecordEntity, IcServiceRecDetailRes.class);
+        if (null != res) {
+            res.setServiceScope(icServiceScopeDao.selectList(serviceId));
+            //服务分类名称
+            Result<Map<String, String>> icServiceTypeMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_SERVICE_TYPE.getCode());
+            if (!icServiceTypeMapRes.success() || MapUtils.isEmpty(icServiceTypeMapRes.getData())) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务分类字典查询异常");
+            }
+            res.setServiceCategoryName(icServiceTypeMapRes.getData().get(res.getServiceCategoryKey()));
+        }
+        return res;
+    }
+
+    /**
+     * 【服务项目记录】修改
+     *
+     * @param formDTO
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateServiceRecord(IcServiceEditFormDTO formDTO) {
+        IcServiceRecordEntity icServiceRecordEntity = baseDao.selectById(formDTO.getServiceRecordId());
+        if (null == icServiceRecordEntity) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),String.format("服务记录不存在，serviceRecordId:%s",formDTO.getServiceRecordId()),"服务记录不存在");
+        }
+        icServiceRecordEntity.setServiceTimeStart(formDTO.getServiceTimeStart());
+        icServiceRecordEntity.setServiceTimeEnd(formDTO.getServiceTimeEnd());
+        if(StringUtils.isNotBlank(formDTO.getPrincipalContact())){
+            icServiceRecordEntity.setPrincipalContact(formDTO.getPrincipalContact());
+        }
+        if(StringUtils.isNotBlank(formDTO.getPrincipalName())){
+            icServiceRecordEntity.setPrincipalName(formDTO.getPrincipalName());
+        }
+        if(StringUtils.isNotBlank(formDTO.getRemark())){
+            icServiceRecordEntity.setRemark(formDTO.getRemark());
+        }
+        baseDao.updateById(icServiceRecordEntity);
+    }
+
+
+}

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

@@ -0,0 +1,19 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.IcServiceScopeDao;
+import com.epmet.entity.IcServiceScopeEntity;
+import com.epmet.service.IcServiceScopeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+@Service
+public class IcServiceScopeServiceImpl extends BaseServiceImpl<IcServiceScopeDao, IcServiceScopeEntity> implements IcServiceScopeService {
+
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceOrgDao.xml

@@ -15,7 +15,7 @@
             longitude longitude,
             latitude latitude,
             address address,
-            remarks remarks
+            remark remark
         FROM
             ic_service_org
         WHERE
@@ -27,7 +27,10 @@
             AND customer_id = #{customerId}
         </if>
         <if test="agencyId != null and agencyId != '' ">
-            AND pids LIKE CONCAT('%',#{agencyId},'%')
+            AND agency_id_path LIKE CONCAT('%',#{agencyId},'%')
+        </if>
+        <if test="serviceType != null and serviceType != '' ">
+            AND service_type LIKE CONCAT('%', #{serviceType}, '%')
         </if>
         <if test="orgName != null and orgName != '' ">
             AND org_name LIKE CONCAT('%', #{orgName}, '%')
@@ -35,11 +38,41 @@
         <if test="address != null and address != '' ">
             AND address LIKE CONCAT('%', #{address}, '%')
         </if>
-        <if test="remarks != null and remarks != '' ">
+        <if test="remark != null and remark != '' ">
-            AND remarks LIKE CONCAT('%', #{remarks}, '%')
+            AND remark LIKE CONCAT('%', #{remark}, '%')
+        </if>
+        ORDER BY created_time DESC
+    </select>
+
+    <select id="selectServiceOrgSelectList" resultType="com.epmet.dto.result.IcServiceOrgSelectListResultDTO">
+        SELECT
+            id icServiceOrgId,
+            org_name orgName
+        FROM
+            ic_service_org
+        WHERE
+            del_flag = '0'
+        <if test="customerId != null and customerId != '' ">
+            AND customer_id = #{customerId}
+        </if>
+        <if test="agencyId != null and agencyId != '' ">
+            AND agency_id_path LIKE CONCAT('%',#{agencyId},'%')
+        </if>
+        <if test="serviceType != null and serviceType != '' ">
+            AND service_type LIKE CONCAT('%', #{serviceType}, '%')
         </if>
         ORDER BY created_time DESC
     </select>
 
+    <delete id="del">
+        UPDATE ic_service_org
+        SET del_flag = '1',
+            updated_by = #{updatedBy},
+            updated_time = NOW()
+        WHERE
+            id = #{id}
+        AND del_flag = '0'
+    </delete>
+
 
 </mapper>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcServiceRecordDao">
+
+    <resultMap type="com.epmet.entity.IcServiceRecordEntity" id="icServiceRecordMap">
+        <result property="id" column="ID"/>
+        <result property="serviceCategoryId" column="SERVICE_CATEGORY_ID"/>
+        <result property="serviceProjectId" column="SERVICE_PROJECT_ID"/>
+        <result property="serviceProjectName" column="SERVICE_PROJECT_NAME"/>
+        <result property="serviceOrgId" column="SERVICE_ORG_ID"/>
+        <result property="serviceOrgName" column="SERVICE_ORG_NAME"/>
+        <result property="principalName" column="PRINCIPAL_NAME"/>
+        <result property="principalContact" column="PRINCIPAL_CONTACT"/>
+        <result property="serviceTimeStart" column="SERVICE_TIME_START"/>
+        <result property="serviceTimeEnd" column="SERVICE_TIME_END"/>
+        <result property="serviceStatus" column="SERVICE_STATUS"/>
+        <result property="remark" column="REMARK"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+    </resultMap>
+
+
+</mapper>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceScopeDao.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcServiceScopeDao">
+
+    <resultMap type="com.epmet.entity.IcServiceScopeEntity" id="icServiceScopeMap">
+        <result property="id" column="ID"/>
+        <result property="serviceCategoryId" column="SERVICE_CATEGORY_ID"/>
+        <result property="serviceProjectId" column="SERVICE_PROJECT_ID"/>
+        <result property="serviceOrgId" column="SERVICE_ORG_ID"/>
+        <result property="serviceRecordId" column="SERVICE_RECORD_ID"/>
+        <result property="objectType" column="OBJECT_TYPE"/>
+        <result property="objectId" column="OBJECT_ID"/>
+        <result property="objectIdPath" column="OBJECT_ID_PATH"/>
+        <result property="objectName" column="OBJECT_NAME"/>
+        <result property="remark" column="REMARK"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+    </resultMap>
+
+    <update id="update" parameterType="map">
+        update ic_service_scope set del_flag='1',UPDATED_TIME=now(),UPDATED_BY=#{userId}
+        where SERVICE_RECORD_ID=#{serviceId}
+    </update>
+
+    <select id="selectList" parameterType="java.lang.String" resultType="com.epmet.dto.result.IcServiceScopeDTO">
+        SELECT
+            s.OBJECT_ID,
+            s.OBJECT_TYPE,
+            s.OBJECT_NAME,
+            s.OBJECT_ID_PATH
+        FROM
+            ic_service_scope s
+        WHERE
+            s.DEL_FLAG = '0'
+            AND s.SERVICE_RECORD_ID = #{serviceRecordId}
+    </select>
+</mapper>