Merge branch 'develop_3' into 'develop_master'

Develop 3

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

adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java

@@ -78,7 +78,7 @@ public class FileMaterialController extends BaseController<FileMaterial> {
 
     @PutMapping
     @ApiOperation("修改文件资料组")
-    public ResponseMessage updateFileMaterial(FileMaterial fileMaterial){
+    public ResponseMessage updateFileMaterial(@RequestBody FileMaterial fileMaterial){
         boolean b = iFileMaterialService.updateById(fileMaterial);
 
         return Result.success(b);

adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java

@@ -8,6 +8,8 @@ import lombok.Data;
 @Data
 public class FileMaterialPage {
 
+    private String id;
+
     private String dataTitle;
 
     private String dataType;

adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java

@@ -52,7 +52,17 @@ public class FileMaterialServiceImpl extends ServiceImpl<FileMaterialDao, FileMa
                     queryPage.getEndDataUploadTime());
         }
 
-        return this.page(new Page<>(queryPage.getPage(),queryPage.getPageSize()),queryWrapper);
+        if (queryPage.getId()!=null && !"".equals(queryPage.getId()) ){
+            queryWrapper.eq("id",queryPage.getId());
+        }
+        IPage<FileMaterial> page=null;
+        if (queryPage.getPage()==null || queryPage .getPageSize()==null){
+            page=new Page<>(1,1);
+        }else {
+            page=new Page<>(queryPage.getPage(),queryPage.getPageSize());
+        }
+
+        return this.page(page,queryWrapper);
     }
 
     @Override

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

@@ -303,7 +303,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         if (result > 0) {
             return Result.success("0", "删除成功", result);
         }else if(result == -1) {
-            return Result.success("-1","所选的标准下挂有标准，无法删除");
+            return Result.success("-1","所选的标准下挂有清单，无法删除");
         }
         else {
             return Result.error("删除失败");

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

@@ -901,9 +901,6 @@
             <!-- 标准名称 -->
             <if test="standName != null and standName != ''">
                 and stand_name like concat(concat('%',#{standName}),'%')
-                or STAND_NUMBER like concat(concat('%',#{standName}),'%')
-                or STAND_YEAR like concat(concat('%',#{standName}),'%')
-                or STAND_SORT like concat(concat('%',#{standName}),'%')
             </if>
             <if test="standEnName != null and standEnName != ''">
                 and stand_en_name like concat(concat('%',#{standEnName}),'%')