|
|
|
|
@ -120,8 +120,15 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
|
|
|
|
|
if(!isFlag.isEmpty()){
|
|
|
|
|
throw new ServiceException("该申报任务标题已经存在");
|
|
|
|
|
}
|
|
|
|
|
//新增的时候根据当前时间判断状态是否有效
|
|
|
|
|
tiTimeChange.getTime(bmsTemplateRecordAddDto);
|
|
|
|
|
//如果不限时
|
|
|
|
|
if(bmsTemplateRecordAddDto.getIsTime()==null){
|
|
|
|
|
throw new ServiceException("请选择是否限时");
|
|
|
|
|
} else if(bmsTemplateRecordAddDto.getIsTime() == 1){
|
|
|
|
|
bmsTemplateRecordAddDto.setStatus(3);
|
|
|
|
|
}else {
|
|
|
|
|
//新增的时候根据当前时间判断状态是否有效
|
|
|
|
|
tiTimeChange.getTime(bmsTemplateRecordAddDto);
|
|
|
|
|
}
|
|
|
|
|
//添加在线模板
|
|
|
|
|
num = baseMapper.insert(bmsTemplateRecordAddDto);
|
|
|
|
|
//前端excel企业名录集合
|
|
|
|
|
@ -267,13 +274,22 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public int supplementation(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
|
|
|
|
|
//只有未修改之前是过期的才能补录
|
|
|
|
|
if (bmsTemplateRecordUpdateDto.getStatus() != 1) {
|
|
|
|
|
throw new ServiceException("未过期不可以补录");
|
|
|
|
|
}
|
|
|
|
|
tiTimeChange.getTime(bmsTemplateRecordUpdateDto);
|
|
|
|
|
if (bmsTemplateRecordUpdateDto.getStatus() != 2) {
|
|
|
|
|
throw new ServiceException("请修改时间范围为有效区间");
|
|
|
|
|
BmsTemplateRecord infos = getById(bmsTemplateRecordUpdateDto.getId());
|
|
|
|
|
if (infos.getIsTime() == 1){
|
|
|
|
|
bmsTemplateRecordUpdateDto.setStartTime(null);
|
|
|
|
|
bmsTemplateRecordUpdateDto.setEndTime(null);
|
|
|
|
|
bmsTemplateRecordUpdateDto.setStatus(3);
|
|
|
|
|
}else if(infos.getIsTime() == 0){
|
|
|
|
|
//只有未修改之前是过期的才能补录
|
|
|
|
|
if (bmsTemplateRecordUpdateDto.getStatus() != 1) {
|
|
|
|
|
throw new ServiceException("未过期不可以补录");
|
|
|
|
|
}
|
|
|
|
|
tiTimeChange.getTime(bmsTemplateRecordUpdateDto);
|
|
|
|
|
if (bmsTemplateRecordUpdateDto.getStatus() != 2) {
|
|
|
|
|
throw new ServiceException("请修改时间范围为有效区间");
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
throw new ServiceException("补录失败");
|
|
|
|
|
}
|
|
|
|
|
int num = baseMapper.updateById(bmsTemplateRecordUpdateDto);
|
|
|
|
|
//要添加的在线申报记录
|
|
|
|
|
@ -304,65 +320,11 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
|
|
|
|
|
getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getTemplateId());
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
//去在线申报记录找已经填报过的企业
|
|
|
|
|
// QueryWrapper<BmsDeclarationRecords> query = new QueryWrapper<>();
|
|
|
|
|
// query.eq("template_record_id", bmsTemplateRecordUpdateDto.getId())
|
|
|
|
|
// .ne("status", 0)
|
|
|
|
|
// .isNotNull("detail_id");
|
|
|
|
|
// List<BmsDeclarationRecords> deRList = iBmsDeclarationRecordsService.list(query);
|
|
|
|
|
//存储已经填报过的所有企业信用代码
|
|
|
|
|
// List<BmsEnterpriseDirectory> deIdList = new ArrayList<>();
|
|
|
|
|
// for (BmsDeclarationRecords items : deRList) {
|
|
|
|
|
// BmsEnterpriseDirectory bmsEnterpriseDirectory = new BmsEnterpriseDirectory();
|
|
|
|
|
// bmsEnterpriseDirectory.setCreditCode(items.getCreditCode());
|
|
|
|
|
// deIdList.add(bmsEnterpriseDirectory);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 创建存放所有数据的map
|
|
|
|
|
// Map<String, BmsEnterpriseDirectory> map = new HashMap<>();
|
|
|
|
|
// // 合并俩个集合
|
|
|
|
|
// list.addAll(enterpriseDirectoryList);
|
|
|
|
|
// // 遍历合并后的集合存放到map里
|
|
|
|
|
// list.forEach(t -> {
|
|
|
|
|
// map.putIfAbsent(t.getCreditCode(), t);
|
|
|
|
|
// });
|
|
|
|
|
// // 这是将excel和企业名录去重之后的企业
|
|
|
|
|
// List<BmsEnterpriseDirectory> mergeList = new ArrayList<>(map.values());
|
|
|
|
|
//
|
|
|
|
|
// List<String> code = new ArrayList<>();
|
|
|
|
|
// mergeList.forEach(x->{
|
|
|
|
|
// code.add(x.getCreditCode());
|
|
|
|
|
// x.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId());
|
|
|
|
|
// getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getTemplateId());
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
|
|
// QueryWrapper<BmsDeclarationRecords> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
// queryWrapper.in("credit_code", code);
|
|
|
|
|
// queryWrapper.eq("template_record_id", bmsTemplateRecordUpdateDto.getId());
|
|
|
|
|
// queryWrapper.eq("status", 0);
|
|
|
|
|
// queryWrapper.isNull("detail_id");
|
|
|
|
|
// iBmsDeclarationRecordsService.remove(queryWrapper);
|
|
|
|
|
//新增到企业名录
|
|
|
|
|
enterpriseDirectoryService.saveBatch(enterpriseDirectoryList);
|
|
|
|
|
//最后新添加进在线申报记录
|
|
|
|
|
iBmsDeclarationRecordsService.saveBatch(drlist);
|
|
|
|
|
|
|
|
|
|
// //再去在线申报记录里面查找相关企业的在线申报记录
|
|
|
|
|
// List<BmsDeclarationRecords> bm = iBmsDeclarationRecordsService.selectET(bmsTemplateRecordUpdateDto.getId(), idList);
|
|
|
|
|
// //保存要删除的在线申报记录id集合
|
|
|
|
|
// List<Long> deIdList = new ArrayList<>();
|
|
|
|
|
// //去查看这些申报记录里面未填报的企业
|
|
|
|
|
// bm.forEach(x->{
|
|
|
|
|
// if(x.getStatus() == 0){
|
|
|
|
|
// getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getId());
|
|
|
|
|
// deIdList.add(x.getId());
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
// //删除这些分配的在线申报记录
|
|
|
|
|
// iBmsDeclarationRecordsService.removeBatchByIds(deIdList);
|
|
|
|
|
|
|
|
|
|
return num;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
