|
@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
@@ -159,6 +160,7 @@ public class WmDeptTaskController {
|
|
|
wmTaskVO.setApprovalOpinion(ReportEnum.APPROVAL_OPINION_NO.getType());
|
|
|
wmTaskVO.setApprovalOpinionName(ReportEnum.APPROVAL_OPINION_NO.getDescription());
|
|
|
}
|
|
|
+
|
|
|
} else if (StrUtil.isNotBlank(wmTask.getReportOneApprovalOpinion())) {
|
|
|
if (ReportEnum.APPROVAL_OPINION_YES.getType().equals(wmTask.getReportOneApprovalOpinion())) {
|
|
|
wmTaskVO.setApprovalOpinion(ReportEnum.APPROVAL_OPINION_YES.getType());
|
|
@@ -167,6 +169,8 @@ public class WmDeptTaskController {
|
|
|
wmTaskVO.setApprovalOpinion(ReportEnum.APPROVAL_OPINION_NO.getType());
|
|
|
wmTaskVO.setApprovalOpinionName(ReportEnum.APPROVAL_OPINION_NO.getDescription());
|
|
|
}
|
|
|
+ } else {
|
|
|
+ wmTaskVO.setUpdateTime(null);
|
|
|
}
|
|
|
|
|
|
return wmTaskVO;
|