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 00000000..ab2c8436 --- /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 60253d0d..04eff68b 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 72966a89..d3ae5d63 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-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java index 31b85dbd..5fd10c68 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java @@ -89,8 +89,8 @@ public class DepartmentController { } @ApiOperation("部门树状所有数据") @PostMapping("/listTree") - public List listTree(@Validated @RequestBody DepartmentTreeQry qry) { - return departmentService.listTree(qry); + public MultiResponse listTree(@Validated @RequestBody DepartmentTreeQry qry) { + return MultiResponse.of(departmentService.listTree(qry)); } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java index ef706883..3f7ea978 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java @@ -1,6 +1,7 @@ package com.zcloud.basic.info.web; +import com.alibaba.cola.exception.BizException; import com.zcloud.basic.info.api.PostServiceI; import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.PostCO; @@ -35,6 +36,10 @@ public class PostController { @PostMapping("/save") public SingleResponse add(@Validated @RequestBody PostAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); + // 监管端不用校验, 企业端必填 + if(cmd.getCorpFlag() == 2 && cmd.getSupervisionFlag() == null){ + throw new BizException("是否监管岗位不能为空"); + } return postService.add(cmd); } @@ -74,8 +79,12 @@ public class PostController { @ApiOperation("修改") @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody PostUpdateCmd postUpdateCmd) { - postService.edit(postUpdateCmd); + public SingleResponse edit(@Validated @RequestBody PostUpdateCmd cmd) { + // 监管端不用校验, 企业端必填 + if(cmd.getCorpFlag() == 2 && cmd.getSupervisionFlag() == null){ + throw new BizException("是否监管岗位不能为空"); + } + postService.edit(cmd); return SingleResponse.buildSuccess(); } } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/RiskPointController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/RiskPointController.java deleted file mode 100644 index 343d4c49..00000000 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/RiskPointController.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.zcloud.basic.info.web; - - -import com.alibaba.cola.dto.MultiResponse; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.Response; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.basic.info.api.RiskPointServiceI; -import com.zcloud.basic.info.dto.RiskPointAddCmd; -import com.zcloud.basic.info.dto.RiskPointPageQry; -import com.zcloud.basic.info.dto.RiskPointUpdateCmd; -import com.zcloud.basic.info.dto.clientobject.RiskPointCo; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; - -/** - * @author lin - */ -@Api(tags = "风险点管理") -@RequestMapping("/risk/riskPoint") -@RestController -@AllArgsConstructor -public class RiskPointController { - private final RiskPointServiceI riskPointService; - - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody RiskPointAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - return riskPointService.add(cmd); - } - - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody RiskPointPageQry qry) { - return riskPointService.listPage(qry); - } - - @ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); - } - - @ApiOperation("详情") - @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(new RiskPointCo()); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - riskPointService.remove(id); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - riskPointService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody RiskPointUpdateCmd riskPointUpdateCmd) { - riskPointService.edit(riskPointUpdateCmd); - return SingleResponse.buildSuccess(); - } -} diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java index eccda02f..d37c4431 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java @@ -62,7 +62,7 @@ public class CorpInfoXgfAddExe { otaTenantAddCmd.setAccount(corpInfoXgfE.getCorpName()); otaTenantAddCmd.setTenantId(corpInfoId); otaTenantAddCmd.setTenantName(corpInfoXgfE.getCorpName()); - otaTenantAddCmd.setPassword("123456"); + otaTenantAddCmd.setPassword("Aa@123456789"); log.info("CorpInfoXgfAddExe,新增企业调用GBS请求:{}",otaTenantAddCmd.toString()); Response response = tenantFacade.addOtaTenant(otaTenantAddCmd); log.info("CorpInfoXgfAddExe,新增企业调用GBS返回:{}",response.toString()); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/RiskPointAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/RiskPointAddExe.java deleted file mode 100644 index 992cdb46..00000000 --- a/web-app/src/main/java/com/zcloud/basic/info/command/RiskPointAddExe.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.zcloud.basic.info.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.basic.info.domain.gateway.RiskPointGateway; -import com.zcloud.basic.info.domain.model.RiskPointE; -import com.zcloud.basic.info.dto.RiskPointAddCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -/** - * 风险点新增执行器 - * - * @author lin - */ -@Component -@AllArgsConstructor -public class RiskPointAddExe { - private final RiskPointGateway riskPointGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(RiskPointAddCmd cmd) { - RiskPointE examTypeE = new RiskPointE(); - BeanUtils.copyProperties(cmd, examTypeE); - boolean res = false; - try { - res = riskPointGateway.add(examTypeE); - } catch (Exception e) { - throw new RuntimeException(e); - } - if (!res) { - throw new BizException("保存失败"); - } - return true; - } -} diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/RiskPointRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/RiskPointRemoveExe.java deleted file mode 100644 index dc6a3751..00000000 --- a/web-app/src/main/java/com/zcloud/basic/info/command/RiskPointRemoveExe.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zcloud.basic.info.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.basic.info.domain.gateway.RiskPointGateway; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -/** - * 风险点新增执行器 - * @author lin - */ -@Component -@AllArgsConstructor -public class RiskPointRemoveExe { - private final RiskPointGateway riskPointGateway; - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long id) { - boolean res = riskPointGateway.deletedRiskPointById(id); - if(!res){ - throw new BizException("删除失败"); - } - return true; - } - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long[] ids) { - boolean res = riskPointGateway.deletedRiskPointByIds(ids); - if(!res){ - throw new BizException("删除失败"); - } - return true; - } -} diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/RiskPointUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/RiskPointUpdateExe.java deleted file mode 100644 index e11296d1..00000000 --- a/web-app/src/main/java/com/zcloud/basic/info/command/RiskPointUpdateExe.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zcloud.basic.info.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.basic.info.domain.gateway.RiskPointGateway; -import com.zcloud.basic.info.domain.model.RiskPointE; -import com.zcloud.basic.info.dto.RiskPointUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -/** - * 风险点修改执行器 - * - * @author lin - */ -@Component -@AllArgsConstructor -public class RiskPointUpdateExe { - private final RiskPointGateway riskPointGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(RiskPointUpdateCmd riskPointUpdateCmd) { - RiskPointE riskPointE = new RiskPointE(); - BeanUtils.copyProperties(riskPointUpdateCmd, riskPointE); - boolean res = riskPointGateway.update(riskPointE); - if (!res) { - throw new BizException("修改失败"); - } - } -} 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 fa206f78..87a9c74f 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-app/src/main/java/com/zcloud/basic/info/command/convertor/RiskPointCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/RiskPointCoConvertor.java deleted file mode 100644 index 29b2e4a7..00000000 --- a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/RiskPointCoConvertor.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zcloud.basic.info.command.convertor; - -import com.zcloud.basic.info.dto.clientobject.RiskPointCo; -import com.zcloud.basic.info.persistence.dataobject.RiskPointDO; -import org.mapstruct.Mapper; - -import java.util.List; - -@Mapper(componentModel = "spring") -public interface RiskPointCoConvertor { - /** - * @param riskPointE - * @return - */ - List converDOsToCOs(List riskPointE); -} diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java index 26f499fd..1e1b3815 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java @@ -52,8 +52,6 @@ public class CorpInfoQueryExe { PageResponse pageResponse = corpInfoRepository.listPage(parmas); List examCenterCOS = corpInfoCoConvertor.converDOsToCOs(pageResponse.getData()); - //TODO - //1.查找营业执照图片信息，2.查找四色图图片信息 return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } @@ -75,7 +73,7 @@ public class CorpInfoQueryExe { List corpInfoList = corpInfoCoConvertor.converDOsToCorpDepartCOs(pageResponse.getData()); corpInfoList.forEach(corpInfo -> { Map departParmas = new HashMap<>(); - departParmas.put("eqCorpinfoId",corpInfo.getId()); + departParmas.put("eqId",corpInfo.getId()); List list = departmentRepository.listByParams(departParmas); List departmentES = corpInfoCoConvertor.converDOsToDepartE(list); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java index bac2e425..bc4a9663 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java @@ -2,15 +2,19 @@ package com.zcloud.basic.info.command.query; import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.MultiResponse; +import com.zcloud.basic.info.command.convertor.DepartmentCoConvertor; import com.zcloud.basic.info.command.convertor.PostCoConvertor; import com.zcloud.basic.info.command.convertor.PostDepartmentCoConvertor; import com.zcloud.basic.info.dto.PostDepartmentPageQry; import com.zcloud.basic.info.dto.PostListQry; import com.zcloud.basic.info.dto.PostPageQry; +import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.basic.info.dto.clientobject.PostCO; import com.zcloud.basic.info.dto.clientobject.PostDepartmentCO; +import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; import com.zcloud.basic.info.persistence.dataobject.PostDO; import com.zcloud.basic.info.persistence.dataobject.PostDepartmentDO; +import com.zcloud.basic.info.persistence.repository.DepartmentRepository; import com.zcloud.basic.info.persistence.repository.PostDepartmentRepository; import com.zcloud.basic.info.persistence.repository.PostRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; @@ -20,6 +24,7 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.beans.BeanUtils; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -37,6 +42,8 @@ import java.util.stream.Collectors; public class PostQueryExe { private final PostRepository postRepository; private final PostDepartmentRepository postDepartmentRepository; + private final DepartmentRepository departmentRepository; + private final DepartmentCoConvertor departmentCoConvertor; private final PostCoConvertor postCoConvertor; private final PostDepartmentCoConvertor postDepartmentCoConvertor; @@ -49,8 +56,30 @@ public class PostQueryExe { public PageResponse execute(PostPageQry postPageQry) { Map params = PageQueryHelper.toHashMap(postPageQry); PageResponse pageResponse = postRepository.listPage(params); - List examCenterCOS = postCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + + Long[] departmentIds = pageResponse.getData().stream().map(PostDO::getDepartmentId).toArray(Long[]::new); + List departmentDOList = departmentRepository.listByIds(Arrays.asList(departmentIds)); + + // Map<部门id, 部门名称> + Map departmentMap = new HashMap<>(); + if(CollUtil.isNotEmpty(departmentDOList)) { + List departmentCOList = departmentCoConvertor.converDOsToCOs(departmentDOList); + departmentMap = departmentCOList.stream().collect(Collectors.toMap( + DepartmentCO::getId, + DepartmentCO::getName + )); + } + + List postCOList = postCoConvertor.converDOsToCOs(pageResponse.getData()); + if(CollUtil.isNotEmpty(postCOList)) { + for (PostCO postCO : postCOList) { + if(CollUtil.isNotEmpty(departmentMap)) { + postCO.setDepartmentName(departmentMap.get(postCO.getDepartmentId())); + } + } + } + + return PageResponse.of(postCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } public MultiResponse execute(PostListQry qry) { @@ -62,8 +91,10 @@ public class PostQueryExe { return new MultiResponse<>(); } Long[] postIds = postMRDO.getData().stream().map(PostDO::getId).toArray(Long[]::new); + Long[] departmentIds = postMRDO.getData().stream().map(PostDO::getDepartmentId).toArray(Long[]::new); // 岗位部门集合 List postDepartmentDOList = postDepartmentRepository.list(postIds); + List departmentDOList = departmentRepository.listByIds(Arrays.asList(departmentIds)); // Map<岗位id, List<岗位部门对象>> Map> postDepartmentMap = new HashMap<>(); @@ -71,6 +102,15 @@ public class PostQueryExe { List postDepartmentCOList = postDepartmentCoConvertor.converDOsToCOs(postDepartmentDOList); postDepartmentMap = postDepartmentCOList.stream().collect(Collectors.groupingBy(PostDepartmentCO::getPostId)); } + // Map<部门id, 部门名称> + Map departmentMap = new HashMap<>(); + if(CollUtil.isNotEmpty(departmentDOList)) { + List departmentCOList = departmentCoConvertor.converDOsToCOs(departmentDOList); + departmentMap = departmentCOList.stream().collect(Collectors.toMap( + DepartmentCO::getId, + DepartmentCO::getName + )); + } // 赋值 List postDOList = postMRDO.getData(); @@ -80,6 +120,9 @@ public class PostQueryExe { if(CollUtil.isNotEmpty(postDepartmentMap) && CollUtil.isNotEmpty(postDepartmentMap.get(postCO.getId()))) { postCO.setDepartmentList(postDepartmentMap.get(postCO.getId())); } + if(CollUtil.isNotEmpty(departmentMap)) { + postCO.setDepartmentName(departmentMap.get(postCO.getDepartmentId())); + } } } @@ -96,6 +139,10 @@ public class PostQueryExe { BeanUtils.copyProperties(postDO.getData(), co); postCO.setData(co); + // 查询部门名称 + DepartmentDO departmentDO = departmentRepository.getById(postDO.getData().getDepartmentId()); + postCO.getData().setDepartmentName(departmentDO.getName()); + // 岗位-部门权限关联代码 if(co.getSupervisionFlag() == 1){ PostDepartmentPageQry qry = new PostDepartmentPageQry(); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/RiskPointQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/RiskPointQueryExe.java deleted file mode 100644 index fe725e1b..00000000 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/RiskPointQueryExe.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zcloud.basic.info.command.query; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.basic.info.command.convertor.RiskPointCoConvertor; -import com.zcloud.basic.info.dto.RiskPointPageQry; -import com.zcloud.basic.info.dto.clientobject.RiskPointCo; -import com.zcloud.basic.info.persistence.dataobject.RiskPointDO; -import com.zcloud.basic.info.persistence.repository.RiskPointRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * 风险点新增执行器 - * - * @author lin - */ -@Component -@AllArgsConstructor -public class RiskPointQueryExe { - private final RiskPointRepository riskPointRepository; - private final RiskPointCoConvertor riskPointCoConvertor; - - /** - * 分页 - * - * @param riskPointPageQry - * @return - */ - public PageResponse execute(RiskPointPageQry riskPointPageQry) { - PageResponse pageResponse = riskPointRepository.listRiskPointPage(riskPointPageQry.toHashMap()); - List examCenterCOS = riskPointCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } -} diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/RiskPointServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/RiskPointServiceImpl.java deleted file mode 100644 index 696667c0..00000000 --- a/web-app/src/main/java/com/zcloud/basic/info/service/RiskPointServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.zcloud.basic.info.service; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.basic.info.api.RiskPointServiceI; -import com.zcloud.basic.info.command.RiskPointAddExe; -import com.zcloud.basic.info.command.RiskPointRemoveExe; -import com.zcloud.basic.info.command.RiskPointUpdateExe; -import com.zcloud.basic.info.command.query.RiskPointQueryExe; -import com.zcloud.basic.info.dto.RiskPointAddCmd; -import com.zcloud.basic.info.dto.RiskPointPageQry; -import com.zcloud.basic.info.dto.RiskPointUpdateCmd; -import com.zcloud.basic.info.dto.clientobject.RiskPointCo; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * @author lin - */ -@Service -@AllArgsConstructor -public class RiskPointServiceImpl implements RiskPointServiceI { - private final RiskPointAddExe riskPointAddExe; - private final RiskPointUpdateExe riskPointUpdateExe; - private final RiskPointRemoveExe riskPointRemoveExe; - private final RiskPointQueryExe riskPointQueryExe; - - @Override - public PageResponse listPage(RiskPointPageQry qry){ - - return riskPointQueryExe.execute(qry); - } - - @Override - public SingleResponse add(RiskPointAddCmd cmd) { - - riskPointAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(RiskPointUpdateCmd riskPointUpdateCmd) { - riskPointUpdateExe.execute(riskPointUpdateCmd); - } - - @Override - public void remove(Long id) { - riskPointRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - riskPointRemoveExe.execute(ids); - } - -} diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/RiskPointServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/RiskPointServiceI.java deleted file mode 100644 index d886de83..00000000 --- a/web-client/src/main/java/com/zcloud/basic/info/api/RiskPointServiceI.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zcloud.basic.info.api; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.basic.info.dto.RiskPointAddCmd; -import com.zcloud.basic.info.dto.RiskPointPageQry; -import com.zcloud.basic.info.dto.RiskPointUpdateCmd; -import com.zcloud.basic.info.dto.clientobject.RiskPointCo; - -public interface RiskPointServiceI { - PageResponse listPage(RiskPointPageQry qry); - SingleResponse add(RiskPointAddCmd cmd); - - void edit(RiskPointUpdateCmd riskPointUpdateCmd); - - void remove(Long id); - - void removeBatch(Long[] ids); - -} 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 4125171b..bbc79501 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 @@ -36,7 +36,7 @@ public class CorpInfoAddCmd extends Command { private Integer xgfLevel; @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true) private Integer corOrder; - @ApiModelProperty(value = "是否启用，1:启用,2:关闭", name = "isUse", required = true) + @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "isUse", required = true) private Integer isUse; @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) private String code; @@ -46,9 +46,6 @@ public class CorpInfoAddCmd extends Command { private String postalCode; @ApiModelProperty(value = "所属区域", name = "companyArea", required = true) private String companyArea; - @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true) - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate firstServeDate; @ApiModelProperty(value = "规模", name = "scale", required = true) private String scale; @ApiModelProperty(value = "规模名称", name = "scaleName", required = true) @@ -68,10 +65,7 @@ public class CorpInfoAddCmd extends Command { private String addressBusiness; @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true) private String addressOffice; - @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true) - private BigDecimal fixedAssets; - @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true) - private BigDecimal yearOutputValue; + @ApiModelProperty(value = "经济类型", name = "ecoType", required = true) private String ecoType; @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true) @@ -84,7 +78,7 @@ public class CorpInfoAddCmd extends Command { private String safetyName; @ApiModelProperty(value = "安全负责人手机号", name = "safetyPhone", required = true) private String safetyPhone; - @ApiModelProperty(value = "是否规模以上,1:是,2:否", name = "scaleType", required = true) + @ApiModelProperty(value = "是否规模以上,1:是,0:否", name = "scaleType", required = true) private Integer scaleType; @ApiModelProperty(value = "占地面积", name = "areaCovered", required = true) private BigDecimal areaCovered; @@ -135,8 +129,6 @@ public class CorpInfoAddCmd extends Command { private String streetName; @ApiModelProperty(value = "所属街道编码", name = "street", required = true) private String street; - @ApiModelProperty(value = "公司简介", name = "descr", required = true) - private String descr; @ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true) @JsonFormat(pattern = "yyyy-MM-dd") @@ -145,34 +137,34 @@ public class CorpInfoAddCmd extends Command { @ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseEnd; - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true) - private Integer whetherHygiene; - @ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true) - private Integer whetherHazards; - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否", name = "whetherScarce", required = true) - private Integer whetherScarce; - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否", name = "whetherChemicals", required = true) - private Integer whetherChemicals; - @ApiModelProperty(value = "有无特种设备,1:是,2:否", name = "whetherSpecialequipment", required = true) - private Integer whetherSpecialequipment; - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否", name = "whetherSpecialpeople", required = true) - private Integer whetherSpecialpeople; - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否", name = "whetherCoalgas", required = true) - private Integer whetherCoalgas; - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否", name = "whetherFire", required = true) - private Integer whetherFire; - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否", name = "whetherConfined", required = true) - private Integer whetherConfined; - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否", name = "whetherPowder", required = true) - private Integer whetherPowder; - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否", name = "whetherLightning", required = true) - private Integer whetherLightning; - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否", name = "whetherPipeline", required = true) - private Integer whetherPipeline; - @ApiModelProperty(value = "是否持有放射源,1:是,2:否", name = "whetherActinogen", required = true) - private Integer whetherActinogen; - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否", name = "whetherLiquidammonia", required = true) - private Integer whetherLiquidammonia; + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true) + private Integer whetherHygieneFlag; + @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true) + private Integer whetherHazardsFlag; + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true) + private Integer whetherScarceFlag; + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true) + private Integer whetherChemicalsFlag; + @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true) + private Integer whetherSpecialequipmentFlag; + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true) + private Integer whetherSpecialpeopleFlag; + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true) + private Integer whetherCoalgasFlag; + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true) + private Integer whetherFireFlag; + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true) + private Integer whetherConfinedFlag; + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true) + private Integer whetherPowderFlag; + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true) + private Integer whetherLightningFlag; + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true) + private Integer whetherPipelineFlag; + @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true) + private Integer whetherActinogenFlag; + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true) + 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 97e7e32d..35c868f4 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 @@ -39,7 +39,7 @@ public class CorpInfoUpdateCmd extends Command { private Integer xgfLevel; @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true) private Integer corOrder; - @ApiModelProperty(value = "是否启用，1:启用,2:关闭", name = "isUse", required = true) + @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "isUse", required = true) private Integer isUse; @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) private String code; @@ -49,9 +49,7 @@ public class CorpInfoUpdateCmd extends Command { private String postalCode; @ApiModelProperty(value = "所属区域", name = "companyArea", required = true) private String companyArea; - @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true) - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate firstServeDate; + @ApiModelProperty(value = "规模", name = "scale", required = true) private String scale; @ApiModelProperty(value = "规模名称", name = "scaleName", required = true) @@ -71,10 +69,7 @@ public class CorpInfoUpdateCmd extends Command { private String addressBusiness; @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true) private String addressOffice; - @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true) - private BigDecimal fixedAssets; - @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true) - private BigDecimal yearOutputValue; + @ApiModelProperty(value = "经济类型", name = "ecoType", required = true) private String ecoType; @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true) @@ -87,7 +82,7 @@ public class CorpInfoUpdateCmd extends Command { private String safetyName; @ApiModelProperty(value = "安全负责人手机号", name = "safetyPhone", required = true) private String safetyPhone; - @ApiModelProperty(value = "是否规模以上,1:是,2:否", name = "scaleType", required = true) + @ApiModelProperty(value = "是否规模以上,1:是,0:否", name = "scaleType", required = true) private Integer scaleType; @ApiModelProperty(value = "占地面积", name = "areaCovered", required = true) private BigDecimal areaCovered; @@ -138,8 +133,6 @@ public class CorpInfoUpdateCmd extends Command { private String streetName; @ApiModelProperty(value = "所属街道编码", name = "street", required = true) private String street; - @ApiModelProperty(value = "公司简介", name = "descr", required = true) - private String descr; @ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true) @JsonFormat(pattern = "yyyy-MM-dd") @@ -148,34 +141,34 @@ public class CorpInfoUpdateCmd extends Command { @ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseEnd; - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true) - private Integer whetherHygiene; - @ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true) - private Integer whetherHazards; - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否", name = "whetherScarce", required = true) - private Integer whetherScarce; - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否", name = "whetherChemicals", required = true) - private Integer whetherChemicals; - @ApiModelProperty(value = "有无特种设备,1:是,2:否", name = "whetherSpecialequipment", required = true) - private Integer whetherSpecialequipment; - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否", name = "whetherSpecialpeople", required = true) - private Integer whetherSpecialpeople; - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否", name = "whetherCoalgas", required = true) - private Integer whetherCoalgas; - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否", name = "whetherFire", required = true) - private Integer whetherFire; - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否", name = "whetherConfined", required = true) - private Integer whetherConfined; - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否", name = "whetherPowder", required = true) - private Integer whetherPowder; - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否", name = "whetherLightning", required = true) - private Integer whetherLightning; - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否", name = "whetherPipeline", required = true) - private Integer whetherPipeline; - @ApiModelProperty(value = "是否持有放射源,1:是,2:否", name = "whetherActinogen", required = true) - private Integer whetherActinogen; - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否", name = "whetherLiquidammonia", required = true) - private Integer whetherLiquidammonia; + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true) + private Integer whetherHygieneFlag; + @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true) + private Integer whetherHazardsFlag; + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true) + private Integer whetherScarceFlag; + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true) + private Integer whetherChemicalsFlag; + @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true) + private Integer whetherSpecialequipmentFlag; + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true) + private Integer whetherSpecialpeopleFlag; + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true) + private Integer whetherCoalgasFlag; + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true) + private Integer whetherFireFlag; + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true) + private Integer whetherConfinedFlag; + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true) + private Integer whetherPowderFlag; + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true) + private Integer whetherLightningFlag; + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true) + private Integer whetherPipelineFlag; + @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true) + private Integer whetherActinogenFlag; + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true) + private Integer whetherLiquidammoniaFlag; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java index df3a36c2..ee8bc2be 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java @@ -37,7 +37,7 @@ public class CorpInfoXgfAddCmd extends Command { @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true) private Integer corOrder; - @ApiModelProperty(value = "是否启用，1:启用,2:关闭", name = "isUse", required = true) + @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "isUse", required = true) private Integer isUse; @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) 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 0adba805..7847c8ec 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 @@ -40,7 +40,7 @@ public class CorpInfoXgfUpdateCmd extends Command { private Integer xgfLevel; @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true) private Integer corOrder; - @ApiModelProperty(value = "是否启用，1:启用,2:关闭", name = "isUse", required = true) + @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "isUse", required = true) private Integer isUse; @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) private String code; @@ -50,9 +50,6 @@ public class CorpInfoXgfUpdateCmd extends Command { private String postalCode; @ApiModelProperty(value = "所属区域", name = "companyArea", required = true) private String companyArea; - @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true) - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate firstServeDate; @ApiModelProperty(value = "规模", name = "scale", required = true) private String scale; @ApiModelProperty(value = "规模名称", name = "scaleName", required = true) @@ -72,10 +69,6 @@ public class CorpInfoXgfUpdateCmd extends Command { private String addressBusiness; @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true) private String addressOffice; - @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true) - private BigDecimal fixedAssets; - @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true) - private BigDecimal yearOutputValue; @ApiModelProperty(value = "经济类型", name = "ecoType", required = true) private String ecoType; @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true) @@ -88,7 +81,7 @@ public class CorpInfoXgfUpdateCmd extends Command { private String safetyName; @ApiModelProperty(value = "安全负责人手机号", name = "safetyPhone", required = true) private String safetyPhone; - @ApiModelProperty(value = "是否规模以上,1:是,2:否", name = "scaleType", required = true) + @ApiModelProperty(value = "是否规模以上,1:是,0:否", name = "scaleType", required = true) private Integer scaleType; @ApiModelProperty(value = "占地面积", name = "areaCovered", required = true) private BigDecimal areaCovered; @@ -138,9 +131,7 @@ public class CorpInfoXgfUpdateCmd extends Command { private String streetName; @ApiModelProperty(value = "所属街道编码", name = "street", required = true) private String street; - @ApiModelProperty(value = "公司简介", name = "descr", required = true) - private String descr; - + @ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseStart; @@ -148,34 +139,34 @@ public class CorpInfoXgfUpdateCmd extends Command { @ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseEnd; - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true) - private Integer whetherHygiene; - @ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true) - private Integer whetherHazards; - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否", name = "whetherScarce", required = true) - private Integer whetherScarce; - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否", name = "whetherChemicals", required = true) - private Integer whetherChemicals; - @ApiModelProperty(value = "有无特种设备,1:是,2:否", name = "whetherSpecialequipment", required = true) - private Integer whetherSpecialequipment; - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否", name = "whetherSpecialpeople", required = true) - private Integer whetherSpecialpeople; - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否", name = "whetherCoalgas", required = true) - private Integer whetherCoalgas; - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否", name = "whetherFire", required = true) - private Integer whetherFire; - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否", name = "whetherConfined", required = true) - private Integer whetherConfined; - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否", name = "whetherPowder", required = true) - private Integer whetherPowder; - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否", name = "whetherLightning", required = true) - private Integer whetherLightning; - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否", name = "whetherPipeline", required = true) - private Integer whetherPipeline; - @ApiModelProperty(value = "是否持有放射源,1:是,2:否", name = "whetherActinogen", required = true) - private Integer whetherActinogen; - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否", name = "whetherLiquidammonia", required = true) - private Integer whetherLiquidammonia; + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true) + private Integer whetherHygieneFlag; + @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true) + private Integer whetherHazardsFlag; + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true) + private Integer whetherScarceFlag; + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true) + private Integer whetherChemicalsFlag; + @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true) + private Integer whetherSpecialequipmentFlag; + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true) + private Integer whetherSpecialpeopleFlag; + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true) + private Integer whetherCoalgasFlag; + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true) + private Integer whetherFireFlag; + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true) + private Integer whetherConfinedFlag; + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true) + private Integer whetherPowderFlag; + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true) + private Integer whetherLightningFlag; + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true) + private Integer whetherPipelineFlag; + @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true) + private Integer whetherActinogenFlag; + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true) + private Integer whetherLiquidammoniaFlag; /* @ApiModelProperty(value = "用工形式", name = "employmentformList", required = true) private List employmentformList; @ApiModelProperty(value = "选取形式", name = "selectfromList", required = true) @@ -189,8 +180,8 @@ public class CorpInfoXgfUpdateCmd extends Command { @ApiModelProperty(value = "基层单位主管部门", name = "superVisecorpDeptList", required = true) private List superVisecorpDeptList; @ApiModelProperty(value = "集团单位", name = "corpTypeList", required = true) - private List corpTypeList; - @ApiModelProperty(value = "密码", name = "passWord", required = true)*/ + private List corpTypeList;*/ + @ApiModelProperty(value = "密码", name = "passWord", required = true) private String passWord; } 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 80b497ea..0148d929 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 @@ -31,12 +31,7 @@ public class DepartmentAddCmd extends Command { @ApiModelProperty(value = "父部门id", name = "parentId", required = true) @NotNull(message = "父部门id不能为空") private Long parentId; - @ApiModelProperty(value = "负责人,汉字6以内", name = "headman", required = true) - private String headman; - @ApiModelProperty(value = "负责人手机号", name = "phone", required = true) - private String phone; - @ApiModelProperty(value = "地址,汉字80以内", name = "address", required = true) - private String address; + @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true) private Long corpinfoId; @ApiModelProperty(value = "部门级别编码", name = "level", required = true) @@ -45,24 +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 = "state", required = true) - private Integer state; - @ApiModelProperty(value = "主管领导,汉字6以内", name = "leaderCharge", required = true) - private String leaderCharge; - @ApiModelProperty(value = "分管领导人,汉字6以内", name = "lrman", required = true) - private String lrman; - @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管", name = "category", required = true) - private Integer category; - @ApiModelProperty(value = "单位类型名称,汉字30以内", name = "deptTypeName", required = true) - private String deptTypeName; - @ApiModelProperty(value = "单位类型编码", name = "deptType", required = true) - private String deptType; - @ApiModelProperty(value = "部门类型编码", name = "type", required = true) - private String type; - @ApiModelProperty(value = "部门类型名称,汉字30以内", name = "typeName", required = true) - private String typeName; + @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "superviseFlag", required = true) + private Integer superviseFlag; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java index 760226cc..afd2c6a1 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java @@ -24,11 +24,6 @@ public class DepartmentTreeQry { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - /** - * 名称模糊查询 - */ - @ApiModelProperty(value = "名称模糊查询", name = "likeName") - private String likeName; @ApiModelProperty(value = "企业id", name = "eqCorpInfoId") private String eqCorpInfoId; 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 0c3f3dbf..c703482b 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 @@ -32,12 +32,7 @@ public class DepartmentUpdateCmd extends Command { private String name; @ApiModelProperty(value = "父部门id", name = "parentId", required = true) private Long parentId; - @ApiModelProperty(value = "负责人,汉字6以内", name = "headman", required = true) - private String headman; - @ApiModelProperty(value = "负责人手机号", name = "phone", required = true) - private String phone; - @ApiModelProperty(value = "地址,汉字80以内", name = "address", required = true) - private String address; + @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true) private Long corpinfoId; @ApiModelProperty(value = "部门级别编码", name = "level", required = true) @@ -46,24 +41,9 @@ 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 = "state", required = true) - private Integer state; - @ApiModelProperty(value = "主管领导,汉字6以内", name = "leaderCharge", required = true) - private String leaderCharge; - @ApiModelProperty(value = "分管领导人,汉字6以内", name = "lrman", required = true) - private String lrman; - @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管", name = "category", required = true) - private Integer category; - @ApiModelProperty(value = "单位类型名称,汉字30以内", name = "deptTypeName", required = true) - private String deptTypeName; - @ApiModelProperty(value = "单位类型编码", name = "deptType", required = true) - private String deptType; - @ApiModelProperty(value = "部门类型编码", name = "type", required = true) - private String type; - @ApiModelProperty(value = "部门类型名称,汉字30以内", name = "typeName", required = true) - private String typeName; + @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "superviseFlag", required = true) + private Integer superviseFlag; + } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java index 3116d693..5666f9bd 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java @@ -24,21 +24,16 @@ public class PostAddCmd extends Command { @NotNull(message = "部门id不能为空") private Long departmentId; - @ApiModelProperty(value = "部门名称", name = "departmentName", required = true) - @NotEmpty(message = "部门名称不能为空") - private String departmentName; - @ApiModelProperty(value = "岗位名称", name = "postName", required = true) @NotEmpty(message = "岗位名称不能为空") private String postName; - @ApiModelProperty(value = "岗位职责", name = "postDuty", required = true) - @NotEmpty(message = "岗位职责不能为空") - private String postDuty; + @ApiModelProperty(value = "岗位职责", name = "remarks") + private String remarks; - @ApiModelProperty(value = "状态 1-启用, 2-禁用", name = "status", required = true) - @NotNull(message = "状态 1-启用, 2-禁用不能为空") - private Integer status; +// @ApiModelProperty(value = "状态 1-启用, 2-禁用", name = "status", required = true) +// @NotNull(message = "状态 1-启用, 2-禁用不能为空") +// private Integer status; @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) @NotNull(message = "企业id不能为空") @@ -48,11 +43,14 @@ public class PostAddCmd extends Command { @NotEmpty(message = "企业名称不能为空") private String corpinfoName; - @ApiModelProperty(value = "是否监管岗位 1-是, 2-不是", name = "supervisionFlag", required = true) - @NotNull(message = "是否监管岗位 1-是, 2-不是,不能为空") + @ApiModelProperty(value = "是否监管岗位 0-否, 1-是", name = "supervisionFlag") private Integer supervisionFlag; - @ApiModelProperty(value = "岗位 部门权限", name = "departmentIds") + @ApiModelProperty(value = "岗位-部门权限", name = "departmentIds") private Long[] departmentIds; + + @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "corpFlag") + @NotNull(message = "监管端/企业端标识不能为空") + private Integer corpFlag; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java index 8ae0f280..a717c20b 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java @@ -23,35 +23,38 @@ public class PostUpdateCmd extends Command { @ApiModelProperty(value = "主键", name = "id", required = true) @NotNull(message = "主键不能为空") private Long id; - @ApiModelProperty(value = "业务主键id", name = "postId", required = true) - @NotEmpty(message = "业务主键id不能为空") - private String postId; + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) @NotNull(message = "部门id不能为空") private Long departmentId; - @ApiModelProperty(value = "部门名称", name = "departmentName", required = true) - @NotEmpty(message = "部门名称不能为空") - private String departmentName; + @ApiModelProperty(value = "岗位名称", name = "postName", required = true) @NotEmpty(message = "岗位名称不能为空") private String postName; - @ApiModelProperty(value = "岗位职责", name = "postDuty", required = true) - @NotEmpty(message = "岗位职责不能为空") - private String postDuty; - @ApiModelProperty(value = "状态 1-启用, 2-禁用", name = "status", required = true) - @NotNull(message = "状态 1-启用, 2-禁用不能为空") - private Integer status; + + @ApiModelProperty(value = "岗位职责", name = "remarks") + private String remarks; + +// @ApiModelProperty(value = "状态 1-启用, 2-禁用", name = "status", required = true) +// @NotNull(message = "状态 1-启用, 2-禁用不能为空") +// private Integer status; + @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) @NotNull(message = "企业id不能为空") private Long corpinfoId; + @ApiModelProperty(value = "企业名称", name = "corpinfoName", required = true) @NotEmpty(message = "企业名称不能为空") private String corpinfoName; - @ApiModelProperty(value = "是否监管岗位 1-是, 2-不是", name = "supervisionFlag", required = true) - @NotNull(message = "是否监管岗位 1-是, 2-不是,不能为空") + + @ApiModelProperty(value = "是否监管岗位 0-否, 1-是", name = "supervisionFlag") private Integer supervisionFlag; @ApiModelProperty(value = "岗位 部门权限", name = "departmentIds") private Long[] departmentIds; + + @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "corpFlag") + @NotNull(message = "监管端/企业端标识不能为空") + private Integer corpFlag; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/RiskPointAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/RiskPointAddCmd.java deleted file mode 100644 index 66e6bd19..00000000 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/RiskPointAddCmd.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.basic.info.dto; - -import com.alibaba.cola.dto.Command; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.validation.constraints.NotEmpty; - -/** - * - * @author lin - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class RiskPointAddCmd extends Command { - @ApiModelProperty(value = "风险点名字", name = "riskPointName", required = true) - @NotEmpty(message = "风险点名字不能为空") - private String riskPointName; -// @ApiModelProperty(value = "部门Id", name = "deptId", required = true) -// @NotEmpty -// private String deptId; - @NotEmpty(message = "部门名字不能为空") - @ApiModelProperty(value = "部门名字", name = "deptName", required = true) - private String deptName; -} diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/RiskPointPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/RiskPointPageQry.java deleted file mode 100644 index 560a3e6b..00000000 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/RiskPointPageQry.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.zcloud.basic.info.dto; - -import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; - -@Data -public class RiskPointPageQry extends PageQuery { - @ApiModelProperty(value = "风险点名称") - private String likeRiskPointName; - @ApiModelProperty(value = "部门名称") - private String eqDeptName; - - public Map toHashMap() { - Map map = new HashMap<>(); - Class clazz = this.getClass(); - - Field[] fields = clazz.getDeclaredFields(); - for (Field field : fields) { - try { - field.setAccessible(true); - map.put(field.getName(), field.get(this)); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - - Class superClass = clazz.getSuperclass(); - if (superClass != null) { - Field[] superFields = superClass.getDeclaredFields(); - for (Field field : superFields) { - try { - field.setAccessible(true); - map.put(field.getName(), field.get(this)); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - } - return map; - } -} diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/RiskPointUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/RiskPointUpdateCmd.java deleted file mode 100644 index 3812be2c..00000000 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/RiskPointUpdateCmd.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zcloud.basic.info.dto; - -import com.alibaba.cola.dto.Command; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.validation.constraints.NotEmpty; - -/** - * - * @author lin - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class RiskPointUpdateCmd extends Command { - @ApiModelProperty(value = "风险点id", name = "id", required = true) - @NotEmpty - private String id; - @ApiModelProperty(value = "风险点名字", name = "riskPointName", required = true) - @NotEmpty - private String riskPointName; - - @NotEmpty - @ApiModelProperty(value = "部门名字", name = "deptName", required = true) - private String deptName; -} diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java index faae6028..6f34ed05 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java @@ -50,9 +50,7 @@ public class CorpInfoCO extends ClientObject { //所属区域 @ApiModelProperty(value = "所属区域") private String companyArea; - //开始服务日期 - @ApiModelProperty(value = "开始服务日期") - private LocalDate firstServeDate; + //规模 @ApiModelProperty(value = "规模") private String scale; @@ -79,12 +77,6 @@ public class CorpInfoCO extends ClientObject { //企事业单位办公地址 @ApiModelProperty(value = "企事业单位办公地址") private String addressOffice; - //固定资产 - @ApiModelProperty(value = "固定资产") - private BigDecimal fixedAssets; - //年产值 - @ApiModelProperty(value = "年产值") - private BigDecimal yearOutputValue; //经济类型 @ApiModelProperty(value = "经济类型") private String ecoType; @@ -102,8 +94,8 @@ public class CorpInfoCO extends ClientObject { //安全负责人手机号 @ApiModelProperty(value = "安全负责人手机号") private String safetyPhone; - //是否规模以上,1:是,2:否 - @ApiModelProperty(value = "是否规模以上,1:是,2:否") + //是否规模以上,1:是,0:否 + @ApiModelProperty(value = "是否规模以上,1:是,0:否") private Integer scaleType; //占地面积 @ApiModelProperty(value = "占地面积") @@ -178,56 +170,53 @@ public class CorpInfoCO extends ClientObject { //所属街道编码 @ApiModelProperty(value = "所属街道编码") private String street; - //公司简介 - @ApiModelProperty(value = "公司简介") - private String descr; @ApiModelProperty(value = "营业执照开始时间") private LocalDate licenseStart; //营业执照结束时间 @ApiModelProperty(value = "营业执照结束时间") private LocalDate licenseEnd; - //有无职业卫生信息,1:是,2:否 - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否") + //有无职业卫生信息,1:是,0:否 + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否") private Integer whetherHygiene; - //有无重大危险源,1:是,2:否 - @ApiModelProperty(value = "有无重大危险源,1:是,2:否") + //有无重大危险源,1:是,0:否 + @ApiModelProperty(value = "有无重大危险源,1:是,0:否") private Integer whetherHazards; - //是否有稀缺大型应急物资或设施,1:是,2:否 - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否") + //是否有稀缺大型应急物资或设施,1:是,0:否 + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否") private Integer whetherScarce; - //是否涉及危化品,1:是,2:否 - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否") + //是否涉及危化品,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否") private Integer whetherChemicals; - //有无特种设备,1:是,2:否 - @ApiModelProperty(value = "有无特种设备,1:是,2:否") + //有无特种设备,1:是,0:否 + @ApiModelProperty(value = "有无特种设备,1:是,0:否") private Integer whetherSpecialequipment; - //有无特存种作业人员,1:是,2:否 - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否") + //有无特存种作业人员,1:是,0:否 + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否") private Integer whetherSpecialpeople; - //是否涉及煤气,1:是,2:否 - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否") + //是否涉及煤气,1:是,0:否 + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否") private Integer whetherCoalgas; - //是否属于消防重点单位,1:是,2:否 - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否") + //是否属于消防重点单位,1:是,0:否 + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否") private Integer whetherFire; - //是否在有限空间作业,1:是,2:否 - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否") + //是否在有限空间作业,1:是,0:否 + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否") private Integer whetherConfined; - //是否存在涉爆粉尘作业,1:是,2:否 - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否") + //是否存在涉爆粉尘作业,1:是,0:否 + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否") private Integer whetherPowder; - //是否涉及防雷防静电,1:是,2:否 - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否") + //是否涉及防雷防静电,1:是,0:否 + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否") private Integer whetherLightning; - //是否涉及危化品管道,1:是,2:否 - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否") + //是否涉及危化品管道,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否") private Integer whetherPipeline; - //是否持有放射源,1:是,2:否 - @ApiModelProperty(value = "是否持有放射源,1:是,2:否") + //是否持有放射源,1:是,0:否 + @ApiModelProperty(value = "是否持有放射源,1:是,0:否") private Integer whetherActinogen; - //是否涉及液氨制冷,1:是,2:否 - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否") + //是否涉及液氨制冷,1:是,0:否 + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否") private Integer whetherLiquidammonia; //乐观锁 @ApiModelProperty(value = "乐观锁") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java index 34fc0faa..d91311f2 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java @@ -52,9 +52,6 @@ public class CorpInfoXgfCO extends ClientObject { //所属区域 @ApiModelProperty(value = "所属区域") private String companyArea; - //开始服务日期 - @ApiModelProperty(value = "开始服务日期") - private LocalDate firstServeDate; //规模 @ApiModelProperty(value = "规模") private String scale; @@ -81,12 +78,6 @@ public class CorpInfoXgfCO extends ClientObject { //企事业单位办公地址 @ApiModelProperty(value = "企事业单位办公地址") private String addressOffice; - //固定资产 - @ApiModelProperty(value = "固定资产") - private BigDecimal fixedAssets; - //年产值 - @ApiModelProperty(value = "年产值") - private BigDecimal yearOutputValue; //经济类型 @ApiModelProperty(value = "经济类型") private String ecoType; @@ -104,8 +95,8 @@ public class CorpInfoXgfCO extends ClientObject { //安全负责人手机号 @ApiModelProperty(value = "安全负责人手机号") private String safetyPhone; - //是否规模以上,1:是,2:否 - @ApiModelProperty(value = "是否规模以上,1:是,2:否") + //是否规模以上,1:是,0:否 + @ApiModelProperty(value = "是否规模以上,1:是,0:否") private Integer scaleType; //占地面积 @ApiModelProperty(value = "占地面积") @@ -179,56 +170,53 @@ public class CorpInfoXgfCO extends ClientObject { //所属街道编码 @ApiModelProperty(value = "所属街道编码") private String street; - //公司简介 - @ApiModelProperty(value = "公司简介") - private String descr; @ApiModelProperty(value = "营业执照开始时间") private LocalDate licenseStart; //营业执照结束时间 @ApiModelProperty(value = "营业执照结束时间") private LocalDate licenseEnd; - //有无职业卫生信息,1:是,2:否 - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否") + //有无职业卫生信息,1:是,0:否 + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否") private Integer whetherHygiene; - //有无重大危险源,1:是,2:否 - @ApiModelProperty(value = "有无重大危险源,1:是,2:否") + //有无重大危险源,1:是,0:否 + @ApiModelProperty(value = "有无重大危险源,1:是,0:否") private Integer whetherHazards; - //是否有稀缺大型应急物资或设施,1:是,2:否 - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否") + //是否有稀缺大型应急物资或设施,1:是,0:否 + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否") private Integer whetherScarce; - //是否涉及危化品,1:是,2:否 - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否") + //是否涉及危化品,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否") private Integer whetherChemicals; - //有无特种设备,1:是,2:否 - @ApiModelProperty(value = "有无特种设备,1:是,2:否") + //有无特种设备,1:是,0:否 + @ApiModelProperty(value = "有无特种设备,1:是,0:否") private Integer whetherSpecialequipment; - //有无特存种作业人员,1:是,2:否 - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否") + //有无特存种作业人员,1:是,0:否 + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否") private Integer whetherSpecialpeople; - //是否涉及煤气,1:是,2:否 - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否") + //是否涉及煤气,1:是,0:否 + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否") private Integer whetherCoalgas; - //是否属于消防重点单位,1:是,2:否 - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否") + //是否属于消防重点单位,1:是,0:否 + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否") private Integer whetherFire; - //是否在有限空间作业,1:是,2:否 - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否") + //是否在有限空间作业,1:是,0:否 + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否") private Integer whetherConfined; - //是否存在涉爆粉尘作业,1:是,2:否 - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否") + //是否存在涉爆粉尘作业,1:是,0:否 + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否") private Integer whetherPowder; - //是否涉及防雷防静电,1:是,2:否 - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否") + //是否涉及防雷防静电,1:是,0:否 + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否") private Integer whetherLightning; - //是否涉及危化品管道,1:是,2:否 - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否") + //是否涉及危化品管道,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否") private Integer whetherPipeline; - //是否持有放射源,1:是,2:否 - @ApiModelProperty(value = "是否持有放射源,1:是,2:否") + //是否持有放射源,1:是,0:否 + @ApiModelProperty(value = "是否持有放射源,1:是,0:否") private Integer whetherActinogen; - //是否涉及液氨制冷,1:是,2:否 - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否") + //是否涉及液氨制冷,1:是,0:否 + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否") private Integer whetherLiquidammonia; //创建人 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 0470705b..6155dba2 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 @@ -27,15 +27,6 @@ public class DepartmentCO extends ClientObject { //父部门id @ApiModelProperty(value = "父部门id") private Long parentId; - //负责人 - @ApiModelProperty(value = "负责人") - private String headman; - //负责人手机号 - @ApiModelProperty(value = "负责人手机号") - private String phone; - //地址 - @ApiModelProperty(value = "地址") - private String address; //所属企业 @ApiModelProperty(value = "所属企业") private Long corpinfoId; @@ -50,31 +41,8 @@ public class DepartmentCO extends ClientObject { private Integer depOrder; //是否监管部门 0-否 1-是 @ApiModelProperty(value = "是否监管部门 0-否 1-是") - private Integer isSupervise; - //0安监部门1消防部门 - @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门") - private Integer state; - //主管领导 - @ApiModelProperty(value = "主管领导") - private String leaderCharge; - //分管领导人 - @ApiModelProperty(value = "分管领导人") - private String lrman; - //部门类别:1.行业监管 2.综合监管 - @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管") - private Integer category; - //单位类型名称 - @ApiModelProperty(value = "单位类型名称") - private String deptTypeName; - //单位类型编码 - @ApiModelProperty(value = "单位类型编码") - private String deptType; - //部门类型编码 - @ApiModelProperty(value = "部门类型编码") - private String type; - //部门类型名称 - @ApiModelProperty(value = "部门类型名称") - private String typeName; + private Integer superviseFlag; + //乐观锁 @ApiModelProperty(value = "乐观锁") private Integer version; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java index 402bb52a..352248e2 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java @@ -20,9 +20,6 @@ public class PostCO extends ClientObject { //主键 @ApiModelProperty(value = "主键") private Long id; - //业务主键id - @ApiModelProperty(value = "业务主键id") - private String postId; //部门id @ApiModelProperty(value = "部门id") private Long departmentId; @@ -32,12 +29,12 @@ public class PostCO extends ClientObject { //岗位名称 @ApiModelProperty(value = "岗位名称") private String postName; - //岗位职责 + // 岗位职责 @ApiModelProperty(value = "岗位职责") - private String postDuty; + private String remarks; //状态 1-启用, 2-禁用 - @ApiModelProperty(value = "状态 1-启用, 2-禁用") - private Integer status; +// @ApiModelProperty(value = "状态 1-启用, 2-禁用") +// private Integer status; //企业id @ApiModelProperty(value = "企业id") private Long corpinfoId; @@ -45,9 +42,8 @@ public class PostCO extends ClientObject { @ApiModelProperty(value = "企业名称") private String corpinfoName; //是否监管岗位 1-是, 2-不是 - @ApiModelProperty(value = "是否监管岗位 1-是, 2-不是") + @ApiModelProperty(value = "是否监管岗位0-否, 1-是") private Integer supervisionFlag; - @ApiModelProperty(value = "监管部门数据权限-部门列表") private List departmentList; @@ -74,9 +70,6 @@ public class PostCO extends ClientObject { @ApiModelProperty(value = "更新时间") @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime updateTime; - //描述 - @ApiModelProperty(value = "描述") - private String remarks; //是否删除 @ApiModelProperty(value = "是否删除") private String deleteEnum; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/RiskPointCo.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/RiskPointCo.java deleted file mode 100644 index b7bb773a..00000000 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/RiskPointCo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zcloud.basic.info.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class RiskPointCo extends ClientObject { - @ApiModelProperty(value = "id") - private Long id; - @ApiModelProperty(value = "风险点名称") - private String riskPointName; - @ApiModelProperty(value = "部门名称") - private String deptName; - @ApiModelProperty(value = "创建人") - private String createName; -} diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/RiskPointGateway.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/RiskPointGateway.java deleted file mode 100644 index 77acaaaa..00000000 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/RiskPointGateway.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zcloud.basic.info.domain.gateway; - - -import com.zcloud.basic.info.domain.model.RiskPointE; - -/** - * 领域getway - * @author lin - */ -public interface RiskPointGateway { - - /** - * 新增 - * @param riskPointE 准考证管理 - * @return 结果 - */ - Boolean add(RiskPointE riskPointE) ; - - /** - * 修改 - * @param riskPointE 准考证管理 - * @return 结果 - */ - Boolean update(RiskPointE riskPointE); - - /** - * 删除 - * @param id - * @return 结果 - */ - Boolean deletedRiskPointById(Long id); - Boolean deletedRiskPointByIds(Long[] id); -} 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 07e73d7a..896377d8 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 @@ -43,8 +43,6 @@ public class CorpInfoE extends BaseE { private String postalCode; //所属区域 private String companyArea; - //开始服务日期 - private LocalDate firstServeDate; //规模 private String scale; //规模名称 @@ -63,10 +61,6 @@ public class CorpInfoE extends BaseE { private String addressBusiness; //企事业单位办公地址 private String addressOffice; - //固定资产 - private BigDecimal fixedAssets; - //年产值 - private BigDecimal yearOutputValue; //经济类型 private String ecoType; private String ecoTypeName; @@ -78,7 +72,7 @@ public class CorpInfoE extends BaseE { private String safetyName; //安全负责人手机号 private String safetyPhone; - //是否规模以上,1:是,2:否 + //是否规模以上,1:是,0:否 private Integer scaleType; //占地面积 private BigDecimal areaCovered; @@ -128,41 +122,39 @@ public class CorpInfoE extends BaseE { private String streetName; //所属街道编码 private String street; - //公司简介 - private String descr; //营业执照开始时间 private LocalDate licenseStart; //营业执照结束时间 private LocalDate licenseEnd; - //有无职业卫生信息,1:是,2:否 - private Integer whetherHygiene; - //有无重大危险源,1:是,2:否 - private Integer whetherHazards; - //是否有稀缺大型应急物资或设施,1:是,2:否 - private Integer whetherScarce; - //是否涉及危化品,1:是,2:否 - private Integer whetherChemicals; - //有无特种设备,1:是,2:否 - private Integer whetherSpecialequipment; - //有无特存种作业人员,1:是,2:否 - private Integer whetherSpecialpeople; - //是否涉及煤气,1:是,2:否 - private Integer whetherCoalgas; - //是否属于消防重点单位,1:是,2:否 - private Integer whetherFire; - //是否在有限空间作业,1:是,2:否 - private Integer whetherConfined; - //是否存在涉爆粉尘作业,1:是,2:否 - private Integer whetherPowder; - //是否涉及防雷防静电,1:是,2:否 - private Integer whetherLightning; - //是否涉及危化品管道,1:是,2:否 - private Integer whetherPipeline; - //是否持有放射源,1:是,2:否 - private Integer whetherActinogen; - //是否涉及液氨制冷,1:是,2:否 - private Integer whetherLiquidammonia; + //有无职业卫生信息,1:是,0:否 + private Integer whetherHygieneFlag; + //有无重大危险源,1:是,0:否 + private Integer whetherHazardsFlag; + //是否有稀缺大型应急物资或设施,1:是,0:否 + private Integer whetherScarceFlag; + //是否涉及危化品,1:是,0:否 + private Integer whetherChemicalsFlag; + //有无特种设备,1:是,0:否 + private Integer whetherSpecialequipmentFlag; + //有无特存种作业人员,1:是,0:否 + private Integer whetherSpecialpeopleFlag; + //是否涉及煤气,1:是,0:否 + private Integer whetherCoalgasFlag; + //是否属于消防重点单位,1:是,0:否 + private Integer whetherFireFlag; + //是否在有限空间作业,1:是,0:否 + private Integer whetherConfinedFlag; + //是否存在涉爆粉尘作业,1:是,0:否 + private Integer whetherPowderFlag; + //是否涉及防雷防静电,1:是,0:否 + private Integer whetherLightningFlag; + //是否涉及危化品管道,1:是,0:否 + private Integer whetherPipelineFlag; + //是否持有放射源,1:是,0:否 + private Integer whetherActinogenFlag; + //是否涉及液氨制冷,1:是,0:否 + 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 d56e30f4..e9f56131 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 @@ -37,8 +37,7 @@ public class CorpInfoXgfE extends BaseE { private String postalCode; //所属区域 private String companyArea; - //开始服务日期 - private LocalDate firstServeDate; + //规模 private String scale; //规模名称 @@ -57,10 +56,7 @@ public class CorpInfoXgfE extends BaseE { private String addressBusiness; //企事业单位办公地址 private String addressOffice; - //固定资产 - private BigDecimal fixedAssets; - //年产值 - private BigDecimal yearOutputValue; + //经济类型 private String ecoType; @@ -73,7 +69,7 @@ public class CorpInfoXgfE extends BaseE { private String safetyName; //安全负责人手机号 private String safetyPhone; - //是否规模以上,1:是,2:否 + //是否规模以上,1:是,0:否 private Integer scaleType; //占地面积 private BigDecimal areaCovered; @@ -124,41 +120,39 @@ public class CorpInfoXgfE extends BaseE { private String streetName; //所属街道编码 private String street; - //公司简介 - private String descr; //营业执照开始时间 private LocalDate licenseStart; //营业执照结束时间 private LocalDate licenseEnd; - //有无职业卫生信息,1:是,2:否 - private Integer whetherHygiene; - //有无重大危险源,1:是,2:否 - private Integer whetherHazards; - //是否有稀缺大型应急物资或设施,1:是,2:否 - private Integer whetherScarce; - //是否涉及危化品,1:是,2:否 - private Integer whetherChemicals; - //有无特种设备,1:是,2:否 - private Integer whetherSpecialequipment; - //有无特存种作业人员,1:是,2:否 - private Integer whetherSpecialpeople; - //是否涉及煤气,1:是,2:否 - private Integer whetherCoalgas; - //是否属于消防重点单位,1:是,2:否 - private Integer whetherFire; - //是否在有限空间作业,1:是,2:否 - private Integer whetherConfined; - //是否存在涉爆粉尘作业,1:是,2:否 - private Integer whetherPowder; - //是否涉及防雷防静电,1:是,2:否 - private Integer whetherLightning; - //是否涉及危化品管道,1:是,2:否 - private Integer whetherPipeline; - //是否持有放射源,1:是,2:否 - private Integer whetherActinogen; - //是否涉及液氨制冷,1:是,2:否 - private Integer whetherLiquidammonia; + //有无职业卫生信息,1:是,0:否 + private Integer whetherHygieneFlag; + //有无重大危险源,1:是,0:否 + private Integer whetherHazardsFlag; + //是否有稀缺大型应急物资或设施,1:是,0:否 + private Integer whetherScarceFlag; + //是否涉及危化品,1:是,0:否 + private Integer whetherChemicalsFlag; + //有无特种设备,1:是,0:否 + private Integer whetherSpecialequipmentFlag; + //有无特存种作业人员,1:是,0:否 + private Integer whetherSpecialpeopleFlag; + //是否涉及煤气,1:是,0:否 + private Integer whetherCoalgasFlag; + //是否属于消防重点单位,1:是,0:否 + private Integer whetherFireFlag; + //是否在有限空间作业,1:是,0:否 + private Integer whetherConfinedFlag; + //是否存在涉爆粉尘作业,1:是,0:否 + private Integer whetherPowderFlag; + //是否涉及防雷防静电,1:是,0:否 + private Integer whetherLightningFlag; + //是否涉及危化品管道,1:是,0:否 + private Integer whetherPipelineFlag; + //是否持有放射源,1:是,0:否 + private Integer whetherActinogenFlag; + //是否涉及液氨制冷,1:是,0:否 + private Integer whetherLiquidammoniaFlag; } 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 b1dd64c1..67764fc1 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 @@ -25,12 +25,6 @@ public class DepartmentE extends BaseE { private String name; //父部门id private Long parentId; - //负责人 - private String headman; - //负责人手机号 - private String phone; - //地址 - private String address; //所属企业 private Long corpinfoId; //部门级别编码 @@ -40,23 +34,7 @@ public class DepartmentE extends BaseE { //部门排序 private Integer depOrder; //是否监管部门 0-否 1-是 - private Integer isSupervise; - //安全管理部门,0安监部门1消防部门 - private Integer state; - //主管领导 - private String leaderCharge; - //分管领导人 - private String lrman; - //部门类别:1.行业监管 2.综合监管 - private Integer category; - //单位类型名称 - private String deptTypeName; - //单位类型编码 - private String deptType; - //部门类型编码 - private String type; - //部门类型名称 - private String typeName; + private Integer superviseFlag; } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java index 23351f41..9e3330e2 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java @@ -23,19 +23,17 @@ public class PostE extends BaseE { private String postId; //部门id private Long departmentId; - //部门名称 - private String departmentName; //岗位名称 private String postName; //岗位职责 - private String postDuty; + private String remarks; //状态 1-启用, 2-禁用 - private Integer status; +// private Integer status; //企业id private Long corpinfoId; //企业名称 private String corpinfoName; - //是否监管岗位 1-是, 2-不是 + //是否监管岗位 0-否, 1-是 private Integer supervisionFlag; // 添加关联部门行为 diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/RiskPointE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/RiskPointE.java deleted file mode 100644 index 881486e5..00000000 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/RiskPointE.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zcloud.basic.info.domain.model; - -import com.alibaba.cola.domain.Entity; -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 领域模型，根据领域模型驱动设计 - * - * @author lin - */ -@Data -@Entity -@EqualsAndHashCode(callSuper = true) -public class RiskPointE extends BaseE { - private Long id; - private String riskPointName; - private String deptName; -} diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/RiskPointGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/RiskPointGatewayImpl.java deleted file mode 100644 index 6c51e423..00000000 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/RiskPointGatewayImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.basic.info.gatewayimpl; - -import com.zcloud.basic.info.domain.gateway.RiskPointGateway; -import com.zcloud.basic.info.domain.model.RiskPointE; -import com.zcloud.basic.info.persistence.dataobject.RiskPointDO; -import com.zcloud.basic.info.persistence.repository.RiskPointRepository; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Arrays; - -/** - * 持久层实现 - * - * @author lin - */ - -@Service -@AllArgsConstructor -public class RiskPointGatewayImpl implements RiskPointGateway { - private final RiskPointRepository riskPointRepository; - - @Override - public Boolean add(RiskPointE riskPointE) { - RiskPointDO d = new RiskPointDO(); - BeanUtils.copyProperties(riskPointE, d); - riskPointRepository.save(d); - return true; - } - - @Override - public Boolean update(RiskPointE riskPointE) { - RiskPointDO d = new RiskPointDO(); - BeanUtils.copyProperties(riskPointE, d); - riskPointRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedRiskPointById(Long id) { - return riskPointRepository.removeById(id); - } - - @Override - public Boolean deletedRiskPointByIds(Long[] ids) { - return riskPointRepository.removeByIds(Arrays.asList(ids)); - } - - -} 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 b2782ce7..80a44958 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 @@ -42,7 +42,7 @@ public class CorpInfoDO extends BaseDO { @ApiModelProperty(value = "企业再列表中的排序") private Integer corOrder; //是否启用，1:启用,2:关闭 - @ApiModelProperty(value = "是否启用，1:启用,2:关闭") + @ApiModelProperty(value = "是否启用，1:启用,0:关闭") private Integer isUse; //统一社会信用代码 @ApiModelProperty(value = "统一社会信用代码") @@ -56,9 +56,7 @@ public class CorpInfoDO extends BaseDO { //所属区域 @ApiModelProperty(value = "所属区域") private String companyArea; - //开始服务日期 - @ApiModelProperty(value = "开始服务日期") - private LocalDate firstServeDate; + //规模 @ApiModelProperty(value = "规模") private String scale; @@ -85,12 +83,6 @@ public class CorpInfoDO extends BaseDO { //企事业单位办公地址 @ApiModelProperty(value = "企事业单位办公地址") private String addressOffice; - //固定资产 - @ApiModelProperty(value = "固定资产") - private BigDecimal fixedAssets; - //年产值 - @ApiModelProperty(value = "年产值") - private BigDecimal yearOutputValue; //经济类型 @ApiModelProperty(value = "经济类型") private String ecoType; @@ -108,8 +100,8 @@ public class CorpInfoDO extends BaseDO { //安全负责人手机号 @ApiModelProperty(value = "安全负责人手机号") private String safetyPhone; - //是否规模以上,1:是,2:否 - @ApiModelProperty(value = "是否规模以上,1:是,2:否") + //是否规模以上,1:是,0:否 + @ApiModelProperty(value = "是否规模以上,1:是,0:否") private Integer scaleType; //占地面积 @ApiModelProperty(value = "占地面积") @@ -183,9 +175,6 @@ public class CorpInfoDO extends BaseDO { //所属街道编码 @ApiModelProperty(value = "所属街道编码") private String street; - //公司简介 - @ApiModelProperty(value = "公司简介") - private String descr; //营业执照开始时间 @ApiModelProperty(value = "营业执照开始时间") @@ -193,48 +182,48 @@ public class CorpInfoDO extends BaseDO { //营业执照结束时间 @ApiModelProperty(value = "营业执照结束时间") private LocalDate licenseEnd; - //有无职业卫生信息,1:是,2:否 - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否") - private Integer whetherHygiene; - //有无重大危险源,1:是,2:否 - @ApiModelProperty(value = "有无重大危险源,1:是,2:否") - private Integer whetherHazards; - //是否有稀缺大型应急物资或设施,1:是,2:否 - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否") - private Integer whetherScarce; - //是否涉及危化品,1:是,2:否 - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否") - private Integer whetherChemicals; - //有无特种设备,1:是,2:否 - @ApiModelProperty(value = "有无特种设备,1:是,2:否") - private Integer whetherSpecialequipment; - //有无特存种作业人员,1:是,2:否 - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否") - private Integer whetherSpecialpeople; - //是否涉及煤气,1:是,2:否 - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否") - private Integer whetherCoalgas; - //是否属于消防重点单位,1:是,2:否 - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否") - private Integer whetherFire; - //是否在有限空间作业,1:是,2:否 - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否") - private Integer whetherConfined; - //是否存在涉爆粉尘作业,1:是,2:否 - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否") - private Integer whetherPowder; - //是否涉及防雷防静电,1:是,2:否 - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否") - private Integer whetherLightning; - //是否涉及危化品管道,1:是,2:否 - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否") - private Integer whetherPipeline; - //是否持有放射源,1:是,2:否 - @ApiModelProperty(value = "是否持有放射源,1:是,2:否") - private Integer whetherActinogen; - //是否涉及液氨制冷,1:是,2:否 - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否") - private Integer whetherLiquidammonia; + //有无职业卫生信息,1:是,0:否 + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否") + private Integer whetherHygieneFlag; + //有无重大危险源,1:是,0:否 + @ApiModelProperty(value = "有无重大危险源,1:是,0:否") + private Integer whetherHazardsFlag; + //是否有稀缺大型应急物资或设施,1:是,0:否 + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否") + private Integer whetherScarceFlag; + //是否涉及危化品,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否") + private Integer whetherChemicalsFlag; + //有无特种设备,1:是,0:否 + @ApiModelProperty(value = "有无特种设备,1:是,0:否") + private Integer whetherSpecialequipmentFlag; + //有无特存种作业人员,1:是,0:否 + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否") + private Integer whetherSpecialpeopleFlag; + //是否涉及煤气,1:是,0:否 + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否") + private Integer whetherCoalgasFlag; + //是否属于消防重点单位,1:是,0:否 + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否") + private Integer whetherFireFlag; + //是否在有限空间作业,1:是,0:否 + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否") + private Integer whetherConfinedFlag; + //是否存在涉爆粉尘作业,1:是,0:否 + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否") + private Integer whetherPowderFlag; + //是否涉及防雷防静电,1:是,0:否 + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否") + private Integer whetherLightningFlag; + //是否涉及危化品管道,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否") + private Integer whetherPipelineFlag; + //是否持有放射源,1:是,0:否 + @ApiModelProperty(value = "是否持有放射源,1:是,0:否") + private Integer whetherActinogenFlag; + //是否涉及液氨制冷,1:是,0:否 + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否") + private Integer whetherLiquidammoniaFlag; //乐观锁 @ApiModelProperty(value = "乐观锁") private Integer version; 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 0f57cbfe..6dab71ec 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 @@ -30,15 +30,6 @@ public class DepartmentDO extends BaseDO { //父部门id @ApiModelProperty(value = "父部门id") private Long parentId; - //负责人 - @ApiModelProperty(value = "负责人") - private String headman; - //负责人手机号 - @ApiModelProperty(value = "负责人手机号") - private String phone; - //地址 - @ApiModelProperty(value = "地址") - private String address; //所属企业 @ApiModelProperty(value = "所属企业") private Long corpinfoId; @@ -53,31 +44,7 @@ public class DepartmentDO extends BaseDO { private Integer depOrder; //是否监管部门 0-否 1-是 @ApiModelProperty(value = "是否监管部门 0-否 1-是") - private Integer isSupervise; - //0安监部门1消防部门 - @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门") - private Integer state; - //主管领导 - @ApiModelProperty(value = "主管领导") - private String leaderCharge; - //分管领导人 - @ApiModelProperty(value = "分管领导人") - private String lrman; - //部门类别:1.行业监管 2.综合监管 - @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管") - private Integer category; - //单位类型名称 - @ApiModelProperty(value = "单位类型名称") - private String deptTypeName; - //单位类型编码 - @ApiModelProperty(value = "单位类型编码") - private String deptType; - //部门类型编码 - @ApiModelProperty(value = "部门类型编码") - private String type; - //部门类型名称 - @ApiModelProperty(value = "部门类型名称") - private String typeName; + private Integer superviseFlag; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java index 5c6dd72a..adbdb61e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java @@ -24,18 +24,15 @@ public class PostDO extends BaseDO { //部门id @ApiModelProperty(value = "部门id") private Long departmentId; - //部门名称 - @ApiModelProperty(value = "部门名称") - private String departmentName; //岗位名称 @ApiModelProperty(value = "岗位名称") private String postName; //岗位职责 @ApiModelProperty(value = "岗位职责") - private String postDuty; + private String remarks; //状态 1-启用, 2-禁用 - @ApiModelProperty(value = "状态 1-启用, 2-禁用") - private Integer status; +// @ApiModelProperty(value = "状态 1-启用, 2-禁用") +// private Integer status; //企业id @ApiModelProperty(value = "企业id") private Long corpinfoId; @@ -43,7 +40,7 @@ public class PostDO extends BaseDO { @ApiModelProperty(value = "企业名称") private String corpinfoName; //是否监管岗位 1-是, 2-不是 - @ApiModelProperty(value = "是否监管岗位 1-是, 2-不是") + @ApiModelProperty(value = "是否监管岗位 0-否, 1-是") private Integer supervisionFlag; public PostDO(String postId) { diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDepartmentDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDepartmentDO.java index 007fc71a..66f91121 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDepartmentDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDepartmentDO.java @@ -8,10 +8,11 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; /** -* web-infrastructure -* @Author SondonYong -* @Date 2025-10-31 17:53:11 -*/ + * web-infrastructure + * + * @Author SondonYong + * @Date 2025-10-31 17:53:11 + */ @Data @TableName("post_department") @NoArgsConstructor @@ -19,15 +20,15 @@ import lombok.NoArgsConstructor; public class PostDepartmentDO extends BaseDO { //业务主键id @ApiModelProperty(value = "业务主键id") -private String postDepartmentId; + private String postDepartmentId; //岗位id @ApiModelProperty(value = "岗位id") -private Long postId; + private Long postId; //部门id @ApiModelProperty(value = "部门id") -private Long departmentId; + private Long departmentId; - public PostDepartmentDO(String postDepartmentId) { + public PostDepartmentDO(String postDepartmentId) { this.postDepartmentId = postDepartmentId; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/RiskPointDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/RiskPointDO.java deleted file mode 100644 index 5e4a3983..00000000 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/RiskPointDO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zcloud.basic.info.persistence.dataobject; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.jjb.saas.framework.repository.basedo.BaseDO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("risk_point") -public class RiskPointDO extends BaseDO { - - private String riskPointName; - - private String deptName; -} diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java index be3ad9e3..38b4a41b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java @@ -10,10 +10,11 @@ import lombok.NoArgsConstructor; import java.util.Date; /** -* web-infrastructure -* @Author SondonYong -* @Date 2025-10-31 09:50:31 -*/ + * web-infrastructure + * + * @Author SondonYong + * @Date 2025-10-31 09:50:31 + */ @Data @TableName("user_qualification_info") @NoArgsConstructor @@ -21,24 +22,24 @@ import java.util.Date; public class UserQualificationInfoDO extends BaseDO { //业务主键id @ApiModelProperty(value = "业务主键id") -private String userQualificationinfoId; + private String userQualificationinfoId; //企业id @ApiModelProperty(value = "企业id") -private Long corpinfoId; + private Long corpinfoId; //用户id @ApiModelProperty(value = "用户id") -private Long userId; + private Long userId; //资质名称 @ApiModelProperty(value = "资质名称") -private String qualificationName; + private String qualificationName; //人员资质证书有效期 @ApiModelProperty(value = "人员资质证书有效期") -private Date validityTime; + private Date validityTime; //证书编号 @ApiModelProperty(value = "证书编号") -private String certificateNo; + private String certificateNo; - public UserQualificationInfoDO(String userQualificationinfoId) { + public UserQualificationInfoDO(String userQualificationinfoId) { this.userQualificationinfoId = userQualificationinfoId; } 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 944790cd..46fd3fac 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 @@ -1,6 +1,8 @@ package com.zcloud.basic.info.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; import org.apache.ibatis.annotations.Mapper; 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 9984e498..0d7376d3 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 @@ -1,6 +1,8 @@ package com.zcloud.basic.info.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.basic.info.persistence.dataobject.CorpQualificationInfoDO; import org.apache.ibatis.annotations.Mapper; 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 36a8f090..a9111d8f 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,9 +13,6 @@ import org.apache.ibatis.annotations.Mapper; * @Date 2025-10-29 16:03:20 */ @Mapper -//@DataScopes( -// @DataScope(method = "selectPage", menuPerms = "open_platform_100012", tenantAlias = "tenant_id") -//) public interface DepartmentMapper extends BaseMapper { } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/PostMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/PostMapper.java index 03ef2b82..95608687 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/PostMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/PostMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper; /** * web-infrastructure * + * * @Author SondonYong * @Date 2025-10-31 17:24:04 */ diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/RiskPointMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/RiskPointMapper.java deleted file mode 100644 index 7058757b..00000000 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/RiskPointMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zcloud.basic.info.persistence.mapper; - -import com.zcloud.basic.info.persistence.dataobject.RiskPointDO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface RiskPointMapper extends BaseMapper { -} diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/RiskPointRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/RiskPointRepository.java deleted file mode 100644 index f305c5bd..00000000 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/RiskPointRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zcloud.basic.info.persistence.repository; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.basic.info.persistence.dataobject.RiskPointDO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.repo.BaseRepository; - -import java.util.Map; - -/** - * @author lin - */ -public interface RiskPointRepository extends BaseRepository { - PageResponse listRiskPointPage(Map parmas); -} 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 187b662f..c665e183 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 @@ -5,6 +5,8 @@ import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; @@ -43,6 +45,8 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl listTree(Map parmas) { QueryWrapper 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)) { diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/RiskPointRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/RiskPointRepositoryImpl.java deleted file mode 100644 index d040c5dc..00000000 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/RiskPointRepositoryImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.zcloud.basic.info.persistence.repository.impl; - -import com.alibaba.cola.dto.PageResponse; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.common.PageHelper; -import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; -import com.zcloud.basic.info.persistence.dataobject.RiskPointDO; -import com.zcloud.basic.info.persistence.mapper.RiskPointMapper; -import com.zcloud.basic.info.persistence.repository.RiskPointRepository; -import com.zcloud.basic.info.utils.PageQueryHelper; -import com.zcloud.basic.info.utils.Query; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * @author lin - */ -@Service -@RequiredArgsConstructor -public class RiskPointRepositoryImpl extends BaseRepositoryImpl implements RiskPointRepository { - private final RiskPointMapper riskPointMapper; - - @Override - public PageResponse listRiskPointPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); - queryWrapper.orderByDesc("create_time"); - IPage result = riskPointMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } -} diff --git a/web-infrastructure/src/main/resources/mapper/RiskPointMapper.xml b/web-infrastructure/src/main/resources/mapper/RiskPointMapper.xml deleted file mode 100644 index 7a1a82d1..00000000 --- a/web-infrastructure/src/main/resources/mapper/RiskPointMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - -