diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java index 0a0b444a8..ffda2322b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java +++ b/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 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); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java index d93101f2b..ae6b8e521 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java +++ b/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") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index 2665e9642..e6c1db550 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/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