feat: 三标详情通用接口(自动匹配标准类型)
This commit is contained in:
+8
@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author: liao
|
* @Author: liao
|
||||||
@@ -45,6 +46,13 @@ public class LawsCommonController {
|
|||||||
return Result.OK(lawsCommonService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize));
|
return Result.OK(lawsCommonService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value="根据标准号查询标准", notes="根据标准号查询标准")
|
||||||
|
@GetMapping(value = "/getInfoByStandardNo")
|
||||||
|
public Result<Map<String, Object>> getInfoByStandardNo(
|
||||||
|
@RequestParam("standardNumber") String standardNumber) {
|
||||||
|
return Result.OK(lawsCommonService.getInfoByStandardNo(standardNumber));
|
||||||
|
}
|
||||||
|
|
||||||
@ApiOperation(value="标准右侧抽屉", notes="标准右侧抽屉")
|
@ApiOperation(value="标准右侧抽屉", notes="标准右侧抽屉")
|
||||||
@GetMapping(value = "/getStandardRightBox")
|
@GetMapping(value = "/getStandardRightBox")
|
||||||
public Result<IPage<ManyStandardSelectionBox>> getStandardRightBox(ManyStandardSelectionBoxVO selectionBoxVO,
|
public Result<IPage<ManyStandardSelectionBox>> getStandardRightBox(ManyStandardSelectionBoxVO selectionBoxVO,
|
||||||
|
|||||||
+7
@@ -215,4 +215,11 @@ public interface ILawsCommonService {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
List<LawsTag> getAdvancedQueryCondition(String moduleValue);
|
List<LawsTag> getAdvancedQueryCondition(String moduleValue);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据标准编号获取标准信息
|
||||||
|
* @param standardNumber
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
Map<String, Object> getInfoByStandardNo(String standardNumber);
|
||||||
}
|
}
|
||||||
|
|||||||
+31
@@ -2470,6 +2470,37 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
|
|||||||
return fieldList;
|
return fieldList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<String, Object> getInfoByStandardNo(String standardNumber) {
|
||||||
|
Map<String, Object> result;
|
||||||
|
// 用国标外标企标分别查询
|
||||||
|
LawsDomesticStandard gbStandard = lawsDomesticStandardService.getOne(new LambdaQueryWrapper<LawsDomesticStandard>()
|
||||||
|
.eq(LawsDomesticStandard::getStandardNumber, standardNumber));
|
||||||
|
if (gbStandard != null) {
|
||||||
|
this.addLookHistory(gbStandard.getId(), "1", TableNameEnum.DOMESTIC_REGULATIONS.getValue(), standardNumber);
|
||||||
|
result = this.getByIdAndModule(gbStandard.getId(), TableNameEnum.DOMESTIC_REGULATIONS.getValue(), "1", standardNumber);
|
||||||
|
result.put("source", TableNameEnum.DOMESTIC_REGULATIONS.getName());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
LawsOverseasStandard fbStandard = lawsOverseasStandardService.getOne(new LambdaQueryWrapper<LawsOverseasStandard>()
|
||||||
|
.eq(LawsOverseasStandard::getStandardNumber, standardNumber));
|
||||||
|
if (fbStandard != null) {
|
||||||
|
this.addLookHistory(fbStandard.getId(), "1", TableNameEnum.FOREIGN_REGULATIONS.getValue(), standardNumber);
|
||||||
|
result = this.getByIdAndModule(fbStandard.getId(), TableNameEnum.FOREIGN_REGULATIONS.getValue(), "1", standardNumber);
|
||||||
|
result.put("source", TableNameEnum.FOREIGN_REGULATIONS.getName());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
LawsEnterpriseStandard esStandard = lawsEnterpriseStandardService.getOne(new LambdaQueryWrapper<LawsEnterpriseStandard>()
|
||||||
|
.eq(LawsEnterpriseStandard::getStandardNumber, standardNumber));
|
||||||
|
if (esStandard != null) {
|
||||||
|
this.addLookHistory(esStandard.getId(), "1", TableNameEnum.ENTERPRISE_STANDARDS.getValue(), standardNumber);
|
||||||
|
result = this.getByIdAndModule(esStandard.getId(), TableNameEnum.ENTERPRISE_STANDARDS.getValue(), "1", standardNumber);
|
||||||
|
result.put("source", TableNameEnum.ENTERPRISE_STANDARDS.getName());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建企标导入模板的Workbook
|
* 创建企标导入模板的Workbook
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user