From 7463493102ea0791d3912e4793e07855ccdada37 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 18 Aug 2022 17:20:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/AddOrEditScheduleFormDTO.java | 48 ++++++++++++++++++ .../controller/IcPartyActController.java | 3 ++ .../controller/IcScheduleController.java | 32 ++++++++++++ .../modules/partyOrg/dao/IcScheduleDao.java | 5 +- .../partyOrg/service/IcScheduleService.java | 17 +++++++ .../service/impl/IcScheduleServiceImpl.java | 49 +++++++++++++++++++ .../mapper/partyOrg/IcScheduleDao.xml | 11 +++++ 7 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java new file mode 100644 index 0000000000..5daa0a7aca --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java @@ -0,0 +1,48 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; + +/** + * @Author zxc + * @DateTime 2022/8/18 16:23 + * @DESC + */ +@Data +public class AddOrEditScheduleFormDTO implements Serializable { + + private static final long serialVersionUID = 6290505458783549828L; + + public interface AddScheduleForm{} + + private String scheduleId; + private String staffId; + private String customerId; + + /** + * 日程标题（35字） + */ + @NotBlank(message = "title不能为空",groups = AddScheduleForm.class) + private String title; + + /** + * 提醒时间；其实就是日程所属日期 + */ + @NotNull(message = "remindTime不能为空",groups = AddScheduleForm.class) + private Date remindTime; + + /** + * 是否公开，0：仅自己可见；1：组织内其他人可见 + */ + @NotBlank(message = "isPublic不能为空",groups = AddScheduleForm.class) + private String isPublic; + + /** + * 备注（500字） + */ + private String remark; +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index edf1438c73..6b94eaf18f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -66,5 +66,8 @@ public class IcPartyActController { icPartyActService.delete(ids); return new Result(); } + +// @PostMapping("homeMonthTotal") +// public Result } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index d3c28d2840..edae364122 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -1,7 +1,9 @@ package com.epmet.modules.partyOrg.controller; +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.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -10,9 +12,11 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; @@ -66,5 +70,33 @@ public class IcScheduleController { icScheduleService.delete(ids); return new Result(); } + + /** + * Desc: 新增或编辑日程 + * @param tokenDto + * @param formDTO + * @author zxc + * @date 2022/8/18 16:31 + */ + @PostMapping("addOrEdit") + public Result addOrEditSchedule(@LoginUser TokenDto tokenDto,@RequestBody AddOrEditScheduleFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddOrEditScheduleFormDTO.AddScheduleForm.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + icScheduleService.addOrEditSchedule(formDTO); + return new Result(); + } + + /** + * Desc: 删除日程 + * @param scheduleIds + * @author zxc + * @date 2022/8/18 17:00 + */ + @PostMapping("del") + public Result delSchedule(@RequestBody List scheduleIds){ + icScheduleService.delSchedule(scheduleIds); + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index 4abde59690..b8b407a170 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -2,6 +2,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import org.apache.ibatis.annotations.Mapper; /** @@ -12,5 +13,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcScheduleDao extends BaseDao { - + + void editSchedule(AddOrEditScheduleFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java index a00d29f11e..dbfc499d81 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java @@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.resi.partymember.dto.IcScheduleDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import java.util.List; import java.util.Map; @@ -75,4 +76,20 @@ public interface IcScheduleService extends BaseService { * @date 2022-08-18 */ void delete(String[] ids); + + /** + * Desc: 新增或编辑日程 + * @param formDTO + * @author zxc + * @date 2022/8/18 16:31 + */ + void addOrEditSchedule(AddOrEditScheduleFormDTO formDTO); + + /** + * Desc: 删除日程 + * @param scheduleIds + * @author zxc + * @date 2022/8/18 17:00 + */ + void delSchedule(List scheduleIds); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 0702302c40..3c7861a02d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -4,12 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -79,4 +86,46 @@ public class IcScheduleServiceImpl extends BaseServiceImpl scheduleIds) { + if (CollectionUtils.isNotEmpty(scheduleIds)){ + baseDao.deleteBatchIds(scheduleIds); + } + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 01fb53be92..878c3f9fec 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -3,4 +3,15 @@ + + UPDATE ic_schedule + SET UPDATED_TIME = NOW(), + title = #{title}, + remind_time = #{remindTime}, + + REMARK = #{remark}, + + is_public = #{isPublic} + WHERE ID = #{scheduleId} + \ No newline at end of file