|
@@ -156,46 +156,49 @@ public class DangerCheckFormService extends BasicService {
|
|
|
DangerCategoryPO dangerCategory = dangerCategoryService.check4IdExc(find.getDangerCategory());
|
|
|
|
|
|
result = CopierUtil.mapTo(find, DangerCheckFormVO.class);
|
|
|
- result.setListItem(CopierUtil.mapTo(listItem, ReqCreateDangerCheckItem.class));
|
|
|
+ result.setListItem(new ArrayList<>());
|
|
|
+ if (ListUtil.isNotNullOrEmpty(listItem)) {
|
|
|
+ result.setListItem(CopierUtil.mapTo(listItem, ReqCreateDangerCheckItem.class));
|
|
|
+ }
|
|
|
result.setDangerCategoryTxt(dangerCategory.getCategoryName());
|
|
|
}
|
|
|
return ExecutedResult.success(result);
|
|
|
}
|
|
|
|
|
|
-// public ExecutedResult<String> stop(Long id) {
|
|
|
-// // 验证记录是否存在
|
|
|
-// ExecutedResult<DangerCheckFormPO> checkExists = this.check4Id(id);
|
|
|
-// if (checkExists.isFailed()) {
|
|
|
-// return ExecutedResult.failed(checkExists.getMsg());
|
|
|
-// }
|
|
|
-// DangerCheckFormPO item = new DangerCheckFormPO();
|
|
|
-// item.setId(id);
|
|
|
-// item.setStatus(EState.DISABLED.getValue());
|
|
|
-//
|
|
|
-// int result = this.dao.updateById(item);
|
|
|
-// if (result != 1) {
|
|
|
-// return ExecutedResult.failed("停用[隐患检查表]失败。");
|
|
|
-// }
|
|
|
-// return ExecutedResult.success();
|
|
|
-// }
|
|
|
-//
|
|
|
-// public ExecutedResult<String> enable(Long id) {
|
|
|
-// // 验证记录是否存在
|
|
|
-// ExecutedResult<DangerCheckFormPO> checkExists = this.check4Id(id);
|
|
|
-// if (checkExists.isFailed()) {
|
|
|
-// return ExecutedResult.failed(checkExists.getMsg());
|
|
|
-// }
|
|
|
-// DangerCheckFormPO item = new DangerCheckFormPO();
|
|
|
-// item.setId(id);
|
|
|
-// item.setStatus(EState.NORMAL.getValue());
|
|
|
-//
|
|
|
-// int result = this.dao.updateById(item);
|
|
|
-// if (result != 1) {
|
|
|
-// return ExecutedResult.failed("启用[隐患检查表]失败。");
|
|
|
-// }
|
|
|
-// return ExecutedResult.success();
|
|
|
-// }
|
|
|
-//
|
|
|
+ public ExecutedResult<String> stop(Long id) {
|
|
|
+ // 验证记录是否存在
|
|
|
+ ExecutedResult<DangerCheckFormPO> checkExists = this.check4Id(id);
|
|
|
+ if (checkExists.isFailed()) {
|
|
|
+ return ExecutedResult.failed(checkExists.getMsg());
|
|
|
+ }
|
|
|
+ DangerCheckFormPO item = new DangerCheckFormPO();
|
|
|
+ item.setId(id);
|
|
|
+ item.setStatus(EState.DISABLED.getValue());
|
|
|
+
|
|
|
+ int result = this.dao.updateById(item);
|
|
|
+ if (result != 1) {
|
|
|
+ return ExecutedResult.failed("停用[隐患检查表]失败。");
|
|
|
+ }
|
|
|
+ return ExecutedResult.success();
|
|
|
+ }
|
|
|
+
|
|
|
+ public ExecutedResult<String> enable(Long id) {
|
|
|
+ // 验证记录是否存在
|
|
|
+ ExecutedResult<DangerCheckFormPO> checkExists = this.check4Id(id);
|
|
|
+ if (checkExists.isFailed()) {
|
|
|
+ return ExecutedResult.failed(checkExists.getMsg());
|
|
|
+ }
|
|
|
+ DangerCheckFormPO item = new DangerCheckFormPO();
|
|
|
+ item.setId(id);
|
|
|
+ item.setStatus(EState.NORMAL.getValue());
|
|
|
+
|
|
|
+ int result = this.dao.updateById(item);
|
|
|
+ if (result != 1) {
|
|
|
+ return ExecutedResult.failed("启用[隐患检查表]失败。");
|
|
|
+ }
|
|
|
+ return ExecutedResult.success();
|
|
|
+ }
|
|
|
+
|
|
|
// public ExecutedResult<String> setSort(ReqSetSort request) {
|
|
|
// // 验证记录是否存在
|
|
|
// ExecutedResult<DangerCheckFormPO> checkExists = this.check4Id(request.getId());
|