diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index 282f55ab..cd3f6a0a 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -3,6 +3,7 @@ package com.lz.modules.app.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.lz.common.utils.NumberUtil; import com.lz.common.utils.R; import com.lz.modules.app.dto.ApprovalDto; import com.lz.modules.app.dto.RecordDetailDto; @@ -15,6 +16,8 @@ import com.lz.modules.app.resp.Step; import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsStaffRelateService; import com.lz.modules.app.service.StaffService; +import com.lz.modules.equipment.entity.EquipmentInfo; +import com.lz.modules.equipment.service.IEquipmentInfoService; import com.lz.modules.flow.dao.StaffRoleMapper; import com.lz.modules.flow.entity.StaffRole; import com.lz.modules.flow.model.FlowModel; @@ -65,6 +68,10 @@ public class TestController { @Autowired private RecordAuthService recordAuthService; + + @Autowired + private IEquipmentInfoService equipmentInfoService; + @RequestMapping("/test/xx") public void test(){ ResultRecord resultRecord = new ResultRecord(); @@ -325,7 +332,15 @@ public class TestController { //http://localhost:8080/lz_management/test/equpinfo @RequestMapping("/test/equpinfo") public R equpinfo() { + List equipmentInfos = equipmentInfoService.selectAll(); + for(EquipmentInfo equipmentInfo : equipmentInfos){ + DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectByStaffId(equipmentInfo.getUserId()); + if(departmentsStaffRelateEntity !=null){ + equipmentInfo.setDepartId(NumberUtil.objToLongDefault(departmentsStaffRelateEntity.getDepartmentId(),-1)); + } + equipmentInfoService.updateCoverEquipmentInfoById(equipmentInfo); + } return null; } diff --git a/src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java b/src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java index 1100e4d3..357546a9 100644 --- a/src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java +++ b/src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java @@ -58,4 +58,6 @@ public interface EquipmentInfoMapper extends BaseMapper { int updateCoverEquipmentInfoByTypeId(@Param("id") Long id, @Param("type") String type); int updateCoverEquipmentInfoByBrandId(@Param("id") Long id, @Param("brand") String brand); int updateCoverEquipmentInfoBySpecsId(@Param("id") Long id, @Param("specs") String specs); + + List selectAll(); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/equipment/service/IEquipmentInfoService.java b/src/main/java/com/lz/modules/equipment/service/IEquipmentInfoService.java index 8642a129..67a82d4b 100644 --- a/src/main/java/com/lz/modules/equipment/service/IEquipmentInfoService.java +++ b/src/main/java/com/lz/modules/equipment/service/IEquipmentInfoService.java @@ -67,4 +67,6 @@ public interface IEquipmentInfoService extends IService { int updateCoverEquipmentInfoByBrandId(Long id, String brand); int updateCoverEquipmentInfoBySpecsId(Long id, String specs); + + List selectAll(); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java index c93bec3a..7834f552 100644 --- a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java +++ b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java @@ -323,4 +323,9 @@ public class EquipmentInfoServiceImpl extends ServiceImpl selectAll() { + return equipmentInfoMapper.selectAll(); + } } diff --git a/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml index f2de8b1c..e5735a4e 100644 --- a/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml +++ b/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml @@ -309,5 +309,12 @@ update equipment_info set spec_type = #{specs} where specs_id=#{id} and is_delete=0 + + + + +