diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java index f0304874e5..8b1d9f8a57 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java @@ -39,6 +39,11 @@ public class IcSocietyOrgDTO implements Serializable { */ private String id; + /** + * 图片地址 + */ + private String imgUrl; + /** * 客户Id */ @@ -74,6 +79,11 @@ public class IcSocietyOrgDTO implements Serializable { */ private String mobile; + /** + * 服务时间 + */ + private String serviceTimeStr; + /** * 起始服务时间 */ @@ -109,34 +119,5 @@ public class IcSocietyOrgDTO implements Serializable { */ private String remarks; - /** - * 删除标识:0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index ca877fda19..b08541a972 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -30,6 +30,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.IcSocietyOrgDTO; import com.epmet.dto.form.AddSocietyOrgFormDTO; import com.epmet.dto.form.EditSocietyOrgFormDTO; import com.epmet.dto.form.GetListSocietyOrgFormDTO; @@ -99,6 +100,16 @@ public class IcSocietyOrgController { return new Result(); } + /** + * @Author sun + * @Description 删除社会组织 + **/ + @RequestMapping("detail/{id}") + public Result detail(@LoginUser TokenDto tokenDto, @PathVariable(value = "id") String id) { + IcSocietyOrgDTO icSocietyOrgDTO = societyOrgService.get(id); + return new Result().ok(icSocietyOrgDTO); + } + /** * @Author sun * @Description 删除社会组织 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java index 20cd08c3b1..f97113dd58 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java @@ -93,7 +93,7 @@ public class IcSocietyOrgEntity extends BaseEpmetEntity { private String adminStaffId; /** - * 地址 + * 图片地址 */ private String imgUrl; /**