|
|
@@ -27,6 +27,8 @@ import com.jeeplus.test.program.configuration.projectList.service.dto.*;
|
|
|
import com.jeeplus.test.program.configuration.projectList.service.mapstruct.ProgramArchiveWrapper;
|
|
|
import com.jeeplus.test.program.configuration.projectList.service.mapstruct.ProgramAuditAssessPeopleWrapper;
|
|
|
import com.jeeplus.test.program.configuration.projectList.service.mapstruct.ProgramAuditWrapper;
|
|
|
+import com.jeeplus.test.program.serviceType.service.ProgramServiceTypeService;
|
|
|
+import com.jeeplus.test.program.serviceType.service.dto.ProgramServiceTypeDTO;
|
|
|
import com.jeeplus.test.proofread.domain.ProofreadDetail;
|
|
|
import com.jeeplus.test.proofread.domain.ProofreadIssued;
|
|
|
import com.jeeplus.test.proofread.service.ProofreadInfoService;
|
|
|
@@ -81,6 +83,9 @@ public class ProjectListService {
|
|
|
private ProofreadIssuedService proofreadIssuedService;
|
|
|
|
|
|
@Resource
|
|
|
+ private ProgramServiceTypeService programServiceTypeService;
|
|
|
+
|
|
|
+ @Resource
|
|
|
private FlowTaskService flowTaskService;
|
|
|
@Resource
|
|
|
private ProgramMembersService programMembersService;
|
|
|
@@ -782,7 +787,7 @@ public class ProjectListService {
|
|
|
//执行人
|
|
|
data.put("executor",UserUtils.get(auditDto.getCreateBy().getId()).getName());
|
|
|
|
|
|
- Date auditDate=projectDto.getAssessmentDate();
|
|
|
+ Date auditDate=projectDto.getAgreeTime();
|
|
|
if(null == auditDate){
|
|
|
//执行人时间
|
|
|
data.put("executorDate","");
|
|
|
@@ -1157,6 +1162,82 @@ public class ProjectListService {
|
|
|
//查询报告签发表信息
|
|
|
ProofreadIssued issuedById = proofreadIssuedService.findById(info.getId());
|
|
|
|
|
|
+ List<ProgramServiceTypeDTO> programServiceTypeList = programServiceTypeService.getList();
|
|
|
+ for (ProgramServiceTypeDTO programServiceType: programServiceTypeList) {
|
|
|
+ if(programServiceType.getChildrenList().size()>0){
|
|
|
+ switch (programServiceType.getName()){
|
|
|
+ case "A类":
|
|
|
+ for(int i = 0 ;i<programServiceType.getChildrenList().size(); i++ ){
|
|
|
+ ProgramServiceTypeDTO programServiceTypeDTO = programServiceType.getChildrenList().get(i);
|
|
|
+ data.put("AMessage" + (i+1),programServiceTypeDTO.getName());
|
|
|
+ if(issuedById.getServiceType().equals(programServiceTypeDTO.getId())){
|
|
|
+ data.put("A" + (i+1),"0052");
|
|
|
+ }else{
|
|
|
+ data.put("A" + (i+1),"00A3");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case "B类":
|
|
|
+ for(int i = 0 ;i<programServiceType.getChildrenList().size(); i++ ){
|
|
|
+ ProgramServiceTypeDTO programServiceTypeDTO = programServiceType.getChildrenList().get(i);
|
|
|
+ data.put("BMessage" + (i+1),programServiceTypeDTO.getName());
|
|
|
+ if(issuedById.getServiceType().equals(programServiceTypeDTO.getId())){
|
|
|
+ data.put("B" + (i+1),"0052");
|
|
|
+ }else{
|
|
|
+ data.put("B" + (i+1),"00A3");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case "C类":
|
|
|
+ for(int i = 0 ;i<programServiceType.getChildrenList().size(); i++ ){
|
|
|
+ ProgramServiceTypeDTO programServiceTypeDTO = programServiceType.getChildrenList().get(i);
|
|
|
+ data.put("CMessage" + (i+1),programServiceTypeDTO.getName());
|
|
|
+ if(issuedById.getServiceType().equals(programServiceTypeDTO.getId())){
|
|
|
+ data.put("C" + (i+1),"0052");
|
|
|
+ }else{
|
|
|
+ data.put("C" + (i+1),"00A3");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ data.put("A1","00A3");
|
|
|
+ data.put("A2","00A3");
|
|
|
+ data.put("A3","00A3");
|
|
|
+ data.put("A4","00A3");
|
|
|
+ data.put("A5","00A3");
|
|
|
+ data.put("AMessage1" ,"经济行为涉及上市公司及其子公司的资产组合、无形资产、企业价值（包括业务及资产组）评估业务");
|
|
|
+ data.put("AMessage2" ,"上市公司及其合并报表范围内的下属公司财务报告目的的评估及咨询业务");
|
|
|
+ data.put("AMessage3" ,"经济行为涉及上市公司及其合并报表范围内的下属公司的除本条第（一）款规定之外的评估业务");
|
|
|
+ data.put("AMessage4" ,"经济行为涉及非上市证券公司、非上市期货公司、非上市公众公司、拟上市公司及其合并报表范围内的下属公司的评估业务");
|
|
|
+ data.put("AMessage5" ,"其中：非国有企业改制设立股份公司评估业务");
|
|
|
+ data.put("B1","00A3");
|
|
|
+ data.put("B2","00A3");
|
|
|
+ data.put("B3","00A3");
|
|
|
+ data.put("B4","00A3");
|
|
|
+ data.put("B5","00A3");
|
|
|
+ data.put("B6","00A3");
|
|
|
+ data.put("B7","00A3");
|
|
|
+ data.put("B8","00A3");
|
|
|
+ data.put("B9","00A3");
|
|
|
+
|
|
|
+ data.put("BMessage1","除A类业务以外的无形资产评估业务");
|
|
|
+ data.put("BMessage2","除A类业务以外的资产组合评估业务");
|
|
|
+ data.put("BMessage3","除A类业务以外的企业价值评估业务");
|
|
|
+ data.put("BMessage4","除A类业务以外的报务报告目的评估业务");
|
|
|
+ data.put("BMessage5","除A类业务以外的抵押担保目的评估业务");
|
|
|
+ data.put("BMessage6","除A类以外的，涉及上市公司、证券公司、期货公司、非上市公众公司、拟上市公司及其下属公司不用于市场交易的复核评估、追溯评估和咨询评估业务");
|
|
|
+ data.put("BMessage7","除A类以外的涉及国有企业与非国有企业之间的交易行为的评估业务及相关的复核评估、追溯评估和咨询评估业务");
|
|
|
+ data.put("BMessage8","金融企业（包括银行、保险公司、信托投资公司、基金管理公司、租赁公司等）的评估业务");
|
|
|
+ data.put("BMessage9","评估经验较少的新领域评估业务");
|
|
|
+
|
|
|
+ data.put("C1","00A3");
|
|
|
+ data.put("C2","00A3");
|
|
|
+
|
|
|
+ data.put("CMessage1","除A、B类业务以外的经济行为涉及单项资产的评估业务");
|
|
|
+ data.put("CMessage2","除A、B类业务以外的不用于市场交易的复核评估、追溯评估和咨询评估业务");
|
|
|
+ }
|
|
|
+ }
|
|
|
//报告号
|
|
|
data.put("projectName",projectDto.getName());
|
|
|
//报告号
|
user5