diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index 7b338038..929fbccb 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java index 45662490..26413666 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java @@ -31,6 +31,7 @@ import com.actionsoft.sdk.local.SDK; import com.actionsoft.sdk.local.api.AppAPI; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.aspose.words.TableAlignment; import com.sini.com.spire.doc.*; import com.sini.com.spire.doc.collections.SectionCollection; import com.sini.com.spire.doc.documents.*; @@ -451,24 +452,6 @@ public class OutputWordUtil { row.setHeightType(TableRowHeightType.Exactly); for (int i = 0; i < header.length; i++) { row.getCells().get(i).getCellFormat().setVerticalAlignment(VerticalAlignment.Middle); - //设置固定列宽 - /*if(i==0){ - row.getCells().get(0).setWidth(40); - }else if(i==1){ - row.getCells().get(1).setWidth(60); - }else if(i==2){ - row.getCells().get(2).setWidth(60); - }else if(i==3){ - row.getCells().get(3).setWidth(60); - }else if(i==4){ - row.getCells().get(4).setWidth(60); - }else if(i==5){ - row.getCells().get(5).setWidth(60); - }else if(i==6){ - row.getCells().get(6).setWidth(50); - }else if(i==7){ - row.getCells().get(7).setWidth(80); - }*/ Paragraph p = row.getCells().get(i).addParagraph(); p.getFormat().setHorizontalAlignment(Center); @@ -494,29 +477,11 @@ public class OutputWordUtil { for (int c = 0; c < data[r].length; c++) { dataRow.getCells().get(c).getCellFormat().setVerticalAlignment(VerticalAlignment.Middle); //设置固定列宽 - /* if(c==0){ - dataRow.getCells().get(0).setWidth(40); - }else if(c==1){ - dataRow.getCells().get(1).setWidth(60); - }else if(c==2){ - dataRow.getCells().get(2).setWidth(60); - }else if(c==3){ - dataRow.getCells().get(3).setWidth(60); - }else if(c==4){ - dataRow.getCells().get(4).setWidth(60); - }else if(c==5){ - dataRow.getCells().get(5).setWidth(60); - }else if(c==6){ - dataRow.getCells().get(6).setWidth(50); - }else if(c==7){ - dataRow.getCells().get(7).setWidth(80); - }*/ - //dataRow.getCells().get(c).addParagraph().appendText(data[r][c]); - TextRange text =dataRow.getCells().get(c).addParagraph().appendText(data[r][c]); text.getCharacterFormat().setFontName("宋体"); text.getCharacterFormat().setFontSize(10.5f); + } } @@ -528,6 +493,7 @@ public class OutputWordUtil { for (int z= 0; z < rows.getCells().get(j).getParagraphs().getCount();z++){ Paragraph p = rows.getCells().get(j).getParagraphs().get(z); p.getFormat().setLineSpacing(12f);//设置边距为1.0 + p.getFormat().setHorizontalAlignment(Center); } } } diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousPortJob.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousPortJob.java index 16e55675..6754af72 100644 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousPortJob.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousPortJob.java @@ -87,6 +87,19 @@ public class SynchronousPortJob implements IJob { modeldefaultId=rowMaprole.getString("id"); } + List orgRowMap=DBSql.getMaps("SELECT * FROM orgdepartment where Closed=1 "); + for(RowMap oneMap:orgRowMap){ + System.out.println("oneMap============="+oneMap.getString("DEPARTMENTNAME")); + RowMap closedModel=DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLMETHODID='org.normal' and EXT1='"+oneMap.getString("ID")+"'"); + if(closedModel!=null){ + String sqlG = "DELETE FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID = '" + closedModel.get("ID") + "'"; + DBSql.update(sqlG); + + } + + + } + Connection open = DBSql.open(); try { orgdepartmentList = DBSql.getMaps(open, "SELECT DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT where Closed=0 "); @@ -169,6 +182,9 @@ public class SynchronousPortJob implements IJob { Timestamp nowTime = new Timestamp(System.currentTimeMillis()); // + + + if (org.getString("PARENTDEPARTMENTID").equals("0")) { String sql1 = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE wsId='" + wsId + "' and EXT1='" + org.getString("ID") + "'"; String parentPalOrgId1 = DBSql.getString(conn, sql1); @@ -210,6 +226,7 @@ public class SynchronousPortJob implements IJob { String parentPalOrgId = getParentPalOrgId(org, conn); + PALRepository coeProcessLevels = CoeProcessLevelDaoFacotory.createCoeProcessLevel(); if (StringUtil.isNotEmpty(parentPalOrgId)) { RowMap orgrowMap=DBSql.getMap("SELECT PLNAME,ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT1=? AND PLMETHODID='org.normal'",org.getString("ID")); @@ -369,13 +386,10 @@ public class SynchronousPortJob implements IJob { } - }else { - } - } @@ -578,6 +592,16 @@ public class SynchronousPortJob implements IJob { } return max; } + + + + + public void cleanClosedDep(){ + + + + + } }