测试导出dnc

yangys

8 天以前 f4c6e0e1308bccb943ca1cddfdf7f643b6b6a1aa

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java

@@ -238,25 +238,25 @@
                     JSONArray jsonArray = JSONArray.parseArray(jsonStr);
                     for(int i=0;i<jsonArray.size();i++){
                        JSONObject jsonObject = jsonArray.getJSONObject(i);
                        NcProgram d = new NcProgram();
                        d.setId(jsonObject.getLong("id"));
                        d.setName(jsonObject.getString("name"));
                        NcProgram prog = new NcProgram();
                        prog.setId(jsonObject.getLong("id"));
                        prog.setName(jsonObject.getString("name"));

                        d.setCode(jsonObject.getString("code"));
                        d.setDescription(jsonObject.getString("description"));
                        d.setCategory(jsonObject.getString("category"));
                        d.setBindNcNodeId(jsonObject.getLong("bindNcNodeId"));
                        d.setIsLastEdition(jsonObject.getInteger("isLastEdition"));
                        d.setIsLocked(jsonObject.getInteger("isLocked"));
                        d.setIsTest(jsonObject.getInteger("isTest"));
                        d.setMachineCode(jsonObject.getString("machineCode"));
                        d.setNcNodeId(jsonObject.getLong("ncNodeId"));
                        d.setDrawingNo(jsonObject.getString("drawingNo"));
                        d.setProcessEdition(jsonObject.getString("processEdition"));
                        prog.setCode(jsonObject.getString("code"));
                        prog.setDescription(jsonObject.getString("description"));
                        prog.setCategory(jsonObject.getString("category"));
                        prog.setBindNcNodeId(jsonObject.getLong("bindNcNodeId"));
                        prog.setIsLastEdition(jsonObject.getInteger("isLastEdition"));
                        prog.setIsLocked(jsonObject.getInteger("isLocked"));
                        prog.setIsTest(jsonObject.getInteger("isTest"));
                        prog.setMachineCode(jsonObject.getString("machineCode"));
                        prog.setNcNodeId(jsonObject.getLong("ncNodeId"));
                        prog.setDrawingNo(jsonObject.getString("drawingNo"));
                        prog.setProcessEdition(jsonObject.getString("processEdition"));

                        setBaseProperties(d,jsonObject);
                        setBaseProperties(prog,jsonObject);

                        progList.add(d);
                        progList.add(prog);
                     }

                  }
@@ -296,6 +296,7 @@
                        record.setUserNickname(jsonObject.getString("userNickname"));
                        record.setOperateResult(jsonObject.getString("operateResult"));
                        record.setOperateTime(jsonObject.getDate("operateTime"));
                        record.setComment(jsonObject.getString("comment"));
                        setBaseProperties(record,jsonObject);

                        recordList.add(record);