需求9...

需求9 （7.道岔检查记录模块，目前仅有数据填报和展示功能，需求为能进行派工，判断状态由人工来进行，系统不自动进行判定（因为判定条件太复杂了，模板有变化，表头新增道岔号参数）。）--shizhilong

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/controller/RecordsMasterCheckController.java

@@ -255,6 +255,8 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
             String realname = user.getRealname();
             //初始化道岔编号
             String switchCode = "";
+            //初始化道岔号数
+            String switchCodeNum = "";
             //初始化备注
             String remark = "";
             //初始化道岔使用情况检查数据集合
@@ -267,6 +269,8 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
                 if (str.contains("道岔编号")) {
                     //截取最后一个:号之后的字符串并去除首位空格
                     switchCode = str.substring(str.indexOf("道岔编号") + 5).trim();
+                } else if(str.contains("道岔号数")){
+                    switchCodeNum = str.substring(str.indexOf("道岔号数") + 5).trim();
                 } else if (str.contains("备注")) {
                     sort = sort + 1;
                     //截取最后一个:号之后的字符串并去除首位空格
@@ -281,21 +285,22 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
                     model.setUpdateBy(realname);
                     model.setType("9");
                     model.setSwitchCode(switchCode);
+                    model.setSwitchCodeNum(switchCodeNum);
                     model.setRemark(remark);
                     model.setSort(sort);
                     recordsMasterTurnoutInfoList.add(model);
                 } else if (str.equals("轨距")) {
-                    this.uploadTrackGauge(recordsMasterTurnoutInfoList, i, realname, rowRecords, id, "1", switchCode);
+                    this.uploadTrackGauge(recordsMasterTurnoutInfoList, i, realname, rowRecords, id, "1", switchCode,switchCodeNum);
                 } else if (str.equals("水平")) {
-                    this.uploadTrackGauge(recordsMasterTurnoutInfoList, i, realname, rowRecords, id, "2", switchCode);
+                    this.uploadTrackGauge(recordsMasterTurnoutInfoList, i, realname, rowRecords, id, "2", switchCode,switchCodeNum);
                 } else if (str.equals("支距")) {
                     //获取支距下一行的数据
                     List<Object> offsetList = rowRecords.get(i + 1);
-                    this.uploadOffset(recordsMasterTurnoutInfoList, offsetList, realname, id, switchCode);
+                    this.uploadOffset(recordsMasterTurnoutInfoList, offsetList, realname, id, switchCode,switchCodeNum);
                 } else if (str.equals("轮缘槽")) {
                     //获取支距下两行的数据
                     List<Object> flangeList = rowRecords.get(i + 2);
-                    this.uploadFlange(recordsMasterTurnoutInfoList, flangeList, realname, id, switchCode);
+                    this.uploadFlange(recordsMasterTurnoutInfoList, flangeList, realname, id, switchCode,switchCodeNum);
                 } else {
                     if (i != rowRecords.size() - 1) {
                         continue;
@@ -543,7 +548,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
      * @param realname
      * @param id
      */
-    public void uploadFlange(List<RecordsMasterTurnoutInfo> recordsMasterTurnoutInfoList, List<Object> list, String realname, String id, String switchCode) {
+    public void uploadFlange(List<RecordsMasterTurnoutInfo> recordsMasterTurnoutInfoList, List<Object> list, String realname, String id, String switchCode,String switchCodeNum) {
         RecordsMasterTurnoutInfo model = new RecordsMasterTurnoutInfo();
         model.setId(IdWorker.get32UUID());
         model.setDelFlag("0");
@@ -554,6 +559,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
         model.setUpdateBy(realname);
         model.setType("4");
         model.setSwitchCode(switchCode);
+        model.setSwitchCodeNum(switchCodeNum);
         String one = "";
         one = list.get(1).toString().trim();
         if (ObjectUtil.isNotEmpty(one)) {
@@ -615,7 +621,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
      * @param realname
      * @param id
      */
-    public void uploadOffset(List<RecordsMasterTurnoutInfo> recordsMasterTurnoutInfoList, List<Object> offsetList, String realname, String id, String switchCode) {
+    public void uploadOffset(List<RecordsMasterTurnoutInfo> recordsMasterTurnoutInfoList, List<Object> offsetList, String realname, String id, String switchCode,String switchCodeNum) {
         RecordsMasterTurnoutInfo model = new RecordsMasterTurnoutInfo();
         model.setId(IdWorker.get32UUID());
         model.setDelFlag("0");
@@ -626,6 +632,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
         model.setUpdateBy(realname);
         model.setType("3");
         model.setSwitchCode(switchCode);
+        model.setSwitchCodeNum(switchCodeNum);
         String one = "";
         one = offsetList.get(1).toString().trim();
         if (ObjectUtil.isNotEmpty(one)) {
@@ -672,7 +679,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
      * @param id                           主表id
      * @param type                         导入子类型
      */
-    public void uploadTrackGauge(List<RecordsMasterTurnoutInfo> recordsMasterTurnoutInfoList, int i, String realname, List<List<Object>> rowRecords, String id, String type, String switchCode) {
+    public void uploadTrackGauge(List<RecordsMasterTurnoutInfo> recordsMasterTurnoutInfoList, int i, String realname, List<List<Object>> rowRecords, String id, String type, String switchCode,String switchCodeNum) {
         //初始化公里总结报告表
         RecordsMasterTurnoutInfo model = new RecordsMasterTurnoutInfo();
         model.setId(IdWorker.get32UUID());
@@ -684,6 +691,8 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
         model.setUpdateBy(realname);
         model.setType(type);
         model.setSwitchCode(switchCode);
+        model.setSwitchCodeNum(switchCodeNum);
+
         //轨距->前顺坡终点S1
         String one = "";
         one = rowRecords.get(i).get(1).toString().trim();

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/entity/RecordsMasterTurnoutInfo.java

@@ -61,6 +61,10 @@ public class RecordsMasterTurnoutInfo implements Serializable {
     @TableField("switch_code")
     private String switchCode;
 
+    @ApiModelProperty("道岔号数")
+    @TableField("switch_code_num")
+    private String switchCodeNum;
+
     @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓；9:道岔）")
     @TableField("type")
     private String type;