guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '安全环保检查状态改8-1122' into 相关方关联分公司功能

cmt1.0
zhaoyu 2023-12-11 17:59:07 +08:00
parent dfcc0cb817 bbaad2b6d7
commit 07cdd9faa4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/controller/app/AppHiddenController.java
View File

@ -1656,7 +1656,7 @@ public class AppHiddenController extends BaseController {
inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID"));
inspection.put("OPERATOR", pd.getString("FINAL_CHECKOR")); inspection.put("OPERATOR", pd.getString("FINAL_CHECKOR"));
inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); inspection.put("OPERATTIME", DateUtil.date2Str(new Date()));
inspection.put("INSPECTION_STATUS", "7"); // 已验收 inspection.put("INSPECTION_STATUS", "8"); // 已验收
safetyenvironmentalService.editStatus(inspection); safetyenvironmentalService.editStatus(inspection);
} }
} }

2
src/main/java/com/zcloud/controller/bus/HiddenController.java
View File

@ -2902,7 +2902,7 @@ public class HiddenController extends BaseController {
inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID"));
inspection.put("OPERATOR", Jurisdiction.getUSER_ID()); inspection.put("OPERATOR", Jurisdiction.getUSER_ID());
inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); inspection.put("OPERATTIME", DateUtil.date2Str(new Date()));
inspection.put("INSPECTION_STATUS", "7"); // 已验收 inspection.put("INSPECTION_STATUS", "8"); // 已验收
safetyenvironmentalService.editStatus(inspection); safetyenvironmentalService.editStatus(inspection);
} }