|
@@ -714,9 +714,7 @@ public class AdminMachineController {
|
|
|
Calendar nowDate = Calendar.getInstance();
|
|
|
Integer year = nowDate.get(Calendar.YEAR);
|
|
|
Integer month = nowDate.get(Calendar.MONTH) + 1;
|
|
|
- if(year == 2017 && month == 12){
|
|
|
- machineNumber += 300;
|
|
|
- }
|
|
|
+
|
|
|
String num = null;
|
|
|
for (int i = 0; i < number; i++) {
|
|
|
machineNumber++;
|
|
@@ -755,7 +753,8 @@ public class AdminMachineController {
|
|
|
}
|
|
|
if(bl){
|
|
|
StringBuffer url = request.getRequestURL();
|
|
|
- String tempContextUrl = url.delete(url.length() - request.getRequestURI().length(), url.length()).append(request.getContextPath()).append("/").toString();
|
|
|
+ //String tempContextUrl = url.delete(url.length() - request.getRequestURI().length(), url.length()).append(request.getContextPath()).append("/").toString();
|
|
|
+ String tempContextUrl = ResultInfo.ROOT_DIRECTORY;
|
|
|
qrCodeUrl = tempContextUrl +ResultInfo.QRCODE_TOOTH_IMAGE+ "/"+berQrcode+num+".png";
|
|
|
}
|
|
|
}else{
|