From 8e7e1f00d59df88f2f5ee120891cad692be4eafe Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 24 十二月 2023 14:12:45 +0800
Subject: [PATCH] 点检标准导入
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java | 133 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 112 insertions(+), 21 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
index f4115e5..26e2a1d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
@@ -127,6 +127,9 @@
@PostMapping(value = "/add")
@Transactional(rollbackFor = { Exception.class })
public Result<String> add(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ dailyInspectionStandard.setWritePerson(sysUser.getRealname());
+ dailyInspectionStandard.setAssignMode("1");
dailyInspectionStandardService.save(dailyInspectionStandard);
List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
DailyInspectionStandardDetail isd = null;
@@ -153,6 +156,7 @@
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
@Transactional(rollbackFor = { Exception.class })
public Result<String> edit(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
+ dailyInspectionStandard.setApprovalStatus("1");
dailyInspectionStandardService.updateById(dailyInspectionStandard);
//1.鍒犻櫎鍘熺偣妫�椤圭洰
List<DailyInspectionStandardDetail> dailyInspectionStandardDetails = dailyInspectionStandardDetailService.lambdaQuery()
@@ -289,18 +293,23 @@
Sheet sheet = workbook.getSheetAt(i);
for (Row row : sheet) {
// 閬嶅巻姣忎竴涓崟鍏冩牸
- for (Cell cell : row) {
+// for (Cell cell : row) {
+ for(int j = 0;j < 5;j++){
// 澶勭悊鍗曞厓鏍兼暟鎹紝渚嬪杈撳嚭鍗曞厓鏍肩殑鍊�
+ Cell cell = row.getCell(j);
+// if("STRING".equals(cell.getCellType().toString())|| "BLANK".equals(cell.getCellType().toString())){
if("STRING".equals(cell.getCellType().toString())|| "BLANK".equals(cell.getCellType().toString())){
//鐐规鍛ㄦ湡瀛樺湪锛屽垽鏂澶囩粺涓�缂栫爜鏄惁瀛樺湪
- if(cell.getStringCellValue().contains("璁惧鍚嶇О锛�")){
- String[] tybh1 = cell.getStringCellValue().split("缁熶竴缂栧彿锛�");
+ String strCell = cell.getStringCellValue();
+ if(strCell.contains("璁惧鍚嶇О锛�")){
+ String[] tybh1 = strCell.split("缁熶竴缂栧彿锛�");
String[] tybh2 = tybh1[1].split("骞�");
- equipmentNum = tybh2[0].trim().substring(0,tybh2[0].trim().length()-4).trim();
+// equipmentNum = tybh2[0].trim().substring(0,tybh2[0].trim().length()-4).trim();
+ equipmentNum = tybh2[0].trim();
/*String year = tybh2[0].trim().substring(tybh2[0].trim().length()-4,tybh2[0].trim().length()).trim();
String[] month1 = tybh2[1].split("鏈�");
String month = month1[0].trim();
- String[] unit1 = cell.getStringCellValue().split("鍗曚綅锛�");
+ String[] unit1 = strCell.split("鍗曚綅锛�");
String unit = unit1[1].trim();*/
Equipment equipment = equipmentService.lambdaQuery().eq(Equipment::getNum,equipmentNum).eq(Equipment::getDelFlag, CommonConstant.DEL_FLAG_0).one();
if(equipment == null){
@@ -321,6 +330,7 @@
dailyInspectionStandard.setVersion("1.0");
dailyInspectionStandard.setAssignMode("1");
dailyInspectionStandard.setEquipmentId(equipment.getId());
+ dailyInspectionStandard.setApprovalStatus("5");
//dailyInspectionStandardService.save(dailyInspectionStandard);
//dailyInspectionStandardId = dailyInspectionStandard.getId();
}
@@ -329,20 +339,20 @@
}
//璁惧缁熶竴缂栫爜瀛樺湪锛屽垽鏂偣妫�椤圭洰鏄惁瀛樺湪
if(c == 0){
- System.out.print(cell.getStringCellValue() + "\t");
- if(cell.getStringCellValue().contains("鐐规椤圭洰")){
+ System.out.print(strCell + "\t");
+ if(strCell.contains("鐐规椤圭洰")){
a = 1;
projectColumnIndex = cell.getColumnIndex();
break;
}
- if(cell.getStringCellValue().contains("缁存姢璐ｄ换浜虹瀛�")){
+ if(strCell.contains("缁存姢璐ｄ换浜虹瀛�")){
a = 0;
}
if(projectColumnIndex == cell.getColumnIndex() && a == 1){
DailyInspectionStandardDetail dailyInspectionStandardDetail = new DailyInspectionStandardDetail();
dailyInspectionStandardDetail.setDailyInspectionStandardId(dailyInspectionStandardId);
String dayInspectionProjectName = row.getCell(projectColumnIndex).toString();
- String standard = row.getCell(projectColumnIndex+1).toString();
+ String standard = row.getCell(projectColumnIndex+3).toString();
//鏌ヨ鐐瑰嚮椤圭洰锛屽鏋滄病鏈夋柊澧炵偣妫�椤圭洰
if(StringUtils.isNotBlank(dayInspectionProjectName)){
List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,dayInspectionProjectName).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list();
@@ -367,12 +377,13 @@
}
break;
}
- if(cell.getStringCellValue().contains("鍛ㄤ繚鍏婚」鐩�")){
+
+ if(strCell.contains("鍛ㄤ繚鍏婚」鐩�")){
b = 1;
maintenanceColumnIndex = cell.getColumnIndex();
break;
}
- if(cell.getStringCellValue().contains("鍛ㄤ繚鍏绘搷浣滆�呮墽琛�")){
+ if(strCell.contains("鍛ㄤ繚鍏绘搷浣滆�呮墽琛�")){
b = 0;
dailyInspectionStandardService.save(dailyInspectionStandard);
for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){
@@ -387,7 +398,7 @@
DailyInspectionStandardDetail dailyInspectionStandardDetail = new DailyInspectionStandardDetail();
dailyInspectionStandardDetail.setDailyInspectionStandardId(dailyInspectionStandardId);
String weekInspectionProjectName = row.getCell(maintenanceColumnIndex).toString();
- String inspectionStandardName = row.getCell(maintenanceColumnIndex+1).toString();
+ String inspectionStandardName = row.getCell(maintenanceColumnIndex+3).toString();
if(StringUtils.isNotBlank(weekInspectionProjectName)){
List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,weekInspectionProjectName).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list();
if(CollectionUtils.isEmpty(inspectionProjectList)){
@@ -448,8 +459,17 @@
@PostMapping(value = "/revise")
@Transactional(rollbackFor = { Exception.class })
public Result<String> revise(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ dailyInspectionStandard.setWritePerson(sysUser.getRealname());
dailyInspectionStandard.setId("");
+ dailyInspectionStandard.setApprovalStatus("1");
dailyInspectionStandard.setCreateTime(new Date());
+ dailyInspectionStandard.setTakeEffectTime(null);
+ dailyInspectionStandard.setLoseEfficacyTime(null);
+ dailyInspectionStandard.setApprovalFeedback(null);
+ dailyInspectionStandard.setAuditFeedback(null);
+ dailyInspectionStandard.setAuditPerson(null);
+ dailyInspectionStandard.setApprovalPerson(null);
dailyInspectionStandardService.save(dailyInspectionStandard);
List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
DailyInspectionStandardDetail isd = null;
@@ -492,15 +512,18 @@
@Transactional(rollbackFor = { Exception.class })
public Result<String> versionTakeEffect(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
- List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
- .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
- .eq(DailyInspectionStandard::getVersionStatus, "2").list();
- for (DailyInspectionStandard standard : dailyInspectionStandards) {
- standard.setVersionStatus("3");
- standard.setLoseEfficacyTime(new Date());
- dailyInspectionStandardService.updateById(standard);
- }
- dailyInspectionStandard.setTakeEffectTime(new Date());
+// List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+// .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
+// .eq(DailyInspectionStandard::getVersionStatus, "2").list();
+// for (DailyInspectionStandard standard : dailyInspectionStandards) {
+// standard.setVersionStatus("3");
+// standard.setLoseEfficacyTime(new Date());
+// dailyInspectionStandardService.updateById(standard);
+// }
+// dailyInspectionStandard.setTakeEffectTime(new Date());
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ dailyInspectionStandard.setLoseEfficacyPerson(sysUser.getRealname());
+ dailyInspectionStandard.setLoseEfficacyTime(new Date());
boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard);
if (b){
return Result.OK("缂栬緫鎴愬姛!");
@@ -509,5 +532,73 @@
}
}
+ /**
+ * 绛惧娴佺▼
+ * qsw 2023-11-16
+ */
+ @RequestMapping(value = "/auditApproval", method = {RequestMethod.PUT,RequestMethod.POST})
+ @Transactional(rollbackFor = { Exception.class })
+ public Result<String> auditApproval(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String approvalStatus = dailyInspectionStandard.getApprovalStatus();
+ if("5".equals(approvalStatus)){//瀹℃牳閫氳繃鍚庯紝鐗堟湰鐢熸晥
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
+ .eq(DailyInspectionStandard::getVersionStatus, "2").list();
+ for (DailyInspectionStandard standard : dailyInspectionStandards) {
+ standard.setVersionStatus("3");
+ standard.setLoseEfficacyTime(new Date());
+ standard.setLoseEfficacyPerson(sysUser.getRealname());
+ dailyInspectionStandardService.updateById(standard);
+ }
+ dailyInspectionStandard.setApprovalPerson(sysUser.getRealname());
+ dailyInspectionStandard.setVersionStatus("2");
+ dailyInspectionStandard.setTakeEffectTime(new Date());
+ }else if("3".equals(approvalStatus)){
+ dailyInspectionStandard.setAuditPerson(sysUser.getRealname());
+ }
+ boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard);
+ if (b){
+ return Result.OK("瀹℃牳鎴愬姛!");
+ }else{
+ return Result.error("瀹℃牳澶辫触!");
+ }
+ }
+
+ /**
+ * 鎵归噺 绛惧娴佺▼
+ * qsw 2023-12-12
+ */
+ @RequestMapping(value = "/auditApprovalBatch", method = {RequestMethod.PUT,RequestMethod.POST})
+ @Transactional(rollbackFor = { Exception.class })
+ public Result<String> auditApprovalBatch(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+ List<DailyInspectionStandard> dailyInspectionStandardlist = dailyInspectionStandard.getDailyInspectionStandardlist();
+ for (DailyInspectionStandard inspectionStandard : dailyInspectionStandardlist) {
+ String approvalStatus = inspectionStandard.getApprovalStatus();
+ if("5".equals(approvalStatus)){//瀹℃牳閫氳繃鍚庯紝鐗堟湰鐢熸晥
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getNum, inspectionStandard.getNum())
+ .eq(DailyInspectionStandard::getVersionStatus, "2").list();
+ for (DailyInspectionStandard standard : dailyInspectionStandards) {
+ standard.setVersionStatus("3");
+ standard.setLoseEfficacyTime(new Date());
+ standard.setLoseEfficacyPerson(sysUser.getRealname());
+ dailyInspectionStandardService.updateById(standard);
+ }
+ inspectionStandard.setApprovalPerson(sysUser.getRealname());
+ inspectionStandard.setVersionStatus("2");
+ inspectionStandard.setTakeEffectTime(new Date());
+ }else if("3".equals(approvalStatus)){
+ inspectionStandard.setAuditPerson(sysUser.getRealname());
+ }
+ boolean b = dailyInspectionStandardService.updateById(inspectionStandard);
+ if (!b){
+ return Result.error("瀹℃牳澶辫触!");
+ }
+ }
+ return Result.OK("瀹℃牳鎴愬姛!");
+ }
}
--
Gitblit v1.9.3