Commit 1ded015f authored by wujipeng's avatar wujipeng
Browse files

excel解析增加人员所属案件id

parent 1838cc66
...@@ -35,7 +35,7 @@ public class ExcelTemplateController extends BaseController { ...@@ -35,7 +35,7 @@ public class ExcelTemplateController extends BaseController {
@ApiOperation(value = "详情") @ApiOperation(value = "详情")
@GetMapping("/{id}") @GetMapping("/{id}")
public Result<ExcelTemplateVO> detail(@PathVariable Integer id) { public Result<ExcelTemplateVO> detail(@PathVariable Integer id) {
return Result.data(DozerUtils.convertBean(excelTemplateService.getById(id), ExcelTemplateVO.class)); return Result.data(excelTemplateService.detail(id));
} }
@ApiOperation(value = "新增编辑") @ApiOperation(value = "新增编辑")
......
...@@ -24,6 +24,7 @@ public class ExcelDataEntity { ...@@ -24,6 +24,7 @@ public class ExcelDataEntity {
private String id; private String id;
@TableField("case_id") @TableField("case_id")
@ApiModelProperty("案件id")
private String caseId; private String caseId;
@TableField("directory_id") @TableField("directory_id")
......
package com.platform.model.entity; package com.platform.model.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
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.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -18,6 +20,10 @@ public class UserAccountEntity { ...@@ -18,6 +20,10 @@ public class UserAccountEntity {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
@TableField("case_id")
@ApiModelProperty("案件id")
private String caseId;
private String userName; private String userName;
private String account; private String account;
......
package com.platform.model.entity; package com.platform.model.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
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.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -18,6 +20,10 @@ public class UserEntity { ...@@ -18,6 +20,10 @@ public class UserEntity {
@TableId(value = "id",type = IdType.AUTO) @TableId(value = "id",type = IdType.AUTO)
private int id; private int id;
@TableField("case_id")
@ApiModelProperty("案件id")
private String caseId;
private String userName; private String userName;
private String sex; private String sex;
......
package com.platform.model.vo; package com.platform.model.vo;
import com.platform.model.entity.ExcelTemplateEntity; import com.platform.model.entity.ExcelTemplateEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2025/7/30 15:12 * @date : 2025/7/30 15:12
...@@ -13,4 +16,7 @@ import lombok.EqualsAndHashCode; ...@@ -13,4 +16,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class ExcelTemplateVO extends ExcelTemplateEntity { public class ExcelTemplateVO extends ExcelTemplateEntity {
@ApiModelProperty("表头解析,方便操作使用")
private List<TableHeaderVO> tableHeaderList;
} }
...@@ -15,5 +15,19 @@ import java.util.List; ...@@ -15,5 +15,19 @@ import java.util.List;
*/ */
public interface ExcelTemplateService extends IService<ExcelTemplateEntity> { public interface ExcelTemplateService extends IService<ExcelTemplateEntity> {
/**
* 分页
*
* @param excelTemplateDTO excelTemplateDTO
* @return List<ExcelTemplateVO>
*/
List<ExcelTemplateVO> pageExcelTemplate(ExcelTemplateDTO excelTemplateDTO); List<ExcelTemplateVO> pageExcelTemplate(ExcelTemplateDTO excelTemplateDTO);
/**
* 详情
*
* @param id id
* @return ExcelTemplateVO
*/
ExcelTemplateVO detail(Integer id);
} }
...@@ -212,11 +212,13 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -212,11 +212,13 @@ public class AnalysisServiceImpl implements AnalysisService {
.idCard(idCardInfo.get("idCard")) .idCard(idCardInfo.get("idCard"))
.sex(idCardInfo.get("sex")) .sex(idCardInfo.get("sex"))
.idType("身份证") .idType("身份证")
.caseId(caseId)
.build()); .build());
} }
if (!excelData.isEmpty()) { if (!excelData.isEmpty()) {
List<String> paymentBankNames = excelData.stream().map(ExcelDataEntity::getPaymentBankName).distinct().collect(Collectors.toList()); List<String> paymentBankNames = excelData.stream().map(ExcelDataEntity::getPaymentBankName).distinct().collect(Collectors.toList());
userAccountService.saveUserBatch(paymentBankNames.stream().map(paymentBankName -> UserAccountEntity.builder().userName(userName).account(paymentBankName).build()).collect(Collectors.toList())); userAccountService.saveUserBatch(paymentBankNames.stream().map(paymentBankName -> UserAccountEntity
.builder().userName(userName).account(paymentBankName).caseId(caseId).build()).collect(Collectors.toList()));
} }
} }
......
package com.platform.service.impl; package com.platform.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.mapper.ExcelTemplateMapper; import com.platform.mapper.ExcelTemplateMapper;
import com.platform.model.dto.ExcelTemplateDTO; import com.platform.model.dto.ExcelTemplateDTO;
import com.platform.model.entity.ExcelTemplateEntity; import com.platform.model.entity.ExcelTemplateEntity;
import com.platform.model.vo.ExcelTemplateVO; import com.platform.model.vo.ExcelTemplateVO;
import com.platform.model.vo.TableHeaderVO;
import com.platform.service.ExcelTemplateService; import com.platform.service.ExcelTemplateService;
import com.platform.utils.DozerUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.List; import java.util.List;
...@@ -20,6 +24,25 @@ import java.util.List; ...@@ -20,6 +24,25 @@ import java.util.List;
public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, ExcelTemplateEntity> implements ExcelTemplateService { public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, ExcelTemplateEntity> implements ExcelTemplateService {
@Override @Override
public List<ExcelTemplateVO> pageExcelTemplate(ExcelTemplateDTO excelTemplateDTO) { public List<ExcelTemplateVO> pageExcelTemplate(ExcelTemplateDTO excelTemplateDTO) {
return baseMapper.pageExcelTemplate(excelTemplateDTO); List<ExcelTemplateVO> excelTemplateList = baseMapper.pageExcelTemplate(excelTemplateDTO);
for (ExcelTemplateVO excelTemplateVO : excelTemplateList) {
if(!ObjectUtils.isEmpty(excelTemplateVO)){
String json = excelTemplateVO.getJson();
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplateVO.setTableHeaderList(tableHeaderList);
}
}
return excelTemplateList;
}
@Override
public ExcelTemplateVO detail(Integer id) {
ExcelTemplateVO excelTemplate = DozerUtils.convertBean(getById(id), ExcelTemplateVO.class);
if(!ObjectUtils.isEmpty(excelTemplate)){
String json = excelTemplate.getJson();
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplate.setTableHeaderList(tableHeaderList);
}
return excelTemplate;
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment