|
@ -339,46 +339,98 @@ public class CheckServiceImpl implements CheckService { |
|
|
} |
|
|
} |
|
|
// 纵向 |
|
|
// 纵向 |
|
|
if (order == 1) { |
|
|
if (order == 1) { |
|
|
if (mainLine == 1) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 1) { |
|
|
|
|
|
if (mainLine < 10){ |
|
|
|
|
|
return (mainLine + 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return mainLine + "-" + (minorLine + 1); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (mainLine == 2) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 2) { |
|
|
|
|
|
if (mainLine > 3){ |
|
|
|
|
|
return (mainLine - 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return mainLine + "-" + (minorLine + 1); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (mainLine == 3) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 3) { |
|
|
|
|
|
if (mainLine < 12){ |
|
|
|
|
|
return (mainLine + 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return mainLine + "-" + (minorLine + 1); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (mainLine == 4) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 4) { |
|
|
|
|
|
if (mainLine > 2){ |
|
|
|
|
|
return (mainLine- 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return mainLine + "-" + (minorLine + 1); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (mainLine == 5) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 5) { |
|
|
|
|
|
if (mainLine < 13){ |
|
|
|
|
|
return (mainLine + 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return mainLine + "-" + (minorLine + 1); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (mainLine == 6) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 6) { |
|
|
|
|
|
if (mainLine > 1){ |
|
|
|
|
|
return (mainLine - 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return mainLine + "-" + (minorLine + 1); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (mainLine == 7) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 7) { |
|
|
|
|
|
if (mainLine < 13){ |
|
|
|
|
|
return (mainLine + 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return mainLine + "-" + (minorLine + 1); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (mainLine == 8) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 8) { |
|
|
|
|
|
if (mainLine > 1){ |
|
|
|
|
|
return (mainLine - 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return mainLine + "-" + (minorLine + 1); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (mainLine == 9) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 9) { |
|
|
|
|
|
if (mainLine < 12){ |
|
|
|
|
|
return (mainLine + 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return mainLine + "-" + (minorLine + 1); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (mainLine == 10) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 10) { |
|
|
|
|
|
if (mainLine > 2){ |
|
|
|
|
|
return (mainLine - 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return mainLine + "-" + (minorLine + 1); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (mainLine == 11) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 11) { |
|
|
|
|
|
if (mainLine < 11){ |
|
|
|
|
|
return (mainLine + 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return mainLine + "-" + (minorLine + 1); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (mainLine == 12) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 12) { |
|
|
|
|
|
if (mainLine > 4){ |
|
|
|
|
|
return (mainLine - 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return mainLine + "-" + (minorLine + 1); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (mainLine == 13) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(minorLine == 13) { |
|
|
|
|
|
if (mainLine < 8){ |
|
|
|
|
|
return (mainLine + 1) + "-" + minorLine; |
|
|
|
|
|
}else { |
|
|
|
|
|
return "finish"; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
return null; |
|
|
|
|
|
|
|
|
return ""; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |