辅材申请查询和详情中前端需要展示的字段

src/main/java/com/starcharge/wios/controller/DeliveryController.java

@@ -194,7 +194,6 @@ public class DeliveryController {
                             throw new ServiceException("400","更新辅材订单发货状态失败！订单号："+delivery.getInstallOrder());
                             throw new ServiceException("400","更新辅材订单发货状态失败！订单号："+delivery.getInstallOrder());
                         }
                         }
                     }
                     }
-                    delivery.setCreateAccount(tokenService.getUser().getUserName());
                     this.commonUpdateService.UpdateColumns(delivery,true);
                     this.commonUpdateService.UpdateColumns(delivery,true);
                     return this.deliveryMapper.insertSelective(delivery);
                     return this.deliveryMapper.insertSelective(delivery);
                 }).reduce(0,Integer::sum));
                 }).reduce(0,Integer::sum));

src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java

@@ -35,6 +35,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -108,7 +110,24 @@ public class TauxiliarymaterialsController {
     @PostMapping("/query")
     @PostMapping("/query")
     @ApiOperation(value = "查询辅材申请列表",notes = "属性不为空即为查询条件")
     @ApiOperation(value = "查询辅材申请列表",notes = "属性不为空即为查询条件")
     public BaseResponse<List<Tauxiliarymaterials>> queryTauxiliarymaterialsList(Tauxiliarymaterials tauxiliarymaterials){
     public BaseResponse<List<Tauxiliarymaterials>> queryTauxiliarymaterialsList(Tauxiliarymaterials tauxiliarymaterials){
-        return new BaseResponse(this.tauxiliarymaterialsMapper.selectTAuxiliaryMaterialsList(tauxiliarymaterials));
+        List<Tauxiliarymaterials> list=this.tauxiliarymaterialsMapper.selectTAuxiliaryMaterialsList(tauxiliarymaterials);
+        LocalDateTime currentTime = LocalDateTime.now();
+        for (Tauxiliarymaterials apply : list) {
+            LocalDateTime createdDate = apply.getCreatedTime();
+            ZoneId zoneId=ZoneId.systemDefault();
+            Date date=Date.from(createdDate.atZone(zoneId).toInstant());
+            LocalDateTime createdTime = LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault());
+            LocalDateTime endTime = createdTime.plusHours(24);
+            long remainingHours = currentTime.until(endTime, ChronoUnit.HOURS);
+            remainingHours = Math.max(remainingHours, 0);  // 将剩余小时数限制在0-24之间
+            if (remainingHours == 0) {
+                apply.setIfTimeout(1L);
+            } else {
+                apply.setIfTimeout(0L);
+            }
+            apply.setTimeRemaining(Long.toString(remainingHours));
+        }
+        return new BaseResponse(list);
     }
     }
     @PostMapping("/delete")
     @PostMapping("/delete")
     @ApiOperation(value = "删除辅材申请")
     @ApiOperation(value = "删除辅材申请")

src/main/java/com/starcharge/wios/dao/entity/Delivery.java

@@ -377,7 +377,13 @@ public class Delivery extends PageVo implements Serializable {
      */
      */
     @ApiModelProperty(value = "墙盒品牌")
     @ApiModelProperty(value = "墙盒品牌")
     private String wallboxModelName;
     private String wallboxModelName;
-
+    /**
+     * 创建人名称
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "创建人名称")
+    private String createName;
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 

src/main/java/com/starcharge/wios/dao/entity/Tauxiliarymaterials.java

@@ -349,6 +349,10 @@ public class Tauxiliarymaterials  extends PageVo implements Serializable{
      */
      */
     @ApiModelProperty(value = "收货人电话")
     @ApiModelProperty(value = "收货人电话")
     private String receiverPhone;
     private String receiverPhone;
+    @ApiModelProperty(value = "超时类型")
+    private Long ifTimeout;
+    @ApiModelProperty(value = "剩余时间")
+    private String timeRemaining;
 
 
 
 
 }
 }
\ No newline at end of file

src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml

@@ -180,11 +180,13 @@
       t.arrival_warehouse_id, t.receiver, t.remarks, t.reject_material, t.reason, t.check_time, t.check_user, t.check_user_name, t.check_suggestion,
       t.arrival_warehouse_id, t.receiver, t.remarks, t.reject_material, t.reason, t.check_time, t.check_user, t.check_user_name, t.check_suggestion,
       t.reject_logistic_order,t.arrival_quantity,t.auxiliary_id,t.file_url,t.material_sn,t.warehouse_id,t.receiver_phone,
       t.reject_logistic_order,t.arrival_quantity,t.auxiliary_id,t.file_url,t.material_sn,t.warehouse_id,t.receiver_phone,
       t.sender,t.sender_phone,t.receive_time,t.reject_time,e.out_order_id outOrderId,
       t.sender,t.sender_phone,t.receive_time,t.reject_time,e.out_order_id outOrderId,
-      tw.create_account createAccount,tw.install_reserve_time installReserveTime,tw.if_emergency ifEmergency,tc.name wallboxModelName
+      tw.create_account createAccount,tw.install_reserve_time installReserveTime,tw.if_emergency ifEmergency,tc.name wallboxModelName,
+      wa.name createName
     from t_delivery t
     from t_delivery t
     left join t_order e  on e.id = t.install_order
     left join t_order e  on e.id = t.install_order
     left join t_wallbox_apply tw on tw.order_id = t.install_order
     left join t_wallbox_apply tw on tw.order_id = t.install_order
     left join t_oem_cascade tc on tc.id = tw.wallbox_model
     left join t_oem_cascade tc on tc.id = tw.wallbox_model
+    left join wb_account wa on wa.id = t.CREATED_BY
     where t.id = #{id,jdbcType=INTEGER}
     where t.id = #{id,jdbcType=INTEGER}
   </select>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">