清单部分高级查询

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java

@@ -23,6 +23,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper<SarLawsAttrDetail
 
     //根据清单id，查出标准的id并排序
     List<String> selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size,@Param("sar") SarFindDto sarFindDto);
+
+    List<String> selectHighLawsId(@Param("standId") String standId,@Param("sar") SarFindDto sarFindDto);
     //根据标准id查出数据
     List<LawsDto> selectLawsById(@Param("param1") List<String> LawsIds, @Param("sarFindDto") SarFindDto sarFindDto);
     //根据标准id查出数据用于清单查询

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;
+
 /**
  * 高级检索
  *

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<BusinessDeptIssue> issue){
+        boolean b = iBusinessDeptIssueService.saveBatch(issue);
+        return Result.success(b);
+    }
+
 
     @DeleteMapping
     @ApiOperation("删除事业部重点问题")

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<ProductDeptIssue> issue){
+        boolean b = iProductDeptIssueService.saveBatch(issue);
+        return Result.success(b);
+    }
+
 
     @DeleteMapping
     @ApiOperation("删除产品规划部重点问题")

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<ProductDeptIssue> {
 
 
     public boolean addProductDeptIssue(ProductDeptIssue obj);

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

@@ -248,6 +248,39 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 
+
+
+    @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询")
+    @GetMapping("/selectHighLawsById")
+    //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")
+    public ResponseMessage<PageInfo<SarStandardsInfo>> selectHighLawsById(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception {
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
+        }
+
+        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
+            List<SarAdvanceSearchVO> 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<SarStandardsInfo> rows = sarStandardsInfoEOService.selectHighLawsById(page);
+        return Result.success(getPageInfo(page.getPager(), rows));
+    }
+
     @ApiOperation(value = "|SarStandardsInfoEO|新增")
     @PostMapping("/addarStandardsInfo")
     //401问题2021-03-31暂时注释掉 liuhuiwen

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java

@@ -23,8 +23,12 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
 
     List<SarStandardsInfo> getSarStandardsInfoPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark);
 
+    List<SarStandardsInfo> selectHighLawsPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark,@Param("list") List<String> lawsIds);
+
     int getSarStandardsInfoCount(@Param("page") SarStandardsInfoEOPage page);
 
+    int selectHighLawsCount(@Param("page") SarStandardsInfoEOPage page);
+
     int getSarStandardsInfoCountWk1(SarStandardsInfoEOPage page);
 
     int insertSelective(SarStandardsInfo page);

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;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java

@@ -27,6 +27,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
 
     List<SarStandardsInfo> getSarStandardsInfoPageBak1(SarStandardsInfoEOPage page) throws Exception;
 
+    List<SarStandardsInfo> selectHighLawsById(SarStandardsInfoEOPage page) throws Exception;
+
     void createSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception;
 
     int updateSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception;

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<SarStandardsInfoDao
     @Value("${file.path}")
     private String filePath;//文件存储路径
 
+    @Autowired
+    SarLawsAttrDetailedListDao sarLawsAttrDetailedListDao;
+
     @Autowired
     WarningDateServiceImpl warningDateService;
 
@@ -433,6 +438,54 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return sarlist;
     }
 
+    @Override
+    public List<SarStandardsInfo> selectHighLawsById(SarStandardsInfoEOPage page) throws Exception {
+        //查询当前登录人角色拥有权限的菜单
+        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
+            QueryWrapper<TsResource> qw = new QueryWrapper<>();
+            qw.eq("ID",page.getMenuId());
+            qw.isNull("PARENT_ID");
+            List<TsResource> children = iTsResourceService.list(qw);
+            if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
+                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
+                    page.setMenuRoleList(getMenuIdList);
+                } else {
+                    page.setMenuRoleList(null);
+                }
+                List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
+                if (ids != null && !ids.isEmpty()) {
+                    page.setMenuAllChildrenIdList(ids);
+                }
+            }
+        }
+        List<String> 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<SarStandardsInfo> sarlist = dao.selectHighLawsPage(page,"0",lawsIds);
+        attrInfo(sarlist);
+        return sarlist;
+    }
+
     public void attrInfo(List<SarStandardsInfo> sarlist) throws Exception {
         for (SarStandardsInfo row : sarlist) {
             attrInfoDetails(row);