Merge remote-tracking branch 'origin/main'

src/main/java/org/energy/modules/leger/controller/InspectionStandardsController.java

@@ -26,6 +26,7 @@ import com.dayu.daf.core.mp.support.Condition;
 import com.dayu.daf.core.mp.support.Query;
 import com.dayu.daf.core.tool.api.R;
 import com.dayu.daf.core.tool.utils.Func;
+import org.energy.modules.leger.entity.InventoryDocument;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,6 +35,8 @@ import org.energy.modules.leger.vo.InspectionStandardsVO;
 import org.energy.modules.leger.service.IInspectionStandardsService;
 import com.dayu.daf.core.boot.ctrl.DafController;
 
+import java.util.List;
+
 /**
  * 检验标准一览 控制器
  *
@@ -122,5 +125,25 @@ public class InspectionStandardsController extends DafController {
 		return R.status(inspectionStandardsService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 列表 检验标准一览
+	 */
+	@GetMapping("/getList")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "列表", notes = "传入inspectionStandards")
+	public R<List<InspectionStandards>> getList(InspectionStandards inspectionStandards) {
+		List<InspectionStandards> list = inspectionStandardsService.list(Condition.getQueryWrapper(inspectionStandards));
+		return R.data(list);
+	}
+
+	/**
+	 * 删除 检验标准一览
+	 */
+	@GetMapping("/del")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "逻辑删除", notes = "传入toolscodeid")
+	public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer toolsCodeId) {
+		return R.status(inspectionStandardsService.delInspectionStandards(toolsCodeId));
+	}
 
 }

src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java

@@ -15,25 +15,51 @@
  */
 package org.energy.modules.leger.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dayu.daf.core.log.annotation.ApiLog;
+import com.dayu.daf.core.tool.constant.DafConstant;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
+
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import com.dayu.daf.core.mp.support.Condition;
 import com.dayu.daf.core.mp.support.Query;
 import com.dayu.daf.core.tool.api.R;
 import com.dayu.daf.core.tool.utils.Func;
+import org.energy.modules.leger.excel.ToolInventoryRecordExcel;
+import org.energy.modules.leger.service.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.energy.modules.leger.entity.ToolInventoryRecord;
 import org.energy.modules.leger.vo.ToolInventoryRecordVO;
-import org.energy.modules.leger.service.IToolInventoryRecordService;
 import com.dayu.daf.core.boot.ctrl.DafController;
 
+import java.util.ArrayList;
+import java.util.List;
+import lombok.SneakyThrows;
+import org.apache.commons.codec.Charsets;
+import org.energy.modules.leger.excel.EquipmentLedgerExcel;
+import org.energy.modules.system.excel.UserExcel;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.leger.entity.EquipmentLedger;
+import org.energy.modules.leger.vo.EquipmentLedgerVO;
+import com.dayu.daf.core.boot.ctrl.DafController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 工器具编码一览 控制器
  *
@@ -47,6 +73,9 @@ import com.dayu.daf.core.boot.ctrl.DafController;
 public class ToolInventoryRecordController extends DafController {
 
 	private IToolInventoryRecordService toolInventoryRecordService;
+	private IInventoryDocumentService inventoryDocumentService;
+	private ITechParametersService techParametersService;
+	private IInspectionStandardsService inspectionStandardsService;
 
 	/**
 	 * 详情
@@ -119,8 +148,64 @@ public class ToolInventoryRecordController extends DafController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		for (String id : ids.split(",")) {
+			inventoryDocumentService.delInventoryDocument(Integer.parseInt(id));
+			techParametersService.delTechParameters(Integer.parseInt(id));
+			inspectionStandardsService.delInspectionStandards(Integer.parseInt(id));
+		}
 		return R.status(toolInventoryRecordService.deleteLogic(Func.toLongList(ids)));
 	}
+	/**
+	 * 审核 工器具台账编码一览
+	 */
+	@PostMapping("/auditing")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "更新", notes = "传入ids")
+	public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return this.approve(2,ids);
+	}
 
+	/**
+	 * 驳回 工器具台账编码一览
+	 */
+	@PostMapping("/reject")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "更新", notes = "传入ids")
+	public R reject(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return this.approve(3,ids);
+	}
+
+	/**
+	 * 驳回OR审核 工器具台账编码一览
+	 */
+	public R approve(Integer status, String ids) {
+		List<ToolInventoryRecord> list = new ArrayList<>();
+		for (String id : ids.split(",")) {
+			ToolInventoryRecord toolInventoryRecord = new ToolInventoryRecord();
+			toolInventoryRecord.setId(Long.parseLong(id));
+			toolInventoryRecord.setCheckStatus(status);
+			list.add(toolInventoryRecord);
+		}
+		return R.status(toolInventoryRecordService.updateBatchById(list));
+	}
+
+	/**
+	 * 导出
+	 */
+	@SneakyThrows
+	@GetMapping("export")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "导出", notes = "传入")
+	@ApiLog
+	public void exportUser(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
+		QueryWrapper<ToolInventoryRecord> queryWrapper = Condition.getQueryWrapper(entity, ToolInventoryRecord.class);
+		queryWrapper.lambda().eq(ToolInventoryRecord::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		List<ToolInventoryRecordExcel> list = toolInventoryRecordService.export(queryWrapper);
+		response.setContentType("application/vnd.ms-excel");
+		response.setCharacterEncoding(Charsets.UTF_8.name());
+		String fileName = URLEncoder.encode("工器具台账数据导出", Charsets.UTF_8.name());
+		response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+		EasyExcel.write(response.getOutputStream(), ToolInventoryRecordExcel.class).sheet("工器具台账").doWrite(list);
+	}
 
 }

src/main/java/org/energy/modules/leger/excel/ToolInventoryRecordExcel.java

@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.leger.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * EquipmentLedge model export
+ * @author edwong
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(16)
+public class ToolInventoryRecordExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "设备台账编码")
+	private String eqLedgerCode;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "设备描述")
+	private String deviceDescription;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "KKS编码")
+	private String kksEncoding;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "设备种类")
+	private String eqType;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "资产编码")
+	private String assetCode;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "制造商")
+	private String manufacturer;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "制造商国家")
+	private String manufacturerCountry;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "制造商零件号")
+	private String manufacturerPartNo;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "制造年月")
+	private String manufactureDate;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "制造序列号")
+	private String manufacturingSerialNo;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "型号")
+	private String model;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "大小尺寸")
+	private String sizeAndSize;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "对象重量")
+	private String objectWeight;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "审核状态")
+	private String checkStatusExt;
+
+}

src/main/java/org/energy/modules/leger/mapper/InspectionStandardsMapper.java

@@ -23,4 +23,12 @@ public interface InspectionStandardsMapper extends BaseMapper<InspectionStandard
 	 */
 	List<InspectionStandardsVO> selectInspectionStandardsPage(IPage page, InspectionStandardsVO inspectionStandards);
 
+	/**
+	 * 自定义分页
+	 *
+	 * @param toolsCodeId
+	 * @return
+	 */
+	boolean delInspectionStandards(Integer toolsCodeId);
+
 }

src/main/java/org/energy/modules/leger/mapper/InspectionStandardsMapper.xml

@@ -21,4 +21,7 @@
         select * from l_inspection_standards where is_deleted = 0
     </select>
 
+    <update id="delInspectionStandards" >
+        update l_inspection_standards set is_deleted = 1 where tools_code_id = #{_parameter}
+    </update>
 </mapper>

src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java

@@ -1,10 +1,15 @@
 package org.energy.modules.leger.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.apache.ibatis.annotations.Param;
+import org.energy.modules.leger.entity.EquipmentLedger;
 import org.energy.modules.leger.entity.ToolInventoryRecord;
+import org.energy.modules.leger.excel.EquipmentLedgerExcel;
 import org.energy.modules.leger.vo.ToolInventoryRecordVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
+import org.energy.modules.leger.excel.ToolInventoryRecordExcel;
 
 /**
  * 工器具编码一览 Mapper 接口
@@ -23,4 +28,6 @@ public interface ToolInventoryRecordMapper extends BaseMapper<ToolInventoryRecor
 	 */
 	List<ToolInventoryRecordVO> selectToolInventoryRecordPage(IPage page, ToolInventoryRecordVO toolInventoryRecord);
 
+	List<ToolInventoryRecordExcel> exportData(@Param("ew") Wrapper<ToolInventoryRecord> queryWrapper);
+
 }

src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml

@@ -33,4 +33,16 @@
         select * from l_tool_inventory_record where is_deleted = 0
     </select>
 
+    <select id="exportData" resultType="org.energy.modules.leger.excel.ToolInventoryRecordExcel">
+        SELECT eq_ledger_code,device_description,kks_encoding,eq_type,asset_code,manufacturer,
+               manufacturer_country,manufacturer_part_no,manufacture_date,manufacturing_serial_no,
+               model,size_and_size,object_weight,
+               CASE
+                   WHEN check_status = '1' THEN '审核中'
+                   WHEN check_status = '2' THEN '已审核'
+                   WHEN check_status = '3' THEN '未通过'
+                   ELSE ''
+                   END AS check_status_ext
+        FROM l_tool_inventory_record ${ew.customSqlSegment}
+    </select>
 </mapper>

src/main/java/org/energy/modules/leger/service/IInspectionStandardsService.java

@@ -22,4 +22,12 @@ public interface IInspectionStandardsService extends BaseService<InspectionStand
 	 */
 	IPage<InspectionStandardsVO> selectInspectionStandardsPage(IPage<InspectionStandardsVO> page, InspectionStandardsVO inspectionStandards);
 
+	/**
+	 * 自定义分页
+	 *
+	 * @param toolsCodeId
+	 * @return
+	 */
+	boolean delInspectionStandards(Integer toolsCodeId);
+
 }

src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java

@@ -1,10 +1,16 @@
 package org.energy.modules.leger.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.energy.modules.leger.entity.EquipmentLedger;
 import org.energy.modules.leger.entity.ToolInventoryRecord;
+import org.energy.modules.leger.excel.EquipmentLedgerExcel;
+import org.energy.modules.leger.excel.ToolInventoryRecordExcel;
 import org.energy.modules.leger.vo.ToolInventoryRecordVO;
 import com.dayu.daf.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 工器具编码一览 服务类
  *
@@ -22,4 +28,12 @@ public interface IToolInventoryRecordService extends BaseService<ToolInventoryRe
 	 */
 	IPage<ToolInventoryRecordVO> selectToolInventoryRecordPage(IPage<ToolInventoryRecordVO> page, ToolInventoryRecordVO toolInventoryRecord);
 
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<ToolInventoryRecordExcel> export(Wrapper<ToolInventoryRecord> queryWrapper);
+
 }

src/main/java/org/energy/modules/leger/service/impl/InspectionStandardsServiceImpl.java

@@ -21,5 +21,8 @@ public class InspectionStandardsServiceImpl extends BaseServiceImpl<InspectionSt
 	public IPage<InspectionStandardsVO> selectInspectionStandardsPage(IPage<InspectionStandardsVO> page, InspectionStandardsVO inspectionStandards) {
 		return page.setRecords(baseMapper.selectInspectionStandardsPage(page, inspectionStandards));
 	}
-
+	@Override
+	public boolean delInspectionStandards(Integer toolsCodeId) {
+		return baseMapper.delInspectionStandards(toolsCodeId);
+	}
 }

src/main/java/org/energy/modules/leger/service/impl/ToolInventoryRecordServiceImpl.java

@@ -1,12 +1,18 @@
 package org.energy.modules.leger.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.energy.modules.leger.entity.EquipmentLedger;
 import org.energy.modules.leger.entity.ToolInventoryRecord;
+import org.energy.modules.leger.excel.EquipmentLedgerExcel;
 import org.energy.modules.leger.vo.ToolInventoryRecordVO;
 import org.energy.modules.leger.mapper.ToolInventoryRecordMapper;
 import org.energy.modules.leger.service.IToolInventoryRecordService;
 import com.dayu.daf.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.leger.excel.ToolInventoryRecordExcel;
+
+import java.util.List;
 
 /**
  * 工器具编码一览 服务实现类
@@ -22,4 +28,10 @@ public class ToolInventoryRecordServiceImpl extends BaseServiceImpl<ToolInventor
 		return page.setRecords(baseMapper.selectToolInventoryRecordPage(page, toolInventoryRecord));
 	}
 
+	@Override
+	public List<ToolInventoryRecordExcel> export(Wrapper<ToolInventoryRecord> queryWrapper) {
+		List<ToolInventoryRecordExcel> list = baseMapper.exportData(queryWrapper);
+		return list;
+	}
+
 }