施工计划批次信息时间显示问题修改

src/main/java/com/jeeplus/modules/cg/infrastructure/util/ChangeTimeUtil.java

@@ -2,6 +2,7 @@ package com.jeeplus.modules.cg.infrastructure.util;
 
 import com.jeeplus.modules.cg.infrastructure.entity.ConstructionBatch;
 
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -25,6 +26,26 @@ public class ChangeTimeUtil {
 
     public SimpleDateFormat SHORT_DATE_FORMAT = new SimpleDateFormat("yyyy/MM/dd");
 
+    public String determineTimeFormat(String date){
+        if (date.matches("\\d{4}/\\d{2}/\\d{2}")) {
+            // 日期格式为 yyyy/MM/dd
+            return date;
+        } else if (date.matches("\\d{4}-\\d{2}-\\d{2}")) {
+            // 日期格式为 yyyy-MM-dd
+            DateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd");
+            DateFormat outputFormat = new SimpleDateFormat("yyyy/MM/dd");
+            try {
+                Date dateTime = inputFormat.parse(date);
+                String formattedDate = outputFormat.format(dateTime);
+                System.out.println("转换后的日期：" + formattedDate);
+                return formattedDate;
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
     /**
      * 判断是哪一个时间区间
      * @param time

src/main/java/com/jeeplus/modules/cg/infrastructure/util/InfrastructureExcelImportUtil.java

@@ -72,8 +72,12 @@ public class InfrastructureExcelImportUtil {
 
                 batch.setBatchName((String) importUtil.getCellValue(row, 1));
                 batch.setBatchNumber((String) importUtil.getCellValue(row, 2));
-                batch.setEndTime((String) importUtil.getCellValue(row, 3));
-                batch.setBidOpenTime((String) importUtil.getCellValue(row, 4));
+                String endTime = ChangeTimeUtil.getOne().determineTimeFormat((String) importUtil.getCellValue(row, 3));
+                batch.setEndTime(endTime);
+                String openTime = ChangeTimeUtil.getOne().determineTimeFormat((String) importUtil.getCellValue(row, 4));
+                batch.setBidOpenTime(openTime);
+//                batch.setEndTime((String) importUtil.getCellValue(row, 3));
+//                batch.setBidOpenTime((String) importUtil.getCellValue(row, 4));
 
                 list.add(batch);
             }

src/main/java/com/jeeplus/modules/cg/infrastructure/web/ConstructionBatchController.java

@@ -6,6 +6,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.cg.infrastructure.entity.ConstructionBatch;
 import com.jeeplus.modules.cg.infrastructure.service.ConstructionBatchService;
+import com.jeeplus.modules.cg.infrastructure.util.ChangeTimeUtil;
 import com.jeeplus.modules.cg.infrastructure.util.InfrastructureExcelExportUtil;
 import com.jeeplus.modules.cg.infrastructure.util.InfrastructureExcelImportUtil;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
@@ -23,7 +24,10 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.DateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -40,10 +44,18 @@ public class ConstructionBatchController extends BaseController {
     private ConstructionBatchService batchService;
 
     @ModelAttribute
-    public ConstructionBatch get(@RequestParam(required = false) String id) {
+    public ConstructionBatch get(@RequestParam(required = false) String id) throws ParseException {
         ConstructionBatch entity = null;
         if (StringUtils.isNotBlank(id)) {
             entity = batchService.get(id);
+            DateFormat inputFormat = new SimpleDateFormat("yyyy/MM/dd");
+            DateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date end = inputFormat.parse(entity.getEndTime());
+            Date open = inputFormat.parse(entity.getBidOpenTime());
+            String endTime = outputFormat.format(end);
+            String openTime = outputFormat.format(open);
+            entity.setEndTime(endTime);
+            entity.setBidOpenTime(openTime);
         }
         if (entity == null) {
             entity = new ConstructionBatch();
@@ -96,7 +108,10 @@ public class ConstructionBatchController extends BaseController {
             j.setMsg( "批次编号为" + batch.getBatchNumber() + "的施工计划批次信息已存在，不对数据进行保存！");
             return j;
         }
-
+        String endTime = ChangeTimeUtil.getOne().determineTimeFormat(batch.getEndTime());
+        batch.setEndTime(endTime);
+        String openTime = ChangeTimeUtil.getOne().determineTimeFormat(batch.getBidOpenTime());
+        batch.setBidOpenTime(openTime);
         //新增或编辑表单保存
         batchService.save(batch);//保存
         j.setSuccess(true);
@@ -113,6 +128,10 @@ public class ConstructionBatchController extends BaseController {
     @RequiresPermissions(value={"cg:infrastructure:constructionBatch:edit"},logical=Logical.OR)
     @RequestMapping(value = "update")
     public AjaxJson update(ConstructionBatch batch) {
+        String endTime = ChangeTimeUtil.getOne().determineTimeFormat(batch.getEndTime());
+        batch.setEndTime(endTime);
+        String openTime = ChangeTimeUtil.getOne().determineTimeFormat(batch.getBidOpenTime());
+        batch.setBidOpenTime(openTime);
         AjaxJson j = new AjaxJson();
         /**
          * 后台hibernate-validation插件校验

src/main/webapp/webpage/modules/cg/infrastructure/constructionBatch/batchAddForm.jsp

@@ -19,11 +19,17 @@
 
 			var batchName = $("#batchName").val();
 			var batchNumber = $("#batchNumber").val();
+			var endTime = $("#endTime").val();
+			var bidOpenTime = $("#bidOpenTime").val();
 
 			if (null==batchName||""==batchName){
 				jp.error("请填写批次名称！");
 			}else if(null==batchNumber||""==batchNumber){
 				jp.error("请填写批次编号！");
+			}else if(null==endTime||""==endTime){
+				jp.error("请填写施工图纸收集截止时间！");
+			}else if(null==bidOpenTime||""==bidOpenTime){
+				jp.error("请填写拟定开标时间！");
 			} else {
 				var isValidate = jp.validateForm('#inputForm');//校验表单
 				if(!isValidate){
@@ -69,11 +75,11 @@
 		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>施工图纸收集截止时间：</label></td>
 			<td class="width-35">
-				<form:input path="endTime" htmlEscape="false" class="form-control"/>
+				<form:input type="date" id="endTime" path="endTime" htmlEscape="false" class="form-control" value="${batch.endTime}"/>
 			</td>
 			<td class="width-15 active"><label class=""><font color="red">*</font>拟定开标时间：</label></td>
 			<td class="width-35">
-				<form:input path="bidOpenTime" htmlEscape="false" class="form-control"/>
+				<form:input path="bidOpenTime" type="date" id="bidOpenTime" htmlEscape="false" class="form-control" value="${batch.bidOpenTime}"/>
 			</td>
 		</tr>
 		</tbody>

src/main/webapp/webpage/modules/cg/infrastructure/constructionBatch/batchUpdateForm.jsp

@@ -16,10 +16,18 @@
 		    });
 		});
 		function save() {
-
-			var isValidate = jp.validateForm('#inputForm');//校验表单
-			if(!isValidate){
-				return false;
+			var batchName = $("#batchName").val();
+			var batchNumber = $("#batchNumber").val();
+			var endTime = $("#endTime").val();
+			var bidOpenTime = $("#bidOpenTime").val();
+			if (null==batchName||""==batchName){
+				jp.error("请填写批次名称！");
+			}else if(null==batchNumber||""==batchNumber){
+				jp.error("请填写批次编号！");
+			}else if(null==endTime||""==endTime){
+				jp.error("请填写施工图纸收集截止时间！");
+			}else if(null==bidOpenTime||""==bidOpenTime){
+				jp.error("请填写拟定开标时间！");
 			}else{
 				jp.loading();
 				jp.post("${ctx}/cg/infrastructure/constructionBatch/update",$('#inputForm').serialize(),function(data){
@@ -59,11 +67,11 @@
 		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>施工图纸收集截止时间：</label></td>
 			<td class="width-35">
-				<form:input path="endTime" htmlEscape="false" class="form-control"/>
+				<form:input type="date" id="endTime" path="endTime" htmlEscape="false" class="form-control" value="${batch.endTime}"/>
 			</td>
 			<td class="width-15 active"><label class=""><font color="red">*</font>拟定开标时间：</label></td>
 			<td class="width-35">
-				<form:input path="bidOpenTime" htmlEscape="false" class="form-control"/>
+				<form:input path="bidOpenTime" type="date" id="bidOpenTime" htmlEscape="false" class="form-control" value="${batch.bidOpenTime}"/>
 			</td>
 		</tr>
 		</tbody>