Merge branch 'develop_master' into develop_migration

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -250,8 +250,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
     @Override
     public IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize) {
         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);
         IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
         System.out.println("总条数"+userIPage.getTotal());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -183,6 +183,67 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 
+    @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询")
+    @GetMapping("/getSarStandardsInfoPageBak")
+    //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")
+    public ResponseMessage<PageInfo<SarStandardsInfo>> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception {
+//        int isNull = -1;
+//        if (null != page.getNowOrderBy()) {
+//            switch (page.getNowOrderBy()) {
+//                case 1:
+//                    page.setOrderByA("issueTime");//发布日期
+//                    break;
+//                case 2:
+//                    page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期
+//                    break;
+//                case 3:
+//                    page.setOrderByA("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期
+//                    break;
+//                case 4:
+//                    page.setOrderByA("SAR_STANDARDS_INFO.text_status");//文本状态
+//                    break;
+//                case 5:
+//                    page.setOrderByA("paixu");
+//                    break;
+//                case 6:
+//                    page.setOrderByA("SAR_STAND_ATTR_INFO.SSRQ");
+//                    break;
+//                default:
+//                    page.setNowOrder(null);
+//                    break;
+//            }
+//            if (null != page.getNowOrder()) {
+//                switch (page.getNowOrder()) {
+//                    case 1:
+//                        page.setOrder1("desc");
+//                        break;
+//                    case 2:
+//                        page.setOrder1("asc");
+//                    default:
+//                        page.setOrder1(null);
+//                        break;
+//                }
+//            }
+//        }
+//
+//
+//        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
+//            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
+//            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList);
+//            if (StringUtils.isNotBlank(advanceStr)) {
+//                page.setAdvanceSearchStr(advanceStr);
+//            } else {
+//                page.setAdvanceSearchStr(null);
+//            }
+//        }
+//
+//        if(page.getUserId() == null || page.getUserId().equals("")){
+//            page.setUserId(LoginUserUtil.getUserId());
+//        }
+        List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPageBak(page);
+        return Result.success(getPageInfo(page.getPager(), rows));
+    }
+
     @ApiOperation(value = "|SarStandardsInfoEO|新增")
     @PostMapping("/addarStandardsInfo")
     //401问题2021-03-31暂时注释掉 liuhuiwen

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -764,7 +764,8 @@
         SAR_STANDARDS_INFO.valid_flag,
         SAR_STANDARDS_INFO.creation_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
         <include refid="SarStandardsInfo_in_left"/>
         ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a