From a5bb107b88b161bd59edb68fa5be7e52137af839 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 31 一月 2024 16:20:11 +0800
Subject: [PATCH] 增加报表
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 222 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 192 insertions(+), 30 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 dce198e..6b0ee06 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
@@ -6,6 +6,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -23,6 +24,7 @@
import org.jeecg.modules.base.service.IFactoryModelService;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.model.DepartVo;
+import org.jeecg.modules.eam.model.MaintenanceCycleVo;
import org.jeecg.modules.eam.service.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -115,6 +117,12 @@
@Autowired
private IAreaService areaService;
+ @Autowired
+ private IDailyInspectionStandardService dailyInspectionStandardService;
+
+ @Autowired
+ private IMaintenanceStandardService maintenanceStandardService;
+
@@ -151,7 +159,7 @@
if(StringUtils.isNotBlank(equipment.getEquipmentCategoryId())){
queryWrapper.eq("equipment_category_id",equipment.getEquipmentCategoryId());
}
-
+ queryWrapper.isNull("line_id");
queryWrapper.eq("status","1");
queryWrapper.eq("del_flag",0);
queryWrapper.orderByDesc("create_time");
@@ -193,6 +201,55 @@
}
return Result.OK(pageList);
}
+
+ @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/showEquipmentList")
+ public Result<IPage<Equipment>> showEquipmentList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(equipment.getNum())){
+ queryWrapper.like("num",equipment.getNum());
+ }
+ if(StringUtils.isNotBlank(equipment.getName())){
+ queryWrapper.like("name",equipment.getName());
+ }
+ queryWrapper.eq("equipment_status","1");
+ queryWrapper.in("technology_status","qualified","limitedUse");
+ queryWrapper.eq("status","1");
+ queryWrapper.eq("del_flag",0);
+ queryWrapper.orderByDesc("create_time");
+
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/findEquipmentList")
+ public Result<IPage<Equipment>> findEquipmentList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(equipment.getNum())){
+ queryWrapper.like("num",equipment.getNum());
+ }
+ if(StringUtils.isNotBlank(equipment.getName())){
+ queryWrapper.like("name",equipment.getName());
+ }
+ queryWrapper.eq("equipment_status","1");
+ queryWrapper.in("technology_status","qualified","limitedUse");
+ queryWrapper.in("equipment_importance_id","A","B","C");
+ queryWrapper.eq("status","1");
+ queryWrapper.eq("del_flag",0);
+ queryWrapper.orderByDesc("create_time");
+
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
/**
@@ -332,6 +389,7 @@
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
Equipment equipment = equipmentService.getById(id);
+ equipmentService.update(new UpdateWrapper<Equipment>().eq("line_id",id).set("line_id",null).set("is_meta",null));
equipment.setDelFlag(1);
equipmentService.updateById(equipment);
return Result.OK("鍒犻櫎鎴愬姛!");
@@ -549,6 +607,7 @@
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@Transactional(rollbackFor = Exception.class)
+ //宸ュ尯銆佸瀷鍙枫�佽澶囩姸鎬併�佹妧鏈姸鎬併�丄BC鏍囪瘑鏈夌┖鍊硷紱缁存姢閮ㄩ棬銆佺淮淇彮缁勪负缂栫爜闇�瑕佹湁瀵圭収鍊笺��
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -570,6 +629,8 @@
String manageId = equipmentImportVo.getManageId();
String constructorId = equipmentImportVo.getConstructorId();
String teamId = equipmentImportVo.getTeamId();
+ String propertyStatus = equipmentImportVo.getPropertyStatus();
+ String abc = equipmentImportVo.getEquipmentImportanceId();
if(StringUtils.isBlank(equipmentImportVo.getNum())){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁熶竴缂栫爜缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
@@ -580,23 +641,18 @@
exceptionNum++;
continue;
}
- else if(StringUtils.isBlank(equipmentImportVo.getTeamId())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁翠慨鐝粍缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- else if(StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:ABC鏍囪瘑缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
+// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:ABC鏍囪瘑缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// continue;
+// }
else if(StringUtils.isBlank(equipmentImportVo.getEquipmentStatus())){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鐘舵�佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
continue;
}
else if(StringUtils.isBlank(equipmentImportVo.getTechnologyStatus())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鎶�鏈姸鎬佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鎶�鏈姸鎬佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
continue;
}
@@ -684,23 +740,26 @@
// exceptionNum++;
// }
else{
- SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()),false);
- if(ObjectUtils.isNull(useId)){
+ SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()).eq("del_flag",0),false);
+ if(ObjectUtils.isNotNull(use)){
equipment.setUseId(use.getId());
}else {
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ浣跨敤閮ㄩ棬,璇风淮鎶ら儴闂ㄦ暟鎹悗鍐嶅鍏�;";
exceptionNum++;
continue;
}
- Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()));
+ Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()).eq("del_flag",0));
+ Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()).eq("del_flag",0));
if(ObjectUtils.isNotNull(area)){
equipment.setFactoryModelId(area.getId());
+ }else if(ObjectUtils.isNotNull(area1)) {
+ equipment.setFactoryModelId(area1.getId());
}else {
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ宸ュ尯,璇风淮鎶ゅ伐鍖烘暟鎹悗鍐嶅鍏�;";
exceptionNum++;
continue;
}
- SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()));
+ SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()).eq("del_flag",0));
if(ObjectUtils.isNotNull(manage)){
equipment.setManageId(manage.getId());
}else{
@@ -708,7 +767,9 @@
exceptionNum++;
continue;
}
- EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(new QueryWrapper<EquipmentCategory>().eq("name",equipmentCategoryName.trim()),false);
+ EquipmentCategory equipmentCategory = equipmentCategoryService
+ .getOne(new QueryWrapper<EquipmentCategory>()
+ .eq("name",equipmentCategoryName.trim()).eq("del_flag",0),false);
if(ObjectUtils.isNotNull(equipmentCategory)){
equipment.setEquipmentCategoryId(equipmentCategory.getId());
}
@@ -717,9 +778,12 @@
exceptionNum++;
continue;
}
- Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()),false);
+ Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()).eq("del_flag",0),false);
+ Team team1 = teamService.getOne(new QueryWrapper<Team>().eq("num",teamId.trim()).eq("del_flag",0),false);
if(ObjectUtils.isNotNull(team)){
equipment.setTeamId(team.getId());
+ }else if(ObjectUtils.isNotNull(team1)) {
+ equipment.setTeamId(team1.getId());
}else {
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ鐝粍,璇峰厛缁存姢鐝粍鏁版嵁鍚庡啀瀵煎叆;";
exceptionNum++;
@@ -737,19 +801,20 @@
equipment.setConstructorId(constructor.getId());
}
}
- if(equipmentImportVo.getPropertyStatus().equals("warranty")){
+ if(StringUtils.isNotBlank(propertyStatus)&&propertyStatus.equals("warranty")){
if(
ObjectUtils.isNull(equipmentImportVo.getWarrantyStart())
||ObjectUtils.isNull(equipmentImportVo.getWarrantyEnd())
){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璇ヨ澶囧浜庤川淇濇湡锛岃川淇濅俊鎭己澶憋紝璇峰厛缁存姢璐ㄤ繚寮�濮嬫椂闂存垨缁撴潫鏃堕棿;";
exceptionNum++;
+ continue;
}
}else{
Equipment oriEquipment = equipmentService
.getOne(new QueryWrapper<Equipment>()
- .eq("num",equipmentImportVo.getNum()),false);
+ .eq("num",equipmentImportVo.getNum()).eq("del_flag",0),false);
if(ObjectUtils.isNull(oriEquipment)){
equipment.setNum(equipmentImportVo.getNum())
.setName(equipmentImportVo.getName())
@@ -779,6 +844,8 @@
.setPropertyStatus(equipmentImportVo.getPropertyStatus())
.setWarrantyStart(equipmentImportVo.getWarrantyStart())
.setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
+ .setIsLineEquip("no")
+ .setIsLine("no")
.setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
.setGpo(equipmentImportVo.getGpo());
if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){
@@ -795,16 +862,18 @@
&&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")
&&!equipmentCategory.getEquipmentCategoryUda1().equals("tester")
){
- if(equipmentImportVo.getEquipmentImportanceId().equals("A")){
- equipment.setCheckPeriod(365*3+"");
+ if(StringUtils.isNotBlank(abc)){
+ if(abc.equals("A")){
+ equipment.setCheckPeriod(365*3+"");
+ }
+ if(
+ abc.equals("B")
+ ||abc.equals("C")
+ ||abc.equals("D")
+ ){
+ equipment.setCheckPeriod(365*4+"");
+ }
}
- if(
- equipmentImportVo.getEquipmentImportanceId().equals("B")
- ||equipmentImportVo.getEquipmentImportanceId().equals("C")
- ||equipmentImportVo.getEquipmentImportanceId().equals("D")
- ){
- equipment.setCheckPeriod(365*4+"");
- }
}
equipmentService.save(equipment);
}else {
@@ -842,9 +911,102 @@
HttpServletRequest req) {
QueryWrapper<DailyInspectionStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(standardDetail, req.getParameterMap());
Page<DailyInspectionStandardDetail> page = new Page<DailyInspectionStandardDetail>(pageNo, pageSize);
- IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId());
+ IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId(),standardDetail.getType());
return Result.OK(pageList);
}
+ @PostMapping("addLine")
+ @Transactional(rollbackFor = {Exception.class})
+ public Result<?> addLine(@RequestBody Equipment equipment){
+ equipment.setIsLineEquip("no");
+ equipment.setIsLine("yes");
+ equipmentService.save(equipment);
+ List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
+ for(Equipment equipment1:equipmentList){
+ equipment1.setId(equipment1.getShowId());
+ equipment1.setIsLineEquip("yes");
+ equipment1.setLineId(equipment.getId());
+ }
+ equipmentService.updateBatchById(equipmentList);
+ return Result.OK("娣诲姞鎴愬姛");
+ }
+ @PutMapping("editLine")
+ @Transactional(rollbackFor = {Exception.class})
+ public Result<?> editLine(@RequestBody Equipment equipment){
+ equipmentService.updateById(equipment);
+ equipmentService.update(new UpdateWrapper<Equipment>()
+ .eq("line_id",equipment.getId())
+ .set("line_id",null)
+ .set("is_meta",null)
+ .set("is_line_equip","no"));
+ List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
+ for(Equipment equipment1:equipmentList){
+ equipment1.setLineId(equipment.getId());
+ String id = equipment1.getId();
+ if(StringUtils.isBlank(id)){
+ equipment1.setId(equipment1.getShowId());
+ }
+ equipment1.setIsLineEquip("yes");
+ }
+ equipmentService.updateBatchById(equipmentList);
+ return Result.OK("缂栬緫鎴愬姛");
+ }
+ @PostMapping("/updateKeyEquipment")
+ public Result<?>updateKeyEquipment(@RequestBody Equipment equipment){
+ equipmentService.update(new UpdateWrapper<Equipment>().eq("specific_equipment","0").set("specific_equipment",null));
+ List<Equipment> keyEquipmentUpdateList = equipment.getKeyEquipmentUpdateList();
+ for(Equipment updateEquipment:keyEquipmentUpdateList){
+ updateEquipment.setId(updateEquipment.getEquipmentId());
+ equipmentService.updateById(updateEquipment);
+ }
+ return Result.OK("淇敼鎴愬姛");
+ }
+ /**
+ *璁惧鍙扮珯-淇濆吇鏍囧噯
+ */
+ @GetMapping("getEquipmentListAllStandard")
+ public Result<?> getEquipmentListAllStandard(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> equipmentListAllStandards = equipmentService.getEquipmentListAllStandard(pageNo, pageSize, params);
+ List<Map<String, Object>> records = equipmentListAllStandards.getRecords();
+ for (Map<String, Object> record : records) {
+ String id = (String) record.get("id");
+ String precisionParameters = (String)record.get("precisionParameters");
+ if("1".equals(precisionParameters)){
+ record.put("yseNoPrecisionParameters","0");
+ }else{
+ record.put("yseNoPrecisionParameters","1");
+ }
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getEquipmentId, id)
+ .eq(DailyInspectionStandard::getVersionStatus, "2")
+ .list();
+ if(dailyInspectionStandards.size()>0){
+ record.put("yseNoInspectionStandard","0");
+ }else{
+ record.put("yseNoInspectionStandard","1");
+ }
+ List<MaintenanceStandard> maintenance2Standards = maintenanceStandardService.lambdaQuery()
+ .eq(MaintenanceStandard::getEquipmentId, id)
+ .eq(MaintenanceStandard::getMaintenanceType, "2")
+ .eq(MaintenanceStandard::getVersionStatus, "2").list();
+ if(maintenance2Standards.size()>0){
+ record.put("yseNoMaintenance2Standard","0");
+ }else{
+ record.put("yseNoMaintenance2Standard","1");
+ }
+
+ List<MaintenanceStandard> maintenance3Standards = maintenanceStandardService.lambdaQuery()
+ .eq(MaintenanceStandard::getEquipmentId, id)
+ .eq(MaintenanceStandard::getMaintenanceType, "3")
+ .eq(MaintenanceStandard::getVersionStatus, "2").list();
+ if(maintenance3Standards.size()>0){
+ record.put("yseNoMaintenance3Standard","0");
+ }else{
+ record.put("yseNoMaintenance3Standard","1");
+ }
+
+ }
+ return Result.ok(equipmentListAllStandards);
+ }
}
--
Gitblit v1.9.3