diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java index bdb77ba..d431821 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java @@ -30,7 +30,7 @@ public interface MaDevQcMapper { /** * 删除装备质检 - * @param id + * @param maId * @return */ int deleteDevQcById(Integer maId); @@ -47,4 +47,6 @@ public interface MaDevQcMapper { List getQcList(Long maId); MaDevQc getQcListByOne(Long maId); + + Integer updateById(MaDevQc maDevQc); } 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 257abb4..687a937 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 @@ -520,7 +520,17 @@ public class DevInfoServiceImpl implements DevInfoService { if (!CollectionUtils.isEmpty(devInfo.getDevInfoProperties())) { devInfoMapper.insertDevInfoProperties(devInfo.getMaId(), devInfo.getDevInfoProperties()); } + List tableList = devInfo.getTableList(); + String identifyCode = tableList.get(0).getIdentifyCode(); + devInfo.setIdentifyCode(identifyCode); int i = devInfoMapper.updateDevInfo(devInfo); + + Integer id = tableList.get(0).getId(); + if (id != null) { + MaDevQc maDevQc = new MaDevQc(); + maDevQc.setId(id).setQcUser(tableList.get(0).getCheckMan()).setQcTime(tableList.get(0).getCheckDate()).setNextCheckTime(tableList.get(0).getNextCheckDate()); + maDevQcMapper.updateById(maDevQc); + } if (i > 0) { BmFileInfo bmFileInfo = new BmFileInfo() .setTaskType(MaterialConstants.MATERIAL_FILE_TYPE_CODE) 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 004884f..4a4ada5 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 @@ -372,6 +372,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update ma_dev_info code = #{code}, + identifyCode = #{identify_code}, device_name = #{deviceName}, device_weight = #{deviceWeight}, device_count = #{deviceCount}, diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml index 343e554..c315864 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml @@ -4,6 +4,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + update ma_dev_qc + + qc_user = #{qcUser}, + qc_time = #{qcTime}, + next_check_time = #{nextCheckTime}, + + where id = #{id} + delete from ma_dev_qc where ma_id = #{maId} @@ -123,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"