|
|
|
@ -15,10 +15,13 @@ import com.ruoyi.jjh.declaration.entity.vo.BmsMunicipalBureauReviewQueryVo;
|
|
|
|
|
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
|
|
|
|
|
import com.ruoyi.jjh.declaration.mapper.BmsDeclarationRecordsMapper;
|
|
|
|
|
import com.ruoyi.jjh.declaration.service.*;
|
|
|
|
|
import com.ruoyi.jjh.ent.entity.JProject;
|
|
|
|
|
import com.ruoyi.jjh.ent.service.JProjectService;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
import java.util.List;
|
|
|
|
@ -54,6 +57,8 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
|
|
|
|
|
@Autowired
|
|
|
|
|
private IBmsEnterpriseBasicInfoService iBmsEnterpriseBasicInfoService;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private JProjectService jProjectService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 查询在线申报记录
|
|
|
|
@ -214,31 +219,42 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
|
|
|
|
|
public int approval(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto, BmsProcessInfo bmsProcessInfo) {
|
|
|
|
|
|
|
|
|
|
BmsDeclarationRecords bmsDeclarationRecords = baseMapper.selectById(bmsApprovalInfoUpdateDto.getDeclarationRecordsId());
|
|
|
|
|
JProject jp = new JProject();
|
|
|
|
|
jp.setId(bmsDeclarationRecords.getJjhProjectId());
|
|
|
|
|
if (bmsProcessInfo.getApprovalLevel().equals(0)) {
|
|
|
|
|
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
|
|
|
|
|
jp.setStatus(2);
|
|
|
|
|
bmsDeclarationRecords.setStatus(2L);
|
|
|
|
|
} else {
|
|
|
|
|
jp.setStatus(8);
|
|
|
|
|
bmsDeclarationRecords.setStatus(8L);
|
|
|
|
|
}
|
|
|
|
|
} else if (bmsProcessInfo.getApprovalLevel().equals(1)) {
|
|
|
|
|
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
|
|
|
|
|
jp.setStatus(3);
|
|
|
|
|
bmsDeclarationRecords.setStatus(3L);
|
|
|
|
|
} else {
|
|
|
|
|
jp.setStatus(7);
|
|
|
|
|
bmsDeclarationRecords.setStatus(7L);
|
|
|
|
|
}
|
|
|
|
|
} else if (bmsProcessInfo.getApprovalLevel().equals(2)) {
|
|
|
|
|
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
|
|
|
|
|
jp.setStatus(4);
|
|
|
|
|
bmsDeclarationRecords.setStatus(4L);
|
|
|
|
|
} else {
|
|
|
|
|
jp.setStatus(6);
|
|
|
|
|
bmsDeclarationRecords.setStatus(6L);
|
|
|
|
|
}
|
|
|
|
|
} else if (bmsProcessInfo.getApprovalLevel().equals(3)) {
|
|
|
|
|
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
|
|
|
|
|
jp.setStatus(5);
|
|
|
|
|
bmsDeclarationRecords.setStatus(5L);
|
|
|
|
|
} else {
|
|
|
|
|
jp.setStatus(9);
|
|
|
|
|
bmsDeclarationRecords.setStatus(9L);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
jProjectService.updateById(jp);
|
|
|
|
|
return baseMapper.updateById(bmsDeclarationRecords);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -255,31 +271,42 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
|
|
|
|
|
BmsProcessInfo bmsProcessInfo = iBmsProcessInfoService.lambdaQuery().eq(BmsProcessInfo::getId, processId).list().get(0);
|
|
|
|
|
if (BeanUtil.isNotEmpty(bmsProcessInfo)) {
|
|
|
|
|
BmsDeclarationRecords bmsDeclarationRecords = baseMapper.selectById(bmsApprovalInfoUpdateDto.getDeclarationRecordsId());
|
|
|
|
|
JProject jp = new JProject();
|
|
|
|
|
jp.setId(bmsDeclarationRecords.getJjhProjectId());
|
|
|
|
|
if (bmsProcessInfo.getApprovalLevel().equals(0)) {
|
|
|
|
|
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
|
|
|
|
|
jp.setStatus(2);
|
|
|
|
|
bmsDeclarationRecords.setStatus(2L);
|
|
|
|
|
} else {
|
|
|
|
|
jp.setStatus(8);
|
|
|
|
|
bmsDeclarationRecords.setStatus(8L);
|
|
|
|
|
}
|
|
|
|
|
} else if (bmsProcessInfo.getApprovalLevel().equals(1)) {
|
|
|
|
|
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
|
|
|
|
|
jp.setStatus(3);
|
|
|
|
|
bmsDeclarationRecords.setStatus(3L);
|
|
|
|
|
} else {
|
|
|
|
|
jp.setStatus(7);
|
|
|
|
|
bmsDeclarationRecords.setStatus(7L);
|
|
|
|
|
}
|
|
|
|
|
} else if (bmsProcessInfo.getApprovalLevel().equals(2)) {
|
|
|
|
|
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
|
|
|
|
|
jp.setStatus(4);
|
|
|
|
|
bmsDeclarationRecords.setStatus(4L);
|
|
|
|
|
} else {
|
|
|
|
|
jp.setStatus(6);
|
|
|
|
|
bmsDeclarationRecords.setStatus(6L);
|
|
|
|
|
}
|
|
|
|
|
} else if (bmsProcessInfo.getApprovalLevel().equals(3)) {
|
|
|
|
|
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
|
|
|
|
|
jp.setStatus(5);
|
|
|
|
|
bmsDeclarationRecords.setStatus(5L);
|
|
|
|
|
} else {
|
|
|
|
|
jp.setStatus(9);
|
|
|
|
|
bmsDeclarationRecords.setStatus(9L);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
jProjectService.updateById(jp);
|
|
|
|
|
baseMapper.updateById(bmsDeclarationRecords);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -482,6 +509,12 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
|
|
|
|
|
if (CollectionUtil.isNotEmpty(recordsIdList)) {
|
|
|
|
|
iBmsApprovalInfoService.updateApprovalList(recordsIdList);
|
|
|
|
|
}
|
|
|
|
|
for (BmsDeclarationRecords a1 : recordsUpdate) {
|
|
|
|
|
JProject jp = new JProject();
|
|
|
|
|
jp.setId(a1.getJjhProjectId());
|
|
|
|
|
jp.setStatus(Math.toIntExact(a1.getStatus()));
|
|
|
|
|
jProjectService.updateById(jp);
|
|
|
|
|
}
|
|
|
|
|
// 批量保存记录
|
|
|
|
|
this.saveOrUpdateBatch(recordsUpdate);
|
|
|
|
|
// 审查审批记录
|
|
|
|
|