suzhou-jichuang-lanhai
/
JinJiHuJava
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增在线申报增加审批

Browse Source
wushunjie
杜函宇 11 months ago
parent 68c0ec566b
commit d8213b2758
4 changed files with 80 additions and 70 deletions
Show Stats Download Patch File Download Diff File

20
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java
Unescape View File

@ -109,16 +109,16 @@ public class BmsTemplateRecordController extends BaseController {
/**
* 修改在线模板
*/
@ApiOperation(value = "修改在线模板")
@PreAuthorize("@ss.hasAnyRoles('admin')")
@Log(title = "在线模板", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
return toAjax(bmsTemplateRecordService.updateBmsTemplateRecord(bmsTemplateRecordUpdateDto));
}
// /**
// * 修改在线模板
// */
// @ApiOperation(value = "修改在线模板")
// @PreAuthorize("@ss.hasAnyRoles('admin')")
// @Log(title = "在线模板", businessType = BusinessType.UPDATE)
// @PostMapping("/edit")
// public AjaxResult edit(@RequestBody BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
// return toAjax(bmsTemplateRecordService.updateBmsTemplateRecord(bmsTemplateRecordUpdateDto));
// }
/**
* 删除在线模板

5
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateRecord.java
Unescape View File

@ -82,4 +82,9 @@ public class BmsTemplateRecord extends BaseInfoEntity {
@Excel(name = "是否限时" , readConverterExp = "0=限时,1=不限时")
@ApiModelProperty(value = "是否限时,0:限时，1:不限时")
private Integer isTime;
@Excel(name = "是否需要审批" , readConverterExp = "0=不需要审批,1=需要审批")
@ApiModelProperty(value = "0=不需要审批,1=需要审批")
private Integer isApproval;
}

14
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java
Unescape View File

@ -48,13 +48,13 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
*/
public int insertBmsTemplateRecord(BmsTemplateRecordAddDto bmsTemplateRecordAddDto);
/**
* 修改在线模板
*
* @param bmsTemplateRecordUpdateDto 在线模板
* @return 结果
*/
public int updateBmsTemplateRecord(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto);
// /**
// * 修改在线模板
// *
// * @param bmsTemplateRecordUpdateDto 在线模板
// * @return 结果
// */
// public int updateBmsTemplateRecord(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto);
/**
* 批量删除在线模板

111
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java
Unescape View File

@ -125,6 +125,11 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
@Override
@Transactional(rollbackFor = Exception.class)
public int insertBmsTemplateRecord(BmsTemplateRecordAddDto bmsTemplateRecordAddDto) {
// 1、新增申报任务时，增加一个选项：是否审批（需要审批/不需要审批），选了“不需要审批”的企业填报后，状态变为“已填报”，不再进行后续流程，并且这种情况不对接到项目库。
// 2、新增申报任务时，若项目分类选择了“企业信息收集”里面的，则只能选择“不需要审批”，这类申报都不对接项目库。
if(bmsTemplateRecordAddDto.getTemplateId()==12&bmsTemplateRecordAddDto.getIsApproval()==1){
throw new ServiceException("企业信息收集模板,不需要审批");
}
int num = 0;
QueryWrapper<BmsTemplateRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("enterprise_directory", bmsTemplateRecordAddDto.getEnterpriseDirectory());
@ -193,59 +198,59 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
drlist.add(drItems);
}
/**
* 修改在线模板
*
* @param bmsTemplateRecordUpdateDto 在线模板
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int updateBmsTemplateRecord(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
QueryWrapper<BmsTemplateRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("enterprise_directory", bmsTemplateRecordUpdateDto.getEnterpriseDirectory());
List<BmsTemplateRecord> isFlag = baseMapper.selectList(queryWrapper);
if(!isFlag.isEmpty()){
throw new ServiceException("该申报任务标题已经存在");
}
tiTimeChange.getTime(bmsTemplateRecordUpdateDto);
int num = baseMapper.updateById(bmsTemplateRecordUpdateDto);
// 删除企业相关列表
QueryWrapper<BmsEnterpriseDirectory> queryWrapper1 = new QueryWrapper<>();
queryWrapper.eq("template_record_id", bmsTemplateRecordUpdateDto.getId());
enterpriseDirectoryService.remove(queryWrapper1);
QueryWrapper<BmsDeclarationRecords> queryWrapper2 = new QueryWrapper<>();
queryWrapper.eq("template_record_id", bmsTemplateRecordUpdateDto.getId());
bmsDeclarationRecordsService.remove(queryWrapper2);
//前端excel企业名录集合
List<BmsEnterpriseDirectory> enterpriseDirectoryList = bmsTemplateRecordUpdateDto
.getEnterpriseDirectoryList();
//要添加的在线申报记录
List<BmsDeclarationRecords> drlist = new ArrayList<>();
//如果前端部分企业名录集合为空
if (null != enterpriseDirectoryList && enterpriseDirectoryList.size() > 0) {
enterpriseDirectoryList.forEach(x -> {
getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getTemplateId());
x.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId());
});
enterpriseDirectoryService.saveBatch(enterpriseDirectoryList);
} else {
List<BmsEnterpriseBasicInfo> list = iBmsEnterpriseBasicInfoService.list();
List<BmsEnterpriseDirectory> copyList = new ArrayList<>();
for (BmsEnterpriseBasicInfo items : list) {
BmsEnterpriseDirectory bms = new BmsEnterpriseDirectory();
bms.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId());
bms.setEnterpriseName(items.getQymc());
bms.setCreditCode(items.getTyshxydm());
copyList.add(bms);
getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, items.getTyshxydm(), bmsTemplateRecordUpdateDto.getTemplateId());
}
enterpriseDirectoryService.saveBatch(copyList);
}
iBmsDeclarationRecordsService.saveBatch(drlist);
return num;
}
// /**
// * 修改在线模板
// *
// * @param bmsTemplateRecordUpdateDto 在线模板
// * @return 结果
// */
// @Override
// @Transactional(rollbackFor = Exception.class)
// public int updateBmsTemplateRecord(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
// QueryWrapper<BmsTemplateRecord> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("enterprise_directory", bmsTemplateRecordUpdateDto.getEnterpriseDirectory());
// List<BmsTemplateRecord> isFlag = baseMapper.selectList(queryWrapper);
// if(!isFlag.isEmpty()){
// throw new ServiceException("该申报任务标题已经存在");
// }
// tiTimeChange.getTime(bmsTemplateRecordUpdateDto);
// int num = baseMapper.updateById(bmsTemplateRecordUpdateDto);
// // 删除企业相关列表
// QueryWrapper<BmsEnterpriseDirectory> queryWrapper1 = new QueryWrapper<>();
// queryWrapper.eq("template_record_id", bmsTemplateRecordUpdateDto.getId());
// enterpriseDirectoryService.remove(queryWrapper1);
// QueryWrapper<BmsDeclarationRecords> queryWrapper2 = new QueryWrapper<>();
// queryWrapper.eq("template_record_id", bmsTemplateRecordUpdateDto.getId());
// bmsDeclarationRecordsService.remove(queryWrapper2);
//
// //前端excel企业名录集合
// List<BmsEnterpriseDirectory> enterpriseDirectoryList = bmsTemplateRecordUpdateDto
// .getEnterpriseDirectoryList();
// //要添加的在线申报记录
// List<BmsDeclarationRecords> drlist = new ArrayList<>();
// //如果前端部分企业名录集合为空
// if (null != enterpriseDirectoryList && enterpriseDirectoryList.size() > 0) {
// enterpriseDirectoryList.forEach(x -> {
// getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getTemplateId());
// x.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId());
// });
// enterpriseDirectoryService.saveBatch(enterpriseDirectoryList);
// } else {
// List<BmsEnterpriseBasicInfo> list = iBmsEnterpriseBasicInfoService.list();
// List<BmsEnterpriseDirectory> copyList = new ArrayList<>();
// for (BmsEnterpriseBasicInfo items : list) {
// BmsEnterpriseDirectory bms = new BmsEnterpriseDirectory();
// bms.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId());
// bms.setEnterpriseName(items.getQymc());
// bms.setCreditCode(items.getTyshxydm());
// copyList.add(bms);
// getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, items.getTyshxydm(), bmsTemplateRecordUpdateDto.getTemplateId());
// }
// enterpriseDirectoryService.saveBatch(copyList);
// }
// iBmsDeclarationRecordsService.saveBatch(drlist);
// return num;
// }
/**
* 批量删除在线模板

Write Preview
Loading…
Cancel
Save