From ff9808690438f097086ca2345ac9883cde5c3fe7 Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Tue, 4 Nov 2025 08:49:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](main?= =?UTF-8?q?)=20=20-=20=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/dto/CorpInfoAddCmd.java | 28 +++++++++---------- .../basic/info/dto/CorpInfoUpdateCmd.java | 28 +++++++++---------- .../basic/info/dto/CorpInfoXgfUpdateCmd.java | 28 +++++++++---------- .../basic/info/domain/model/CorpInfoE.java | 28 +++++++++---------- .../basic/info/domain/model/CorpInfoXgfE.java | 28 +++++++++---------- .../persistence/dataobject/CorpInfoDO.java | 28 +++++++++---------- 6 files changed, 84 insertions(+), 84 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java index 36db005..bbc7950 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java @@ -138,33 +138,33 @@ public class CorpInfoAddCmd extends Command { @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseEnd; @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true) - private Integer whetherHygiene; + private Integer whetherHygieneFlag; @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true) - private Integer whetherHazards; + private Integer whetherHazardsFlag; @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true) - private Integer whetherScarce; + private Integer whetherScarceFlag; @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true) - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true) - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true) - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true) - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true) - private Integer whetherFire; + private Integer whetherFireFlag; @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true) - private Integer whetherConfined; + private Integer whetherConfinedFlag; @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true) - private Integer whetherPowder; + private Integer whetherPowderFlag; @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true) - private Integer whetherLightning; + private Integer whetherLightningFlag; @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true) - private Integer whetherPipeline; + private Integer whetherPipelineFlag; @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true) - private Integer whetherActinogen; + private Integer whetherActinogenFlag; @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true) - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java index 31a52de..35c868f 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java @@ -142,33 +142,33 @@ public class CorpInfoUpdateCmd extends Command { @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseEnd; @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true) - private Integer whetherHygiene; + private Integer whetherHygieneFlag; @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true) - private Integer whetherHazards; + private Integer whetherHazardsFlag; @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true) - private Integer whetherScarce; + private Integer whetherScarceFlag; @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true) - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true) - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true) - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true) - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true) - private Integer whetherFire; + private Integer whetherFireFlag; @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true) - private Integer whetherConfined; + private Integer whetherConfinedFlag; @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true) - private Integer whetherPowder; + private Integer whetherPowderFlag; @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true) - private Integer whetherLightning; + private Integer whetherLightningFlag; @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true) - private Integer whetherPipeline; + private Integer whetherPipelineFlag; @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true) - private Integer whetherActinogen; + private Integer whetherActinogenFlag; @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true) - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java index a1809e7..7847c8e 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java @@ -140,33 +140,33 @@ public class CorpInfoXgfUpdateCmd extends Command { @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseEnd; @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true) - private Integer whetherHygiene; + private Integer whetherHygieneFlag; @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true) - private Integer whetherHazards; + private Integer whetherHazardsFlag; @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true) - private Integer whetherScarce; + private Integer whetherScarceFlag; @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true) - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true) - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true) - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true) - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true) - private Integer whetherFire; + private Integer whetherFireFlag; @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true) - private Integer whetherConfined; + private Integer whetherConfinedFlag; @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true) - private Integer whetherPowder; + private Integer whetherPowderFlag; @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true) - private Integer whetherLightning; + private Integer whetherLightningFlag; @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true) - private Integer whetherPipeline; + private Integer whetherPipelineFlag; @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true) - private Integer whetherActinogen; + private Integer whetherActinogenFlag; @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true) - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; /* @ApiModelProperty(value = "用工形式", name = "employmentformList", required = true) private List employmentformList; @ApiModelProperty(value = "选取形式", name = "selectfromList", required = true) diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java index f68f2c0..896377d 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java @@ -128,33 +128,33 @@ public class CorpInfoE extends BaseE { //营业执照结束时间 private LocalDate licenseEnd; //有无职业卫生信息,1:是,0:否 - private Integer whetherHygiene; + private Integer whetherHygieneFlag; //有无重大危险源,1:是,0:否 - private Integer whetherHazards; + private Integer whetherHazardsFlag; //是否有稀缺大型应急物资或设施,1:是,0:否 - private Integer whetherScarce; + private Integer whetherScarceFlag; //是否涉及危化品,1:是,0:否 - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; //有无特种设备,1:是,0:否 - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; //有无特存种作业人员,1:是,0:否 - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; //是否涉及煤气,1:是,0:否 - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; //是否属于消防重点单位,1:是,0:否 - private Integer whetherFire; + private Integer whetherFireFlag; //是否在有限空间作业,1:是,0:否 - private Integer whetherConfined; + private Integer whetherConfinedFlag; //是否存在涉爆粉尘作业,1:是,0:否 - private Integer whetherPowder; + private Integer whetherPowderFlag; //是否涉及防雷防静电,1:是,0:否 - private Integer whetherLightning; + private Integer whetherLightningFlag; //是否涉及危化品管道,1:是,0:否 - private Integer whetherPipeline; + private Integer whetherPipelineFlag; //是否持有放射源,1:是,0:否 - private Integer whetherActinogen; + private Integer whetherActinogenFlag; //是否涉及液氨制冷,1:是,0:否 - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java index 5f44a07..e9f5613 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java @@ -126,33 +126,33 @@ public class CorpInfoXgfE extends BaseE { //营业执照结束时间 private LocalDate licenseEnd; //有无职业卫生信息,1:是,0:否 - private Integer whetherHygiene; + private Integer whetherHygieneFlag; //有无重大危险源,1:是,0:否 - private Integer whetherHazards; + private Integer whetherHazardsFlag; //是否有稀缺大型应急物资或设施,1:是,0:否 - private Integer whetherScarce; + private Integer whetherScarceFlag; //是否涉及危化品,1:是,0:否 - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; //有无特种设备,1:是,0:否 - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; //有无特存种作业人员,1:是,0:否 - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; //是否涉及煤气,1:是,0:否 - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; //是否属于消防重点单位,1:是,0:否 - private Integer whetherFire; + private Integer whetherFireFlag; //是否在有限空间作业,1:是,0:否 - private Integer whetherConfined; + private Integer whetherConfinedFlag; //是否存在涉爆粉尘作业,1:是,0:否 - private Integer whetherPowder; + private Integer whetherPowderFlag; //是否涉及防雷防静电,1:是,0:否 - private Integer whetherLightning; + private Integer whetherLightningFlag; //是否涉及危化品管道,1:是,0:否 - private Integer whetherPipeline; + private Integer whetherPipelineFlag; //是否持有放射源,1:是,0:否 - private Integer whetherActinogen; + private Integer whetherActinogenFlag; //是否涉及液氨制冷,1:是,0:否 - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java index 13357be..80a4495 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java @@ -184,46 +184,46 @@ public class CorpInfoDO extends BaseDO { private LocalDate licenseEnd; //有无职业卫生信息,1:是,0:否 @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否") - private Integer whetherHygiene; + private Integer whetherHygieneFlag; //有无重大危险源,1:是,0:否 @ApiModelProperty(value = "有无重大危险源,1:是,0:否") - private Integer whetherHazards; + private Integer whetherHazardsFlag; //是否有稀缺大型应急物资或设施,1:是,0:否 @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否") - private Integer whetherScarce; + private Integer whetherScarceFlag; //是否涉及危化品,1:是,0:否 @ApiModelProperty(value = "是否涉及危化品,1:是,0:否") - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; //有无特种设备,1:是,0:否 @ApiModelProperty(value = "有无特种设备,1:是,0:否") - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; //有无特存种作业人员,1:是,0:否 @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否") - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; //是否涉及煤气,1:是,0:否 @ApiModelProperty(value = "是否涉及煤气,1:是,0:否") - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; //是否属于消防重点单位,1:是,0:否 @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否") - private Integer whetherFire; + private Integer whetherFireFlag; //是否在有限空间作业,1:是,0:否 @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否") - private Integer whetherConfined; + private Integer whetherConfinedFlag; //是否存在涉爆粉尘作业,1:是,0:否 @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否") - private Integer whetherPowder; + private Integer whetherPowderFlag; //是否涉及防雷防静电,1:是,0:否 @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否") - private Integer whetherLightning; + private Integer whetherLightningFlag; //是否涉及危化品管道,1:是,0:否 @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否") - private Integer whetherPipeline; + private Integer whetherPipelineFlag; //是否持有放射源,1:是,0:否 @ApiModelProperty(value = "是否持有放射源,1:是,0:否") - private Integer whetherActinogen; + private Integer whetherActinogenFlag; //是否涉及液氨制冷,1:是,0:否 @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否") - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; //乐观锁 @ApiModelProperty(value = "乐观锁") private Integer version; From 15c25db20aa295b916b5197f121223ed5b8aca72 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 4 Nov 2025 08:50:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=96=B0=E5=A2=9Edubbo?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../facade/ZcloudDepartmentFacadeImpl.java | 71 +++++++++++++++++++ .../basic/info/web/CorpInfoController.java | 4 ++ .../basic/info/web/CorpInfoXgfController.java | 6 +- .../convertor/DepartmentCoConvertor.java | 4 ++ .../basic/info/dto/DepartmentAddCmd.java | 4 +- .../basic/info/dto/DepartmentUpdateCmd.java | 4 +- .../info/dto/clientobject/DepartmentCO.java | 2 +- .../basic/info/domain/model/DepartmentE.java | 2 +- .../persistence/dataobject/DepartmentDO.java | 2 +- .../persistence/mapper/CorpInfoMapper.java | 4 -- .../mapper/CorpQualificationInfoMapper.java | 4 -- .../persistence/mapper/DepartmentMapper.java | 4 -- .../impl/DepartmentRepositoryImpl.java | 1 + 13 files changed, 92 insertions(+), 20 deletions(-) create mode 100644 web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java new file mode 100644 index 0000000..ab2c843 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java @@ -0,0 +1,71 @@ +package com.zcloud.basic.info.facade; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.basic.info.api.DepartmentServiceI; +import com.zcloud.basic.info.command.convertor.DepartmentCoConvertor; +import com.zcloud.basic.info.dto.DepartmentAddCmd; +import com.zcloud.basic.info.dto.DepartmentPageQry; +import com.zcloud.basic.info.dto.DepartmentUpdateCmd; +import com.zcloud.basic.info.dto.clientobject.DepartmentCO; +import com.zcloud.gbscommon.zclouddepartment.face.ZcloudDepartmentFacade; +import com.zcloud.gbscommon.zclouddepartment.request.ZcloudDepartmentAddCmd; +import com.zcloud.gbscommon.zclouddepartment.request.ZcloudDepartmentInfoQry; +import com.zcloud.gbscommon.zclouddepartment.request.ZcloudDepartmentPageQry; +import com.zcloud.gbscommon.zclouddepartment.request.ZcloudDepartmentUpdateCmd; +import com.zcloud.gbscommon.zclouddepartment.response.ZcloudDepartmentInfoCo; +import com.zcloud.gbscommon.zclouduser.facade.ZcloudUserFacade; +import com.zcloud.gbscommon.zclouduser.response.ZcloudUserCo; +import org.apache.dubbo.config.annotation.DubboService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * + * @author lin + */ +@DubboService +public class ZcloudDepartmentFacadeImpl implements ZcloudDepartmentFacade { + + @Resource + private DepartmentServiceI departmentService; + @Resource + private DepartmentCoConvertor departmentCoConvertor; + + @Override + public SingleResponse getDepartmentInfoById(ZcloudDepartmentInfoQry zcloudDepartmentInfoQry) { + DepartmentCO info = departmentService.info(zcloudDepartmentInfoQry.getId()); + ZcloudDepartmentInfoCo zcloudDepartmentInfoCo = new ZcloudDepartmentInfoCo(); + BeanUtils.copyProperties(info, zcloudDepartmentInfoCo); + return SingleResponse.of(zcloudDepartmentInfoCo); + } + + @Override + public PageResponse pageByParentId(ZcloudDepartmentPageQry zcloudDepartmentPageQry) { + DepartmentPageQry qry = new DepartmentPageQry(); + BeanUtils.copyProperties(zcloudDepartmentPageQry, qry); + PageResponse departmentCOPageResponse = departmentService.listPage(qry); + List zcloudPage = departmentCoConvertor.converCOsToDoubbpCOs(departmentCOPageResponse.getData()); + return PageResponse.of(zcloudPage, departmentCOPageResponse.getTotalCount(), departmentCOPageResponse.getPageSize(), departmentCOPageResponse.getPageIndex()); + } + + @Override + public SingleResponse addDepartment(ZcloudDepartmentAddCmd zcloudDepartmentAddCmd) { + DepartmentAddCmd addCmd =new DepartmentAddCmd(); + BeanUtils.copyProperties(zcloudDepartmentAddCmd, addCmd); + return departmentService.add(addCmd); + } + + @Override + public SingleResponse editDepartment(ZcloudDepartmentUpdateCmd zcloudDepartmentUpdateCmd) { + DepartmentUpdateCmd updateCmd =new DepartmentUpdateCmd(); + BeanUtils.copyProperties(zcloudDepartmentUpdateCmd, updateCmd); + departmentService.edit(updateCmd); + return SingleResponse.buildSuccess(); + } +} diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java index 60253d0..04eff68 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java @@ -58,6 +58,10 @@ public class CorpInfoController { @ApiOperation("详情") @PostMapping("/info/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { + if(id==null){ + SSOUser ssoUser = AuthContext.getCurrentUser(); + id = ssoUser.getTenantId(); + } return SingleResponse.of(corpInfoService.info(id)); } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoXgfController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoXgfController.java index 72966a8..d3ae5d6 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoXgfController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoXgfController.java @@ -36,7 +36,7 @@ public class CorpInfoXgfController { @ApiOperation("新增相关方企业") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody CorpInfoXgfAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); + return corpInfoXgfService.add(cmd); } @@ -55,6 +55,10 @@ public class CorpInfoXgfController { @ApiOperation("相关方企业详情") @PostMapping("/info/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { + if(id==null){ + SSOUser ssoUser = AuthContext.getCurrentUser(); + id = ssoUser.getTenantId(); + } return SingleResponse.of(corpInfoXgfService.info(id)); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/DepartmentCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/DepartmentCoConvertor.java index fa206f7..87a9c74 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/DepartmentCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/DepartmentCoConvertor.java @@ -3,6 +3,7 @@ package com.zcloud.basic.info.command.convertor; import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; +import com.zcloud.gbscommon.zclouddepartment.response.ZcloudDepartmentInfoCo; import org.mapstruct.Mapper; import java.util.List; @@ -23,5 +24,8 @@ public interface DepartmentCoConvertor { List converDOsToCOs(List departmentDOs); List converDOsToInfoCOs(List pageResponse); + + + List converCOsToDoubbpCOs(List departmentCOList); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java index a31bf75..0148d92 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java @@ -40,8 +40,8 @@ public class DepartmentAddCmd extends Command { private String levelName; @ApiModelProperty(value = "部门排序", name = "depOrder", required = true) private Integer depOrder; - @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "isSupervise", required = true) - private Integer isSupervise; + @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "superviseFlag", required = true) + private Integer superviseFlag; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java index 9b053f2..c703482 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java @@ -41,8 +41,8 @@ public class DepartmentUpdateCmd extends Command { private String levelName; @ApiModelProperty(value = "部门排序", name = "depOrder", required = true) private Integer depOrder; - @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "isSupervise", required = true) - private Integer isSupervise; + @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "superviseFlag", required = true) + private Integer superviseFlag; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java index 0aa9d4d..6155dba 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java @@ -41,7 +41,7 @@ public class DepartmentCO extends ClientObject { private Integer depOrder; //是否监管部门 0-否 1-是 @ApiModelProperty(value = "是否监管部门 0-否 1-是") - private Integer isSupervise; + private Integer superviseFlag; //乐观锁 @ApiModelProperty(value = "乐观锁") diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java index 5ab0b89..67764fc 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java @@ -34,7 +34,7 @@ public class DepartmentE extends BaseE { //部门排序 private Integer depOrder; //是否监管部门 0-否 1-是 - private Integer isSupervise; + private Integer superviseFlag; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java index 8da0221..6dab71e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java @@ -44,7 +44,7 @@ public class DepartmentDO extends BaseDO { private Integer depOrder; //是否监管部门 0-否 1-是 @ApiModelProperty(value = "是否监管部门 0-否 1-是") - private Integer isSupervise; + private Integer superviseFlag; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java index 4ec093e..46fd3fa 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java @@ -13,10 +13,6 @@ import org.apache.ibatis.annotations.Mapper; * @Date 2025-10-29 16:02:16 */ @Mapper -@DataScopes({ - @DataScope(method = "selectList", menuPerms = "open_platform_100012", tenantAlias = "tenant_id"), - @DataScope(method = "selectPage", menuPerms = "open_platform_100013", tenantAlias = "tenant_id") -}) public interface CorpInfoMapper extends BaseMapper { } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpQualificationInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpQualificationInfoMapper.java index 297e6be..0d7376d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpQualificationInfoMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpQualificationInfoMapper.java @@ -13,10 +13,6 @@ import org.apache.ibatis.annotations.Mapper; * @Date 2025-10-29 16:02:46 */ @Mapper -@DataScopes({ - @DataScope(method = "selectList", menuPerms = "open_platform_100012", tenantAlias = "tenant_id"), - @DataScope(method = "selectPage", menuPerms = "open_platform_100013", tenantAlias = "tenant_id") -}) public interface CorpQualificationInfoMapper extends BaseMapper { } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java index ab3577f..a9111d8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java @@ -13,10 +13,6 @@ import org.apache.ibatis.annotations.Mapper; * @Date 2025-10-29 16:03:20 */ @Mapper -@DataScopes({ - @DataScope(method = "selectList", menuPerms = "open_platform_100012", tenantAlias = "tenant_id"), - @DataScope(method = "selectPage", menuPerms = "open_platform_100013", tenantAlias = "tenant_id") -}) public interface DepartmentMapper extends BaseMapper { } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java index 6d4cca0..c665e18 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java @@ -46,6 +46,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); SSOUser ssoUser = AuthContext.getCurrentUser(); + queryWrapper.eq("tenant_id",ssoUser.getTenantId()); queryWrapper.orderByDesc("dep_order"); List departmentDOList = departmentMapper.selectList(queryWrapper); if (CollUtil.isEmpty(departmentDOList)) {