diff --git a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdBuiRegulatoryInspectionsController.java b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdBuiRegulatoryInspectionsController.java index 22788c1c..b5240835 100644 --- a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdBuiRegulatoryInspectionsController.java +++ b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdBuiRegulatoryInspectionsController.java @@ -3,12 +3,15 @@ package com.kms.warn.controller; import java.util.Arrays; import java.util.List; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; +import com.kms.earlyStage.domain.SpecialProjectPreDesign; +import com.kms.earlyStage.service.SpecialProjectPreDesignService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +48,9 @@ public class BsSgcJsjdBuiRegulatoryInspectionsController extends BaseController @Autowired private BsSgcJsjdBuiRegulatoryInspectionsService bsSgcJsjdBuiRegulatoryInspectionsService; + @Autowired + private SpecialProjectPreDesignService specialProjectPreDesignService; + /** * 查询监管检查列表 */ @@ -75,7 +81,15 @@ public class BsSgcJsjdBuiRegulatoryInspectionsController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - return AjaxResult.success(bsSgcJsjdBuiRegulatoryInspectionsService.getById(id)); + BsSgcJsjdBuiRegulatoryInspections byId = bsSgcJsjdBuiRegulatoryInspectionsService.getById(id); + String proNo = byId.getProNo(); + String proCode = byId.getProCode(); + SpecialProjectPreDesign one = specialProjectPreDesignService.getOne(Wrappers.lambdaQuery(SpecialProjectPreDesign.class) + .eq(SpecialProjectPreDesign::getProjectCode, proCode).eq(SpecialProjectPreDesign::getProNo, proNo)); + String projectName = one.getProjectName(); + byId.setProjectName(projectName); + + return AjaxResult.success(byId); } /** diff --git a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdBuiZrdwController.java b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdBuiZrdwController.java index f8846d75..037bdbde 100644 --- a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdBuiZrdwController.java +++ b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdBuiZrdwController.java @@ -3,6 +3,7 @@ package com.kms.warn.controller; import java.util.Arrays; import java.util.List; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; @@ -55,6 +56,12 @@ public class BsSgcJsjdBuiZrdwController extends BaseController return bsSgcJsjdBuiZrdwService.selectPage(sp); } + @GetMapping("/list/{id}") + public AjaxResult list(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcJsjdBuiZrdwService.listById(id)); + } + /** * 导出责任单位列表 */ diff --git a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiZrdw.java b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiZrdw.java index 97782b52..b40b5744 100644 --- a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiZrdw.java +++ b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiZrdw.java @@ -1,5 +1,6 @@ package com.kms.warn.domain; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -60,4 +61,7 @@ public class BsSgcJsjdBuiZrdw extends BaseEntity @ApiModelProperty("附件") private String owerDept; + @TableField(exist = false) + private String unitName; + } diff --git a/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiZrdwMapper.java b/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiZrdwMapper.java index ee263eaa..7732d561 100644 --- a/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiZrdwMapper.java +++ b/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiZrdwMapper.java @@ -4,6 +4,8 @@ import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.warn.domain.BsSgcJsjdBuiZrdw; +import java.util.List; + /** * 责任单位Mapper接口 * @@ -13,4 +15,5 @@ import com.kms.warn.domain.BsSgcJsjdBuiZrdw; @Repository public interface BsSgcJsjdBuiZrdwMapper extends BaseMapper { + List listById(String id); } diff --git a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java index 0da7a731..36aa3508 100644 --- a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java +++ b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java @@ -41,6 +41,7 @@ public class BsSgcJsjdBuiRegulatoryInspectionsService extends BaseService list = null; + if (ObjectUtil.isNull(params)) { list = bsSgcJsjdBuiRegulatoryInspectionsMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(), data.getId(),data.getProjectName(),data.getInspectionTypes(),"create_time",sp.getPageNum(), diff --git a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiZrdwService.java b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiZrdwService.java index f59f2432..da007069 100644 --- a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiZrdwService.java +++ b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiZrdwService.java @@ -1,10 +1,13 @@ package com.kms.warn.service; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.warn.mapper.BsSgcJsjdBuiZrdwMapper; import com.kms.warn.domain.BsSgcJsjdBuiZrdw; +import java.util.List; + /** * 责任单位Service接口 * @@ -14,4 +17,11 @@ import com.kms.warn.domain.BsSgcJsjdBuiZrdw; @Service public class BsSgcJsjdBuiZrdwService extends BaseService{ + @Autowired + private BsSgcJsjdBuiZrdwMapper bsSgcJsjdBuiZrdwMapper; + + public List listById(String id) { + return bsSgcJsjdBuiZrdwMapper.listById(id); + + } } diff --git a/jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdBuiZrdwMapper.xml b/jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdBuiZrdwMapper.xml new file mode 100644 index 00000000..eca180f3 --- /dev/null +++ b/jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdBuiZrdwMapper.xml @@ -0,0 +1,28 @@ + + + + + + select ei.enterprise_name,bz.* + from bs_sgc_jsjd_bui_ente_info ei left join bs_sgc_jsjd_bui_zrdw bz on ei.id=bz.unit_id + + + + + + + + + + + + + +