项目库详情查询接口

laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java

@@ -1,16 +1,21 @@
 package com.jero.modules.projectLibrary.controller;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import com.jero.common.api.vo.Result;
+import com.jero.modules.laws.enterprise.entity.EnterpriseStandard;
+import com.jero.modules.laws.enterprise.service.EnterpriseStandardService;
+import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
+import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
+import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
+import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
 import com.jero.modules.projectLibrary.entity.LawsAssess;
 import com.jero.modules.projectLibrary.service.ILawsAssessService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -36,6 +41,13 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 	@Autowired
 	private ILawsAssessService lawsAssessService;
 
+	 @Autowired
+	 private ILawsDomesticStandardService lawsDomesticStandardService; //国内标准
+	 @Autowired
+	 private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
+	 @Autowired
+	 private EnterpriseStandardService enterpriseStandardService; //企业标准
+
 	/**
 	 * 分页列表查询
 	 */
@@ -47,19 +59,31 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		IPage<LawsAssess> pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req);
+		this.assignment(pageList.getRecords());
 		return Result.OK(pageList);
 	}
 
-    /**
-	 * 列表查询
-	 */
-	@AutoLog(value = "项目-标准评估-列表查询")
-    @ApiOperation(value="项目-标准评估-列表查询", notes="项目-标准评估-列表查询")
-	@GetMapping(value = "/list")
-	public Result<List<LawsAssess>> queryList(LawsAssess lawsAssess, HttpServletRequest req) {
-        List<LawsAssess> list = lawsAssessService.queryList(lawsAssess, req);
-        return Result.OK(list);
-	}
+	 private void assignment(List<LawsAssess> records) {
+		 for (LawsAssess assess : records) {
+			 String standardId = assess.getStandardId();
+			 String source = assess.getSource();
+			 if ("1".equals(source)){
+				 //查询国内标准数据，赋值给collection
+				 LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId);
+				 BeanUtils.copyProperties(standard, assess);
+			 }
+			 if ("2".equals(source)){
+				 //查询海外标准数据，赋值给collection
+				 LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId);
+				 BeanUtils.copyProperties(standard, assess);
+			 }
+			 if ("3".equals(source)){
+				 //查询企业标准数据，赋值给collection
+				 EnterpriseStandard standard = enterpriseStandardService.getById(standardId);
+				 BeanUtils.copyProperties(standard, assess);
+			 }
+		 }
+	 }
 
 	/**
 	 *   添加
@@ -72,25 +96,8 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 		return Result.OK("操作成功!");
 	}
 
-	/**
-	 *  编辑
-	 *
-	 * @param lawsAssess
-	 * @return
-	 */
-	@AutoLog(value = "项目-标准评估-编辑")
-	@ApiOperation(value="项目-标准评估-编辑", notes="项目-标准评估-编辑")
-	@PostMapping(value = "/edit")
-	public Result<T> edit(@Validated @RequestBody LawsAssess lawsAssess) {
-		lawsAssessService.editById(lawsAssess);
-		return Result.OK("操作成功!");
-	}
-
 	/**
 	 *   通过id删除
-	 *
-	 * @param map
-	 * @return
 	 */
 	@AutoLog(value = "项目-标准评估-通过id删除")
 	@ApiOperation(value="项目-标准评估-通过id删除", notes="项目-标准评估-通过id删除")
@@ -103,61 +110,14 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 		return Result.OK("删除成功!");
 	}
 
-	/**
-	 *  批量删除
-	 *
-	 * @param map
-	 * @return
-	 */
-	@AutoLog(value = "项目-标准评估-批量删除")
-	@ApiOperation(value="项目-标准评估-批量删除", notes="项目-标准评估-批量删除")
-	@PostMapping(value = "/deleteBatch")
-	public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
-        if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
-			return Result.error("请选择数据!");
-		}
-		this.lawsAssessService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
-		return Result.OK("批量删除成功!");
-	}
-
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "项目-标准评估-通过id查询")
-	@ApiOperation(value="项目-标准评估-通过id查询", notes="项目-标准评估-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<LawsAssess> queryById(@RequestParam(name="id",required=true) String id) {
-		LawsAssess lawsAssess = lawsAssessService.queryById(id);
-		if(lawsAssess==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(lawsAssess);
-	}
-
     /**
     * 导出excel
-    *
-    * @param request
-    * @param lawsAssess
     */
-    @RequestMapping(value = "/exportXls")
+	@AutoLog(value = "项目-标准评估-导出excel")
+	@ApiOperation(value="项目-标准评估-导出excel", notes="项目-标准评估-导出excel")
+    @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, LawsAssess lawsAssess) {
         return super.exportXls(request, lawsAssess, LawsAssess.class, "项目-标准评估");
     }
 
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<LawsAssess> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, LawsAssess.class);
-    }
-
 }

laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.common.aspect.annotation.Dict;
@@ -50,6 +51,12 @@ public class LawsAssess implements Serializable {
     @ApiModelProperty(value = "标准ID")
     private String standardId;
 
+    /**标准来源*/
+    @NotBlank(message = "source not null")
+    @Excel(name = "标准来源(1国内、2海外、3企标)", width = 15)
+    @ApiModelProperty(value = "标准来源(1国内、2海外、3企标)")
+    private String source;
+
 	/**标准编号*/
     @NotBlank(message = "standardNum not null")
 	@Excel(name = "标准编号", width = 15)
@@ -86,4 +93,37 @@ public class LawsAssess implements Serializable {
     @Excel(name = "所属部门", width = 15)
     @ApiModelProperty(value = "所属部门")
     private String orgCode;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准名称")
+    private String standardName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "英文名称")
+    private String standardEnglishName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准状态")
+    private String standardState;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "适用车型")
+    private String applicableVehicle;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "在产车实施日期")
+    private String onTheProductionDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "新车型实施日期")
+    private String newModelImplementationDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "评估结果")
+    private String evaluationResults;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "责任部门")
+    private String responsibleDepartment;
+
 }