wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management

Browse Source
This commit is contained in:
DirectionOfMind 2021-01-05 18:08:30 +08:00
commit 46482617c5
5 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/lz/modules/app/controller/TestController.java
View File

@ -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<EquipmentInfo> 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;
}

2
src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java
View File

@ -58,4 +58,6 @@ public interface EquipmentInfoMapper extends BaseMapper<EquipmentInfo> {
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<EquipmentInfo> selectAll();
}

2
src/main/java/com/lz/modules/equipment/service/IEquipmentInfoService.java
View File

@ -67,4 +67,6 @@ public interface IEquipmentInfoService extends IService<EquipmentInfo> {
int updateCoverEquipmentInfoByBrandId(Long id, String brand);
int updateCoverEquipmentInfoBySpecsId(Long id, String specs);
List<EquipmentInfo> selectAll();
}

5
src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java
View File

@ -332,4 +332,9 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
public int updateCoverEquipmentInfoBySpecsId(Long id, String specs){
return equipmentInfoMapper.updateCoverEquipmentInfoBySpecsId(id, specs);
}
@Override
public List<EquipmentInfo> selectAll() {
return equipmentInfoMapper.selectAll();
}
}

7
src/main/resources/mapper/equipment/EquipmentInfoMapper.xml
View File

@ -309,5 +309,12 @@
update equipment_info set spec_type = #{specs} where specs_id=#{id} and is_delete=0
</update>
<select id="selectAll" resultType="com.lz.modules.equipment.entity.EquipmentInfo">
select * from equipment_info
</select>
</mapper>