diff --git a/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java b/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java index b223837..32d97bd 100644 --- a/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java +++ b/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java @@ -40,7 +40,7 @@ public class InspectionObject extends BaseEntity { * 对象名称 */ @ApiModelProperty(value = "对象名称") - private Integer objectName; + private String objectName; /** * 场站 */ @@ -61,11 +61,18 @@ public class InspectionObject extends BaseEntity { */ @ApiModelProperty(value = "对象区域") private String objectArea; + + /** + * KKS编号 + */ + @ApiModelProperty(value = "KKS编号") + private String kksNo; + /** * KKS编号 */ - @ApiModelProperty(value = "KKS编号") - private String kksNo; + @ApiModelProperty(value = "工器具编号") + private String toolsCodeId; /** * 取消原因 */ diff --git a/src/main/java/org/energy/modules/inspection/excel/InspectionObjectExcel.java b/src/main/java/org/energy/modules/inspection/excel/InspectionObjectExcel.java index a6830a0..b4f2129 100644 --- a/src/main/java/org/energy/modules/inspection/excel/InspectionObjectExcel.java +++ b/src/main/java/org/energy/modules/inspection/excel/InspectionObjectExcel.java @@ -43,6 +43,10 @@ public class InspectionObjectExcel implements Serializable { @ExcelProperty(value = "KKS编号") private String kksNo; + @ColumnWidth(15) + @ExcelProperty(value = "工器具台账编码") + private String toolsCodeId; + @ColumnWidth(15) @ExcelProperty(value = "取消原因") private String cancelReason; diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml index 7aa1e8d..f14bfa2 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml @@ -18,6 +18,7 @@ + @@ -58,6 +59,7 @@ THEN '巡检对象02' ELSE '' END AS object_name_ext + , tools_code_id FROM i_inspection_object ${ew.customSqlSegment} diff --git a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java index d19206e..15f3528 100644 --- a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java +++ b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java @@ -33,6 +33,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.EquipmentLedger; import org.energy.modules.leger.entity.TechParameters; import org.energy.modules.leger.excel.ToolInventoryRecordExcel; import org.energy.modules.leger.service.*; @@ -221,14 +222,26 @@ public class ToolInventoryRecordController extends DafController { EasyExcel.write(response.getOutputStream(), ToolInventoryRecordExcel.class).sheet("工器具台账").doWrite(list); } -// /** -// * 删除 检验标准一览 -// */ -// @GetMapping("/del") -// @ApiOperationSupport(order = 9) -// @ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId") -// public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer eqLedgerId) { -// return R.status(toolInventoryRecordService.delTechParameters(eqLedgerId)); -// } + /** + * 获取对象编号 + */ + @GetMapping("/getToolsCodeIdList") + @ApiOperationSupport(order = 11) + @ApiOperation(value = "获取工器具编码", notes = "获取工器具编码") + public R> getToolsCodeIdList() { + List kksList = toolInventoryRecordService.getToolsCodeIdList(); + return R.data(kksList); + } + + /** + * 获取对象编号 + */ + @GetMapping("/getDetailList") + @ApiOperationSupport(order = 12) + @ApiOperation(value = "获取工器具信息", notes = "获取工器具信息") + public R getDetailList(String toolsCodeId) { + ToolInventoryRecord DetailList = toolInventoryRecordService.getDetailList("'" + toolsCodeId + "'"); + return R.data(DetailList); + } } diff --git a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java index d82dbb4..5e21bc8 100644 --- a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java @@ -30,4 +30,13 @@ public interface ToolInventoryRecordMapper extends BaseMapper exportData(@Param("ew") Wrapper queryWrapper); + /** + * 获取kks编号 + */ + List getToolsCodeIdList(); + /** + * 获取kks的信息 + */ + ToolInventoryRecord getDetailList(String toolsCodeId); + } diff --git a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml index cb0447f..60a7800 100644 --- a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml @@ -66,4 +66,12 @@ END AS check_status_ext FROM l_tool_inventory_record ${ew.customSqlSegment} + + + + diff --git a/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java b/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java index eb44cac..1b1b343 100644 --- a/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java +++ b/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java @@ -36,4 +36,13 @@ public interface IToolInventoryRecordService extends BaseService export(Wrapper queryWrapper); + /** + * 获取路线编号 + */ + List getToolsCodeIdList(); + /** + * 获取路线的信息 + */ + ToolInventoryRecord getDetailList(String toolsCodeId); + } diff --git a/src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java b/src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java index b1459e4..69afb83 100644 --- a/src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java +++ b/src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java @@ -26,4 +26,5 @@ public class TechParametersServiceImpl extends BaseServiceImpl getToolsCodeIdList() { + List list = baseMapper.getToolsCodeIdList(); + return list; + } + + @Override + public ToolInventoryRecord getDetailList(String toolsCodeId) { + ToolInventoryRecord DetailList = baseMapper.getDetailList(toolsCodeId); + return DetailList; + } + } diff --git a/src/main/java/org/energy/modules/smart/entity/WorkPermit.java b/src/main/java/org/energy/modules/smart/entity/WorkPermit.java index 4bfbfbb..43b03f6 100644 --- a/src/main/java/org/energy/modules/smart/entity/WorkPermit.java +++ b/src/main/java/org/energy/modules/smart/entity/WorkPermit.java @@ -5,6 +5,7 @@ import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.EqualsAndHashCode; @@ -126,6 +127,7 @@ public class WorkPermit extends BaseEntity { /** * 是否延期 */ + @JsonSerialize(nullsUsing = NullSerializer.class) @ApiModelProperty(value = "是否延期") private Integer isExtended; /** @@ -141,6 +143,7 @@ public class WorkPermit extends BaseEntity { /** * 是否变更 */ + @JsonSerialize(nullsUsing = NullSerializer.class) @ApiModelProperty(value = "是否变更") private Integer ischanged; /** diff --git a/src/main/java/org/energy/modules/spares/controller/WarehouseController.java b/src/main/java/org/energy/modules/spares/controller/WarehouseController.java index c34bf84..40464c1 100644 --- a/src/main/java/org/energy/modules/spares/controller/WarehouseController.java +++ b/src/main/java/org/energy/modules/spares/controller/WarehouseController.java @@ -140,6 +140,26 @@ public class WarehouseController extends DafController { @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入warehouse") public R submit(@Valid @RequestBody Warehouse warehouse) { + if (warehouse.getId() == null) { + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().select(Warehouse::getCode) + .eq(Warehouse::getType, warehouse.getType()) + .eq(Warehouse::getIsDeleted, DafConstant.DB_NOT_DELETED) + .orderByDesc(Warehouse::getCode) + .last("LIMIT 1"); + String code = ""; + Warehouse warehouseSelect = warehouseService.getOne(qw); + if (warehouseSelect != null) { + String maxCode = warehouseSelect.getCode(); + if ("9999".equals(maxCode)) { + return R.fail("操作失败，编号已越位"); + } + code = "CK" + warehouse.getType() + DataUtils.incrementLast(maxCode, 4); + } else { + code = "CK" + warehouse.getType() + "0001"; + } + warehouse.setCode(code); + } return R.status(warehouseService.saveOrUpdate(warehouse)); } diff --git a/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java b/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java index 5c2f52c..fcbcb9f 100644 --- a/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java +++ b/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java @@ -65,12 +65,16 @@ public class ManufacturerInfo extends BaseEntity { */ @ApiModelProperty(value = "经营范围") private String businessScope; - /** - * 执行标准 - */ + /** + * 审核状态 + */ @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "执行标准") + @ApiModelProperty(value = "审核状态") private Integer approvalStatus; - + /** + * 执行标准 + */ + @ApiModelProperty(value = "执行标准") + private String executiveStandards; } diff --git a/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java b/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java index 753abff..2a18d79 100644 --- a/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java +++ b/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java @@ -66,10 +66,10 @@ public class SupplierInfo extends BaseEntity { @ApiModelProperty(value = "经营范围") private String businessScope; /** - * 执行标准 + * 审核状态 */ @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "执行标准") + @ApiModelProperty(value = "审核状态") private Integer approvalStatus; /** * 付款条约 @@ -81,6 +81,11 @@ public class SupplierInfo extends BaseEntity { */ @ApiModelProperty(value = "价格条款") private String priceTerms; + /** + * 执行标准 + */ + @ApiModelProperty(value = "执行标准") + private String executiveStandards; } diff --git a/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java b/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java index 51ee610..b62a737 100644 --- a/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java +++ b/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java @@ -85,6 +85,14 @@ public class ManufacturerInfoExcel implements Serializable { @JsonSerialize(nullsUsing = NullSerializer.class) @ColumnWidth(20) @ExcelProperty(value = "执行标准") + private String executiveStandards; + + /** + * 审核状态 + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ColumnWidth(20) + @ExcelProperty(value = "审核状态") private String approvalStatus; } diff --git a/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java b/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java index 4c00fa6..8b062a3 100644 --- a/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java +++ b/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java @@ -82,7 +82,7 @@ public class SupplierInfoExcel implements Serializable { @JsonSerialize(nullsUsing = NullSerializer.class) @ColumnWidth(20) @ExcelProperty(value = "执行标准") - private String approvalStatus; + private String executiveStandards; /** * 付款条约 */ @@ -96,4 +96,12 @@ public class SupplierInfoExcel implements Serializable { @ExcelProperty(value = "价格条款") private String priceTerms; + /** + * 审核状态 + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ColumnWidth(20) + @ExcelProperty(value = "审核状态") + private String approvalStatus; + } diff --git a/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml b/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml index 0790f0e..ed03a5c 100644 --- a/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml @@ -16,6 +16,7 @@ + @@ -36,7 +37,8 @@ a.contact_number, a.email, a.business_scope, - a.approval_status + a.approval_status, + a.executive_standards from spt_manufacturer_info a where a.is_deleted = 0 diff --git a/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml b/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml index a480ce3..7daf699 100644 --- a/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml @@ -19,6 +19,7 @@ + @@ -39,7 +40,8 @@ a.business_scope, a.approval_status, a.payment_terms, - a.price_terms + a.price_terms, + a.executive_standards from spt_supplier_info a where a.is_deleted = 0 diff --git a/src/main/java/org/energy/modules/system/util/DataUtils.java b/src/main/java/org/energy/modules/system/util/DataUtils.java index 2d1babd..2e49591 100644 --- a/src/main/java/org/energy/modules/system/util/DataUtils.java +++ b/src/main/java/org/energy/modules/system/util/DataUtils.java @@ -68,4 +68,21 @@ public class DataUtils { // Add more type conversions as needed return value; } + + /** + * 将字符串末尾的latterIndex位数字加一并格式化成latterIndex位数 + * @param str + * @return + */ + public static String incrementLast(String str, int latterIndex) { + // 获取字符串末尾的latterIndex位字符 + String lastFour = str.substring(Math.max(0, str.length() - latterIndex)); + // 将末尾字符转换为整数 + int number = Integer.parseInt(lastFour); + // 整数加一 + number++; + // 格式化整数为latterIndex位数的字符串 + String result = String.format("%0" + latterIndex + "d", number); + return result; + } }