com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java

@@ -367,51 +367,93 @@ public class CreateEcnController extends KFXPanelController {
             // 1222 新增逻辑，责任人指派
             for (int i = 0; i < 7; i++) {
                 RefTableBean refTableBean = items.get(i);
+                String user = refTableBean.getUserVal();
+                String uuid = refTableBean.getUserUUid();
+                if(uuid != null && !uuid.isEmpty())
+                	user += ";" + uuid;
+                if(user.isEmpty())
+                	user = ";";
                 String result = refTableBean.getShYes().isSelected() ? "是" : "否";
                 SqlUtil.write(new String[] { endCode, "1", refTableBean.getDepart(), String.valueOf(i + 1),
-                        refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(),
+                        refTableBean.getMessage(), result, user,
                         refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql);
             }
             for (int i = 7; i < 11; i++) {
                 RefTableBean refTableBean = items.get(i);
+                String user = refTableBean.getUserVal();
+                String uuid = refTableBean.getUserUUid();
+                if(uuid != null && !uuid.isEmpty())
+                	user += ";" + uuid;
+                if(user.isEmpty())
+                	user = ";";
                 String result = refTableBean.getShYes().isSelected() ? "是" : "否";
                 SqlUtil.write(new String[] { endCode, "2", refTableBean.getDepart(), String.valueOf(i - 6),
-                        refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(),
+                        refTableBean.getMessage(), result, user,
                         refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql);
             }
             for (int i = 11; i < 15; i++) {
                 RefTableBean refTableBean = items.get(i);
+                String user = refTableBean.getUserVal();
+                String uuid = refTableBean.getUserUUid();
+                if(uuid != null && !uuid.isEmpty())
+                	user += ";" + uuid;
+                if(user.isEmpty())
+                	user = ";";
                 String result = refTableBean.getShYes().isSelected() ? "是" : "否";
                 SqlUtil.write(new String[] { endCode, "3", refTableBean.getDepart(), String.valueOf(i - 10),
-                        refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(),
+                        refTableBean.getMessage(), result, user,
                         refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql);
             }
             for (int i = 15; i < 19; i++) {
                 RefTableBean refTableBean = items.get(i);
+                String user = refTableBean.getUserVal();
+                String uuid = refTableBean.getUserUUid();
+                if(uuid != null && !uuid.isEmpty())
+                	user += ";" + uuid;
+                if(user.isEmpty())
+                	user = ";";
                 String result = refTableBean.getShYes().isSelected() ? "是" : "否";
                 SqlUtil.write(new String[] { endCode, "4", refTableBean.getDepart(), String.valueOf(i - 14),
-                        refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(),
+                        refTableBean.getMessage(), result, user,
                         refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql);
             }
             for (int i = 19; i < 24; i++) {
                 RefTableBean refTableBean = items.get(i);
+                String user = refTableBean.getUserVal();
+                String uuid = refTableBean.getUserUUid();
+                if(uuid != null && !uuid.isEmpty())
+                	user += ";" + uuid;
+                if(user.isEmpty())
+                	user = ";";
                 String result = refTableBean.getShYes().isSelected() ? "是" : "否";
                 SqlUtil.write(new String[] { endCode, "5", refTableBean.getDepart(), String.valueOf(i - 18),
-                        refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(),
+                        refTableBean.getMessage(), result, user,
                         refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql);
             }
             for (int i = 24; i < 27; i++) {
                 RefTableBean refTableBean = items.get(i);
+                String user = refTableBean.getUserVal();
+                String uuid = refTableBean.getUserUUid();
+                if(uuid != null && !uuid.isEmpty())
+                	user += ";" + uuid;
+                if(user.isEmpty())
+                	user = ";";
                 String result = refTableBean.getShYes().isSelected() ? "是" : "否";
                 SqlUtil.write(new String[] { endCode, "6", refTableBean.getDepart(), String.valueOf(i - 23),
-                        refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(),
+                        refTableBean.getMessage(), result, user,
                         refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql);
             }
             for (int i = 27; i < 28; i++) {
                 RefTableBean refTableBean = items.get(i);
+                String user = refTableBean.getUserVal();
+                String uuid = refTableBean.getUserUUid();
+                if(uuid != null && !uuid.isEmpty())
+                	user += ";" + uuid;
+                if(user.isEmpty())
+                	user = ";";
                 String result = refTableBean.getShYes().isSelected() ? "是" : "否";
                 SqlUtil.write(new String[] { endCode, "7", refTableBean.getDepart(), String.valueOf(i - 26),
-                        refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(),
+                        refTableBean.getMessage(), result, user,
                         refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql);
             }
             frame.dispose();

com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnBean.java

@@ -1,7 +1,6 @@
 package com.chint.plm.createEcn;
 
 import java.sql.ResultSet;
-import java.sql.SQLException;
 
 import com.connor.chint.sap2.util.BomToSapUtil;
 import com.connor.chint.sap2.util.SqlUtil;
@@ -55,7 +54,7 @@ public class RelateEcnBean {
             SimpleStringProperty requestNo, SimpleStringProperty prodModel, SimpleStringProperty applicant,
             SimpleStringProperty status, String link, CreateEcnController controller, 
             ResultSet read, String[] prefs, TableView<RelateEcnBean> tableView)
-            throws SQLException {
+            throws Exception {
         super();
         this.num = num;
         this.contConde = contConde;
@@ -67,13 +66,13 @@ public class RelateEcnBean {
         // 变更单号
         String applyNo = read.getString("APPLYNO");
         // 七种责任人
-        String designPal = read.getString("DESIGNPRINCIPAL");
+        String designPal = getUser(read, "DESIGNPRINCIPAL");
-        String techPal = read.getString("TECHPRINCIPAL");
+        String techPal = getUser(read, "TECHPRINCIPAL");
-        String quantityPal = read.getString("QUALITYPRINCIPAL");
+        String quantityPal = getUser(read, "QUALITYPRINCIPAL");
-        String producePal = read.getString("PRODUCEPRINCIPAL");
+        String producePal = getUser(read, "PRODUCEPRINCIPAL");
-        String purchasePal = read.getString("PURCHASEYPRINCIPAL");
+        String purchasePal = getUser(read, "PURCHASEYPRINCIPAL");
-        String customPal = read.getString("CUSTOMNOTICEPRINCIPAL");// FINAPRICEPRINCIPAL
+        String customPal = getUser(read, "CUSTOMNOTICEPRINCIPAL");// FINAPRICEPRINCIPAL
-        String finaPal = read.getString("FINAPRICEPRINCIPAL");
+        String finaPal = getUser(read, "FINAPRICEPRINCIPAL");
         String docuName = read.getString("DOCUNAME"); // 文件代号及名称
 //        String designFile = read.getString("DESIGNFILE");// 获取行动内容
         linkBtn.setOnAction(e -> {
@@ -175,5 +174,15 @@ public class RelateEcnBean {
     public void setApplicant(SimpleStringProperty applicant) {
         this.applicant = applicant;
     }
-
+    /**
+	 * 用户查询结果:替换为;（避免空值）
+	 * 
+	 * @param read 查询结果
+	 * @param col 列名
+	 * @return 替换后的值
+	 */
+    private String getUser(ResultSet read, String col) throws Exception {
+    	String val = read.getString(col);
+        return val == null ? val : val.replaceAll(":", ";");
+    }
 }

com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnController.java

@@ -231,14 +231,13 @@ public class RelateEcnController {
             if (!startText.isEmpty()) {
                 searchSqlBuff.append(" and to_date(APPLYDATE,'yyyy-mm-dd hh24:mi:ss') >= to_date('").append(startText)
                         .append("','yyyy-mm-dd') "); // to_date(?,'yyyy-mm-ddhh24:mi:ss')
-                System.out.println("startText==>" + startText);
             }
             String endText = endTime.getEditor().getText();
             if (!endText.isEmpty()) {
                 searchSqlBuff.append(" and to_date(APPLYDATE,'yyyy-mm-dd hh24:mi:ss') <= to_date('").append(endText)
                         .append("','yyyy-mm-dd') "); // to_date(?,'yyyy-mm-ddhh24:mi:ss')
-                System.out.println("endText==>" + endText);
             }
+            System.out.println("searchSqlBuff==>" + searchSqlBuff);
             int num = 1;
             ResultSet read = SqlUtil.read(searchSqlBuff.toString());
             List<RelateEcnBean> ecnBeans = new ArrayList<>();
@@ -247,7 +246,8 @@ public class RelateEcnController {
                 String contName = read.getString("CONTRACTNAME");
                 String requestNo = read.getString("APPLYNO");
                 String prodModel = read.getString("PRODUCTMODEL");
-                String applicant = read.getString("APPLYUSER");// STATUS
+                String applicant = read.getString("APPLYUSER").replaceAll(":", ";");// STATUS
+                System.out.println("applicant£º" + read.getString("APPLYUSER") + "==" + applicant);
                 String status = read.getString("STATUS");
                 String link = read.getString("APPLYLINK");
                 ecnBeans.add(new RelateEcnBean(new SimpleStringProperty(num + ""), new SimpleStringProperty(contConde),