diff --git a/bin/com/net/connor/ld/plm/ld05/CIForm$1.class b/bin/com/net/connor/ld/plm/ld05/CIForm$1.class index f2c3014..a8a2119 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CIForm$1.class and b/bin/com/net/connor/ld/plm/ld05/CIForm$1.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CIForm$2.class b/bin/com/net/connor/ld/plm/ld05/CIForm$2.class index 806c133..e28c302 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CIForm$2.class and b/bin/com/net/connor/ld/plm/ld05/CIForm$2.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CIForm$3.class b/bin/com/net/connor/ld/plm/ld05/CIForm$3.class index 503d6ff..fdb6419 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CIForm$3.class and b/bin/com/net/connor/ld/plm/ld05/CIForm$3.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CIForm$4.class b/bin/com/net/connor/ld/plm/ld05/CIForm$4.class index bdd0c93..1f8b141 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CIForm$4.class and b/bin/com/net/connor/ld/plm/ld05/CIForm$4.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CIForm$5.class b/bin/com/net/connor/ld/plm/ld05/CIForm$5.class index 6a9ada9..4395c01 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CIForm$5.class and b/bin/com/net/connor/ld/plm/ld05/CIForm$5.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CIForm$6.class b/bin/com/net/connor/ld/plm/ld05/CIForm$6.class index e89e95f..5116154 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CIForm$6.class and b/bin/com/net/connor/ld/plm/ld05/CIForm$6.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CIForm$7.class b/bin/com/net/connor/ld/plm/ld05/CIForm$7.class index f65cb93..bc0196d 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CIForm$7.class and b/bin/com/net/connor/ld/plm/ld05/CIForm$7.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CIForm.class b/bin/com/net/connor/ld/plm/ld05/CIForm.class index ec31f86..25edd8d 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CIForm.class and b/bin/com/net/connor/ld/plm/ld05/CIForm.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$1.class b/bin/com/net/connor/ld/plm/ld05/CNForm$1.class index ace63cd..9521d83 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CNForm$1.class and b/bin/com/net/connor/ld/plm/ld05/CNForm$1.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$2.class b/bin/com/net/connor/ld/plm/ld05/CNForm$2.class index 5ab9c95..66114a8 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CNForm$2.class and b/bin/com/net/connor/ld/plm/ld05/CNForm$2.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$3.class b/bin/com/net/connor/ld/plm/ld05/CNForm$3.class index 8699a0e..ad4b758 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CNForm$3.class and b/bin/com/net/connor/ld/plm/ld05/CNForm$3.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$4.class b/bin/com/net/connor/ld/plm/ld05/CNForm$4.class index 3f64b57..92cfdf4 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CNForm$4.class and b/bin/com/net/connor/ld/plm/ld05/CNForm$4.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$5.class b/bin/com/net/connor/ld/plm/ld05/CNForm$5.class index c4a6fd8..efc0dbb 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CNForm$5.class and b/bin/com/net/connor/ld/plm/ld05/CNForm$5.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$6.class b/bin/com/net/connor/ld/plm/ld05/CNForm$6.class index 09e2efe..09e0906 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CNForm$6.class and b/bin/com/net/connor/ld/plm/ld05/CNForm$6.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$7.class b/bin/com/net/connor/ld/plm/ld05/CNForm$7.class index c5cb951..0228dc3 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CNForm$7.class and b/bin/com/net/connor/ld/plm/ld05/CNForm$7.class differ diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm.class b/bin/com/net/connor/ld/plm/ld05/CNForm.class index 0ddae80..e18cf48 100644 Binary files a/bin/com/net/connor/ld/plm/ld05/CNForm.class and b/bin/com/net/connor/ld/plm/ld05/CNForm.class differ diff --git a/src/com/net/connor/ld/plm/ld05/CIForm.java b/src/com/net/connor/ld/plm/ld05/CIForm.java index a3ad43d..9b3f383 100644 --- a/src/com/net/connor/ld/plm/ld05/CIForm.java +++ b/src/com/net/connor/ld/plm/ld05/CIForm.java @@ -224,6 +224,34 @@ public class CIForm extends AbstractRendering implements FormModel{ if(LD_ChangeForm_HighestPriv_Users_Config[0].contains(userId)) { ArrayList columns = getColumn(LD_ChangeForm_HighestPriv_AttrName_Config[0]); String sfsjgg = tableModel.getValueAt(row, YNCHANGE_INDEX).toString(); + + + + if(LD_ChangeForm_MiddlePriv_Users_Config[0].contains(userId)) { + ArrayList columnsB = getColumn(LD_ChangeForm_MiddlePriv_AttrName_Config[0]); + if(tableModel.getValueAt(row, CHANGE_PERSON_INDEX).toString().contains(userId) && columnsB.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { + for (int i = 0; i < columnsB.size(); i++) { + if(!columns.contains(columnsB.get(i))) { + columns.add(columnsB.get(i)); + } + } + } + } + + if(LD_ChangeForm_LowerstPriv_Users_Config[0].contains(userId)) { + ArrayList columnsC = getColumn(LD_ChangeForm_LowerstPriv_AttrName_Config[0]); + if(tableModel.getValueAt(row, CLRZH_PERSON_INDEX).toString().contains(userId) && columnsC.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { + for (int i = 0; i < columnsC.size(); i++) { + if(!columns.contains(columnsC.get(i))) { + columns.add(columnsC.get(i)); + } + } + } + } + + + + if(columns.contains(column) && column == YNCHANGE_INDEX) { return true; }else if(columns.contains(column) && column != YNCHANGE_INDEX && sfsjgg != null && sfsjgg.equals("是")) { @@ -236,6 +264,19 @@ public class CIForm extends AbstractRendering implements FormModel{ if(LD_ChangeForm_MiddlePriv_Users_Config[0].contains(userId)) { ArrayList columns = getColumn(LD_ChangeForm_MiddlePriv_AttrName_Config[0]); String sfsjgg = tableModel.getValueAt(row, YNCHANGE_INDEX).toString(); + + if(LD_ChangeForm_LowerstPriv_Users_Config[0].contains(userId)) { + ArrayList columnsC = getColumn(LD_ChangeForm_LowerstPriv_AttrName_Config[0]); + if(tableModel.getValueAt(row, CLRZH_PERSON_INDEX).toString().contains(userId) && columnsC.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { + for (int i = 0; i < columnsC.size(); i++) { + if(!columns.contains(columnsC.get(i))) { + columns.add(columnsC.get(i)); + } + } + } + } + + if(tableModel.getValueAt(row, CHANGE_PERSON_INDEX).toString().contains(userId) && columns.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { return true; }else { diff --git a/src/com/net/connor/ld/plm/ld05/CNForm.java b/src/com/net/connor/ld/plm/ld05/CNForm.java index c63d120..4ba4422 100644 --- a/src/com/net/connor/ld/plm/ld05/CNForm.java +++ b/src/com/net/connor/ld/plm/ld05/CNForm.java @@ -211,6 +211,33 @@ public class CNForm extends AbstractRendering implements FormModel{ if(LD_ChangeForm_HighestPriv_Users_Config[0].contains(userId)) { ArrayList columns = getColumn(LD_ChangeForm_HighestPriv_AttrName_Config[0]); String sfsjgg = tableModel.getValueAt(row, YNCHANGE_INDEX).toString(); + + + if(LD_ChangeForm_MiddlePriv_Users_Config[0].contains(userId)) { + ArrayList columnsB = getColumn(LD_ChangeForm_MiddlePriv_AttrName_Config[0]); + if(tableModel.getValueAt(row, CHANGE_PERSON_INDEX).toString().contains(userId) && columnsB.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { + for (int i = 0; i < columnsB.size(); i++) { + if(!columns.contains(columnsB.get(i))) { + columns.add(columnsB.get(i)); + } + } + } + } + + if(LD_ChangeForm_LowerstPriv_Users_Config[0].contains(userId)) { + ArrayList columnsC = getColumn(LD_ChangeForm_LowerstPriv_AttrName_Config[0]); + if(tableModel.getValueAt(row, CLRZH_PERSON_INDEX).toString().contains(userId) && columnsC.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { + for (int i = 0; i < columnsC.size(); i++) { + if(!columns.contains(columnsC.get(i))) { + columns.add(columnsC.get(i)); + } + } + } + } + + + + if(columns.contains(column) && column == YNCHANGE_INDEX) { return true; }else if(columns.contains(column) && column != YNCHANGE_INDEX && sfsjgg != null && sfsjgg.equals("是")) { @@ -223,6 +250,21 @@ public class CNForm extends AbstractRendering implements FormModel{ if(LD_ChangeForm_MiddlePriv_Users_Config[0].contains(userId)) { ArrayList columns = getColumn(LD_ChangeForm_MiddlePriv_AttrName_Config[0]); String sfsjgg = tableModel.getValueAt(row, YNCHANGE_INDEX).toString(); + + + if(LD_ChangeForm_LowerstPriv_Users_Config[0].contains(userId)) { + ArrayList columnsC = getColumn(LD_ChangeForm_LowerstPriv_AttrName_Config[0]); + if(tableModel.getValueAt(row, CLRZH_PERSON_INDEX).toString().contains(userId) && columnsC.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { + for (int i = 0; i < columnsC.size(); i++) { + if(!columns.contains(columnsC.get(i))) { + columns.add(columnsC.get(i)); + } + } + } + } + + + if(tableModel.getValueAt(row, CHANGE_PERSON_INDEX).toString().contains(userId) && columns.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { return true; }else { diff --git a/src/com/net/connor/ld/plm/ld05/ECSelectDialog.java b/src/com/net/connor/ld/plm/ld05/ECSelectDialog.java index b64fe31..01ab772 100644 --- a/src/com/net/connor/ld/plm/ld05/ECSelectDialog.java +++ b/src/com/net/connor/ld/plm/ld05/ECSelectDialog.java @@ -729,11 +729,20 @@ public class ECSelectDialog extends JFrame implements ActionListener, FormModel String ggrwxStr = formBean.getLd6_ChangeTaskName(); String nycdStr = formBean.getLd6_RWnycd(); String jjcdStr = formBean.getLd6_RWjjcd(); - - if (ggrwxStr != null && nycdStr != null && jjcdStr != null && result!= null && !ggrwxStr.isEmpty() && !nycdStr.isEmpty() && !jjcdStr.isEmpty() && !result.isEmpty()) { + String ld6_RWworkhour = formBean.getLd6_RWworkhour(); + System.out.println("count==================="+count); + System.out.println("1============"+ld6_RWworkhour); + System.out.println("2============"+ggrwxStr); + System.out.println("3============"+rwxzMap.get("EC")); + System.out.println("4============"+nycdStr); + System.out.println("5============"+jjcdStr); + System.out.println("6============"+result); + if (ggrwxStr != null && nycdStr != null && jjcdStr != null && result!= null && ld6_RWworkhour!= null && !ggrwxStr.isEmpty() && !nycdStr.isEmpty() && !jjcdStr.isEmpty() && !result.isEmpty() && !ld6_RWworkhour.isEmpty()) { try { - score = ggrwxMap.get(ggrwxStr) * rwxzMap.get("EC") * nycdMap.get(nycdStr) * jjcdMap.get(jjcdStr) * cskfMap.get(result); + + + score = Double.parseDouble(ld6_RWworkhour) * ggrwxMap.get(ggrwxStr) * rwxzMap.get("EC") * nycdMap.get(nycdStr) * jjcdMap.get(jjcdStr) * cskfMap.get(result); setCellValue(titleRow, 35, score == null ? "" : score + "", sheet, row);// 得分 } catch (Exception e2) { // TODO: handle exception