Compare commits

..

No commits in common. "d10020e9b420e1ebccabbb574e97c67dc1daf21c" and "9cd57ab23ea6f4d6f79f014305eceb6298660c68" have entirely different histories.

5 changed files with 6 additions and 10 deletions

View File

@ -33,9 +33,7 @@ public class GbsUserSyncInterceptor implements WebMvcConfigurer {
"/safetyEval-h5/**",
"/**/images/**",
"/**/file/**",
"/**/tree/**",
"/**/safety-eval/**",
"/**/safetyEval/**"
"/**/tree/**"
};
@Override

View File

@ -1,4 +1,4 @@
package org.qinan.safetyeval.adapter.web;
package org.qinan.safetyeval.adapter.controller.web;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.Response;
@ -25,14 +25,14 @@ import java.io.Serializable;
@RestController
@AllArgsConstructor
@Api(tags = "安全评价机构业务范围与设备参照")
@RequestMapping("/safetyEval/org-business-scope-device-ref")
@RequestMapping("/ref")
public class OrgBusinessScopeDeviceRefController implements Serializable {
private static final long serialVersionUID = 1L;
private final OrgBusinessScopeDeviceRefServiceI orgBusinessScopeDeviceRefServiceI;
@GetMapping
@ApiOperation("v1.0.1_查询安全评价机构业务范围与设备参照列表-分页")
@ApiOperation("查询安全评价机构业务范围与设备参照列表-分页")
public PageResponse<OrgBusinessScopeDeviceRefCo> list(@Validated OrgBusinessScopeDeviceRefPageQry qry) {
return orgBusinessScopeDeviceRefServiceI.listOrgBusinessScopeDeviceRefPage(qry);
}

View File

@ -32,7 +32,7 @@ public class BasicDisciplineMajorController implements Serializable {
private final BasicDisciplineMajorServiceI basicDisciplineMajorServiceI;
@GetMapping
@ApiOperation("v1.0.1_查询基础学科专业列表-分页")
@ApiOperation("查询基础学科专业列表-分页")
public PageResponse<BasicDisciplineMajorCo> list(@Validated BasicDisciplineMajorPageQry qry) {
return basicDisciplineMajorServiceI.listBasicDisciplineMajorPage(qry);
}

View File

@ -25,7 +25,7 @@ public class BasicDisciplineMajorCo extends ClientObject {
("FIREWORKS_FIRECRACKERS", "烟花爆竹制造业"),
("METAL_SMELTING", "金属冶炼"),
; */
@ApiModelProperty(value = "行业code 看 IndustryEnum);")
@ApiModelProperty(value = "行业code 看 IndustryEnum),;")
private String industryCode;
/**
* code

View File

@ -16,8 +16,6 @@ public enum IndustryEnum {
private final String code;
private final String value;
public static final String REMARKS = "行业类型枚举=COAL_MINING:煤炭开采业,METAL_NONMETAL_MINING:金属、非金属矿及其他矿采选业" +
",ONSHORE_OIL_GAS:陆地石油和天然气开采业,ONSHORE_OIL_GAS_PIPELINE:陆上油气管道运输业,PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL:石油加工业,化学原料、化学品及医药制造业,FIREWORKS_FIRECRACKERS:烟花爆竹制造业,METAL_SMELTING:金属冶炼";
IndustryEnum(String code, String value) {
this.code = code;