修复bug

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsFormElementController.java

@@ -131,28 +131,28 @@ public class WbsFormElementController extends BladeController {
         for (WbsFormElementExcel wbsFE : list) {
             if (("字符串").equals(wbsFE.getElementType()) || ("string").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("1");
-                wbsFE.setElementLength("255");
+                wbsFE.setElementLength("250");
             } else if (("整数").equals(wbsFE.getElementType()) || ("bigint").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("2");
-                wbsFE.setElementLength("20");
+                wbsFE.setElementLength("50");
             } else if (("小数").equals(wbsFE.getElementType()) || ("decimal").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("3");
-                wbsFE.setElementLength("20");
+                wbsFE.setElementLength("50");
             } else if (("日期").equals(wbsFE.getElementType()) || ("datetime").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("4");
-                wbsFE.setElementLength("0");
+                wbsFE.setElementLength("50");
             } else if (("数值").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("3");
-                wbsFE.setElementLength("20");
+                wbsFE.setElementLength("50");
             } else if (("签名").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("1");
-                wbsFE.setElementLength("255");
+                wbsFE.setElementLength("250");
             } else if (("文件").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("1");
-                wbsFE.setElementLength("255");
+                wbsFE.setElementLength("250");
             } else {
                 wbsFE.setElementType("1");
-                wbsFE.setElementLength("255");
+                wbsFE.setElementLength("250");
             }
         }
         return R.data(list, "操作成功");

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsFormElementServiceImpl.java

@@ -107,7 +107,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
             //默认字段类型=varchar 长度=255
             String fieldNameKey = wbsFormElement.getEKey();
             String fieldType = "varchar";
-            String fieldLength = "255";
+            String fieldLength = "250";
             sbr.append(fieldNameKey);
             sbr.append(" ").append(fieldType).append("(").append(fieldLength).append(") ,\n");
 
@@ -182,6 +182,8 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                     //同步
                     //sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
 
+                    wbsFormElement.setELength(250);
+
                     sbr1.append(" ").append("varchar").append("(").append(wbsFormElement.getELength()).append(")");
                     String sql = newName + " " + sbr1;
                     baseMapper.alterAddFiled(sql, tableName);
@@ -198,7 +200,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                     //同步
                     //sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
 
-                    wbsFormElement.setELength(255);
+                    wbsFormElement.setELength(250);
 
                     sbr1.append(" ").append("varchar").append("(").append(wbsFormElement.getELength()).append(")");
                     String sql = newName + " " + sbr1;
@@ -216,7 +218,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                     //同步
                     //sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
 
-                    wbsFormElement.setELength(255);
+                    wbsFormElement.setELength(250);
 
                     sbr1.append(" ").append("varchar").append("(").append(wbsFormElement.getELength()).append(")");
                     String sql = newName + " " + sbr1;
@@ -233,7 +235,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                     //同步
                     //sbr1.append(" ").append(fieldType).append("(").append(0).append(")");
 
-                    wbsFormElement.setELength(255);
+                    wbsFormElement.setELength(250);
 
                     sbr1.append(" ").append("varchar").append("(").append(wbsFormElement.getELength()).append(")");
                     String sql = newName + " " + sbr1;
@@ -315,11 +317,11 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
 
                 //设置默认长度
                 if (eLength <= 255 && eLength > 65) {
-                    eLength = 255;
+                    eLength = 250;
                 } else if (eLength <= 1000 && eLength > 500) {
                     eLength = 500;
                 } else if (eLength >= 0 && eLength <= 65) {
-                    eLength = 20;
+                    eLength = 50;
                 }
 
                 //判断是否存在该Key字段
@@ -484,7 +486,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
 
                             //初始化默认值varchar 长度255
                             String eTypeFiled = "varchar";
-                            int eLengthFiled = 255;
+                            int eLengthFiled = 250;
 
                             //判断是否存在该Key字段
                             int row1 = wbsTreeMapper.isThereAField(wbsTree.getInitTableName(), key);
@@ -570,7 +572,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
 
                     //初始化默认值varchar 长度255
                     String eTypeFiled = "varchar";
-                    int eLengthFiled = 255;
+                    int eLengthFiled = 250;
 
                     //判断是否存在该Key字段
                     int row1 = wbsTreeMapper.isThereAField(wbsTree.getInitTableName(), key);
@@ -727,7 +729,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
             //默认初始化值
             String eKey = listDatum.getEKey();
             String initTableFiledType = "varchar";
-            Integer elementLength = 255;
+            Integer elementLength = 250;
 
             //同步
             baseMapper.addTableFiled(initTableName, eKey, initTableFiledType, elementLength);
@@ -768,11 +770,11 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
             case "字符串":
             case "签名":
             case "文件":
-                return 255;
+                return 250;
             case "整数":
             case "数值":
             case "小数":
-                return 20;
+                return 50;
             case "日期":
             default:
                 return 0;
@@ -782,10 +784,10 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
     private Integer getElementLength2(String type) {
         switch (type) {
             case "varchar":
-                return 255;
+                return 250;
             case "bigint":
             case "decimal":
-                return 20;
+                return 50;
             case "datetime":
             default:
                 return 0;
@@ -797,11 +799,11 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
             case 1:  //字符串
             case 7:  //文件
             case 6:  //签名
-                return "255";
+                return "250";
             case 2:  //整数
             case 5:  //数值
             case 3:  //小数
-                return "20";
+                return "50";
             case 4:  //日期
             default:
                 return "0";

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -334,7 +334,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             baseMapper.updateBatchWbsPrivate(listPrivate);
             wbsTreeContractMapper.updateBatchWbsContract(listContract);
         }catch (Exception e){
-            throw new ServiceException("节点基础信息同步修改失败");
+            e.printStackTrace();
+            //throw new ServiceException("节点基础信息同步修改失败");
         }
         return true;
     }
@@ -382,7 +383,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             baseMapper.updateBatchWbsPrivate(listPrivate);
             wbsTreeContractMapper.updateBatchWbsContract(listContract);
         }catch (Exception e){
-            throw new ServiceException("节点基础信息同步修改失败");
+            e.printStackTrace();
+            //throw new ServiceException("节点基础信息同步修改失败");
         }
         return true;
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -898,7 +898,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                             WbsTreePrivate wbsTreePrivate1 = wbsTreePrivateMapper.selectOne(Wrappers.<WbsTreePrivate>query().lambda()
                                     .eq(WbsTreePrivate::getId, list.getParentId())
                                     .eq(WbsTreePrivate::getWbsId, pawDTO.getPrimaryKeyId())
-                                    .eq(WbsTreePrivate::getProjectId, wbsTreePrivate.getProjectId())
+                                    .eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId())
+                                    .eq(WbsTreePrivate::getStatus,1)
                             );
 
                             if (wbsTreePrivate1 != null) {
@@ -957,7 +958,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                                 }
                             }
                         });
-                        return true;
+
                     }
                 }
             }