diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 4307db71..f397a894 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -23,6 +23,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size,@Param("sar") SarFindDto sarFindDto); + + List selectHighLawsId(@Param("standId") String standId,@Param("sar") SarFindDto sarFindDto); //根据标准id查出数据 List selectLawsById(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); //根据标准id查出数据用于清单查询 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java index cc7ee987..3c885a39 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java @@ -1,7 +1,11 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; +import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import lombok.Data; +import java.util.List; +import java.util.Map; + /** * 高级检索 * diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java index b3f491c0..5c50e8dd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java @@ -40,6 +40,13 @@ public class BusinessDeptIssueController extends BaseController { return Result.success(b); } + @PostMapping("/saveBatch") + @ApiOperation("批量新增事业部重点问题") + public ResponseMessage saveBatch(@RequestBody List issue){ + boolean b = iBusinessDeptIssueService.saveBatch(issue); + return Result.success(b); + } + @DeleteMapping @ApiOperation("删除事业部重点问题") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java index 68d8d12a..a74378b2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java @@ -33,6 +33,13 @@ public class ProductDeptIssueController { return Result.success(b); } + @PostMapping("/saveBatch") + @ApiOperation("新增产品规划部重点问题") + public ResponseMessage productDeptIssueSaveBatch(@RequestBody List issue){ + boolean b = iProductDeptIssueService.saveBatch(issue); + return Result.success(b); + } + @DeleteMapping @ApiOperation("删除产品规划部重点问题") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java index a9e04a4a..3441da72 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java @@ -3,10 +3,11 @@ package com.adc.da.slrs.sarStandUnqualified.service; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssueVo; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; -public interface IProductDeptIssueService { +public interface IProductDeptIssueService extends IService { public boolean addProductDeptIssue(ProductDeptIssue obj); 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 9ec7375e..75e38532 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 @@ -248,6 +248,39 @@ public class SarStandardsInfoController extends BaseController return Result.success(getPageInfo(page.getPager(), rows)); } + + + @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") + @GetMapping("/selectHighLawsById") + //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") + public ResponseMessage> selectHighLawsById(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception { + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + //不改传参强行置换 +// searchList.forEach(sarAdvanceSearchVO -> { +// if ("TXLB".equals(sarAdvanceSearchVO.getField())){ +// sarAdvanceSearchVO.setField("STAND_SYSTEM"); +// } +// }); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_stand_attr_info"); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } + List rows = sarStandardsInfoEOService.selectHighLawsById(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + @ApiOperation(value = "|SarStandardsInfoEO|新增") @PostMapping("/addarStandardsInfo") //401问题2021-03-31暂时注释掉 liuhuiwen diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index b5a26655..a59045c9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -23,8 +23,12 @@ public interface SarStandardsInfoDao extends BaseMapper { List getSarStandardsInfoPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark); + List selectHighLawsPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark,@Param("list") List lawsIds); + int getSarStandardsInfoCount(@Param("page") SarStandardsInfoEOPage page); + int selectHighLawsCount(@Param("page") SarStandardsInfoEOPage page); + int getSarStandardsInfoCountWk1(SarStandardsInfoEOPage page); int insertSelective(SarStandardsInfo page); 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 4afc427c..06d58413 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 @@ -116,4 +116,20 @@ public class SarStandardsInfoEOPage extends BasePage { * 标准号 */ private String standCode; + + private String qdFlag; + + + private String qdid; +// private String standName; +// private String standEnName; + private String typeApplicable; + private String nylx; + private String zrbm; + private String sycpx; +// private String standSort; +// private String standType; +// private String standNumber; + private String types; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 4caf6161..62383c9f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -27,6 +27,8 @@ public interface ISarStandardsInfoService extends IService { List getSarStandardsInfoPageBak1(SarStandardsInfoEOPage page) throws Exception; + List selectHighLawsById(SarStandardsInfoEOPage page) throws Exception; + void createSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception; int updateSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception; 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 686a137c..b5a95c20 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 @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarStandardsInfo.service.impl; import com.adc.da.att.entity.AttFileEO; import com.adc.da.person.entity.StandInfo; import com.adc.da.person.entity.TsPersonCollect; +import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto; import com.adc.da.slrs.sarPosition.entity.TsPosition; import com.adc.da.slrs.sarPosition.service.ITsPositionService; import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao; @@ -128,6 +130,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl selectHighLawsById(SarStandardsInfoEOPage page) throws Exception { + //查询当前登录人角色拥有权限的菜单 + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + 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 lawsIds=new ArrayList<>(); + if ("1".equals(page.getQdFlag())){ + + SarFindDto sarFindDto=new SarFindDto(); + sarFindDto.setId(page.getQdid()); + sarFindDto.setStandEnName(page.getStandEnName()); + sarFindDto.setStandName(page.getStandName()); + sarFindDto.setTypeApplicable(page.getTypeApplicable()); + sarFindDto.setSycpx(page.getSycpx()); + sarFindDto.setNylx(page.getNylx()); + sarFindDto.setTypes(page.getTypes()); + sarFindDto.setStandSort(page.getStandSort()); + sarFindDto.setZrbm(page.getZrbm()); + sarFindDto.setStandNumber(page.getStandNumber()); + sarFindDto.setStandType(page.getStandType()); + + lawsIds = sarLawsAttrDetailedListDao.selectHighLawsId(sarFindDto.getId(),sarFindDto); + + } + + Integer rowCount = dao.selectHighLawsCount(page); + page.getPager().setRowCount(rowCount); + List sarlist = dao.selectHighLawsPage(page,"0",lawsIds); + attrInfo(sarlist); + return sarlist; + } + public void attrInfo(List sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 2fdcaa54..7ec47008 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -169,6 +169,31 @@ LIMIT #{param3} , #{param2}; + + + select t.* from ( SELECT issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME FROM @@ -28,5 +29,36 @@ LEFT JOIN sar_laws_stand_info AS laws ON issue.law_id = laws.ID ${ew.customSqlSegment} + + UNION ALL + SELECT + issue.*, + laws.STAND_CODE AS lawNumber, + laws.STAND_NAME AS lawName + FROM + business_dept_issue AS issue + LEFT JOIN sar_bussioness_stand AS laws + ON issue.law_id = laws.ID + ${ew.customSqlSegment} + + UNION ALL + SELECT + issue.*, CONCAT( + laws.STAND_SORT, + ' ', + laws.STAND_NUMBER, + '-', + laws.STAND_YEAR + ) AS lawNumber, + laws.STAND_NAME AS lawName + FROM + business_dept_issue AS issue + LEFT JOIN sar_standards_info AS laws + ON issue.law_id = laws.ID + ${ew.customSqlSegment} + ) t + where t.LAWS_NAME is not null and t.LAWS_NUMBER is not null + + 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 58ea160b..9b506342 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 @@ -1394,6 +1394,8 @@ + + + + @@ -1422,6 +1443,15 @@ GROUP BY SAR_STANDARDS_INFO.id) a + +