新增批量完结工单(仅用于刷数据)

src/custom/restcontroller/webmanage/sale/workorder/workorder.java

@@ -1065,8 +1065,13 @@ public class workorder extends Controller {
 //                    insertSQL.setValue("itemid", itemrows.get(0).getLong("itemid"));
 //                    sqlList.add(insertSQL.getSQL());
                     }
+                    LocalDate now;
+                    if(StringUtils.isBlank(rows.get(0).getString("finishdate"))){
+                         now = LocalDate.now();
+                    }else{
+                         now = LocalDate.parse(getDate_Str(rows.get(0).getDate("finishdate")));
+                    }
 
-                    LocalDate now = LocalDate.now();
 
                     // 将当前日期加上年
                     LocalDate futureDate = now.plusYears(itemrows.get(0).getInteger("warrantyday"));
@@ -1098,7 +1103,7 @@ public class workorder extends Controller {
                     insertSQL.setValue("city", itemrows.get(0).getString("city"));
                     insertSQL.setValue("county", itemrows.get(0).getString("county"));
                     insertSQL.setValue("enddate", formattedDate);
-                    insertSQL.setValue("begdate", getDateTime_Str());
+                    insertSQL.setValue("begdate", now.format(formatter));
                     insertSQL.setValue("itemid",  itemrows.get(0).getLong("itemid"));
                     insertSQL.setValue("createby", rows.get(0).getString("finishby"));
                     insertSQL.setValue("createdate", StringUtils.isBlank(rows.get(0).getString("finishdate"))?"CURRENT_TIME":rows.get(0).getString("finishdate"));