线索记录业务和代码规范插件删除

master
yqy 1 year ago
parent c45d7d2d2f
commit e516ccb2be

@ -1,38 +0,0 @@
package com.baiye.modules.distribute.controller;
import com.baiye.modules.distribute.entity.ClueFollowRecordEntity;
import com.baiye.modules.distribute.service.ClueFollowRecordService;
import com.baiye.result.BaseResultCode;
import com.baiye.result.R;
import com.baiye.validation.group.CreateGroup;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RequiredArgsConstructor
@RestController
@Tag(name = "资源跟进记录API")
@RequestMapping("/clueFollow")
public class ClueFollowRecordController {
private final ClueFollowRecordService clueFollowRecordService;
@PostMapping("/add")
@Operation(summary = "新增线索跟进记录", description = "新增线索跟进记录")
public R<Object> add(@Validated({ CreateGroup.class }) @RequestBody ClueFollowRecordEntity clueStageEntity) {
return clueFollowRecordService.add(clueStageEntity) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "添加失败");
}
@DeleteMapping("/delAll")
@Operation(summary = "ID删除线索阶段")
public R<Void> deleteByUserId(@RequestBody List<Long> ids) {
return clueFollowRecordService.removeBatchByIds(ids) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "删除失败");
}
}

@ -1,46 +0,0 @@
package com.baiye.modules.distribute.entity;
import com.baiye.entity.BaseEntity;
import com.baiye.validation.group.CreateGroup;
import com.baiye.validation.group.UpdateGroup;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
@Getter
@Setter
@ToString
@TableName("tb_clue_follow_record")
@Schema(title = "线索跟进记录表")
public class ClueFollowRecordEntity extends BaseEntity {
@TableId
@Schema(title = "ID")
@NotNull(message = "ID不能为空", groups = { UpdateGroup.class })
private Long id;
@Schema(title = "线索ID")
@NotNull(message = "线索ID不能为空", groups = { CreateGroup.class })
private Long clueId;
@Schema(title = "线索阶段ID")
@NotNull(message = "线索阶段ID不能为空", groups = { CreateGroup.class })
private Long clueStageId;
@Schema(title = "跟进信息")
private String recordInfo;
@Schema(title = "跟进信息集合")
@TableField(exist = false)
@NotEmpty(message = "跟进信息不能为空", groups = { CreateGroup.class })
private List<String> recordInfoList;
}

@ -3,7 +3,6 @@ package com.baiye.modules.distribute.entity;
import com.baiye.entity.BaseEntity; import com.baiye.entity.BaseEntity;
import com.baiye.validation.group.CreateGroup; import com.baiye.validation.group.CreateGroup;
import com.baiye.validation.group.UpdateGroup; import com.baiye.validation.group.UpdateGroup;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
@ -13,12 +12,7 @@ import lombok.ToString;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @Author YQY
* @Date 2023/8/15
*/
@Getter @Getter
@Setter @Setter
@ToString @ToString
@ -42,8 +36,4 @@ public class ClueStageEntity extends BaseEntity {
@NotNull(message = "线索阶段排序不能为空", groups = { CreateGroup.class }) @NotNull(message = "线索阶段排序不能为空", groups = { CreateGroup.class })
private Integer sort; private Integer sort;
@Schema(title = "线索阶段记录")
@TableField(exist = false)
private List<ClueFollowRecordEntity> clueFollowRecordList;
} }

@ -1,8 +0,0 @@
package com.baiye.modules.distribute.mapper;
import com.baiye.extend.mybatis.plus.mapper.ExtendMapper;
import com.baiye.modules.distribute.entity.ClueFollowRecordEntity;
public interface ClueFollowRecordMapper extends ExtendMapper<ClueFollowRecordEntity> {
}

@ -1,10 +0,0 @@
package com.baiye.modules.distribute.service;
import com.baiye.extend.mybatis.plus.service.ExtendService;
import com.baiye.modules.distribute.entity.ClueFollowRecordEntity;
public interface ClueFollowRecordService extends ExtendService<ClueFollowRecordEntity> {
boolean add(ClueFollowRecordEntity clueStageEntity);
}

@ -1,35 +0,0 @@
package com.baiye.modules.distribute.service.impl;
import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl;
import com.baiye.modules.distribute.entity.ClueFollowRecordEntity;
import com.baiye.modules.distribute.mapper.ClueFollowRecordMapper;
import com.baiye.modules.distribute.service.ClueFollowRecordService;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@Service
@Slf4j
public class ClueFollowRecordServiceImpl extends ExtendServiceImpl<ClueFollowRecordMapper, ClueFollowRecordEntity>
implements ClueFollowRecordService {
@Override
@Transactional(rollbackFor = Exception.class)
public boolean add(ClueFollowRecordEntity entity) {
List<ClueFollowRecordEntity> list = new ArrayList<>();
List<String> recordInfoList = entity.getRecordInfoList();
for (String recordInfo : recordInfoList) {
ClueFollowRecordEntity clueFollowRecordEntity = new ClueFollowRecordEntity();
BeanUtils.copyProperties(entity, clueFollowRecordEntity);
clueFollowRecordEntity.setRecordInfo(recordInfo);
list.add(clueFollowRecordEntity);
}
return SqlHelper.retBool(baseMapper.insertBatchSomeColumn(list));
}
}

@ -8,7 +8,6 @@ import com.baiye.domain.PageResult;
import com.baiye.modules.distribute.converter.ClueConverter; import com.baiye.modules.distribute.converter.ClueConverter;
import com.baiye.modules.distribute.dto.ClueDTO; import com.baiye.modules.distribute.dto.ClueDTO;
import com.baiye.modules.distribute.entity.*; import com.baiye.modules.distribute.entity.*;
import com.baiye.modules.distribute.mapper.ClueFollowRecordMapper;
import com.baiye.modules.distribute.mapper.ClueMapper; import com.baiye.modules.distribute.mapper.ClueMapper;
import com.baiye.modules.distribute.mapper.ClueRecordMapper; import com.baiye.modules.distribute.mapper.ClueRecordMapper;
import com.baiye.modules.distribute.qo.ClueQo; import com.baiye.modules.distribute.qo.ClueQo;
@ -20,7 +19,6 @@ import com.baiye.security.util.SecurityUtils;
import com.baiye.util.AESUtils; import com.baiye.util.AESUtils;
import com.baiye.util.MobileUtil; import com.baiye.util.MobileUtil;
import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -45,8 +43,6 @@ public class ClueServiceImpl extends ExtendServiceImpl<ClueMapper, ClueEntity> i
private final ClueStageService clueStageService; private final ClueStageService clueStageService;
private final ClueFollowRecordMapper clueFollowRecordMapper;
private final SecurityProperties securityProperties; private final SecurityProperties securityProperties;
@Override @Override
@ -163,25 +159,6 @@ public class ClueServiceImpl extends ExtendServiceImpl<ClueMapper, ClueEntity> i
List<LabelOrganizeEntity> organizeEntities = labelOrganizeService.queryUserList(whichUserId); List<LabelOrganizeEntity> organizeEntities = labelOrganizeService.queryUserList(whichUserId);
// 查询上级用户阶段 // 查询上级用户阶段
List<ClueStageEntity> clueStageEntities = clueStageService.queryUserList(whichUserId); List<ClueStageEntity> clueStageEntities = clueStageService.queryUserList(whichUserId);
if (CollUtil.isNotEmpty(clueStageEntities)) {
List<Long> clueStageIds = clueStageEntities.stream()
.map(ClueStageEntity::getClueStageId)
.collect(Collectors.toList());
// 查询阶段的记录
List<ClueFollowRecordEntity> clueFollowRecordEntities = clueFollowRecordMapper.selectList(
new LambdaQueryWrapper<ClueFollowRecordEntity>().eq(ClueFollowRecordEntity::getClueId, clueId)
.in(ClueFollowRecordEntity::getClueStageId, clueStageIds));
// 记录放入阶段中
if (CollUtil.isNotEmpty(clueFollowRecordEntities)) {
Map<Long, List<ClueFollowRecordEntity>> map = clueFollowRecordEntities.stream()
.collect(Collectors.groupingBy(ClueFollowRecordEntity::getClueStageId));
for (ClueStageEntity clueStageEntity : clueStageEntities) {
if (map.containsKey(clueStageEntity.getClueStageId())) {
clueStageEntity.setClueFollowRecordList(map.get(clueStageEntity.getClueStageId()));
}
}
}
}
clueVO.setOrganizeEntities(organizeEntities); clueVO.setOrganizeEntities(organizeEntities);
clueVO.setClueStageEntities(clueStageEntities); clueVO.setClueStageEntities(clueStageEntities);

@ -518,19 +518,6 @@
</resources> </resources>
<plugins> <plugins>
<plugin>
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>validate</goal>
</goals>
<inherited>true</inherited>
<phase>validate</phase>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId> <artifactId>flatten-maven-plugin</artifactId>
@ -558,11 +545,6 @@
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId>
<version>${spring-javaformat-checkstyle.version}</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -617,23 +599,5 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<developers>
<developer>
<name>hccake</name>
<email>chengbohua@foxmail.com</email>
</developer>
</developers>
<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/mit-license.php</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>https://github.com/hccake/ballcat</url>
<connection>https://github.com/hccake/ballcat.git</connection>
<developerConnection>https://github.com/hccake</developerConnection>
</scm>
</project> </project>

Loading…
Cancel
Save