暂提

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

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java

@@ -67,4 +67,7 @@ public class IcPartyActController {
         return new Result();
     }
 
+//    @PostMapping("homeMonthTotal")
+//    public Result
+    
 }

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;
 
 
@@ -67,4 +71,32 @@ public class IcScheduleController {
         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<String> scheduleIds){
+        icScheduleService.delSchedule(scheduleIds);
+        return new Result();
+    }
+    
 }

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;
 
 /**
@@ -13,4 +14,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IcScheduleDao extends BaseDao<IcScheduleEntity> {
 
+    void editSchedule(AddOrEditScheduleFormDTO formDTO);
+
 }

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<IcScheduleEntity> {
      * @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<String> scheduleIds);
 }

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<IcScheduleDao, IcSche
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * Desc: 新增或编辑日程
+     * @param formDTO
+     * @author zxc
+     * @date 2022/8/18 16:31
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addOrEditSchedule(AddOrEditScheduleFormDTO formDTO) {
+        if (StringUtils.isNotBlank(formDTO.getScheduleId())){
+            baseDao.editSchedule(formDTO);
+            return;
+        }
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null == staffInfo){
+            throw new EpmetException("查询工作人员信息失败："+formDTO.getStaffId());
+        }
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+        if (null == agencyInfo){
+            throw new EpmetException("查询组织信息失败："+staffInfo.getAgencyId());
+        }
+        IcScheduleEntity e = ConvertUtils.sourceToTarget(formDTO, IcScheduleEntity.class);
+        e.setOrgId(staffInfo.getAgencyId());
+        e.setPid(agencyInfo.getPid());
+        e.setOrgIdPath("".equals(agencyInfo.getPids()) ? "" : agencyInfo.getPids().concat(":").concat(agencyInfo.getId()));
+        baseDao.insert(e);
+    }
+
+    /**
+     * Desc: 删除日程
+     * @param scheduleIds
+     * @author zxc
+     * @date 2022/8/18 17:00
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delSchedule(List<String> scheduleIds) {
+        if (CollectionUtils.isNotEmpty(scheduleIds)){
+            baseDao.deleteBatchIds(scheduleIds);
+        }
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml

@@ -3,4 +3,15 @@
 
 <mapper namespace="com.epmet.modules.partyOrg.dao.IcScheduleDao">
 
+    <update id="editSchedule">
+        UPDATE ic_schedule
+        SET UPDATED_TIME = NOW(),
+            title = #{title},
+            remind_time = #{remindTime},
+            <if test='null != remark and remark != "" '>
+                REMARK = #{remark},
+            </if>
+            is_public = #{isPublic}
+        WHERE ID = #{scheduleId}
+    </update>
 </mapper>