Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!368

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java

@@ -41,5 +41,7 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
     List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);
 
     List<SarBussionessStand> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception;
+
+    List<SarBussionessStand> getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception;
 }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -916,6 +916,35 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         return sarlist;
     }
 
+
+    @Override
+    public List<SarBussionessStand> getSarBussionStandPageQd(SarBussionessStandEOPage 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);
+                }
+            }
+        }
+
+        Integer rowCount = this.baseMapper.getBussionessStandInfoCount(page);
+        page.getPager().setRowCount(rowCount);
+        List<SarBussionessStand> sarlist = this.baseMapper.getBussionessStandInfoPage(page);
+        attrInfo(sarlist);
+        return sarlist;
+    }
     /***
      * @Description: 处理属性表数据
      * @Param: [sarlist]

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java

@@ -83,10 +83,10 @@ public class StandWarningEO extends EarlyWarningEO {
     @ExcelIgnore
     @ApiModelProperty("范围查询发布日期开始")
     @DateTimeFormat(pattern = "YYYY-MM-dd")
-    private String startPutTime;
+    private String startIssueTime;
 
     @ExcelIgnore
     @ApiModelProperty("范围查询发布日期结束")
     @DateTimeFormat(pattern = "YYYY-MM-dd")
-    private String endPutTime;
+    private String endIssueTime;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java

@@ -486,7 +486,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
             if (!file1.exists()) {
                 file1.mkdirs();
             }
-            String filepathandname = filePath + "/img/" + imageName;
+            String filepathandname = splitFilePath +"/" + imageName;
             try {
                 FileOutputStream fos = new FileOutputStream(filepathandname);
                 fos.write(bytev);