BUG

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/ConstructionLedger.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.mp.base.BaseEntity;
@@ -53,22 +54,22 @@ public class ConstructionLedger extends BaseEntity {
      * 施工开始时间
      */
 	@ApiModelProperty("施工开始时间")
-    private LocalDateTime siteStartTime;
+    private Date siteStartTime;
     /**
      * 施工结束时间
      */
 	@ApiModelProperty("施工结束时间")
-    private LocalDateTime siteEndTime;
+    private Date siteEndTime;
     /**
      * 检测开始时间
      */
 	@ApiModelProperty("检测开始时间")
-    private LocalDateTime detectionStartTime;
+    private Date detectionStartTime;
     /**
      * 检测结束时间
      */
 	@ApiModelProperty("检测结束时间")
-    private LocalDateTime detectionEndTime;
+    private Date detectionEndTime;
     /**
      * 设计方量
      */

blade-service/blade-business/src/main/java/org/springblade/business/controller/ConstructionLedgerController.java

@@ -1,6 +1,7 @@
 package org.springblade.business.controller;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
@@ -144,7 +145,7 @@ public class ConstructionLedgerController extends BladeController {
 					//校验两个时间，看看哪个时间更早
 					Duration duration = org.springblade.core.tool.utils.DateUtil.between(
 							org.springblade.core.tool.utils.DateUtil.parse(recordTime, "yyyy-MM-dd HH:mm:ss"),
-							org.springblade.core.tool.utils.DateUtil.toDate(vos.getSiteStartTime())
+							vos.getSiteStartTime()
 					);
 					if(duration.getSeconds() > 0){
 						//说明施工日志最早的填报时间比自定义填写的时间要晚，取客户填写的时间
@@ -192,22 +193,25 @@ public class ConstructionLedgerController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入constructionLedger")
-	public R<Boolean> update(@Valid @RequestBody ConstructionLedgerVO constructionLedger) {
+	public R<Boolean> update(@RequestBody JSONObject json) {
+		ConstructionLedgerVO voLedger = JSONObject.parseObject(JSONObject.toJSONString(json), ConstructionLedgerVO.class);
+		ConstructionLedger ledger = JSONObject.parseObject(JSONObject.toJSONString(json), ConstructionLedger.class);
+
 		//施工起止时间
-		if(StringUtils.isNotEmpty(constructionLedger.getSiteTimeStr()) && constructionLedger.getSiteTimeStr().contains("~")){
-			String[] time = constructionLedger.getSiteTimeStr().split("~");
-			constructionLedger.setSiteStartTime(DateUtil.toLocalDateTime(org.springblade.core.tool.utils.DateUtil.parse(time[0], "yyyy-MM-dd")));
-			constructionLedger.setSiteEndTime(DateUtil.toLocalDateTime(org.springblade.core.tool.utils.DateUtil.parse(time[1], "yyyy-MM-dd")));
+		if(StringUtils.isNotEmpty(voLedger.getSiteTimeStr()) && voLedger.getSiteTimeStr().contains("~")){
+			String[] time = voLedger.getSiteTimeStr().split("~");
+			ledger.setSiteStartTime(org.springblade.core.tool.utils.DateUtil.parse(time[0], "yyyy-MM-dd"));
+			ledger.setSiteEndTime(org.springblade.core.tool.utils.DateUtil.parse(time[1], "yyyy-MM-dd"));
 		}
 
 		//检测起止时间
-		if(StringUtils.isNotEmpty(constructionLedger.getDetectionTimeStr()) && constructionLedger.getDetectionTimeStr().contains("~")){
-			String[] time = constructionLedger.getDetectionTimeStr().split("~");
-			constructionLedger.setDetectionStartTime(DateUtil.toLocalDateTime(org.springblade.core.tool.utils.DateUtil.parse(time[0], "yyyy-MM-dd")));
-			constructionLedger.setDetectionEndTime(DateUtil.toLocalDateTime(org.springblade.core.tool.utils.DateUtil.parse(time[1], "yyyy-MM-dd")));
+		if(StringUtils.isNotEmpty(voLedger.getDetectionTimeStr()) && voLedger.getDetectionTimeStr().contains("~")){
+			String[] time = voLedger.getDetectionTimeStr().split("~");
+			ledger.setDetectionStartTime(org.springblade.core.tool.utils.DateUtil.parse(time[0], "yyyy-MM-dd"));
+			ledger.setDetectionEndTime(org.springblade.core.tool.utils.DateUtil.parse(time[1], "yyyy-MM-dd"));
 		}
-		setUserData(constructionLedger, false);
-		return R.status(this.constructionLedgerService.updateById(constructionLedger));
+		setUserData(ledger, false);
+		return R.status(this.constructionLedgerService.updateById(ledger));
 	}
 
 	/**