修复制度手册两位数版本显示异常/增加方案图手册
This commit is contained in:
parent
0605070b6b
commit
d43d929de6
Binary file not shown.
@ -75,7 +75,14 @@ public class Report1Gener {
|
||||
// ----预处理、校验----
|
||||
OutputAppProfile appModel = OutputAppManager.getProfile(model.getProfileId());
|
||||
String tempPath = appModel.getAppContext().getPath();
|
||||
String tempName = "制度-手册5.xml";
|
||||
|
||||
PALRepositoryModel repositoryModel = PALRepositoryCache.getCache().get(jsonObj.get("targetFileId").toString());
|
||||
String tempName;
|
||||
if(PALRepositoryCache.getCache().get(jsonObj.get("targetFileId").toString()).getMethodId().equals("process.scheme")){
|
||||
tempName = "方案-手册1.xml";
|
||||
}else{
|
||||
tempName="制度-手册5.xml";
|
||||
}
|
||||
log.info("begin...");
|
||||
log.info("-------------------");
|
||||
// ----文件处理-----
|
||||
@ -243,8 +250,8 @@ public class Report1Gener {
|
||||
String plver = "";
|
||||
if (!"".equals(plvers)) {
|
||||
if (plvers.length() > 1) {
|
||||
plver = plvers.substring(0, 1) + "."
|
||||
+ plvers.substring(plvers.length() - 1, plvers.length());
|
||||
//plver = plvers.substring(0, 1) + "." + plvers.substring(plvers.length() - 1, plvers.length());
|
||||
plver = plvers.substring(0,plvers.indexOf(".")) + "." + plvers.substring(plvers.length() - 1, plvers.length());
|
||||
} else {
|
||||
plver = plvers.substring(0, 1) + ".0";
|
||||
}
|
||||
|
||||
@ -106,8 +106,8 @@ public class PrReportComment {
|
||||
String plver = "";
|
||||
if (!"".equals(plvers)) {
|
||||
if (plvers.length() > 1) {
|
||||
plver = plvers.substring(0, 1) + "."
|
||||
+ plvers.substring(plvers.length() - 1, plvers.length());
|
||||
//plver = plvers.substring(0, 1) + "." + plvers.substring(plvers.length() - 1, plvers.length());
|
||||
plver = plvers.substring(0,plvers.indexOf(".")) + "." + plvers.substring(plvers.length() - 1, plvers.length());
|
||||
} else {
|
||||
plver = plvers.substring(0, 1) + ".0";
|
||||
}
|
||||
|
||||
@ -1,29 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<?mso-application progid="Word.Document"?>
|
||||
<w:wordDocument
|
||||
xmlns:aml="http://schemas.microsoft.com/aml/2001/core"
|
||||
xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas"
|
||||
xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex"
|
||||
xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex"
|
||||
xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex"
|
||||
xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex"
|
||||
xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex"
|
||||
xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex"
|
||||
xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex"
|
||||
xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex"
|
||||
xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex"
|
||||
xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink"
|
||||
xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d"
|
||||
xmlns:o="urn:schemas-microsoft-com:office:office"
|
||||
xmlns:v="urn:schemas-microsoft-com:vml"
|
||||
xmlns:w10="urn:schemas-microsoft-com:office:word"
|
||||
xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml"
|
||||
xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint"
|
||||
xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
|
||||
xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2"
|
||||
xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
|
||||
xmlns:aml="http://schemas.microsoft.com/aml/2001/core"
|
||||
xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas"
|
||||
xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex"
|
||||
xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex"
|
||||
xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex"
|
||||
xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex"
|
||||
xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex"
|
||||
xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex"
|
||||
xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex"
|
||||
xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex"
|
||||
xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex"
|
||||
xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink"
|
||||
xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d"
|
||||
xmlns:o="urn:schemas-microsoft-com:office:office"
|
||||
xmlns:v="urn:schemas-microsoft-com:vml"
|
||||
xmlns:w10="urn:schemas-microsoft-com:office:word"
|
||||
xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml"
|
||||
xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint"
|
||||
xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
|
||||
xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2"
|
||||
xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
|
||||
<w:ignoreSubtree w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/>
|
||||
<o:DocumentProperties>
|
||||
<o:Author>Administrator</o:Author>
|
||||
@ -2832,16 +2832,16 @@
|
||||
<w:jc w:val="center"/>
|
||||
</w:pPr>
|
||||
</w:p>
|
||||
<!-- <w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:jc w:val="center"/>
|
||||
</w:pPr>
|
||||
</w:p>
|
||||
<w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:jc w:val="center"/>
|
||||
</w:pPr>
|
||||
</w:p>-->
|
||||
<!-- <w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:jc w:val="center"/>
|
||||
</w:pPr>
|
||||
</w:p>
|
||||
<w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:jc w:val="center"/>
|
||||
</w:pPr>
|
||||
</w:p>-->
|
||||
<w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F7324A">
|
||||
<w:pPr>
|
||||
<w:ind w:right="100"/>
|
||||
@ -2913,16 +2913,16 @@
|
||||
<w:jc w:val="center"/>
|
||||
</w:pPr>
|
||||
</w:p>
|
||||
<!-- <w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:jc w:val="center"/>
|
||||
</w:pPr>
|
||||
</w:p>
|
||||
<w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:jc w:val="center"/>
|
||||
</w:pPr>
|
||||
</w:p>-->
|
||||
<!-- <w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:jc w:val="center"/>
|
||||
</w:pPr>
|
||||
</w:p>
|
||||
<w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:jc w:val="center"/>
|
||||
</w:pPr>
|
||||
</w:p>-->
|
||||
<w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:adjustRightInd w:val="off"/>
|
||||
@ -4378,25 +4378,25 @@ y7fdOgAAAABJRU5ErkJggk==
|
||||
</w:tc>
|
||||
</w:tr>
|
||||
</w:tbl>
|
||||
<!-- <w:p wsp:rsidR="00092CA0" wsp:rsidRDefault="00092CA0" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:rPr>
|
||||
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
|
||||
<wx:font wx:val="宋体"/>
|
||||
<w:color w:val="000000"/>
|
||||
</w:rPr>
|
||||
</w:pPr>
|
||||
</w:p>-->
|
||||
<!-- <w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:rPr>
|
||||
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
|
||||
<wx:font wx:val="宋体"/>
|
||||
<w:color w:val="000000"/>
|
||||
<w:lang w:val="ZH-CN"/>
|
||||
</w:rPr>
|
||||
</w:pPr>
|
||||
</w:p>-->
|
||||
<!-- <w:p wsp:rsidR="00092CA0" wsp:rsidRDefault="00092CA0" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:rPr>
|
||||
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
|
||||
<wx:font wx:val="宋体"/>
|
||||
<w:color w:val="000000"/>
|
||||
</w:rPr>
|
||||
</w:pPr>
|
||||
</w:p>-->
|
||||
<!-- <w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00F96B41">
|
||||
<w:pPr>
|
||||
<w:rPr>
|
||||
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
|
||||
<wx:font wx:val="宋体"/>
|
||||
<w:color w:val="000000"/>
|
||||
<w:lang w:val="ZH-CN"/>
|
||||
</w:rPr>
|
||||
</w:pPr>
|
||||
</w:p>-->
|
||||
<!--<w:p wsp:rsidR="002737AF" wsp:rsidRDefault="002737AF" wsp:rsidP="00E1269B">
|
||||
<w:pPr>
|
||||
<w:spacing w:line="360" w:line-rule="auto"/>
|
||||
|
||||
5487
com.awspaas.user.apps.coe.pal.output.zd/方案-手册1.xml
Normal file
5487
com.awspaas.user.apps.coe.pal.output.zd/方案-手册1.xml
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user