d52b2bdc62a5722a96d3999a9ed96640f3945f91..c2e4ed1a6e3a14406db471304360cd45ac8177d1
2023-08-11 jiaosong
Merge remote-tracking branch 'origin/master'
c2e4ed 对比 | 目录
2023-08-11 jiaosong
# 联调接口
8fc384 对比 | 目录
已修改3个文件
14 ■■■■ 文件已修改
server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/doumeemes/dao/system/model/SystemUser.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java
@@ -1,5 +1,6 @@
package doumeemes.dao.ext.dto;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -40,4 +41,11 @@
    @ApiModelProperty(value = "优先级")
    private Integer urgent;
    @ApiModelProperty(value = "计划开始日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date startDate;
    @ApiModelProperty(value = "销售单号" )
    private String salesorder;
}
server/src/main/java/doumeemes/dao/system/model/SystemUser.java
@@ -37,7 +37,7 @@
    @NotBlank(message = "姓名不能为空", groups = {OperaType.Create.class/*, OperaType.Update.class*/})
    private String realname;
    @NotBlank(message = "工号不能为空", groups = {OperaType.Create.class/*, OperaType.Update.class*/})
//    @NotBlank(message = "工号不能为空", groups = {OperaType.Create.class/*, OperaType.Update.class*/})
    @ApiModelProperty(value = "总账号工号")
    private String empNo;
server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
@@ -97,7 +97,9 @@
                || Objects.isNull(workPlansSaveDTO.getNum())
                || Objects.isNull(workPlansSaveDTO.getFactoryId())
                || Objects.isNull(workPlansSaveDTO.getUnitId())
                || Objects.isNull(workPlansSaveDTO.getMaterialId())){
                || Objects.isNull(workPlansSaveDTO.getMaterialId())
                || Objects.isNull(workPlansSaveDTO.getStartDate())
                || workPlansSaveDTO.getStartDate().getTime() > workPlansSaveDTO.getPlanDate().getTime()){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        WorkPlans workPlans = new WorkPlans();