Ver Fonte

修改数据

DESKTOP-USV654P\pc há 2 anos atrás
pai
commit
4130e2bf26

+ 1 - 1
src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java

@@ -97,7 +97,7 @@ public class MaterialTaskController {
         MPJLambdaWrapper<MaterialTask> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .disableLogicDel()
-                .eq(MaterialTask::getCreateUserId, StpUtil.getLoginIdAsLong())
+//                .eq(MaterialTask::getCreateUserId, StpUtil.getLoginIdAsLong())
                 .like(StrUtil.isNotBlank(dto.getName()), MaterialTask::getName, dto.getName())
                 .eq(ObjectUtil.isNotEmpty(dto.getStatus()) && dto.getStatus() >0, MaterialTask::getStatus, dto.getStatus())
                 .eq((ObjectUtil.isNotEmpty(dto.getMaterialTypeId())) && dto.getMaterialTypeId() > 0, MaterialTask::getMaterialTypeId, dto.getMaterialTypeId())

+ 2 - 1
src/main/java/com/xjrsoft/module/material/dto/AddMaterialTaskDto.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
@@ -45,7 +46,7 @@ public class AddMaterialTaskDto implements Serializable {
     */
     @ApiModelProperty("要求完成日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime requiredCompleteTime;
+    private LocalDate requiredCompleteTime;
     /**
     * 要求
     */

+ 2 - 1
src/main/java/com/xjrsoft/module/material/entity/MaterialTask.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
@@ -93,7 +94,7 @@ public class MaterialTask implements Serializable {
     */
     @ApiModelProperty("要求完成日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime requiredCompleteTime;
+    private LocalDate requiredCompleteTime;
     /**
     * 要求
     */

+ 2 - 1
src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -16,6 +16,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
@@ -142,7 +143,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
             if (oldStatus == 1) {
                 materialTaskAssign.setStatus(2);
                 MaterialTask materialTask = materialTaskMaterialTaskMapper.selectByIdDeep(materialTaskAssign.getTransferMaterialTaskId());
-                if (LocalDateTime.now().compareTo(materialTask.getRequiredCompleteTime()) > 0) {
+                if (LocalDate.now().compareTo(materialTask.getRequiredCompleteTime()) > 0) {
                     materialTaskAssign.setExecutiveStatus(2);
                     materialTask.setOnTimePerson(materialTask.getOnTimePerson() + 1);
                 } else {

+ 3 - 1
src/main/java/com/xjrsoft/module/material/vo/MaterialTaskPageVo.java

@@ -9,6 +9,8 @@ import lombok.Data;
 
 import com.xjrsoft.common.annotation.Trans;
 import com.xjrsoft.common.enums.TransType;
+
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
@@ -99,7 +101,7 @@ public class MaterialTaskPageVo {
     @ExcelProperty("要求完成日期")
     @ApiModelProperty("要求完成日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime requiredCompleteTime;
+    private LocalDate requiredCompleteTime;
     /**
     * 要求
     */

+ 2 - 1
src/main/java/com/xjrsoft/module/material/vo/MaterialTaskWaitPageVo.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -45,7 +46,7 @@ public class MaterialTaskWaitPageVo {
     @ExcelProperty("要求完成日期")
     @ApiModelProperty("要求完成日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime requiredCompleteTime;
+    private LocalDate requiredCompleteTime;
     /**
      * 指派给几人
      */