|
|
@@ -1172,28 +1172,42 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
String[] ss=tOrderNew.getContractPictureUrl().split(",");
|
|
|
list=Arrays.stream(ss).filter(e ->!e.equals(fileName)).collect(Collectors.toList());
|
|
|
}
|
|
|
- for (String s : list) {
|
|
|
- str=str.append(s).append(",");
|
|
|
+ if (list.size()<1){
|
|
|
+ newOrder.setContractPictureUrl("");
|
|
|
+ }else {
|
|
|
+ for (String s : list) {
|
|
|
+ str=str.append(s).append(",");
|
|
|
+ }
|
|
|
+ newOrder.setContractPictureUrl(str.substring(0,str.length()-1));
|
|
|
}
|
|
|
- newOrder.setContractPictureUrl(str.substring(0,str.length()-1));
|
|
|
}else if (sign.equals(OrderImgEnums.SUPPLEMENT.getCode())){
|
|
|
if (tOrderNew.getAgreementUrl()!=null){
|
|
|
String[] ss=tOrderNew.getAgreementUrl().split(",");
|
|
|
list=Arrays.stream(ss).filter(e ->!e.equals(fileName)).collect(Collectors.toList());
|
|
|
}
|
|
|
- for (String s : list) {
|
|
|
- str=str.append(s).append(",");
|
|
|
+ if (list.size()<1){
|
|
|
+ newOrder.setAgreementUrl("");
|
|
|
+ }else {
|
|
|
+ for (String s : list) {
|
|
|
+ str=str.append(s).append(",");
|
|
|
+ }
|
|
|
+ newOrder.setAgreementUrl(str.substring(0,str.length()-1));
|
|
|
}
|
|
|
- newOrder.setAgreementUrl(str.substring(0,str.length()-1));
|
|
|
+
|
|
|
}else if (sign.equals(OrderImgEnums.CONTENT.getCode())){
|
|
|
if (tOrderNew.getServiceContent()!=null){
|
|
|
String[] ss=tOrderNew.getServiceContent().split(",");
|
|
|
list=Arrays.stream(ss).filter(e ->!e.equals(fileName)).collect(Collectors.toList());
|
|
|
}
|
|
|
- for (String s : list) {
|
|
|
- str=str.append(s).append(",");
|
|
|
+ if (list.size()<1){
|
|
|
+ newOrder.setServiceContent("");
|
|
|
+ }else {
|
|
|
+ for (String s : list) {
|
|
|
+ str=str.append(s).append(",");
|
|
|
+ }
|
|
|
+ newOrder.setServiceContent(str.substring(0,str.length()-1));
|
|
|
}
|
|
|
- newOrder.setServiceContent(str.substring(0,str.length()-1));
|
|
|
+
|
|
|
}else {
|
|
|
return 0;
|
|
|
}
|