From 01568460ca39c303b54a1e0311d635ff5fb2b0ad Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 13 Nov 2021 22:37:24 +0800 Subject: [PATCH] feat: There is no way the, --- .../SarBussionessStandController.java | 61 ++++---- .../impl/SarBussionessStandServiceImpl.java | 35 +++++ .../SarLawsStandInfoController.java | 86 +++++------ .../entity/SarLawsStandInfoPage.java | 4 +- .../impl/SarLawsStandInfoServiceImpl.java | 35 +++++ .../SarStandardsInfoController.java | 111 +++++--------- .../entity/SarBussionessStandEOPage.java | 36 +++++ .../entity/SarStandardsInfoEOPage.java | 4 +- .../impl/SarStandardsInfoServiceImpl.java | 42 ++++++ .../SarBussionessStandMapper.xml | 18 ++- .../SarLawsStandInfoMapper.xml | 123 +++++++--------- .../SarStandardsInfoMapper.xml | 138 ++++++++---------- 12 files changed, 380 insertions(+), 313 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index fb08f978..3270c493 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -242,37 +242,42 @@ public class SarBussionessStandController extends BaseController rows = sarBussionessStandEOService.getSarBussionStandPage(page); return Result.success(getPageInfo(page.getPager(), rows)); -// if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { -// List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); -// String advanceStr = SarAdvanceSearchUtil.createSql(searchList); -// if (StringUtils.isNotBlank(advanceStr)) { -// page.setAdvanceSearchStr(advanceStr); -// } else { -// page.setAdvanceSearchStr(null); -// } -// } -// page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time desc nulls last,SAR_BUSSIONESS_STAND.id"); -// List getMenuIdList = tsUserService.getResourceId(new TsResource()); -//// List getMenuIdList = iTsResourceService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId()); -// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { -// page.setMenuRoleList(getMenuIdList); -// } else { -// page.setMenuRoleList(null); -// } -// List ids = iTsResourceService.getChildMenuList(page.getMenuId()); -// if (ids != null && !ids.isEmpty()) { -// page.setMenuAllChildrenIdList(ids); -// } -// List rows = sarBussionessStandEOService.getSarBussionStandPage(page); -// return Result.success(getPageInfo(page.getPager(), rows)); + } + + private void nowOrderFunc(SarBussionessStandEOPage page) { + switch (page.getNowOrderBy()) { + case 1: + page.setOrderByA("tmp_tb.issue_time");//发布日期 + break; + case 2: + page.setOrderByA("tmp_tb.put_time");//实施日期 + break; + case 3: + page.setOrderByA("tmp_tb.standStatusShow");//文本状态 + break; + default: + page.setNowOrder(null); + break; + } + if (null != page.getNowOrder()) { + switch (page.getNowOrder()) { + case 1: + page.setOrder1("desc"); + break; + case 2: + page.setOrder1("asc"); + break; + default: + page.setOrder1(null); + break; + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index f216455c..c68dc1d7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -278,11 +278,46 @@ public class SarBussionessStandServiceImpl extends ServiceImpl getList = sarBussionessStandEODao.getSarBussionessStand(page); attrInfoShowExport(getList); return getList; } + private void nowOrderFunc(SarBussionessStandEOPage page) { + switch (page.getNowOrderBy()) { + case 1: + page.setOrderByA("tmp_tb.issue_time");//发布日期 + break; + case 2: + page.setOrderByA("tmp_tb.put_time");//实施日期 + break; + case 3: + page.setOrderByA("tmp_tb.standStatusShow");//文本状态 + break; + default: + page.setNowOrder(null); + break; + } + if (null != page.getNowOrder()) { + switch (page.getNowOrder()) { + case 1: + page.setOrder1("desc"); + break; + case 2: + page.setOrder1("asc"); + break; + default: + page.setOrder1(null); + break; + } + } + } + public void attrInfoShow (List sarlist) throws Exception { for(SarBussionessStand row : sarlist){ attrInfoDetails(row); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java index d3aefe07..bdb440df 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java @@ -77,22 +77,13 @@ public class SarLawsStandInfoController extends BaseController if (null != page.getNowOrderBy()) { switch (page.getNowOrderBy()) { case 1: - page.setOrderByA("a.issueTime");//发布日期 + page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期 break; case 2: - page.setOrderByA("SAR_LAWS_ATTR_INFO.XCXSSRQLAWS");//新车型实施日期 + page.setOrderByA("XCXSSRQLAWS"); break; case 3: - page.setOrderByA("SAR_LAWS_ATTR_INFO.ZCXSSRQLAWS");//在产车实施日期 - break; - case 4: - page.setOrderByA("a.LAWS_TEXT_STATE");//文本状态 - break; - case 5: - page.setOrderByA("paixu"); - break; - case 6: - page.setOrderByA("SAR_LAWS_ATTR_INFO.SSRQ"); + page.setOrderByA("standStatusShow");//文本状态 break; default: page.setNowOrder(null); @@ -105,6 +96,7 @@ public class SarLawsStandInfoController extends BaseController break; case 2: page.setOrder1("asc"); + break; default: page.setOrder1(null); break; @@ -131,44 +123,10 @@ public class SarLawsStandInfoController extends BaseController @GetMapping("/pageLaws") /*@RequiresPermissions("lawss:sarLawsInfo:page")*/ public ResponseMessage> pageLaws(SarLawsStandInfoPage page) throws Exception { - if (null != page.getNowOrderBy()) { - switch (page.getNowOrderBy()) { - case 1: - page.setOrderByA("a.issueTime");//发布日期 - break; - case 2: - page.setOrderByA("SAR_LAWS_ATTR_INFO.XCXSSRQLAWS");//新车型实施日期 - break; - case 3: - page.setOrderByA("SAR_LAWS_ATTR_INFO.ZCXSSRQLAWS");//在产车实施日期 - break; - case 4: - page.setOrderByA("a.LAWS_TEXT_STATE");//文本状态 - break; - case 5: - page.setOrderByA("paixu"); - break; - case 6: - page.setOrderByA("SAR_LAWS_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 (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } if (com.adc.da.util.utils.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); @@ -184,6 +142,36 @@ public class SarLawsStandInfoController extends BaseController return Result.success(getPageInfo(page.getPager(), rows)); } + private void nowOrderFunc(SarLawsStandInfoPage page) { + switch (page.getNowOrderBy()) { + case 1: + page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期 + break; + case 2: + page.setOrderByA("XCXSSRQLAWS");//实施日期 + break; + case 3: + page.setOrderByA("standStatusShow");//文本状态 + break; + default: + page.setNowOrder(null); + break; + } + if (null != page.getNowOrder()) { + switch (page.getNowOrder()) { + case 1: + page.setOrder1("desc"); + break; + case 2: + page.setOrder1("asc"); + break; + default: + page.setOrder1(null); + break; + } + } + } + @ApiOperation(value = "|SarLawsStandInfo|详情") @GetMapping("/getStandInfoById") //@RequiresPermissions("lawss:sarStandardsInfo:get") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java index 897dbaad..c75c082d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java @@ -268,10 +268,10 @@ public class SarLawsStandInfoPage extends BasePage { @TableField(exist = false) private Integer nowOrderBy; @TableField(exist = false) - private String orderByA = "a.issue_time"; + private String orderByA = ""; @TableField(exist = false) private String orderBy1 = "SAR_LAWS_STAND_INFO.issue_time"; @TableField(exist = false) - private String order1 = "desc"; + private String order1 = ""; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 0033955a..72a57edb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -436,11 +436,46 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl rows = this.baseMapper.getSarStandardsExportInfo(page); attrInfoShowExport(rows); return rows; } + private void nowOrderFunc(SarLawsStandInfoPage page) { + switch (page.getNowOrderBy()) { + case 1: + page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期 + break; + case 2: + page.setOrderByA("XCXSSRQLAWS");//实施日期 + break; + case 3: + page.setOrderByA("standStatusShow");//文本状态 + break; + default: + page.setNowOrder(null); + break; + } + if (null != page.getNowOrder()) { + switch (page.getNowOrder()) { + case 1: + page.setOrder1("desc"); + break; + case 2: + page.setOrder1("asc"); + break; + default: + page.setOrder1(null); + break; + } + } + } + public void attrInfoShow (List sarlist) throws Exception { for(SarLawsStandInfo row : sarlist){ attrInfoDetails(row); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index ebd67e12..d6e5d118 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -92,46 +92,10 @@ public class SarStandardsInfoController extends BaseController @GetMapping("/getSarStandardsInfoPage") //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") public ResponseMessage> getSarStandardsInfoPage(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception { - int isNull = -1; if (null != page.getNowOrderBy()) { - switch (page.getNowOrderBy()) { - case 1: - page.setOrderByA("ISSUE_TIME");//发布日期 - 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; - } - } + nowOrderFunc(page); } - if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); @@ -142,40 +106,6 @@ public class SarStandardsInfoController extends BaseController } } - - - - -// if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { -// List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); -// int i = 0; -// for (SarAdvanceSearchVO sarAdvanceSearchVO:searchList){ -// if ("SVPPS".equals(sarAdvanceSearchVO.getField()) && StringUtils.isBlank(sarAdvanceSearchVO.getValue())){ -// isNull = i; -// } -// i++; -// } -// if (-1 != isNull) { -// searchList.remove(isNull); -// } -// if (isNull == 0 && searchList.size() > 0){ -// searchList.get(0).setConnect(""); -// } -// String advanceStr = SarAdvanceSearchUtil.createSql(searchList); -// if (null != advanceStr) { -// advanceStr = advanceStr.replace("stand_number", "concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',SAR_STANDARDS_INFO.STAND_YEAR)"); -// } -// if (-1 != isNull && StringUtils.isBlank(advanceStr)){ -// advanceStr = advanceStr + " SVPPS is null"; -// }else if (-1 != isNull && StringUtils.isNotBlank(advanceStr)){ -// advanceStr = advanceStr + " and SVPPS is null"; -// } -// if (StringUtils.isNotBlank(advanceStr)) { -// page.setAdvanceSearchStr(advanceStr); -// } else { -// page.setAdvanceSearchStr(null); -// } -// } if(page.getUserId() == null || page.getUserId().equals("")){ page.setUserId(LoginUserUtil.getUserId()); } @@ -183,6 +113,45 @@ public class SarStandardsInfoController extends BaseController return Result.success(getPageInfo(page.getPager(), rows)); } + private void nowOrderFunc(SarStandardsInfoEOPage page) { + switch (page.getNowOrderBy()) { + case 1: + page.setOrderByA("ISSUE_TIME");//发布日期 + break; + case 2: + page.setOrderByA("ZCCSSRQ");//新车型实施日期 + break; + case 3: + page.setOrderByA("XCXSSRQ");//在产车实施日期 + break; + case 4: + page.setOrderByA("standTextStatusShow");//文本状态 + break; + case 5: + page.setOrderByA("paixu"); + break; + case 6: + page.setOrderByA("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"); + break; + default: + page.setOrder1(null); + break; + } + } + } + @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") @GetMapping("/getSarStandardsInfoPageBak") //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java index d2fee840..0fc3aec2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -120,6 +120,10 @@ public class SarBussionessStandEOPage extends BasePage { private String paixu; private String shunxu; private String sql; + private Integer nowOrder; + private Integer nowOrderBy; + private String orderByA = ""; + private String order1 = ""; // 新增字段 private String FZRQBUSS; @@ -144,6 +148,38 @@ public class SarBussionessStandEOPage extends BasePage { private String GLWJBUSS; private String XCSJBUSS; + public Integer getNowOrder() { + return nowOrder; + } + + public void setNowOrder(Integer nowOrder) { + this.nowOrder = nowOrder; + } + + public Integer getNowOrderBy() { + return nowOrderBy; + } + + public void setNowOrderBy(Integer nowOrderBy) { + this.nowOrderBy = nowOrderBy; + } + + public String getOrderByA() { + return orderByA; + } + + public void setOrderByA(String orderByA) { + this.orderByA = orderByA; + } + + public String getOrder1() { + return order1; + } + + public void setOrder1(String order1) { + this.order1 = order1; + } + public String getFZRQBUSS() { return FZRQBUSS; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java index 0327acda..6b48976e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java @@ -84,9 +84,9 @@ public class SarStandardsInfoEOPage extends BasePage { private String productId; private Integer nowOrder; private Integer nowOrderBy; - private String orderByA = "a.issue_time"; + private String orderByA = ""; private String orderBy1 = "SAR_STANDARDS_INFO.issue_time"; - private String order1 = "desc"; + private String order1 = ""; // zhaokaiyao private String textStatus;//文本状态 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index d85f760f..0e714994 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1613,11 +1613,53 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getList = dao.getSarStandardsExportInfo(page); attrInfoShowExport(getList); return getList; } + private void nowOrderFunc(SarStandardsInfoEOPage page) { + switch (page.getNowOrderBy()) { + case 1: + page.setOrderByA("ISSUE_TIME");//发布日期 + break; + case 2: + page.setOrderByA("ZCCSSRQ");//新车型实施日期 + break; + case 3: + page.setOrderByA("XCXSSRQ");//在产车实施日期 + break; + case 4: + page.setOrderByA("text_status");//文本状态 + break; + case 5: + page.setOrderByA("paixu"); + break; + case 6: + page.setOrderByA("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"); + break; + default: + page.setOrder1(null); + break; + } + } + } + public ResponseMessage importSarStandardsInfoData(List> dataList, String standType, String menuId, String filepath) { //此处需要做各种验证，数据库操作 try { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 3465da42..a883b131 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -350,6 +350,9 @@ ORDER BY + + ${orderByA} ${order1}, + CASE when tmp_tb.stand_code like concat('%', 'Q/FT A', '%') THEN 0 when tmp_tb.stand_code like concat('%', 'Q/FT B', '%') THEN 1 @@ -401,6 +404,11 @@ left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0) + LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( + dicstandTextStatus.dic_type_code = SAR_BUSSIONESS_STAND.text_status_buss + AND dicstandTextStatus.dic_id IS NOT NULL + AND dicstandTextStatus.valid_flag = 0 + ) where 1=1 @@ -624,16 +632,12 @@ - select - DISTINCT a.ID, - a.LAWS_TYPE, - a.LAWS_NUMBER, - a.LAWS_NAME, - a.LAWS_EN_NAME, - a.LAWS_NO, - a.ISSUE_TIME, - a.ISSUE_COMPANY, - a.COMMENT_CYCLE_START, - a.COMMENT_CYCLE_END, - a.LAWS_TEXT_STATE, - a.LAWS_SYQY, - a.LAWS_SYCX, - a.IS_RELATE_ACCESS, - a.LAWS_YEAR, - a.LAWS_NOTISYNC_NUM, - a.LAWS_BULLETIN, - a.LAWS_LABEL, - a.LAWS_REMARK, - a.COUNTRY, - a.MODIFY_TIME, - dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow, - ( - CASE - WHEN SAR_LAWS_ATTR_INFO.XCXSSRQLAWS ='' THEN '9999-01-01' - ELSE SAR_LAWS_ATTR_INFO.XCXSSRQLAWS - END - ) AS XCXSSRQLAWS - from - (select tmp_tb.* from - ( SELECT DISTINCT SAR_LAWS_STAND_INFO.ID, SAR_LAWS_STAND_INFO.LAWS_TYPE, @@ -287,19 +254,27 @@ SAR_LAWS_STAND_INFO.LAWS_LABEL, SAR_LAWS_STAND_INFO.LAWS_REMARK, SAR_LAWS_STAND_INFO.COUNTRY, - SAR_LAWS_STAND_INFO.MODIFY_TIME + SAR_LAWS_STAND_INFO.MODIFY_TIME, + dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow, + ( + CASE + WHEN SAR_LAWS_ATTR_INFO.XCXSSRQLAWS ='' THEN '9999-01-01' + ELSE SAR_LAWS_ATTR_INFO.XCXSSRQLAWS + END + ) AS XCXSSRQLAWS from SAR_LAWS_STAND_INFO - ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a - order by - ${orderByA} ${order1},a.id + + ${orderByA} ${order1}, + + SAR_LAWS_STAND_INFO.id + limit ${pager.startIndex-1},${pageSize} @@ -307,33 +282,35 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 0c5ab7a2..2bc5e145 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -73,7 +73,28 @@ SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time, SAR_STANDARDS_INFO.STAND_SYSTEM, - SAR_STANDARDS_INFO.IS_RELATE_ACCESS + SAR_STANDARDS_INFO.IS_RELATE_ACCESS, + SAR_STAND_ATTR_INFO.CHJL AS CHJL, + dicstandSort.DIC_TYPE_NAME AS standSortShow, + dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow, + ( + CASE + WHEN SAR_STAND_ATTR_INFO.SSRQ ='' THEN '9999-01-01' + ELSE SAR_STAND_ATTR_INFO.SSRQ + END + ) AS SSRQ, + ( + CASE + WHEN SAR_STAND_ATTR_INFO.ZCCSSRQ ='' THEN '9999-01-01' + ELSE SAR_STAND_ATTR_INFO.ZCCSSRQ + END + ) AS ZCCSSRQ, + ( + CASE + WHEN SAR_STAND_ATTR_INFO.XCXSSRQ ='' THEN '9999-01-01' + ELSE SAR_STAND_ATTR_INFO.XCXSSRQ + END + ) AS XCXSSRQ @@ -566,9 +587,12 @@ + ORDER BY + + ${page.orderByA} ${page.order1}, + - ORDER BY - CASE tmp_tb.stand_sort + CASE sar_standards_info.stand_sort when 'GB' THEN 0 when 'GB/T' THEN 1 when 'QC/T' THEN 2 @@ -579,11 +603,10 @@ when 'HJ' THEN 7 ELSE 8 END, - tmp_tb.stand_sort ASC + sar_standards_info.stand_sort ASC,sar_standards_info.id - ORDER BY - CASE tmp_tb.stand_sort + CASE sar_standards_info.stand_sort when 'ECE' THEN 0 when 'EU' THEN 1 when 'EC' THEN 2 @@ -610,7 +633,7 @@ when 'ADR' THEN 23 ELSE 24 END, - tmp_tb.stand_sort ASC + sar_standards_info.stand_sort ASC,sar_standards_info.id @@ -709,6 +732,14 @@ left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id + left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( + dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status + AND dicstandTextStatus.dic_id IS NOT NULL + AND dicstandTextStatus.valid_flag = 0 + ) + left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) where 1=1 and SAR_STANDARDS_INFO.valid_flag=0 @@ -820,6 +851,21 @@ and TS_PERSON_COLLECT.user_id=#{page.userId} ) + + + + and SAR_STAND_ATTR_INFO.GXHBQ is not null + + + and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{page.labelMenuId}),'%') + + + + and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic} + + + and (${page.advanceSearchStr}) + @@ -935,80 +981,13 @@ - left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) - LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( - dicstandTextStatus.dic_type_code = a.text_status - AND dicstandTextStatus.dic_id IS NOT NULL - AND dicstandTextStatus.valid_flag = 0 - ) - left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = a.id and SAR_STAND_ATTR_INFO.valid_flag=0) - where 1=1 - - and SAR_STAND_ATTR_INFO.GXHBQ is not null - - - and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{page.labelMenuId}),'%') - - - - and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic} - - - - and (${page.advanceSearchStr}) - - + @@ -1160,6 +1133,9 @@ GROUP BY ) a order by + + ${orderByA} ${order1}, + a.issue_time is null ,a.issue_time desc,a.id