Skip to content

P
promotion-service
提交 2b0fa4ce authored 作者: 李秋林's avatar 李秋林
浏览文件
操作

1. 删除指定的销售数据、推广图片；销售数据、打卡记录的数据全部为【有效】

上级 4dd7d9c1
显示空白字符变更
内嵌 并排
正在显示 包含 151 行增加 和 17 行删除
src/main/java/com/wangxiaolu/promotion/controller/activity/employee/EmployeeCoreTemActivityController.java
浏览文件 @ 2b0fa4ce
......@@ -18,14 +18,14 @@ import org.springframework.web.bind.annotation.*;
*/
@Slf4j
@RestController
//@RequestMapping("/activity/employee/core")
@RequestMapping("/activity/employee/core")
public class EmployeeCoreTemActivityController {
@Autowired
EmployeeCoreTemActivityService employeeCoreTemActivityService;
/**
* 员工审批上报活动数据
* 管理员审批上报活动数据
*/
// @PostMapping("/approve/{id}")
public R approveActivity(@PathVariable("id") long reportedId,@RequestBody ApproveVO approveVO) {
......@@ -36,5 +36,14 @@ public class EmployeeCoreTemActivityController {
return R.success();
}
/**
* 管理员删除活动记录
*/
@DeleteMapping("/delete/{id}")
public R deleteActivityById(@PathVariable("id") long id){
employeeCoreTemActivityService.deleteById(id);
return R.success();
}
}
src/main/java/com/wangxiaolu/promotion/controller/activity/employee/EmployeeCoreTemClockController.java
浏览文件 @ 2b0fa4ce
......@@ -6,10 +6,7 @@ import com.wangxiaolu.promotion.result.basedata.R;
import com.wangxiaolu.promotion.service.activity.employee.EmployeeCoreTemClockService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* @author : liqiulin
......@@ -36,5 +33,12 @@ public class EmployeeCoreTemClockController {
return R.success();
}
@DeleteMapping("/delete/{id}")
public R deleteClockById(@PathVariable("id") long id){
employeeCoreTemClockService.deleteClockById(id);
return R.success();
}
}
src/main/java/com/wangxiaolu/promotion/domain/activity/dao/TemporaryActivityMarketCellDao.java
浏览文件 @ 2b0fa4ce
......@@ -18,5 +18,8 @@ public interface TemporaryActivityMarketCellDao {
List<TemporaryActivityMarketCellDto> selectList(TemporaryMarketCellWrapper wrap);
void updateById(TemporaryActivityMarketCellDto dto);
void deleteById(Long id);
void deleteByActivityReportedId(long activityReportedId);
}
src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityClockDaoImpl.java
浏览文件 @ 2b0fa4ce
......@@ -2,6 +2,7 @@ package com.wangxiaolu.promotion.domain.activity.dao.impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wangxiaolu.promotion.common.enums.StatusType;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityClockDao;
import com.wangxiaolu.promotion.domain.activity.mapper.TemporaryActivityClockMapper;
import com.wangxiaolu.promotion.domain.activity.mapper.entity.TemporaryActivityClockDO;
......@@ -119,6 +120,11 @@ public class TemporaryActivityClockDaoImpl implements TemporaryActivityClockDao
if (!CollectionUtils.isEmpty(tcw.getReportedIds())){
qw.in(TemporaryActivityClockDO::getReportedId,tcw.getReportedIds());
}
if (Objects.nonNull(tcw.getReportedId())) {
qw.eq(TemporaryActivityClockDO::getReportedId, tcw.getReportedId());
}
qw.eq(TemporaryActivityClockDO::getIsDelete, StatusType.VALID.getType());
return qw;
}
......
src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityMarketCellDaoImpl.java
浏览文件 @ 2b0fa4ce
......@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wangxiaolu.promotion.common.enums.StatusType;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityMarketCellDao;
import com.wangxiaolu.promotion.domain.activity.mapper.TemporaryActivityMarketCellMapper;
import com.wangxiaolu.promotion.domain.activity.mapper.entity.TemporaryActivityMarketCellDO;
......@@ -76,10 +77,20 @@ public class TemporaryActivityMarketCellDaoImpl implements TemporaryActivityMark
public void deleteById(Long id) {
TemporaryActivityMarketCellDO updateDos = new TemporaryActivityMarketCellDO();
updateDos.setId(id);
updateDos.setIsDelete(0);
updateDos.setIsDelete(StatusType.INVALID.getType());
temporaryActivityMarketCellMapper.updateById(updateDos);
}
@Override
public void deleteByActivityReportedId(long activityReportedId) {
LambdaQueryWrapper<TemporaryActivityMarketCellDO> qw = new LambdaQueryWrapper<>();
qw.eq(TemporaryActivityMarketCellDO::getActivityReportedId,activityReportedId);
TemporaryActivityMarketCellDO updateDo = new TemporaryActivityMarketCellDO();
updateDo.setIsDelete(StatusType.INVALID.getType());
temporaryActivityMarketCellMapper.update(updateDo,qw);
}
private LambdaQueryWrapper<TemporaryActivityMarketCellDO> buildWrapper(TemporaryMarketCellWrapper wrap) {
LambdaQueryWrapper<TemporaryActivityMarketCellDO> qw = new LambdaQueryWrapper<>();
......@@ -95,9 +106,8 @@ public class TemporaryActivityMarketCellDaoImpl implements TemporaryActivityMark
qw.in(TemporaryActivityMarketCellDO::getActivityReportedId, wrap.getActivityIds());
}
// 默认查询未删除数据
qw.eq(TemporaryActivityMarketCellDO::getIsDelete, 1);
qw.eq(TemporaryActivityMarketCellDO::getIsDelete, StatusType.VALID.getType());
return qw;
}
......
src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityPhotoDaoImpl.java
浏览文件 @ 2b0fa4ce
package com.wangxiaolu.promotion.domain.activity.dao.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wangxiaolu.promotion.common.enums.StatusType;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityPhotoDao;
import com.wangxiaolu.promotion.domain.activity.mapper.TemporaryActivityPhotoMapper;
import com.wangxiaolu.promotion.domain.activity.mapper.entity.TemporaryActivityPhotoDO;
......@@ -103,7 +104,7 @@ public class TemporaryActivityPhotoDaoImpl implements TemporaryActivityPhotoDao
@Override
public Map<Integer, List<String>> findReportedGroup(Integer temporaryId, Long reportedId) {
LambdaQueryWrapper<TemporaryActivityPhotoDO> wq = new LambdaQueryWrapper<>();
wq.eq(TemporaryActivityPhotoDO::getReportedId, reportedId).eq(TemporaryActivityPhotoDO::getIsDelete, 1);
wq.eq(TemporaryActivityPhotoDO::getReportedId, reportedId).eq(TemporaryActivityPhotoDO::getIsDelete, StatusType.VALID.getType());
List<TemporaryActivityPhotoDO> dos = temporaryActivityPhotoMapper.selectList(wq);
if (CollectionUtils.isEmpty(dos)) {
return null;
......@@ -121,7 +122,7 @@ public class TemporaryActivityPhotoDaoImpl implements TemporaryActivityPhotoDao
@Override
public Map<Integer, TemporaryActivityPhotoDto> findClockPhotoGroupByClockId(Long clockId) {
LambdaQueryWrapper<TemporaryActivityPhotoDO> wq = new LambdaQueryWrapper<>();
wq.eq(TemporaryActivityPhotoDO::getClockId, clockId).eq(TemporaryActivityPhotoDO::getIsDelete, 1);
wq.eq(TemporaryActivityPhotoDO::getClockId, clockId).eq(TemporaryActivityPhotoDO::getIsDelete, StatusType.VALID.getType());
List<TemporaryActivityPhotoDO> dos = temporaryActivityPhotoMapper.selectList(wq);
List<TemporaryActivityPhotoDto> photoDtos = transitionDtos(dos);
Map<Integer, TemporaryActivityPhotoDto> dtoMap = photoDtos.stream().collect(Collectors.toMap(TemporaryActivityPhotoDto::getType, pDto -> pDto));
......@@ -152,6 +153,11 @@ public class TemporaryActivityPhotoDaoImpl implements TemporaryActivityPhotoDao
if (!Objects.isNull(pw.getTemporaryId()) && pw.getTemporaryId() > 0) {
wq.eq(TemporaryActivityPhotoDO::getTemporaryId, pw.getTemporaryId());
}
if (!Objects.isNull(pw.getReportedId())) {
wq.eq(TemporaryActivityPhotoDO::getReportedId,pw.getReportedId());
}
return wq;
}
......
src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityReportedDaoImpl.java
浏览文件 @ 2b0fa4ce
......@@ -5,6 +5,7 @@ import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wangxiaolu.promotion.common.enums.StatusType;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityReportedDao;
import com.wangxiaolu.promotion.domain.activity.mapper.TemporaryActivityReportedMapper;
import com.wangxiaolu.promotion.domain.activity.mapper.entity.TemporaryActivityReportedDO;
......@@ -124,6 +125,7 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
queryWrapper.between(TemporaryActivityReportedDO::getCreateTime, tw.getCreateDateStart(), tw.getCreateDateEnd());
}
queryWrapper.eq(TemporaryActivityReportedDO::getIsDelete, StatusType.VALID.getType());
// 默认创建日期倒序排列
queryWrapper.orderByDesc(TemporaryActivityReportedDO::getId);
return queryWrapper;
......
src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/TemporaryActivityClockDO.java
浏览文件 @ 2b0fa4ce
......@@ -152,6 +152,13 @@ public class TemporaryActivityClockDO implements Serializable {
// 活动模式
String activityPattern;
/**
* 是否删除
* 1:有效；0：删除；
*/
private Integer isDelete;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/TemporaryActivityReportedDO.java
浏览文件 @ 2b0fa4ce
......@@ -109,6 +109,12 @@ public class TemporaryActivityReportedDO implements Serializable {
*/
private Date modifyTime;
/**
* 是否删除
* 1:有效；0：删除；
*/
private Integer isDelete;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/TemporaryClockWrapper.java
浏览文件 @ 2b0fa4ce
......@@ -43,4 +43,6 @@ public class TemporaryClockWrapper {
* 根据关联id批量查询
*/
private List<Long> reportedIds;
private Long reportedId;
}
src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/dto/TemporaryActivityReportedDto.java
浏览文件 @ 2b0fa4ce
......@@ -144,6 +144,12 @@ public class TemporaryActivityReportedDto {
*/
private TemporaryClockDto clockDto;
/**
* 是否删除
* 1:有效；0：删除；
*/
private Integer isDelete;
public void approvedDataVerify(){
}
......
src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/dto/TemporaryClockDto.java
浏览文件 @ 2b0fa4ce
......@@ -130,6 +130,13 @@ public class TemporaryClockDto {
// 临时打卡类型
Integer brevityClockType;
/**
* 是否删除
* 1:有效；0：删除；
*/
private Integer isDelete;
public TemporaryClockDto(Integer clockType, Long id, Integer temporaryId, String temporaryName, String clockProvince, String clockCity) {
if (!ClockType.TEMPORARY_CLOCK_IN.equals(clockType)) {
this.id = id;
......
src/main/java/com/wangxiaolu/promotion/service/activity/employee/EmployeeCoreTemActivityService.java
浏览文件 @ 2b0fa4ce
......@@ -9,4 +9,6 @@ import com.wangxiaolu.promotion.pojo.activity.employee.vo.ApproveVO;
*/
public interface EmployeeCoreTemActivityService {
void approveActivity(long reportedId, ApproveVO approveVO);
void deleteById(long id);
}
src/main/java/com/wangxiaolu/promotion/service/activity/employee/EmployeeCoreTemClockService.java
浏览文件 @ 2b0fa4ce
......@@ -9,4 +9,6 @@ import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
*/
public interface EmployeeCoreTemClockService {
void updateClockactivityPattern(TemporaryClockDto temporaryClockDto);
void deleteClockById(long id);
}
src/main/java/com/wangxiaolu/promotion/service/activity/employee/impl/EmployeeCoreTemActivityServiceImpl.java
浏览文件 @ 2b0fa4ce
package com.wangxiaolu.promotion.service.activity.employee.impl;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityLogDao;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityReportedDao;
import com.wangxiaolu.promotion.common.enums.StatusType;
import com.wangxiaolu.promotion.domain.activity.dao.*;
import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper;
import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryPhotoWrapper;
import com.wangxiaolu.promotion.enums.activity.LogType;
import com.wangxiaolu.promotion.enums.activity.TemActApproveStatus;
import com.wangxiaolu.promotion.exception.DataException;
import com.wangxiaolu.promotion.exception.ParamException;
import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityMarketCellDto;
import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
import com.wangxiaolu.promotion.pojo.activity.employee.vo.ApproveVO;
import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
import com.wangxiaolu.promotion.result.basedata.RCode;
import com.wangxiaolu.promotion.service.activity.employee.EmployeeCoreTemActivityService;
import lombok.extern.slf4j.Slf4j;
......@@ -27,9 +32,14 @@ import java.util.Objects;
public class EmployeeCoreTemActivityServiceImpl implements EmployeeCoreTemActivityService {
@Autowired
TemporaryActivityReportedDao temporaryActivityReportedDao;
private TemporaryActivityReportedDao temporaryActivityReportedDao;
@Autowired
private TemporaryActivityLogDao tempActivityLogDao;
@Autowired
private TemporaryActivityMarketCellDao temporaryActivityMarketCellDao;
@Autowired
private TemporaryActivityPhotoDao temporaryActivityPhotoDao;
@Transactional(rollbackFor = Exception.class)
@Override
......@@ -55,4 +65,29 @@ public class EmployeeCoreTemActivityServiceImpl implements EmployeeCoreTemActivi
LogType logType = TemActApproveStatus.APPROVED.equals(approveVO.getApproveStatus()) ? LogType.t_5 : LogType.t_4;
tempActivityLogDao.save(reportedDto.getTemporaryId(), reportedDto.getTemporaryName(), logType, temActDto.getId(), temActDto);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void deleteById(long id) {
// 查询记录判断是否存在
TemporaryActivityReportedDto activityDo = temporaryActivityReportedDao.findOneById(id);
if (Objects.isNull(activityDo)){
throw new DataException(RCode.ACTIVITY_DATA_NOT_HAVE_ERROR);
}
// 删除记录
TemporaryActivityReportedDto updateDto = new TemporaryActivityReportedDto();
updateDto.setId(activityDo.getId()).setIsDelete(StatusType.INVALID.getType());
temporaryActivityReportedDao.updateById(updateDto);
// 删除售卖单元
temporaryActivityMarketCellDao.deleteByActivityReportedId(activityDo.getId());
// 删除记录图片
TemporaryPhotoWrapper tpw = new TemporaryPhotoWrapper();
tpw.setTemporaryId(activityDo.getTemporaryId())
.setReportedId(activityDo.getId());
temporaryActivityPhotoDao.updateStatus(tpw,StatusType.INVALID.getType());
}
}
src/main/java/com/wangxiaolu/promotion/service/activity/employee/impl/EmployeeCoreTemClockServiceImpl.java
浏览文件 @ 2b0fa4ce
package com.wangxiaolu.promotion.service.activity.employee.impl;
import com.wangxiaolu.promotion.common.enums.StatusType;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityClockDao;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityPhotoDao;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityReportedDao;
import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper;
import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryPhotoWrapper;
import com.wangxiaolu.promotion.exception.DataException;
import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
......@@ -27,6 +31,9 @@ public class EmployeeCoreTemClockServiceImpl implements EmployeeCoreTemClockServ
TemporaryActivityClockDao temporaryActivityClockDao;
@Autowired
TemporaryActivityReportedDao temporaryActivityReportedDao;
@Autowired
private TemporaryActivityPhotoDao temporaryActivityPhotoDao;
@Transactional(rollbackFor = Exception.class)
@Override
......@@ -46,4 +53,23 @@ public class EmployeeCoreTemClockServiceImpl implements EmployeeCoreTemClockServ
temporaryActivityReportedDao.updateById(reportedDto);
}
@Override
public void deleteClockById(long id) {
// 查询打卡记录并删除
TemporaryClockDto clockDto = temporaryActivityClockDao.selectById(id);
if (Objects.isNull(clockDto)){
throw new DataException(RCode.CLOCK_DATA_NOT_HAVE_ERROR);
}
TemporaryClockDto updateClockDto = new TemporaryClockDto();
updateClockDto.setId(clockDto.getId()).setIsDelete(StatusType.INVALID.getType());
temporaryActivityClockDao.updateById(updateClockDto);
// 删除打卡记录图片
TemporaryPhotoWrapper tpw = new TemporaryPhotoWrapper();
tpw.setTemporaryId(clockDto.getTemporaryId())
.setClockId(clockDto.getId());
temporaryActivityPhotoDao.updateStatus(tpw,StatusType.INVALID.getType());
}
}
src/main/resources/mapper/TemporaryActivityClockMapper.xml
浏览文件 @ 2b0fa4ce
......@@ -53,11 +53,10 @@
ti.charger_name
from temporary_info ti
inner join temporary_activity_clock tc on ti.id = tc.temporary_id
<where>
where tc.is_delete = 1
<if test="tcw != null and tcw.clockOutTimeIsNull != null and tcw.clockOutTimeIsNull == true">
tc.clock_out_time is null
and tc.clock_out_time is null
</if>
</where>
order by id desc
limit #{skipNum}, #{pageSize};
</select>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论