FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标准法规清单-选择标准法规按钮无法勾选bug修复 && 流程查询生产线初步修改

Browse Source
This commit is contained in:
yuezhihang
2021-11-01 13:59:32 +08:00
parent 4b1f6503e6
commit e4c5ae815f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+3 -2
View File
@@ -250,8 +250,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
@Override @Override
public IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize) { public IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize) {
QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>(); QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","s.uName"); wrapper.select("product_line","s.user_id as projectManager","s.NAME AS uName");
wrapper.last("inner join ts_user s on s.USID = sar_stand_project_library.project_manager"); wrapper.last("inner join sar_stand_project_team s on s.project_code = sar_stand_project_library.project_number" +
" and sar_stand_project_library.product_line IS not NULL");
Page<SarStandProjectLibrary> page = new Page<>(current, pageSize); Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
System.out.println("总条数"+userIPage.getTotal()); System.out.println("总条数"+userIPage.getTotal());
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+2 -1
View File
@@ -764,7 +764,8 @@
SAR_STANDARDS_INFO.valid_flag, SAR_STANDARDS_INFO.valid_flag,
SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.creation_time,
SAR_STANDARDS_INFO.modify_time, SAR_STANDARDS_INFO.modify_time,
SAR_STANDARDS_INFO.STAND_SYSTEM SAR_STANDARDS_INFO.STAND_SYSTEM,
SAR_STANDARDS_INFO.IS_RELATE_ACCESS
from SAR_STANDARDS_INFO from SAR_STANDARDS_INFO
<include refid="SarStandardsInfo_in_left"/> <include refid="SarStandardsInfo_in_left"/>
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a