From 2a4f714d9cabc6c401df845462fd926d67950219 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Mon, 15 Sep 2025 23:17:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD-=20=E5=9C=A8=20De?= =?UTF-8?q?vInfo=20=E6=A8=A1=E5=9E=8B=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E8=B4=AD=E7=BD=AE=E8=B4=B9=E7=94=A8=E6=9D=A5=E6=BA=90=E3=80=81?= =?UTF-8?q?=E4=B8=93=E4=B8=9A=E3=80=81=E4=B8=BB=E5=B7=A5=E5=BA=8F=E3=80=81?= =?UTF-8?q?=E5=AD=90=E5=B7=A5=E5=BA=8F=E3=80=81=E6=A3=80=E9=AA=8C=E6=9C=89?= =?UTF-8?q?=E6=95=88=E7=8A=B6=E6=80=81=E7=AD=89=E5=AD=97=E6=AE=B5=20-=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=20DevInfoMapper.xml=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=20SQL=20=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2-=20=E4=BF=AE=E6=94=B9=E4=BA=86=20DevInfoServ?= =?UTF-8?q?iceImpl=20=E4=B8=AD=E7=9A=84=E8=AE=BE=E5=A4=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E4=BA=86=E6=A0=B9=E6=8D=AE=E5=85=AC=E5=8F=B8=20ID=20?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20-=20=E5=9C=A8?= =?UTF-8?q?=20DevInfoVo=20=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BA=86=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=E7=BA=A7=E5=88=AB=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=B1=95=E7=A4=BA=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=AD=89=E7=BA=A7=20-=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BA=86=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AF=B9?= =?UTF-8?q?=E9=9D=9E=E6=95=B0=E5=AD=97=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/device/domain/DevInfo.java | 14 ++++++++++++++ .../material/device/domain/vo/DevInfoVo.java | 4 +++- .../service/impl/DevInfoServiceImpl.java | 6 +++++- .../mapper/material/device/DevInfoMapper.xml | 19 ++++++++++++++++--- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java index 9ac564c..6cee5bf 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java @@ -366,6 +366,20 @@ public class DevInfo extends BaseEntity { @ApiModelProperty(value = "资产原值", required = true) private BigDecimal assetValue; + @ApiModelProperty(value = "购置费用来源", required = true) private String purchaseSource; + + @ApiModelProperty(value = "专业") + private String profession; + + @ApiModelProperty(value = "主工序") + private String mainProcess; + + @ApiModelProperty(value = "子工序") + private String subProcess; + + @ApiModelProperty(value = "检验有效状态") + private String verifyStatus; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java index 1f4fdd3..f71b250 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java @@ -174,11 +174,13 @@ public class DevInfoVo extends DevInfo { @ApiModelProperty(value = "订单金额") private BigDecimal cost; - private String devicenewName; + private String devicenewName; private String deviceId; private String deviceTypeName; + @ApiModelProperty(value = "设备类型级别") + private Integer typeLevel; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index 053a90e..d00d15b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.material.device.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.PhoneUtil; import com.bonus.common.biz.constant.MaterialConstants; @@ -712,7 +713,7 @@ public class DevInfoServiceImpl implements DevInfoService { */ @Override public List selectDevInfoLists(DevInfoVo devInfo) { - devInfo.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); + //devInfo.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); List list = devInfoMapper.selectDevInfoLists(devInfo); if (!CollectionUtils.isEmpty(list)) { for (DevInfoVo infoVo : list) { @@ -1336,6 +1337,9 @@ public class DevInfoServiceImpl implements DevInfoService { String taskNum = devInfoMapper.selectTaskNumByMonth(nowDate); if (StringUtils.isNotBlank(taskNum)) { // 将字符串转换为整数 + if (!NumberUtil.isNumber(taskNum)) { + return nowDate + "0001"; + } int num = Integer.parseInt(taskNum); // 执行加一操作 num++; diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 213d2e9..86a85c1 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.ma_id as maId, d.code as code, d.identify_code as identifyCode, + d.day_lease_price as dayLeasePrice, d.device_name as deviceName, d.device_weight as deviceWeight, d.device_count as deviceCount, @@ -67,7 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.production_date as productionDate, d.working_hours as workingHours, d.serial_number as serialNumber, - mt4.lease_price as dayLeasePrice, d.person as person, d.person_phone as personPhone, d.create_time as createTime, @@ -263,6 +263,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.update_time as updateTime, d.is_zone as isZone, d.zone_id as zoneId, + d.profession as profession, + d.main_process as mainProcess, + d.sub_process as subProcess, + mt4.level as typeLevel, CASE WHEN check_date IS NULL THEN '未设置检验日期' WHEN check_date > CURDATE() THEN '已过期' @@ -331,6 +335,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" check_cycle, is_zone, zone_id, + day_lease_price, + profession, + main_process, + sub_process, #{deviceName}, @@ -374,6 +382,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{checkCycle}, #{isZone}, #{zoneId}, + #{dayLeasePrice}, + #{profession}, + #{mainProcess}, + #{subProcess}, @@ -491,12 +503,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + update ma_dev_info set ma_status = #{maStatus} where ma_id = #{maId} and is_active = 1 + update ma_dev_info set is_qc = 1 where ma_id = #{maId} and is_active = 1 + update ma_dev_info set is_safe_book = 1 where ma_id = #{maId} and is_active = 1 @@ -555,7 +570,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and d.area_id = #{areaId} and d.brand = #{brand} and d.model_name like concat('%', #{modelName}, '%') - and d.own_co = #{companyId} and d.update_time between #{startTime} and #{endTime} @@ -569,7 +583,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" or locate(#{keyWord},d.description) > 0 ) - and d.own_co = #{companyId} and d.is_active = '1' ORDER BY d.create_time desc