WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'fix_bug_first_stage' 到 'master'

Browse Source 
Fix bug first stage

查看合并请求 laws-nio/laws-weilai!116
This commit is contained in:
李雪涛
2022-07-31 10:43:00 +08:00
parent 544fd76cc5 bf7ec3b3f7
commit 4d0d508893
5 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+1
View File
@@ -1501,6 +1501,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
dummyInventoryInfoEO.setShi4Yong4Fan4Wei2(collect.get(0).getShi4Yong4Fan4Wei2());
dummyInventoryInfoEO.setImplementTime(collect.get(0).getImplementTime());
dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1());
dummyInventoryInfoEO.setBussDocumentLibraryId(collect.get(0).getId());
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+12
View File
@@ -3630,6 +3630,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
queryWrapper.in("id",Arrays.asList(projectLawsInventoryEO.getIds().split(",")));
}
queryWrapper.orderByDesc("create_time");
int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
&& isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())){
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
queryWrapper.and(q ->{
q.eq("regulation_owner_id",currentUser.getId()).
or().eq("homologation_engineer_id",currentUser.getId());
});
}
//导出的数据
dataList = this.list(queryWrapper);
@@ -4621,6 +4632,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryEO.setRegion(collect.get(0).getRegion());//适用地区
projectLawsInventoryEO.setImplementTime(collect.get(0).getImplementTime());//在产车实施日期
projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1());//新车实施日期
projectLawsInventoryEO.setStandId(collect.get(0).getId());//新车实施日期
}
}