修改并网时间，以及增加并网自审记录

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PowerStationEngineeringInfo.java

@@ -104,7 +104,6 @@ public class PowerStationEngineeringInfo extends BaseEntity {
     private Long workOrderPowerStationId;
 
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField("completion_date")
     private Date completionDate;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/WorkOrder.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -43,12 +44,14 @@ public class WorkOrder extends BaseEntity {
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
 	@TableField("issue_date")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date issueDate;
 
     /**
      * 计划开工日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
 	@TableField("planned_start_date")
     private Date plannedStartDate;
 
@@ -56,6 +59,7 @@ public class WorkOrder extends BaseEntity {
      * 计划完工日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
 	@TableField("planned_end_date")
     private Date plannedEndDate;
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationConstructionDataServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationConstructionDataDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationConstructionData;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationConstructionDataMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationConstructionDataService;
-import org.springframework.stereotype.Service;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationConstructionDataDto;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
 
 /**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -802,7 +802,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
         //修改电站状态
          workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待审核.getCode());
          workOrderPowerStationMapper.updateById(workOrderPowerStation);
-         //修改派工单状态
+         //修改派工单状态PowerStationEngineeringInfo
          LambdaQueryWrapper<WorkOrderPowerStation> qu1=new LambdaQueryWrapper();
          qu1.eq(WorkOrderPowerStation::getWorkOrderId,workOrderPowerStation.getWorkOrderId());
          List<String> d=new ArrayList<>();
@@ -874,6 +874,12 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
              //修改电站状态
              workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.已完工.getCode());
 
+             //修改完工时间
+             LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1=new LambdaUpdateWrapper();
+             upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,workOrderPowerStation.getSequenceNbr());
+             upq1.set(PowerStationEngineeringInfo::getCompletionDate,new Date());
+             powerStationEngineeringInfoMapper.update(null,upq1);
+
              BasicGridAcceptance dat=new BasicGridAcceptance();
              dat.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
              dat.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
@@ -913,6 +919,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
 
         //增加操作日志
         constructionRecords.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
+        constructionRecords.setOperationContent("完工自审-"+constructionRecords.getOperationResults());
         constructionRecords.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
         constructionRecords.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
         constructionRecordsServiceImpl.save(constructionRecords);