|
@@ -1873,7 +1873,7 @@ public class TaskController extends BladeController {
|
|
|
throw new ServiceException("未获取到当前登陆的用户信息");
|
|
|
} else {
|
|
|
if (!SecureUtil.getUser().getRoleName().contains("administrator")) {
|
|
|
- return R.data(200, null, "当前用户不是超管角色,未查询到信息");
|
|
|
+ return R.fail(200, "当前用户不是超管角色,未查询到信息");
|
|
|
}
|
|
|
}
|
|
|
if (ObjectUtil.isEmpty(dto.getContractId())) {
|
|
@@ -1889,7 +1889,7 @@ public class TaskController extends BladeController {
|
|
|
//封装入参SQL
|
|
|
List<Object> params = new ArrayList<>();
|
|
|
Integer eVisaStatus = dto.getVisaStatus();
|
|
|
- StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE approval_type not in (4, 5, 6, 7, 8) AND status != 3 AND is_deleted=0 AND contract_id = " + dto.getContractId()); //approval_type != 4 非档案的任务就是1填报资料,2工程文件,3日志资料
|
|
|
+ StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE approval_type not in (4, 5, 6, 7, 11) AND status != 3 AND is_deleted=0 AND contract_id = " + dto.getContractId()); //approval_type != 4 非档案的任务就是1填报资料,2工程文件,3日志资料
|
|
|
|
|
|
if (StringUtils.isNotBlank(dto.getStartTimeValue()) && StringUtils.isNotBlank(dto.getEndTimeValue())) {
|
|
|
if (dto.getStartTimeValue().equals(dto.getEndTimeValue())) {
|