财务报告审核单下载功能调整

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/controller/CwProjectReportController.java

@@ -142,9 +142,9 @@ public class CwProjectReportController {
      * @param response
      * @param id
      */
-    @RequestMapping(value="downloadCwAuditTpl")
+    @RequestMapping(value="downloadCwReportAuditTpl")
     @ResponseBody
-    public void downloadCwAuditTpl(HttpServletResponse response,@RequestParam("id") String id)  {
+    public void downloadCwReportAuditTpl(HttpServletResponse response,@RequestParam("id") String id)  {
         Map data = projectReportService.getAuditInfoMap(response, id );
 
         //模板对象

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -1113,201 +1113,287 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         data.put("archiveName","");
         //归档时间
         data.put("archiveDate","    年  月  日");
+        data.put("type","");
+        data.put("projectName","");
+        data.put("servedUnitName","");
+        data.put("reportDate","    年  月  日");
+        data.put("reportNumber","");
+        data.put("totalCount","");
+        data.put("giveOutCount","");
+        data.put("archiveCount","");
+        data.put("printName","");
+        data.put("proofreadName","");
+        data.put("pcNumber","");
+        data.put("s114","");
+        data.put("s115","");
+        data.put("s214","");
+        data.put("s215","");
+        data.put("s314","");
+        data.put("s315","");
+        data.put("s111","");
+        data.put("s112","");
+        data.put("s113","");
+
+        data.put("s121","");
+        data.put("s122","");
+        data.put("s123","");
+
+        data.put("s131","");
+        data.put("s132","");
+        data.put("s133","");
+
+        data.put("s141","");
+        data.put("s142","");
+        data.put("s143","");
+
+        data.put("s151","");
+        data.put("s152","");
+        data.put("s153","");
+
+        data.put("s161","");
+        data.put("s162","");
+        data.put("s163","");
+
+        data.put("s171","");
+        data.put("s172","");
+        data.put("s173","");
+
+        data.put("s181","");
+        data.put("s182","");
+        data.put("s183","");
+
+        data.put("s191","");
+        data.put("s192","");
+        data.put("s193","");
+
+        data.put("s1101","");
+        data.put("s1102","");
+        data.put("s1103","");
+
+        data.put("s211","");
+        data.put("s212","");
+        data.put("s213","");
+
+        data.put("s221","");
+        data.put("s222","");
+        data.put("s223","");
+
+        data.put("s231","");
+        data.put("s232","");
+        data.put("s233","");
+
+        data.put("s311","");
+        data.put("s312","");
+        data.put("s313","");
+
+        data.put("s321","");
+        data.put("s322","");
+        data.put("s323","");
+
+        data.put("s331","");
+        data.put("s332","");
+        data.put("s333","");
+
+        data.put("s341","");
+        data.put("s342","");
+        data.put("s343","");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
         try {
-            List<Flow> flows = flowTaskService.historicTaskList(reportData.getProcInsId3());
-            for (Flow flow : flows) {
-                HistoricActivityInstance histIns = flow.getHistIns();
-                if(StringUtils.isNotBlank(histIns.getActivityName())){
-
-                    switch (histIns.getActivityName()){
-                        case "开始":
-                            if(StringUtils.isNotBlank(flow.getAssigneeName())){
-                                data.put("firstAuditName",flow.getAssigneeName());
-                                data.put("giveName",flow.getAssigneeName());
-                            }else{
-                                data.put("firstAuditName","");
-                            }
-                            if(null != histIns.getEndTime()){
-                                data.put("firstAuditDate",sdf.format(histIns.getEndTime()));
-                            }else{
-                                data.put("firstAuditDate","    年  月  日");
-                            }
-                            break;
-                        case "二级复核":
-                            if(null != flow.getComment() && "success".equals(flow.getComment().getLevel())){
+            if(StringUtils.isNotBlank(reportData.getProcInsId3())){
+                List<Flow> flows = flowTaskService.historicTaskList(reportData.getProcInsId3());
+                for (Flow flow : flows) {
+                    HistoricActivityInstance histIns = flow.getHistIns();
+                    if(StringUtils.isNotBlank(histIns.getActivityName())){
+
+                        switch (histIns.getActivityName()){
+                            case "开始":
                                 if(StringUtils.isNotBlank(flow.getAssigneeName())){
-                                    data.put("secondAuditName",flow.getAssigneeName());
+                                    data.put("firstAuditName",flow.getAssigneeName());
+                                    data.put("giveName",flow.getAssigneeName());
                                 }else{
-                                    data.put("secondAuditName","");
+                                    data.put("firstAuditName","");
                                 }
                                 if(null != histIns.getEndTime()){
-                                    data.put("secondAuditDate",sdf.format(histIns.getEndTime()));
+                                    data.put("firstAuditDate",sdf.format(histIns.getEndTime()));
                                 }else{
-                                    data.put("secondAuditDate","    年  月  日");
+                                    data.put("firstAuditDate","    年  月  日");
                                 }
-                            }
-                            break;
-                        case "三级复核":
-                            if(null != flow.getComment() && "success".equals(flow.getComment().getLevel())){
-                                if(StringUtils.isNotBlank(flow.getAssigneeName())){
-                                    data.put("thirdlyAuditName",flow.getAssigneeName());
-                                }else{
-                                    data.put("thirdlyAuditName","");
+                                break;
+                            case "二级复核":
+                                if(null != flow.getComment() && "success".equals(flow.getComment().getLevel())){
+                                    if(StringUtils.isNotBlank(flow.getAssigneeName())){
+                                        data.put("secondAuditName",flow.getAssigneeName());
+                                    }else{
+                                        data.put("secondAuditName","");
+                                    }
+                                    if(null != histIns.getEndTime()){
+                                        data.put("secondAuditDate",sdf.format(histIns.getEndTime()));
+                                    }else{
+                                        data.put("secondAuditDate","    年  月  日");
+                                    }
                                 }
-                                if(null != histIns.getEndTime()){
-                                    data.put("thirdlyAuditDate",sdf.format(histIns.getEndTime()));
-                                }else{
-                                    data.put("thirdlyAuditDate","    年  月  日");
+                                break;
+                            case "三级复核":
+                                if(null != flow.getComment() && "success".equals(flow.getComment().getLevel())){
+                                    if(StringUtils.isNotBlank(flow.getAssigneeName())){
+                                        data.put("thirdlyAuditName",flow.getAssigneeName());
+                                    }else{
+                                        data.put("thirdlyAuditName","");
+                                    }
+                                    if(null != histIns.getEndTime()){
+                                        data.put("thirdlyAuditDate",sdf.format(histIns.getEndTime()));
+                                    }else{
+                                        data.put("thirdlyAuditDate","    年  月  日");
+                                    }
                                 }
-                            }
-                            break;
+                                break;
+                        }
                     }
                 }
-            }
-            //报告类型
-            String reportType = DictUtils.getDictLabel(reportData.getReportType(), "cw_report_title_type", "");
-            if(StringUtils.isNotBlank(reportType)){
-                data.put("type",reportType);
-            }else{
-                data.put("type","");
-            }
-            //项目名称
-            if(StringUtils.isNotBlank(reportData.getProjectName())){
-                data.put("projectName",reportData.getProjectName());
-            }else{
-                data.put("projectName","");
-            }
-            //根据项目名称查询合同委托方名称
-            if(StringUtils.isNotBlank(reportData.getProjectId())){
-                String servedUnitName = reportMapper.getServedUnitName(reportData.getProjectId());
-                if(StringUtils.isNotBlank(servedUnitName)){
-                    data.put("servedUnitName",servedUnitName);
+                //报告类型
+                String reportType = DictUtils.getDictLabel(reportData.getReportType(), "cw_report_title_type", "");
+                if(StringUtils.isNotBlank(reportType)){
+                    data.put("type",reportType);
                 }else{
-                    data.put("servedUnitName","");
+                    data.put("type","");
                 }
-            }else{
-                data.put("servedUnitName","");
-            }
-            //报告日期
-            if(null != reportData.getReportDate()){
-                data.put("reportDate",sdf.format(reportData.getReportDate()));
-            }else{
-                data.put("reportDate","    年  月  日");
-            }
-            //报告文号
-            if(StringUtils.isNotBlank(reportData.getReportNo())){
-                data.put("reportNumber",reportData.getReportNo());
-            }else{
-                data.put("reportNumber","");
-            }
-            //共印份数
-            if(StringUtils.isNotBlank(reportData.getAllPrintNum())){
-                data.put("totalCount",reportData.getAllPrintNum());
-            }else{
-                data.put("totalCount","");
-            }
-            //发出份数
-            if(StringUtils.isNotBlank(reportData.getIssueNum())){
-                data.put("giveOutCount",reportData.getIssueNum());
-            }else{
-                data.put("giveOutCount","");
-            }
-            //存档份数
-            if(StringUtils.isNotBlank(reportData.getPlaceOnFileNum())){
-                data.put("archiveCount",reportData.getPlaceOnFileNum());
-            }else{
-                data.put("archiveCount","");
-            }
-            //打印人签名
-            if(StringUtils.isNotBlank(reportData.getPrintedBy())){
-                data.put("printName",reportData.getPrintedBy());
-            }else{
-                data.put("printName","");
-            }
-            //校对人签名
-            if(StringUtils.isNotBlank(reportData.getCheckAutograph())){
-                data.put("proofreadName",reportData.getCheckAutograph());
-            }else{
-                data.put("proofreadName","");
-            }
-            //计算机文号
-            if(StringUtils.isNotBlank(reportData.getComputerNo())){
-                data.put("pcNumber",reportData.getComputerNo());
-            }else{
-                data.put("pcNumber","");
-            }
-            //一级复核需提请关注或修改的事项
-            if(StringUtils.isNotBlank(reportData.getNeedUpdate1())){
-                data.put("s114",reportData.getNeedUpdate1());
-            }else{
-                data.put("s114","");
-            }
-            //一级复核备注
-            if(StringUtils.isNotBlank(reportData.getRemark1())){
-                data.put("s115",reportData.getRemark1());
-            }else{
-                data.put("s115","");
-            }
-            //二级复核需提请关注或修改的事项
-            if(StringUtils.isNotBlank(reportData.getNeedUpdate2())){
-                data.put("s214",reportData.getNeedUpdate2());
-            }else{
-                data.put("s214","");
-            }
-            //二级复核备注
-            if(StringUtils.isNotBlank(reportData.getRemark2())){
-                data.put("s215",reportData.getRemark2());
-            }else{
-                data.put("s215","");
-            }
-            //三级复核需提请关注或修改的事项
-            if(StringUtils.isNotBlank(reportData.getNeedUpdate3())){
-                data.put("s314",reportData.getNeedUpdate3());
-            }else{
-                data.put("s314","");
-            }
-            //三级复核备注
-            if(StringUtils.isNotBlank(reportData.getRemark3())){
-                data.put("s315",reportData.getRemark3());
-            }else{
-                data.put("s315","");
-            }
-
-            data.put("archiveName","");
-            data.put("archiveDate","");
-            List<CwProofreadDetail> details = reportData.getDetails();
-            Map map = disposeViewList(details);
-            data.putAll(map);
-
-            if(StringUtils.isNotBlank(reportData.getReportId())){
-                //根据报告id查询归档信息
-                CwProjectReportArchiveDTO cwProjectReportArchiveDTO = cwProjectReportArchiveMapper.queryByReportId(reportData.getReportId());
-
-                if(null != cwProjectReportArchiveDTO){
-                    if(null != cwProjectReportArchiveDTO.getAuditDate()){
-                        data.put("archiveDate",sdf.format(cwProjectReportArchiveDTO.getAuditDate()));
-                        data.put("giveDate",sdf.format(cwProjectReportArchiveDTO.getAuditDate()));
+                //项目名称
+                if(StringUtils.isNotBlank(reportData.getProjectName())){
+                    data.put("projectName",reportData.getProjectName());
+                }else{
+                    data.put("projectName","");
+                }
+                //根据项目名称查询合同委托方名称
+                if(StringUtils.isNotBlank(reportData.getProjectId())){
+                    String servedUnitName = reportMapper.getServedUnitName(reportData.getProjectId());
+                    if(StringUtils.isNotBlank(servedUnitName)){
+                        data.put("servedUnitName",servedUnitName);
                     }else{
-                        data.put("archiveDate","    年  月  日");
+                        data.put("servedUnitName","");
                     }
+                }else{
+                    data.put("servedUnitName","");
+                }
+                //报告日期
+                if(null != reportData.getReportDate()){
+                    data.put("reportDate",sdf.format(reportData.getReportDate()));
+                }else{
+                    data.put("reportDate","    年  月  日");
+                }
+                //报告文号
+                if(StringUtils.isNotBlank(reportData.getReportNo())){
+                    data.put("reportNumber",reportData.getReportNo());
+                }else{
+                    data.put("reportNumber","");
+                }
+                //共印份数
+                if(StringUtils.isNotBlank(reportData.getAllPrintNum())){
+                    data.put("totalCount",reportData.getAllPrintNum());
+                }else{
+                    data.put("totalCount","");
+                }
+                //发出份数
+                if(StringUtils.isNotBlank(reportData.getIssueNum())){
+                    data.put("giveOutCount",reportData.getIssueNum());
+                }else{
+                    data.put("giveOutCount","");
+                }
+                //存档份数
+                if(StringUtils.isNotBlank(reportData.getPlaceOnFileNum())){
+                    data.put("archiveCount",reportData.getPlaceOnFileNum());
+                }else{
+                    data.put("archiveCount","");
+                }
+                //打印人签名
+                if(StringUtils.isNotBlank(reportData.getPrintedBy())){
+                    data.put("printName",reportData.getPrintedBy());
+                }else{
+                    data.put("printName","");
+                }
+                //校对人签名
+                if(StringUtils.isNotBlank(reportData.getCheckAutograph())){
+                    data.put("proofreadName",reportData.getCheckAutograph());
+                }else{
+                    data.put("proofreadName","");
+                }
+                //计算机文号
+                if(StringUtils.isNotBlank(reportData.getComputerNo())){
+                    data.put("pcNumber",reportData.getComputerNo());
+                }else{
+                    data.put("pcNumber","");
+                }
+                //一级复核需提请关注或修改的事项
+                if(StringUtils.isNotBlank(reportData.getNeedUpdate1())){
+                    data.put("s114",reportData.getNeedUpdate1());
+                }else{
+                    data.put("s114","");
+                }
+                //一级复核备注
+                if(StringUtils.isNotBlank(reportData.getRemark1())){
+                    data.put("s115",reportData.getRemark1());
+                }else{
+                    data.put("s115","");
+                }
+                //二级复核需提请关注或修改的事项
+                if(StringUtils.isNotBlank(reportData.getNeedUpdate2())){
+                    data.put("s214",reportData.getNeedUpdate2());
+                }else{
+                    data.put("s214","");
+                }
+                //二级复核备注
+                if(StringUtils.isNotBlank(reportData.getRemark2())){
+                    data.put("s215",reportData.getRemark2());
+                }else{
+                    data.put("s215","");
+                }
+                //三级复核需提请关注或修改的事项
+                if(StringUtils.isNotBlank(reportData.getNeedUpdate3())){
+                    data.put("s314",reportData.getNeedUpdate3());
+                }else{
+                    data.put("s314","");
+                }
+                //三级复核备注
+                if(StringUtils.isNotBlank(reportData.getRemark3())){
+                    data.put("s315",reportData.getRemark3());
+                }else{
+                    data.put("s315","");
                 }
 
-                List<Flow> archiveFlows = flowTaskService.historicTaskList(cwProjectReportArchiveDTO.getProcInsId());
-                for (Flow flow : archiveFlows) {
-                    HistoricActivityInstance histIns = flow.getHistIns();
-                    if(StringUtils.isNotBlank(histIns.getActivityName())){
+                data.put("archiveName","");
+                data.put("archiveDate","");
+                List<CwProofreadDetail> details = reportData.getDetails();
+                Map map = disposeViewList(details);
+                data.putAll(map);
+
+                if(StringUtils.isNotBlank(reportData.getReportId())){
+                    //根据报告id查询归档信息
+                    CwProjectReportArchiveDTO cwProjectReportArchiveDTO = cwProjectReportArchiveMapper.queryByReportId(reportData.getReportId());
+
+                    if(null != cwProjectReportArchiveDTO){
+                        if(null != cwProjectReportArchiveDTO.getAuditDate()){
+                            data.put("archiveDate",sdf.format(cwProjectReportArchiveDTO.getAuditDate()));
+                            data.put("giveDate",sdf.format(cwProjectReportArchiveDTO.getAuditDate()));
+                        }else{
+                            data.put("archiveDate","    年  月  日");
+                        }
+                    }
 
-                        switch (histIns.getActivityName()){
-                            case "归档员审核":
-                                if(null != flow.getComment() && "success".equals(flow.getComment().getLevel())){
-                                    if(StringUtils.isNotBlank(flow.getAssigneeName())){
-                                        data.put("archiveName",flow.getAssigneeName());
-                                    }else{
-                                        data.put("archiveName","");
+                    List<Flow> archiveFlows = flowTaskService.historicTaskList(cwProjectReportArchiveDTO.getProcInsId());
+                    for (Flow flow : archiveFlows) {
+                        HistoricActivityInstance histIns = flow.getHistIns();
+                        if(StringUtils.isNotBlank(histIns.getActivityName())){
+
+                            switch (histIns.getActivityName()){
+                                case "归档员审核":
+                                    if(null != flow.getComment() && "success".equals(flow.getComment().getLevel())){
+                                        if(StringUtils.isNotBlank(flow.getAssigneeName())){
+                                            data.put("archiveName",flow.getAssigneeName());
+                                        }else{
+                                            data.put("archiveName","");
+                                        }
                                     }
-                                }
-                                break;
+                                    break;
+                            }
                         }
                     }
                 }
@@ -1315,7 +1401,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
 
         }catch (Exception e){
-
+            e.getMessage();
         }
         return data;
     }

jeeplus-web/src/main/resources/freemarker/cwAudit.ftl

@@ -223,7 +223,7 @@
 			</Row>
 			<Row ss:AutoFitHeight="0" ss:Height="29.25">
 				<Cell ss:MergeDown="9" ss:StyleID="s94"><Data ss:Type="String">一级复核&#10;(项目负责人)&#10;同意出具报告。&#10;&#10;&#10;签名：${firstAuditName}&#10;&#10;&#10;&#10;&#10;&#10;&#10;${firstAuditDate}&#10;</Data></Cell>
-				<Cell ss:MergeAcross="2" ss:StyleID="s95"><Data ss:Type="String">1.已在现场进行技术性的逐张、详细复核且修&#10;改完善，并保证数据的正确性</Data></Cell>
+				<Cell ss:MergeAcross="2" ss:StyleID="s95"><Data ss:Type="String">1.已在现场进行技术性的逐张、详细复核且修改完善，并保证数据的正确性</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s111}</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s112}</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s113}</Data></Cell>
@@ -237,7 +237,7 @@
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s123}</Data></Cell>
 			</Row>
 			<Row ss:AutoFitHeight="0" ss:Height="28.5">
-				<Cell ss:Index="2" ss:MergeAcross="2" ss:StyleID="s95"><Data ss:Type="String">3.重要审验程序是否适当，是否得以较好地实&#10;施，是否实现了审验目标</Data></Cell>
+				<Cell ss:Index="2" ss:MergeAcross="2" ss:StyleID="s95"><Data ss:Type="String">3.重要审验程序是否适当，是否得以较好地实施，是否实现了审验目标</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s131}</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s132}</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s133}</Data></Cell>
@@ -255,7 +255,7 @@
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s153}</Data></Cell>
 			</Row>
 			<Row ss:AutoFitHeight="0" ss:Height="28.5">
-				<Cell ss:Index="2" ss:MergeAcross="2" ss:StyleID="s95"><Data ss:Type="String">6.建议调整的不符事项和未调整不符事项的处&#10;理是否恰当</Data></Cell>
+				<Cell ss:Index="2" ss:MergeAcross="2" ss:StyleID="s95"><Data ss:Type="String">6.建议调整的不符事项和未调整不符事项的处理是否恰当</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s161}</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s162}</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s163}</Data></Cell>
@@ -267,7 +267,7 @@
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s173}</Data></Cell>
 			</Row>
 			<Row ss:AutoFitHeight="0" ss:Height="42.75">
-				<Cell ss:Index="2" ss:MergeAcross="2" ss:StyleID="s95"><Data ss:Type="String">8.执业过程中发现的问题及其对会计报表和业&#10;务报告的影响，项目组对这些问题的处理是否恰当</Data></Cell>
+				<Cell ss:Index="2" ss:MergeAcross="2" ss:StyleID="s95"><Data ss:Type="String">8.执业过程中发现的问题及其对会计报表和业务报告的影响，项目组对这些问题的处理是否恰当</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s181}</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s182}</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s183}</Data></Cell>
@@ -286,7 +286,7 @@
 			</Row>
 			<Row ss:AutoFitHeight="0" ss:Height="29.25">
 				<Cell ss:MergeDown="2" ss:StyleID="s94"><Data ss:Type="String">二级复核&#10;(独立复核人)&#10;同意出具报告。&#10;签名：${secondAuditName}&#10;&#10;${secondAuditDate}</Data></Cell>
-				<Cell ss:MergeAcross="2" ss:StyleID="s95"><Data ss:Type="String">1.对审验过程中的重大会计审计问题，重大调&#10;整事项及重要的工作底稿进行复核无误</Data></Cell>
+				<Cell ss:MergeAcross="2" ss:StyleID="s95"><Data ss:Type="String">1.对审验过程中的重大会计审计问题，重大调整事项及重要的工作底稿进行复核无误</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s211}</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s212}</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s213}</Data></Cell>
@@ -300,7 +300,7 @@
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s223}</Data></Cell>
 			</Row>
 			<Row ss:AutoFitHeight="0" ss:Height="42">
-				<Cell ss:Index="2" ss:MergeAcross="2" ss:StyleID="s95"><Data ss:Type="String">3.与项目组沟通，能以所收集的证据来证明其&#10;所根据具体的审验环境和审验证据得出的结论和意见是恰当的</Data></Cell>
+				<Cell ss:Index="2" ss:MergeAcross="2" ss:StyleID="s95"><Data ss:Type="String">3.与项目组沟通，能以所收集的证据来证明其所根据具体的审验环境和审验证据得出的结论和意见是恰当的</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s231}</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s232}</Data></Cell>
 				<Cell ss:StyleID="s93"><Data ss:Type="String">${s233}</Data></Cell>