Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java

@@ -21,6 +21,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -79,24 +80,26 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 	@ApiOperation(value="上报库参数项-列表查询", notes="上报库参数项-列表查询")
 	@GetMapping(value = "/list")
 	@RequiresPermissions("report:detail:list")
-	public Result<?> queryList(ParamsReportDetailEO paramsReportDetailEO,
+	public Result<?> queryList(ParamsReportDetailVO paramsReportDetailVO,
 							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 							   @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
 							   @RequestParam(name = "cut") String cut) {
-		if (StringUtils.isNotEmpty(paramsReportDetailEO.getNioNumber())) {
-			paramsReportDetailEO.setNioNumber(paramsReportDetailEO.getNioNumber().replace("%","\\%"));
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getNioNumber())) {
+			paramsReportDetailVO.setNioNumber(paramsReportDetailVO.getNioNumber().replace("%","\\%"));
 		}
-		if (StringUtils.isNotEmpty(paramsReportDetailEO.getParamsName())) {
-			paramsReportDetailEO.setParamsName(paramsReportDetailEO.getParamsName().replace("%","\\%"));
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getParamsName())) {
+			paramsReportDetailVO.setParamsName(paramsReportDetailVO.getParamsName().replace("%","\\%"));
 		}
-		if (StringUtils.isNotEmpty(paramsReportDetailEO.getSdt())) {
-			paramsReportDetailEO.setSdt(paramsReportDetailEO.getSdt().replace("%","\\%"));
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getSdtName())) {
+			paramsReportDetailVO.setSdt(paramsReportDetailVO.getSdtName().replace("%","\\%"));
 		}
-		if (StringUtils.isNotEmpty(paramsReportDetailEO.getDre())) {
-			paramsReportDetailEO.setDre(paramsReportDetailEO.getDre().replace("%","\\%"));
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getDreName())) {
+			paramsReportDetailVO.setDre(paramsReportDetailVO.getDreName().replace("%","\\%"));
 		}
 
 		IPage page = new Page(pageNo, pageSize);
+		ParamsReportDetailEO paramsReportDetailEO = new ParamsReportDetailEO();
+		BeanUtils.copyProperties(paramsReportDetailVO, paramsReportDetailEO);
 		IPage list = paramsReportDetailEOService.queryList(page, paramsReportDetailEO, cut);
 		return Result.OK(list);
 	}

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java

@@ -25,10 +25,12 @@ public class ParamsReportDetailVO {
     /**工程接口人*/
     @ApiModelProperty(value = "工程接口人")
     private String sdt;
+    private String sdtName; // 用于搜索条件
 
     /**填写人*/
     @ApiModelProperty(value = "填写人")
     private String dre;
+    private String dreName; // 用于搜索条件
 
 
     @ApiModelProperty(value = "参数清单id")

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java

@@ -19,6 +19,7 @@ import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.report.entity.LawsMonthlyReportManageEO;
 import com.jero.modules.report.mapper.LawsMonthlyReportManageEOMapper;
 import com.jero.modules.report.service.ILawsMonthlyReportManageEOService;
+import com.jero.modules.searchcenter.enums.ModuleTypeFlagEnum;
 import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.util.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -249,6 +250,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 						  String flag){
 		stringMap.put("id", id);
 		stringMap.put("module_type", moduleType);
+		stringMap.put("module_type_flag", ModuleTypeFlagEnum.LAWS_MONTHLY_REPORT.getValue()); // 默认法规月报标识
 		stringMap.put("content", content);
 		stringMap.put("title", title);
 		stringMap.put("file_text", fileText);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java

@@ -0,0 +1,30 @@
+package com.jero.modules.searchcenter.enums;
+
+public enum ModuleTypeFlagEnum {
+    LAWS_MONTHLY_REPORT("法规月报","FGYB"),
+    PROBLEM_KNOWLEDGE_BASE_CLASSIFY("问题知识库","WTZSK");
+
+    String name;
+    String value;
+
+    private ModuleTypeFlagEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

jero-web/src/views/documentTools/searchCenter/components/whole.vue

@@ -231,15 +231,20 @@
         }
       },
       titleClick(item) {
-        let newUrl = this.$router.resolve({
-          path: '/docManage/library/detail',
-          query: {
-            id: item.id.slice(0, 32),
-            title: item.title,
-            serial_number: item.serial_number
-          }
-        })
-        window.open(newUrl.href, '_blank')
+        console.log(item)
+        if (item.module_type_flag == 'FGYB') {
+          this.monthlyReportClick(item)
+        } else {
+          let newUrl = this.$router.resolve({
+            path: '/docManage/library/detail',
+            query: {
+              id: item.id.slice(0, 32),
+              title: item.title,
+              serial_number: item.serial_number
+            }
+          })
+          window.open(newUrl.href, '_blank')
+        }
       }
     }
   }