Commit 5e4a0513 authored by 韩桐桐's avatar 韩桐桐

fix(tcm):1,新增接口:必填项校验(前端处理不了后端处理)

parent 98269fab
...@@ -14,8 +14,10 @@ import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserPermissionMapper; ...@@ -14,8 +14,10 @@ import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserPermissionMapper;
import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserPermissionService; import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserPermissionService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -98,7 +100,26 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD ...@@ -98,7 +100,26 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
// permissionData6552 作业人员资质 // permissionData6552 作业人员资质
JSONArray permissionData6552 = userInfoDto.getPermissionData6552(); JSONArray permissionData6552 = userInfoDto.getPermissionData6552();
if (!ValidationUtil.isEmpty(permissionData6552)) { if (!ValidationUtil.isEmpty(permissionData6552)) {
permissionData6552.forEach(x -> tzsUserPermissions.add(buildPermission(ZYRY_TYPE, (JSONObject) x, userInfoDto))); permissionData6552.forEach(item -> {
JSONObject itempermissionData6552 = (JSONObject) item;
// 前端无法处理后端手动判断
// 作业项目中含有【金属焊接操作】,则【金属焊接操作-项目代号】必填
// 作业项目中含有【非金属焊接操作】,则【非金属焊接操作-项目代号】必填
// 作业项目中含有【其他】,则【其他作业项目是必填的】必填
String jobItem = String.valueOf(itempermissionData6552.get("jobItem"));
String otherItem = String.valueOf(itempermissionData6552.get("otherItem"));
JSONObject itemCode = JSON.parseObject(String.valueOf(itempermissionData6552.get("itemCode")));
if (jobItem.contains("金属焊接操作") && ObjectUtils.isEmpty(itemCode.get("JSHJCZItemCode"))) {
throw new BadRequest("金属焊接操作-项目代号是必填的");
}
if (jobItem.contains("非金属焊接操作") && ObjectUtils.isEmpty(itemCode.get("FJSHJCZItemCode"))) {
throw new BadRequest("非金属焊接操作-项目代号是必填的");
}
if (jobItem.contains("其他") && ObjectUtils.isEmpty(otherItem)) {
throw new BadRequest("其他作业项目是必填的");
}
tzsUserPermissions.add(buildPermission(ZYRY_TYPE, itempermissionData6552, userInfoDto));
});
} }
this.saveBatch(tzsUserPermissions); this.saveBatch(tzsUserPermissions);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment