元素类型bug修复

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

@@ -90,8 +90,7 @@ public class WbsFormElementController extends BladeController {
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "批量新增wbs元素", notes = "传入wbsFormElementList")
     public R submitBatch(@RequestBody WbsFormElementVO2 wbsFormElementVO2) {
-        boolean b = wbsFormElementService.submitBatch(wbsFormElementVO2);
-        return R.status(b);
+        return R.status(wbsFormElementService.submitBatch(wbsFormElementVO2));
     }
 
 
@@ -103,8 +102,7 @@ public class WbsFormElementController extends BladeController {
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
     public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam("ids") String ids,
                     @RequestParam("eKey") String eKey, @RequestParam("initTableName") String initTableName) {
-        boolean b = wbsFormElementService.deleteAndSyn(ids, eKey, initTableName);
-        if (b) {
+        if (wbsFormElementService.deleteAndSyn(ids, eKey, initTableName)) {
             return R.success("操作成功");
         }
         return R.fail("操作失败");

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

@@ -217,7 +217,7 @@ public class WbsTreeController extends BladeController {
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "表单与元素新增", notes = "传入FormElementDTO")
     public R saveFormElement(@RequestBody FormElementDTO formElementDTO) {
-        return wbsTreeService.saveFormElement(formElementDTO);
+        return R.status(wbsTreeService.saveFormElement(formElementDTO));
     }
 
 
@@ -228,15 +228,8 @@ public class WbsTreeController extends BladeController {
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "编辑表单元素批量修改", notes = "传入WbsFormElement")
     @ApiImplicitParam(name = "ids", value = "元素的id集合", required = true)
-    @Transactional(rollbackFor = Exception.class)
     public R updateBatchElements(@RequestBody List<WbsFormElement> wbsFormElementList, @RequestParam("initTableName") String initTableName) {
-        for (WbsFormElement wbsFormElement : wbsFormElementList) {
-            wbsFormElement.setStatus(1);
-        }
-        if (wbsFormElementService.updateBatchById(wbsFormElementList)) {
-            return R.status(wbsFormElementService.updateAndSyn(wbsFormElementList, initTableName));
-        }
-        return R.fail(200,"修改失败");
+        return R.status(wbsFormElementService.updateAndSyn(wbsFormElementList, initTableName));
     }
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeService.java

@@ -40,7 +40,7 @@ public interface IWbsTreeService extends BaseService<WbsTree> {
 
     WbsTreeAllListVO findWbsTreeList(Integer type);
 
-    R saveFormElement(FormElementDTO formElementDTO);
+    boolean saveFormElement(FormElementDTO formElementDTO);
 
     int deleteBatchByProjectNodeId(Long projectNodeId);
 

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

@@ -62,10 +62,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
     @Override
     public boolean addFormElement(WbsFormElement wbsFormElement) {
         int insert1 = baseMapper.insert(wbsFormElement);
-        if (insert1 > 0) {
-            return true;
-        }
-        return false;
+        return insert1 > 0;
     }
 
     @Override
@@ -77,29 +74,23 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
         }
         List<WbsFormElement> wbsFormElements = baseMapper.selectBatchIds(ids);
 
-        if ((wbsFormElements).equals(wbsFormElementList)) {
-            return false;
-        }
-        return true;
+        return !(wbsFormElements).equals(wbsFormElementList);
     }
 
     @Override
     public Boolean initTable(List<WbsFormElement> elementList, String tableName) {
         String sql = createSQL(elementList);
         //建表
-        Integer row = wbsFormElementMapper.createTable(sql, tableName);
-        if (row >= 0) {
-            return true;
-        }
-        return false;
+        return wbsFormElementMapper.createTable(sql, tableName) >= 0;
     }
 
     private String createSQL(List<WbsFormElement> elementList) {
-        StringBuffer sbr = new StringBuffer();
+        StringBuilder sbr = new StringBuilder();
         for (WbsFormElement wbsFormElement : elementList) {
+            /* 字段类型不默认
             //获取字段名、类型、长度
             String fieldNameKey = wbsFormElement.getEKey();
-            String fieldType = judgeDataType(wbsFormElement.getEType());
+            String fieldType = getInitTableFiledType(wbsFormElement.getEType());
             String fieldLength = String.valueOf(wbsFormElement.getELength());
 
             sbr.append("" + fieldNameKey + "");
@@ -111,23 +102,17 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                 sbr.append(" " + fieldType + "(" + fieldLength + ") ,\n");
             } else if ("datetime".equals(fieldType)) {
                 sbr.append(" " + fieldType + "(" + fieldLength + ") ,\n");
-            }
-        }
-        return String.valueOf(sbr);
-    }
+            }*/
+
+            //默认字段类型=varchar 长度=255
+            String fieldNameKey = wbsFormElement.getEKey();
+            String fieldType = "varchar";
+            String fieldLength = "255";
+            sbr.append(fieldNameKey);
+            sbr.append(" ").append(fieldType).append("(").append(fieldLength).append(") ,\n");
 
-    private String judgeDataType(Integer type) {
-        switch (type) {
-            case 2:
-                return "bigint";
-            case 3:
-                return "decimal";
-            case 4:
-                return "datetime";
-            case 1:
-            default:
-                return "varchar";
         }
+        return String.valueOf(sbr);
     }
 
     @Override
@@ -140,7 +125,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
     @Override
     public void importElement(List<WbsFormElementExcel> data, Boolean isCovered, String tableId) {
         List<WbsFormElement> list = new ArrayList<>();
-        data.stream().forEach(excel -> {
+        data.forEach(excel -> {
             WbsFormElement wbsFormElement = new WbsFormElement();
             wbsFormElement.setEName(excel.getElementName());
             wbsFormElement.setEType(Integer.valueOf(excel.getElementType()));
@@ -195,7 +180,9 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                     baseMapper.insert(wbsFormElement);
 
                     //同步
-                    sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
+                    //sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
+
+                    sbr1.append(" ").append("varchar").append("(").append(wbsFormElement.getELength()).append(")");
                     String sql = newName + " " + sbr1;
                     baseMapper.alterAddFiled(sql, tableName);
                     return true;
@@ -209,7 +196,11 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                     baseMapper.insert(wbsFormElement);
 
                     //同步
-                    sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
+                    //sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
+
+                    wbsFormElement.setELength(255);
+
+                    sbr1.append(" ").append("varchar").append("(").append(wbsFormElement.getELength()).append(")");
                     String sql = newName + " " + sbr1;
                     baseMapper.alterAddFiled(sql, tableName);
                     return true;
@@ -221,10 +212,14 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                 } else {
                     //新增
                     baseMapper.insert(wbsFormElement);
-                    sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
-                    String sql = newName + " " + sbr1;
 
                     //同步
+                    //sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
+
+                    wbsFormElement.setELength(255);
+
+                    sbr1.append(" ").append("varchar").append("(").append(wbsFormElement.getELength()).append(")");
+                    String sql = newName + " " + sbr1;
                     baseMapper.alterAddFiled(sql, tableName);
                     return true;
                 }
@@ -234,10 +229,14 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                 } else {
                     //新增
                     baseMapper.insert(wbsFormElement);
-                    sbr1.append(" ").append(fieldType).append("(").append(0).append(")");
-                    String sql = newName + " " + sbr1;
 
                     //同步
+                    //sbr1.append(" ").append(fieldType).append("(").append(0).append(")");
+
+                    wbsFormElement.setELength(255);
+
+                    sbr1.append(" ").append("varchar").append("(").append(wbsFormElement.getELength()).append(")");
+                    String sql = newName + " " + sbr1;
                     baseMapper.alterAddFiled(sql, tableName);
                     return true;
                 }
@@ -274,40 +273,53 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updateAndSyn(List<WbsFormElement> wbsFormElementList, String initTableName) {
-        String fId = "";
-        for (WbsFormElement wbsFormElement : wbsFormElementList) {
-            fId = wbsFormElement.getFId();
-            break;
-        }
-        //当前元素表下所有元素信息
-        List<WbsFormElement> wbsFormElements = baseMapper.selectList(Wrappers.<WbsFormElement>query().lambda().eq(WbsFormElement::getFId, fId));
-
-        for (WbsFormElement wbsFormElement : wbsFormElements) {
-            String eKey = wbsFormElement.getEKey();
-            Integer eLength = wbsFormElement.getELength();
-            String eType = getInitTableFiledType(wbsFormElement.getEType());
-
-            if (eType.equals("bigint") && (eLength > 255 || eLength < 10)) {
-                throw new ServiceException("请输入正确长度,范围为10-255之间");
-            } else if (eType.equals("varchar") && (eLength > 1000 || eLength < 10)) {
-                throw new ServiceException("请输入正确长度,范围为10-1000之间");
-            } else if (eType.equals("decimal") && (eLength > 65 || eLength < 10)) {
-                throw new ServiceException("请输入正确长度,范围为10-65之间");
+        //修改元素基础信息
+        wbsFormElementList.forEach(obj -> obj.setStatus(1));
+        boolean b = this.updateBatchById(wbsFormElementList);
+
+        //修改实体表信息
+        if (b) {
+            String fId = "";
+            for (WbsFormElement wbsFormElement : wbsFormElementList) {
+                fId = wbsFormElement.getFId();
+                break;
             }
+            //当前元素表下所有元素信息
+            List<WbsFormElement> wbsFormElements = baseMapper.selectList(Wrappers.<WbsFormElement>query().lambda().eq(WbsFormElement::getFId, fId));
+
+            for (WbsFormElement wbsFormElement : wbsFormElements) {
+                String eKey = wbsFormElement.getEKey();
+                Integer eLength = wbsFormElement.getELength();
+                String eType = getInitTableFiledType(wbsFormElement.getEType());
+
+                if (eType.equals("bigint") && (eLength > 255 || eLength < 10)) {
+                    throw new ServiceException("请输入正确长度,该类型范围为10-255之间");
+                } else if (eType.equals("varchar") && (eLength > 1000 || eLength < 10)) {
+                    throw new ServiceException("请输入正确长度,该类型范围为10-1000之间");
+                } else if (eType.equals("decimal") && (eLength > 65 || eLength < 10)) {
+                    throw new ServiceException("请输入正确长度,该类型范围为10-65之间");
+                }
+
+                /*//当前字段类型
+                String filedTypeOld = baseMapper.selectFiledType(initTableName, eKey);
 
-            //当前字段类型
-            String filedTypeOld = baseMapper.selectFiledType(initTableName, eKey);
+                if (!eType.equals(filedTypeOld)) {
+                    //修改前判断，字段是否存在填报数据
+                    int row = baseMapper.assertFiledExist(initTableName, eKey);
+                    if (row > 0) {
+                        throw new ServiceException("选择修改的元素字段下存在填报数据，不允许修改字段类型");
+                    }
+                }*/
 
-            if (!eType.equals(filedTypeOld)) {
-                //修改前判断，字段是否存在填报数据
-                int row = baseMapper.assertFiledExist(initTableName, eKey);
-                if (row > 0) {
-                    throw new ServiceException("选择修改的元素字段下存在填报数据，不允许修改字段类型");
+                //设置默认长度
+                if (eLength < 255) {
+                    eLength = 255;
                 }
+                //修改
+                baseMapper.updateFiledType(initTableName, eKey, "varchar", eLength);
             }
-            //修改
-            baseMapper.updateFiledType(initTableName, eKey, eType, eLength);
         }
 
         return true;
@@ -417,7 +429,6 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                         if (obj != 1) {
                             //不存在对应实体表的元素表不新增同步元素字段
                             continue;
-                            //throw new ServiceException(StringUtil.format("未获取到 {} 对应实体表信息，同步失败",wbsTree.getDeptName()));
                         }
 
                         //获取表单下的元素信息
@@ -457,8 +468,12 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
 
                             baseMapper.insert(wbsFormElementInfo);
 
-                            String eTypeFiled = getInitTableFiledType(wbsFormElementInfo.getEType());
-                            int eLengthFiled = Integer.parseInt(setDefaultElementLength(wbsFormElementInfo.getEType()));
+                            //String eTypeFiled = getInitTableFiledType(wbsFormElementInfo.getEType());
+                            //int eLengthFiled = Integer.parseInt(setDefaultElementLength(wbsFormElementInfo.getEType()));
+
+                            //初始化默认值varchar 长度255
+                            String eTypeFiled = "varchar";
+                            int eLengthFiled = 255;
 
                             //判断是否存在该Key字段
                             int row1 = wbsTreeMapper.isThereAField(wbsTree.getInitTableName(), key);
@@ -539,8 +554,12 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
 
                     baseMapper.insert(wbsFormElementInfo);
 
-                    String eTypeFiled = getInitTableFiledType(wbsFormElementInfo.getEType());
-                    int eLengthFiled = Integer.parseInt(setDefaultElementLength(wbsFormElementInfo.getEType()));
+                    //String eTypeFiled = getInitTableFiledType(wbsFormElementInfo.getEType());
+                    //int eLengthFiled = Integer.parseInt(setDefaultElementLength(wbsFormElementInfo.getEType()));
+
+                    //初始化默认值varchar 长度255
+                    String eTypeFiled = "varchar";
+                    int eLengthFiled = 255;
 
                     //判断是否存在该Key字段
                     int row1 = wbsTreeMapper.isThereAField(wbsTree.getInitTableName(), key);
@@ -691,9 +710,14 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
 
     public boolean syncDataFiled(String initTableName, List<WbsFormElement> listData) {
         for (WbsFormElement listDatum : listData) {
-            String initTableFiledType = getInitTableFiledType(listDatum.getEType());
-            int elementLength = getElementLength(initTableFiledType);
+            // String initTableFiledType = getInitTableFiledType(listDatum.getEType());
+            // int elementLength = getElementLength(initTableFiledType);
+
+            //默认初始化值
             String eKey = listDatum.getEKey();
+            String initTableFiledType = "varchar";
+            Integer elementLength = 255;
+
             //同步
             baseMapper.addTableFiled(initTableName, eKey, initTableFiledType, elementLength);
         }
@@ -773,6 +797,20 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
         }
     }
 
+    private String judgeDataType(Integer type) {
+        switch (type) {
+            case 2:
+                return "bigint";
+            case 3:
+                return "decimal";
+            case 4:
+                return "datetime";
+            case 1:
+            default:
+                return "varchar";
+        }
+    }
+
     private static String getPinyin(String text, String separator) {
         //text 文本, separator 转换后添加的分隔符
         char[] chars = text.toCharArray();

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

@@ -65,10 +65,10 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         List<String> idList = Arrays.asList(ids);
         List<String> idList1 = idList.stream().filter(string -> !string.isEmpty()).collect(Collectors.toList());
 
-        //获取当前合同段wbs所有节点+表单(不包括客户端新增或者复制节点)
+        //获取当前合同段wbs所有节点、表单(不包括客户端新增或者复制节点)
         List<WbsTreeContract> list = baseMapper.findAllNodeList2(pawDTO.getProjectId(), pawDTO.getContractId(), pawDTO.getWbsId());
 
-        //当前合同段所有节点下表单Id
+        //当前合同段所有表单Id
         List<String> collect3 = new ArrayList<>();
         //当前合同段所有节点Id
         List<String> collect7 = new ArrayList<>();
@@ -103,8 +103,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             );
 
             //只获取当前引用节点下的所有表
-            wbsTreePrivateList.stream().forEach(wbsTreePrivate -> {
-                idList1.stream().forEach(id -> {
+            wbsTreePrivateList.forEach(wbsTreePrivate -> {
+                idList1.forEach(id -> {
                     if (Long.parseLong(id) == (wbsTreePrivate.getParentId()) && wbsTreePrivate.getType() == 2) {
                         //表
                         wbsTreePrivateList2.add(wbsTreePrivate);
@@ -124,8 +124,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             if (collect2.size() > collect3.size()) {
                 //初始化
                 List<WbsTreeContract> wbsTreeContracts = new ArrayList<>();
-                wbsTreePrivateList.stream().forEach(wbsTreePrivate -> {
-                    diffRent1.stream().forEach(id -> {
+                wbsTreePrivateList.forEach(wbsTreePrivate -> {
+                    diffRent1.forEach(id -> {
                         if (Long.parseLong(id) == (wbsTreePrivate.getId())) {
                             WbsTreeContract wbsTreeContract = getWbsTreeContract(wbsTreePrivate, pawDTO);
                             wbsTreeContracts.add(wbsTreeContract);
@@ -176,8 +176,9 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 List<WbsTreePrivate> wbsTreePrivatesList = new ArrayList<>();
                 ArrayList<ConstructionLedger> constructionLedgerList = new ArrayList<>();
 
-                //获取wbs私有树下节点+表 saveIds=新增的节点id
+                //获取wbs私有树下节点、表 saveIds=新增的节点id
                 List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateMapper.selectNodeAndTable2(pawDTO.getWbsId(), pawDTO.getProjectId());
+
                 for (WbsTreePrivate wbsTreePrivate : wbsTreePrivates) {
                     for (String id : saveIds) {
                         if (Long.parseLong(id) == (wbsTreePrivate.getId())) {
@@ -191,7 +192,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 }
 
                 //初始化
-                wbsTreePrivatesList.stream().forEach(wbsTreePrivate -> {
+                wbsTreePrivatesList.forEach(wbsTreePrivate -> {
                     //节点、表信息
                     WbsTreeContract wbsTreeContract = getWbsTreeContract(wbsTreePrivate, pawDTO);
                     wbsTreeContractList.add(wbsTreeContract);
@@ -206,7 +207,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                         constructionLedger.setContractId(Long.parseLong(pawDTO.getContractId()));
                         constructionLedgerList.add(constructionLedger);
                     }
-
                 });
 
                 //新增合同段wbs树、元素表

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

@@ -1233,9 +1233,9 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public R saveFormElement(FormElementDTO formElementDTO) {
+    public boolean saveFormElement(FormElementDTO formElementDTO) {
         if (formElementDTO.getElementList().size() <= 0) {
-            return R.fail("操作失败,请先添加表单元素");
+            throw new ServiceException("操作失败,请先添加表单元素");
         }
 
         String filedName = "";
@@ -1248,7 +1248,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         }
 
         if (StringUtils.isEmpty(filedName) || StringUtils.isEmpty(filedType) || StringUtils.isEmpty(filedLength)) {
-            return R.fail("操作失败,请完整填写元素参数");
+            throw new ServiceException("操作失败,请完整填写元素参数");
         }
         String deptName = formElementDTO.getDeptName();
         if (deptName.length() > 100 || deptName.length() < 1) {
@@ -1258,7 +1258,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         //初始化表名
         //String realName = getFirstSpell(deptName);
         Long id = SnowFlakeUtil.getId();
-        String newTableName = "m_" + DateUtil.time() + "_" + id.toString();
+        String newTableName = "m_" + DateUtil.time() + "_" + id;
         formElementDTO.setInitTableName(newTableName);
 
         //创建元素表
@@ -1267,14 +1267,16 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         int i = 1;
 
         for (WbsFormElement wbsFormElement : elementList) {
-            if (wbsFormElement.getEType() == 1 && (wbsFormElement.getELength() > 1000 || wbsFormElement.getELength() < 10)) {
-                throw new ServiceException("请输入正确的字符串长度,范围为10-1000");
+            if ((wbsFormElement.getEType() == 1 || wbsFormElement.getEType() == 6 || wbsFormElement.getEType() == 7)
+                    && (wbsFormElement.getELength() > 1000 || wbsFormElement.getELength() < 10)) {
+                throw new ServiceException("请输入正确的长度,该类型范围为10-1000");
             }
-            if (wbsFormElement.getEType() == 2 && (wbsFormElement.getELength() > 255 || wbsFormElement.getELength() < 10)) {
-                throw new ServiceException("请输入正确的整数长度,范围为10-255");
+            if ((wbsFormElement.getEType() == 2 || wbsFormElement.getEType() == 5 )
+                    && (wbsFormElement.getELength() > 255 || wbsFormElement.getELength() < 10)) {
+                throw new ServiceException("请输入正确的长度,该类型范围为10-255");
             }
             if (wbsFormElement.getEType() == 3 && (wbsFormElement.getELength() > 65 || wbsFormElement.getELength() < 10)) {
-                throw new ServiceException("请输入正确的小数长度,范围为10-65");
+                throw new ServiceException("请输入正确的长度,该类型范围为10-65");
             }
 
             //当前元素表中元素对应实体表唯一key值、fId
@@ -1292,7 +1294,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         Boolean b3 = wbsFormElementService.initTable(list, newTableName);
 
         if (b1 && b2 && b3) {
-            return R.data(formElementDTO, "新增表单、元素、初始化实体表成功");
+            return true;
         } else {
             throw new ServiceException("操作失败");
         }