From 43761042988ab4940f5e04e8c8b1cf7e51dd3029 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 04 九月 2023 17:02:56 +0800
Subject: [PATCH] 设备台账
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentProcessParametersController.java | 6 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java | 10 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 120 ++++++++++++++++++------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java | 16 ++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 98 +++++++++++--------
5 files changed, 169 insertions(+), 81 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 3a960a8..4e74994 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -185,6 +185,8 @@
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
+ queryWrapper.eq("status","1");
+ queryWrapper.eq("del_flag",0);
Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
return Result.OK(pageList);
@@ -356,7 +358,7 @@
//@RequiresPermissions("org.jeecg.modules.demo:mom_eam_equipment:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Equipment equipment) {
- return super.exportXls(request, equipment, Equipment.class, "mom_eam_equipment");
+ return super.exportXls(request, equipment, Equipment.class, "璁惧鍙拌处瀵煎嚭");
}
// /**
@@ -535,34 +537,92 @@
for(int i = 0;i<list.size();i++){
EquipmentImportVo equipmentImportVo = list.get(i);
EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(new QueryWrapper<EquipmentCategory>().eq("name",equipmentImportVo.getEquipmentCategoryName()),false);
- if(
- StringUtils.isBlank(equipmentImportVo.getNum())
- || StringUtils.isBlank(equipmentImportVo.getName())
- || StringUtils.isBlank(equipmentImportVo.getUseId())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentUda1())
- || StringUtils.isBlank(equipmentImportVo.getManageId())
- || StringUtils.isBlank(equipmentImportVo.getTeamId())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentCategoryName())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentStatus())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentUda3())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentUda5())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentUda2())
- || StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())
- || StringUtils.isBlank(equipmentImportVo.getProjectApprovalNo())
- || StringUtils.isBlank(equipmentImportVo.getFundSource())
- || StringUtils.isBlank(equipmentImportVo.getAcceptanceCheckDate())
- || StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())
- || StringUtils.isBlank(equipmentImportVo.getFactoryNo())
- || StringUtils.isBlank(equipmentImportVo.getConstructorId())
- || StringUtils.isBlank(equipmentImportVo.getSourceCountry())
- || StringUtils.isBlank(equipmentImportVo.getModel())
- || StringUtils.isBlank(equipmentImportVo.getSpecification())
- || StringUtils.isBlank(equipmentImportVo.getGpo())
- ){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鏁版嵁鏈夋湭濉」,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ if(StringUtils.isBlank(equipmentImportVo.getNum())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁熶竴缂栫爜缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
- }else if(ObjectUtils.isNull(equipmentCategory))
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getName())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍚嶇О缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getUseId())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浣跨敤閮ㄩ棬缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda1())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:宸ュ尯缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+ else if(StringUtils.isBlank(equipmentImportVo.getManageId())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁存姢閮ㄩ棬缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getTeamId())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁翠慨鐝粍缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:ABC鏍囪瘑缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getEquipmentCategoryName())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍒嗙被缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getEquipmentStatus())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鐘舵�佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ //闈炲繀濉」
+// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda5())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍔熻兘浣嶇疆缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getLocation())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:瀹夎浣嶇疆缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍑哄巶鏃ユ湡缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getProjectApprovalNo())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:绔嬮」鍗″彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getFundSource())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璧勯噾鏉ユ簮缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getAcceptanceCheckDate())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:楠屾敹鏃ユ湡缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍑哄巶鏃ユ湡缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getFactoryNo())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍑哄巶缂栧彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if( StringUtils.isBlank(equipmentImportVo.getConstructorId())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璧勪骇鍒堕�犲晢缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+ else if(StringUtils.isBlank(equipmentImportVo.getModel())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍨嬪彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getSpecification())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧瑙勬牸缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+// else if(StringUtils.isBlank(equipmentImportVo.getGpo())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍔熺巼缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+ else if(ObjectUtils.isNull(equipmentCategory))
{
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璇ヨ澶囨墍灞炵被鍒笉瀛樺湪锛岃鍏堢淮鎶よ澶囩被鍒�;";
exceptionNum++;
@@ -592,12 +652,12 @@
.setEquipmentUda3(equipmentImportVo.getEquipmentUda3())
.setEquipmentUda4(equipmentImportVo.getEquipmentUda4())
.setEquipmentUda5(equipmentImportVo.getEquipmentUda5())
- .setLocation(equipmentImportVo.getEquipmentUda2())
+ .setLocation(equipmentImportVo.getLocation())
.setLastVerificationDate(equipmentImportVo.getLeaveFactoryDate())
.setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
.setFundSource(equipmentImportVo.getFundSource())
.setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
- .setFactoryNumber(equipmentImportVo.getFactoryNo())
+ .setFactoryNumber(equipmentImportVo.getFactoryNumber())
.setConstructorId(equipmentImportVo.getConstructorId())
.setSourceCountry(equipmentImportVo.getSourceCountry())
.setModel(equipmentImportVo.getModel())
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java
index ba57383..c551c47 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java
@@ -93,7 +93,7 @@
}
return Result.OK(pageList);
}
-
+
/**
* 娣诲姞
*
@@ -116,7 +116,7 @@
}
return Result.OK("娣诲姞鎴愬姛锛�");
}
-
+
/**
* 缂栬緫
*
@@ -131,7 +131,7 @@
equipmentPrecisionParametersService.updateById(equipmentPrecisionParameters);
return Result.OK("缂栬緫鎴愬姛!");
}
-
+
/**
* 閫氳繃id鍒犻櫎
*
@@ -146,7 +146,7 @@
equipmentPrecisionParametersService.removeById(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
-
+
/**
* 鎵归噺鍒犻櫎
*
@@ -161,7 +161,7 @@
this.equipmentPrecisionParametersService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
}
-
+
/**
* 閫氳繃id鏌ヨ
*
@@ -204,4 +204,10 @@
return super.importExcel(request, response, EquipmentPrecisionParameters.class);
}
+ @PutMapping("/submitBatch")
+ public Result<?> submitBatch(@RequestBody List<EquipmentPrecisionParameters> equipmentPrecisionParameters){
+ equipmentPrecisionParametersService.saveOrUpdateBatch(equipmentPrecisionParameters);
+ return Result.OK("鎻愪氦鎴愬姛");
+ }
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentProcessParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentProcessParametersController.java
index bd5f56f..b5a64d3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentProcessParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentProcessParametersController.java
@@ -15,6 +15,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.EquipmentPrecisionParameters;
import org.jeecg.modules.eam.entity.EquipmentProcessParameters;
import org.jeecg.modules.eam.entity.ProcessParameters;
import org.jeecg.modules.eam.service.IEquipmentProcessParametersService;
@@ -201,5 +202,10 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, EquipmentProcessParameters.class);
}
+ @PutMapping("/submitBatch")
+ public Result<?> submitBatch(@RequestBody List<EquipmentProcessParameters> equipmentProcessParameters){
+ equipmentProcessParametersService.saveOrUpdateBatch(equipmentProcessParameters);
+ return Result.OK("鎻愪氦鎴愬姛");
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 9cc9f70..2b66aa5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -32,172 +32,154 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="mom_eam_equipment瀵硅薄", description="mom_eam_equipment")
-public class Equipment extends JeecgEntity implements Serializable {
+public class Equipment implements Serializable {
private static final long serialVersionUID = 1L;
-
+ private String id;
/**璁惧缂栫爜*/
- @Excel(name = "璁惧缂栫爜", width = 15)
+ @Excel(name = "缁熶竴缂栫爜", width = 15,orderNum = "0")
@ApiModelProperty(value = "璁惧缂栫爜")
private String num;
/**璁惧鍚嶇О*/
- @Excel(name = "璁惧鍚嶇О", width = 15)
+ @Excel(name = "璁惧鍚嶇О", width = 15,orderNum = "1")
@ApiModelProperty(value = "璁惧鍚嶇О")
private String name;
/**璁惧鍨嬪彿*/
- @Excel(name = "璁惧鍨嬪彿", width = 15)
+ @Excel(name = "璁惧鍨嬪彿", width = 15,orderNum = "30")
@ApiModelProperty(value = "璁惧鍨嬪彿")
private String model;
/**璁惧瑙勬牸*/
- @Excel(name = "璁惧瑙勬牸", width = 15)
+ @Excel(name = "璁惧瑙勬牸", width = 15,orderNum = "31")
@ApiModelProperty(value = "璁惧瑙勬牸")
private String specification;
/**璁惧鐘舵��*/
- @Excel(name = "璁惧鐘舵��", width = 15)
+ @Excel(name = "璁惧鐘舵��", width = 15,orderNum = "17")
@ApiModelProperty(value = "璁惧鐘舵��")
@Dict(dicCode = "equipment_status")
private String equipmentStatus;
/**鎶�鏈姸鎬�*/
- @Excel(name = "鎶�鏈姸鎬�", width = 15)
@ApiModelProperty(value = "鎶�鏈姸鎬�")
@Dict(dicCode = "technology_status")
private String technologyStatus;
/**璧勪骇缂栧彿*/
- @Excel(name = "璧勪骇缂栧彿", width = 15)
@ApiModelProperty(value = "璧勪骇缂栧彿")
private String assetNumber;
/**鎵�灞炲垎绫�*/
- @Excel(name = "鎵�灞炲垎绫�", width = 15)
+ @Excel(name = "鎵�灞炲垎绫�", width = 15,orderNum = "7",dictTable = "mom_eam_equipment_category",dicCode = "id",dicText = "name")
@ApiModelProperty(value = "鎵�灞炲垎绫�")
@Dict(dictTable = "mom_eam_equipment_category",dicCode = "id",dicText = "name")
private String equipmentCategoryId;
/**鐗圭璁惧*/
- @Excel(name = "鐗圭璁惧锛堟槸銆佸惁锛�", width = 15)
+ @Excel(name = "鍏抽敭璁惧鏍囪瘑",orderNum = "8",width = 15,dicCode = "specific_equipment")
@ApiModelProperty(value = "鐗圭璁惧锛堟槸銆佸惁锛�")
@Dict(dicCode = "specific_equipment")
private String specificEquipment;
/**璁惧鍥剧墖*/
- @Excel(name = "璁惧鍥剧墖", width = 15)
@ApiModelProperty(value = "璁惧鍥剧墖")
private String equipmentPhoto;
/**鍒堕�犲晢*/
- @Excel(name = "鍒堕�犲晢", width = 15)
+ @Excel(name = "璧勪骇鍒堕�犲晢", width = 15,orderNum = "28")
@ApiModelProperty(value = "鍒堕�犲晢")
@Dict(dicCode = "id",dictTable="mom_base_constructor",dicText="name")
private String constructorId;
/**渚涘簲鍟�*/
- @Excel(name = "渚涘簲鍟�", width = 15)
@ApiModelProperty(value = "渚涘簲鍟�")
@Dict(dicCode = "id",dictTable="mom_base_supplier",dicText="name")
private String supplierId;
/**鍑哄巶缂栧彿*/
- @Excel(name = "鍑哄巶缂栧彿", width = 15)
+ @Excel(name = "鍑哄巶缂栧彿", width = 15,orderNum = "27")
@ApiModelProperty(value = "鍑哄巶缂栧彿")
private String factoryNumber;
/**鍑哄巶鏃ユ湡*/
- @Excel(name = "鍑哄巶鏃ユ湡", width = 15)
+ @Excel(name = "鍑哄巶鏃ユ湡", width = 15,orderNum = "22")
@ApiModelProperty(value = "鍑哄巶鏃ユ湡")
private String leaveFactoryDate;
/**楠屾敹鏃ユ湡*/
- @Excel(name = "楠屾敹鏃ユ湡", width = 15)
+ @Excel(name = "楠屾敹鏃ユ湡", width = 15,orderNum = "25")
@ApiModelProperty(value = "楠屾敹鏃ユ湡")
private String acceptanceCheckDate;
/**鎵�鏈夌粍缁�*/
- @Excel(name = "鎵�鏈夌粍缁�", width = 15)
@ApiModelProperty(value = "鎵�鏈夌粍缁�")
@Dict(dicCode = "id",dictTable="sys_depart",dicText="depart_name")
private String affiliationId;
/**绠＄悊缁勭粐*/
- @Excel(name = "绠＄悊缁勭粐", width = 15)
+ @Excel(name = "缁存姢閮ㄩ棬", width = 15,orderNum = "4",dicCode = "id",dictTable="sys_depart",dicText="depart_name")
@ApiModelProperty(value = "绠＄悊缁勭粐")
@Dict(dicCode = "id",dictTable="sys_depart",dicText="depart_name")
private String manageId;
/**绠＄悊浜�*/
- @Excel(name = "绠＄悊浜�", width = 15)
@ApiModelProperty(value = "绠＄悊浜�")
@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
private String manager;
/**浣跨敤閮ㄩ棬*/
- @Excel(name = "浣跨敤閮ㄩ棬", width = 15)
+ @Excel(name = "浣跨敤閮ㄩ棬", width = 15,orderNum = "2",dicCode = "id",dictTable="sys_depart",dicText="depart_name")
@ApiModelProperty(value = "浣跨敤閮ㄩ棬")
@Dict(dicCode = "id",dictTable="sys_depart",dicText="depart_name")
private String useId;
/**璐ｄ换浜�*/
- @Excel(name = "璐ｄ换浜�", width = 15)
@ApiModelProperty(value = "璐ｄ换浜�")
@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
private String functionary;
/**浣嶇疆*/
- @Excel(name = "浣嶇疆", width = 15)
+ @Excel(name = "瀹夎浣嶇疆", width = 15,orderNum = "21")
@ApiModelProperty(value = "浣嶇疆")
private String location;
/**閲嶈搴�*/
- @Excel(name = "閲嶈搴�", width = 15)
+ @Excel(name = "ABC鏍囪瘑", width = 15,orderNum = "6")
@ApiModelProperty(value = "閲嶈搴�")
@Dict(dicCode = "id",dictTable="mom_eam_equipment_importance",dicText="name")
private String equipmentImportanceId;
/**宸ヨ壓鍙傛暟绠＄悊锛�1锛氭槸锛�0锛氬惁锛�*/
- @Excel(name = "宸ヨ壓鍙傛暟绠＄悊锛�1锛氭槸锛�0锛氬惁锛�", width = 15)
@ApiModelProperty(value = "宸ヨ壓鍙傛暟绠＄悊锛�1锛氭槸锛�0锛氬惁锛�")
private String processParameters;
/**绮惧害鍙傛暟绠＄悊锛�1锛氭槸锛�0锛氬惁锛�*/
- @Excel(name = "绮惧害鍙傛暟绠＄悊锛�1锛氭槸锛�0锛氬惁锛�", width = 15)
@ApiModelProperty(value = "绮惧害鍙傛暟绠＄悊锛�1锛氭槸锛�0锛氬惁锛�")
private String precisionParameters;
/**妫�瀹氱鐞嗭紙1锛氭槸锛�0锛氬惁锛�*/
- @Excel(name = "妫�瀹氱鐞嗭紙1锛氭槸锛�0锛氬惁锛�", width = 15)
@ApiModelProperty(value = "妫�瀹氱鐞嗭紙1锛氭槸锛�0锛氬惁锛�")
private String verification;
/**妫�瀹氬懆鏈�*/
- @Excel(name = "妫�瀹氭棩鏈�", width = 15)
@ApiModelProperty(value = "妫�瀹氭棩鏈�")
private String verificationPeriod;
/**涓婃閴村畾鏃ユ湡*/
- @Excel(name = "涓婃閴村畾鏃ユ湡", width = 15)
@ApiModelProperty(value = "涓婃妫�瀹氭棩鏈�")
private String lastVerificationDate;
/**涓嬫閴村畾鏃ユ湡*/
- @Excel(name = "涓嬫閴村畾鏃ユ湡", width = 15)
@ApiModelProperty(value = "涓嬫妫�瀹氭棩鏈�")
private String nextVerificationDate;
/**鐘舵��*/
- @Excel(name = "鐘舵��", width = 15)
@ApiModelProperty(value = "鐘舵��")
private String status = CommonConstant.STATUS_1;
/**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
/**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
+ @Excel(name = "宸ュ尯", width = 15,orderNum = "3")
+ @ApiModelProperty(value = "宸ュ尯")
private String equipmentUda1;
/**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁2")
private String equipmentUda2;
/**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
+ @Excel(name = "閲嶉噺", width = 15,orderNum = "18")
@ApiModelProperty(value = "澶囩敤瀛楁3")
private String equipmentUda3;
/**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
+ @Excel(name = "閲嶉噺璁￠噺鍗曚綅", width = 15,orderNum = "19")
@ApiModelProperty(value = "澶囩敤瀛楁4")
private String equipmentUda4;
/**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
+ @Excel(name = "鍔熻兘浣嶇疆", width = 15,orderNum = "20")
@ApiModelProperty(value = "澶囩敤瀛楁5")
private String equipmentUda5;
/**绉熸埛id*/
- @Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
private String tenantId;
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**璐ｄ换鐝粍*/
- @Excel(name = "璐ｄ换鐝粍", width = 15)
+ @Excel(name = "缁翠慨鐝粍", width = 15,orderNum = "5",dicCode = "id",dictTable="mom_base_team",dicText="name")
@ApiModelProperty(value = "璐ｄ换鐝粍")
@Dict(dicCode = "id",dictTable="mom_base_team",dicText="name")
private String teamId;
@@ -210,9 +192,11 @@
private String sourceId;
@ApiModelProperty(value = "宸ヨ壓鍙傛暟妯℃澘Id")
+ @Dict(dicCode = "id",dictTable = "mom_eam_process_parameters_template",dicText = "name")
private String processParametersTemplateId;
@ApiModelProperty(value = "璁惧绮惧害妯℃澘Id")
+ @Dict(dicCode = "id",dictTable = "mom_eam_precision_parameters_template",dicText = "name")
private String precisionParametersTemplateId;
@TableField(exist = false)
@@ -241,34 +225,46 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sealDate;
@ApiModelProperty(value = "璧勯噾鏉ユ簮")
+ @Excel(name = "璧勯噾鏉ユ簮", width = 15,orderNum = "24")
private String fundSource;
@ApiModelProperty(value = "鍑哄巶缂栧彿")
private String factoryNo;
@ApiModelProperty(value = "鍒堕�犲晢")
private String mfr;
@ApiModelProperty(value = "璧勪骇鏉ユ簮鍥藉")
+ @Excel(name = "璧勪骇鏉ユ簮鍥藉", width = 15,orderNum = "29")
private String sourceCountry;
@ApiModelProperty(value = "鎬诲姛鐜�")
+ @Excel(name = "鎬诲姛鐜�", width = 15,orderNum = "32")
private String gpo;
@ApiModelProperty(value = "鍏抽敭璁惧鏍囪瘑")
private String keyEquipmentIdentification;
+ @Excel(name = "瀹夊叏閰嶇疆", width = 15,orderNum = "9")
@ApiModelProperty(value = "瀹夊叏閰嶇疆")
private String securityConfiguration;
@ApiModelProperty(value = "鍐峰嵈绯荤粺")
+ @Excel(name = "鍐峰嵈绯荤粺", width = 15,orderNum = "10")
private String coolingSystem;
+ @Excel(name = "鐏伀鍣�", width = 15,orderNum = "11")
@ApiModelProperty(value = "鐏伀鍣�")
private String fireExtinguisher;
+ @Excel(name = "鐏伀鍣ㄦ湁鏁堟湡", width = 15,orderNum = "12")
@ApiModelProperty(value = "鐏伀鍣ㄦ湁鏁堟湡")
private String fireExtinguisherValidityPeriod;
+ @Excel(name = "鎿嶄綔绯荤粺", width = 15,orderNum = "13")
@ApiModelProperty(value = "鎿嶄綔绯荤粺")
private String operatingSystem;
+ @Excel(name = "绯荤粺", width = 15,orderNum = "14")
@ApiModelProperty(value = "绯荤粺")
private String system;
@ApiModelProperty(value = "绔彛")
+ @Excel(name = "璁惧绔彛", width = 15,orderNum = "15")
private String port;
@ApiModelProperty(value = "鍧愭爣鏁伴噺")
+ @Excel(name = "鍧愭爣鏁伴噺", width = 15,orderNum = "16")
private BigDecimal coordinateNum;
@ApiModelProperty(value = "绔嬮」鍗″彿")
+ @Excel(name = "绔嬮」鍗″彿", width = 15,orderNum = "23")
private String projectApprovalNo;
private String standardA;
private String standardB;
@@ -276,4 +272,24 @@
private String standardD;
private String standardE;
private String standardF;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ @Excel(name = "鍒涘缓浜�", width = 15,orderNum = "33")
+ private java.lang.String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @Excel(name = "鍒涘缓鏃堕棿", width = 15,orderNum = "34",format = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private java.util.Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ @Excel(name = "鏇存柊浜�", width = 15,orderNum = "35")
+ private java.lang.String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @Excel(name = "鏇存柊鏃堕棿", width = 15,orderNum = "36",format = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private java.util.Date updateTime;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
index 882e779..37e981e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
@@ -69,16 +69,16 @@
@Excel(name = "閲嶉噺")
private String equipmentUda3;
- @Excel(name = "閲嶉噺璁￠噺鍗曚綅",dicCode = "id",dicText = "name",dictTable = "mom_base_unit")
+ @Excel(name = "閲嶉噺璁￠噺鍗曚綅")
private String equipmentUda4;
@Excel(name = "鍔熻兘浣嶇疆")
private String equipmentUda5;
@Excel(name = "瀹夎浣嶇疆")
- private String equipmentUda2;
+ private String location;
- @Excel(name = "鍑哄巶鏃ユ湡",importFormat = "yyyyMMdd")
+ @Excel(name = "鍑哄巶鏃ユ湡")
private String leaveFactoryDate;
@Excel(name = "绔嬮」鍗″彿")
@@ -87,11 +87,11 @@
@Excel(name = "璧勯噾鏉ユ簮")
private String fundSource;
- @Excel(name = "楠屾敹鏃ユ湡",importFormat = "yyyyMMdd")
+ @Excel(name = "楠屾敹鏃ユ湡")
private String acceptanceCheckDate;
@Excel(name = "鍑哄巶缂栧彿")
- private String factoryNo;
+ private String factoryNumber;
@Excel(name = "璧勪骇鍒堕�犲晢",dicCode = "id",dictTable="mom_base_constructor",dicText="name")
private String constructorId;
--
Gitblit v1.9.3