逻辑修改

data-docking/src/main/java/com/qmth/data/docking/util/zufe/ZufeDataDockingUtil.java

@@ -215,18 +215,18 @@ public class ZufeDataDockingUtil {
                             if (yjxtKcxxMap.containsKey(z.getKCH() + SystemConstant.HYPHEN + z.getKKXY())) {
                                 YjxtKcxx yjxtKcxx = new YjxtKcxx(z);
                                 YjxtKcxx yjxtKcxxDb = yjxtKcxxMap.get(z.getKCH() + SystemConstant.HYPHEN + z.getKKXY());
-//                            if (Objects.equals("010010235" + SystemConstant.HYPHEN + "会计学院（MPAcc学院）", yjxtKcxx.getCode() + SystemConstant.HYPHEN + yjxtKcxx.getCollegeName())) {
-//                                yjxtKcxx.setName("基础会计1");
-//                                yjxtKcxx.setCollegeName("会计学院（MPAcc学院）1");
-//                            }
-//                            if (Objects.equals("010030030" + SystemConstant.HYPHEN + "会计学院（MPAcc学院）", yjxtKcxx.getCode() + SystemConstant.HYPHEN + yjxtKcxx.getCollegeName())) {
-//                                yjxtKcxx.setName("中级财务会计2");
-//                                yjxtKcxx.setCollegeName("会计学院（MPAcc学院）2");
-//                            }
-//                            if (Objects.equals("050110030" + SystemConstant.HYPHEN + "会计学院（MPAcc学院）", yjxtKcxx.getCode() + SystemConstant.HYPHEN + yjxtKcxx.getCollegeName())) {
-//                                yjxtKcxx.setName("Management Accounting（F2）3");
-//                                yjxtKcxx.setCollegeName("会计学院（MPAcc学院）3");
-//                            }
+//                                if (Objects.equals("010010235" + SystemConstant.HYPHEN + "会计学院（MPAcc学院）", yjxtKcxx.getCode() + SystemConstant.HYPHEN + yjxtKcxx.getCollegeName())) {
+//                                    yjxtKcxx.setName("基础会计1");
+//                                    yjxtKcxx.setCollegeName("会计学院（MPAcc学院）1");
+//                                }
+//                                if (Objects.equals("010030030" + SystemConstant.HYPHEN + "会计学院（MPAcc学院）", yjxtKcxx.getCode() + SystemConstant.HYPHEN + yjxtKcxx.getCollegeName())) {
+//                                    yjxtKcxx.setName("中级财务会计2");
+//                                    yjxtKcxx.setCollegeName("会计学院（MPAcc学院）2");
+//                                }
+//                                if (Objects.equals("050110030" + SystemConstant.HYPHEN + "会计学院（MPAcc学院）", yjxtKcxx.getCode() + SystemConstant.HYPHEN + yjxtKcxx.getCollegeName())) {
+//                                    yjxtKcxx.setName("Management Accounting（F2）3");
+//                                    yjxtKcxx.setCollegeName("会计学院（MPAcc学院）3");
+//                                }
                                 if (!yjxtKcxx.equals(yjxtKcxxDb)) {
                                     yjxtKcxxDb.updateData(yjxtKcxx);
                                 }
@@ -355,18 +355,18 @@ public class ZufeDataDockingUtil {
                             if (yjxtKsxxMap.containsKey(z.getXNM() + SystemConstant.HYPHEN + z.getXQM() + SystemConstant.HYPHEN + z.getKCH() + SystemConstant.HYPHEN + z.getSJBH() + SystemConstant.HYPHEN + z.getXH())) {
                                 YjxtKsxx yjxtKsxx = new YjxtKsxx(z);
                                 YjxtKsxx yjxtKsxxDb = yjxtKsxxMap.get(z.getXNM() + SystemConstant.HYPHEN + z.getXQM() + SystemConstant.HYPHEN + z.getKCH() + SystemConstant.HYPHEN + z.getSJBH() + SystemConstant.HYPHEN + z.getXH());
-//                            if (Objects.equals("2023" + SystemConstant.HYPHEN + "3" + SystemConstant.HYPHEN + "DAT1284" + SystemConstant.HYPHEN + "0277590EF2FA7E65E063A30810ACD052" + SystemConstant.HYPHEN + "220110820112", yjxtKsxx.getXnm() + SystemConstant.HYPHEN + yjxtKsxx.getXqm() + SystemConstant.HYPHEN + yjxtKsxx.getCourseCode() + SystemConstant.HYPHEN + yjxtKsxx.getPaperNumber() + SystemConstant.HYPHEN + yjxtKsxx.getStudentCode())) {
-//                                yjxtKsxx.setStudentName("李瑞洋1");
-//                                yjxtKsxx.setSiteNumber("1");
-//                            }
-//                            if (Objects.equals("2023" + SystemConstant.HYPHEN + "3" + SystemConstant.HYPHEN + "DAT1284" + SystemConstant.HYPHEN + "0277590EF2FA7E65E063A30810ACD052" + SystemConstant.HYPHEN + "220110780426", yjxtKsxx.getXnm() + SystemConstant.HYPHEN + yjxtKsxx.getXqm() + SystemConstant.HYPHEN + yjxtKsxx.getCourseCode() + SystemConstant.HYPHEN + yjxtKsxx.getPaperNumber() + SystemConstant.HYPHEN + yjxtKsxx.getStudentCode())) {
-//                                yjxtKsxx.setStudentName("平戎芮2");
-//                                yjxtKsxx.setSiteNumber("2");
-//                            }
-//                            if (Objects.equals("2023" + SystemConstant.HYPHEN + "3" + SystemConstant.HYPHEN + "DAT1284" + SystemConstant.HYPHEN + "0277590EF2FA7E65E063A30810ACD052" + SystemConstant.HYPHEN + "220110780509", yjxtKsxx.getXnm() + SystemConstant.HYPHEN + yjxtKsxx.getXqm() + SystemConstant.HYPHEN + yjxtKsxx.getCourseCode() + SystemConstant.HYPHEN + yjxtKsxx.getPaperNumber() + SystemConstant.HYPHEN + yjxtKsxx.getStudentCode())) {
-//                                yjxtKsxx.setStudentName("金一炜3");
-//                                yjxtKsxx.setSiteNumber("3");
-//                            }
+//                                if (Objects.equals("2023" + SystemConstant.HYPHEN + "3" + SystemConstant.HYPHEN + "DAT1284" + SystemConstant.HYPHEN + "0277590EF2FA7E65E063A30810ACD052" + SystemConstant.HYPHEN + "220110820112", yjxtKsxx.getXnm() + SystemConstant.HYPHEN + yjxtKsxx.getXqm() + SystemConstant.HYPHEN + yjxtKsxx.getCourseCode() + SystemConstant.HYPHEN + yjxtKsxx.getPaperNumber() + SystemConstant.HYPHEN + yjxtKsxx.getStudentCode())) {
+//                                    yjxtKsxx.setStudentName("李瑞洋1");
+//                                    yjxtKsxx.setSiteNumber("1");
+//                                }
+//                                if (Objects.equals("2023" + SystemConstant.HYPHEN + "3" + SystemConstant.HYPHEN + "DAT1284" + SystemConstant.HYPHEN + "0277590EF2FA7E65E063A30810ACD052" + SystemConstant.HYPHEN + "220110780426", yjxtKsxx.getXnm() + SystemConstant.HYPHEN + yjxtKsxx.getXqm() + SystemConstant.HYPHEN + yjxtKsxx.getCourseCode() + SystemConstant.HYPHEN + yjxtKsxx.getPaperNumber() + SystemConstant.HYPHEN + yjxtKsxx.getStudentCode())) {
+//                                    yjxtKsxx.setStudentName("平戎芮2");
+//                                    yjxtKsxx.setSiteNumber("2");
+//                                }
+//                                if (Objects.equals("2023" + SystemConstant.HYPHEN + "3" + SystemConstant.HYPHEN + "DAT1284" + SystemConstant.HYPHEN + "0277590EF2FA7E65E063A30810ACD052" + SystemConstant.HYPHEN + "220110780509", yjxtKsxx.getXnm() + SystemConstant.HYPHEN + yjxtKsxx.getXqm() + SystemConstant.HYPHEN + yjxtKsxx.getCourseCode() + SystemConstant.HYPHEN + yjxtKsxx.getPaperNumber() + SystemConstant.HYPHEN + yjxtKsxx.getStudentCode())) {
+//                                    yjxtKsxx.setStudentName("金一炜3");
+//                                    yjxtKsxx.setSiteNumber("3");
+//                                }
                                 if (!yjxtKsxx.equals(yjxtKsxxDb)) {
                                     yjxtKsxxDb.updateData(yjxtKsxx);
                                 }