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 3573531..065c3bc 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 @@ -37,7 +37,6 @@ public class CorpInfoController { @ApiOperation("新增") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody CorpInfoAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); return corpInfoService.add(cmd); } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpQualificationInfoController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpQualificationInfoController.java index 02594bc..18af839 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpQualificationInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpQualificationInfoController.java @@ -36,7 +36,6 @@ public class CorpQualificationInfoController { @ApiOperation("新增") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody CorpQualificationInfoAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); return corpQualificationInfoService.add(cmd); } @@ -55,7 +54,7 @@ public class CorpQualificationInfoController { @ApiOperation("详情") @PostMapping("/info/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(new CorpQualificationInfoCO()); + return SingleResponse.of(corpQualificationInfoService.getInfoById(id)); } @ApiOperation("删除") 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 cf0d70c..c276067 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 @@ -40,8 +40,6 @@ public class DepartmentController { @DubboReference private DeptFacade deptFacade; - - @ApiOperation("新增部门") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody DepartmentAddCmd cmd) { diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpQualificationInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpQualificationInfoQueryExe.java index d5d3a75..30456ee 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpQualificationInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpQualificationInfoQueryExe.java @@ -8,6 +8,7 @@ import com.zcloud.basic.info.persistence.dataobject.CorpQualificationInfoDO; import com.zcloud.basic.info.persistence.repository.CorpQualificationInfoRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import java.util.List; @@ -38,5 +39,12 @@ public class CorpQualificationInfoQueryExe { List examCenterCOS = corpQualificationInfoCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public CorpQualificationInfoCO getInfoById(Long id) { + CorpQualificationInfoDO corpQualificationInfoDO = corpQualificationInfoRepository.getById(id); + CorpQualificationInfoCO corpQualificationInfoCO =new CorpQualificationInfoCO(); + BeanUtils.copyProperties(corpQualificationInfoDO, corpQualificationInfoCO); + return corpQualificationInfoCO; + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpQualificationInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpQualificationInfoServiceImpl.java index b90b3ed..d99a0a1 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpQualificationInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpQualificationInfoServiceImpl.java @@ -55,5 +55,10 @@ public class CorpQualificationInfoServiceImpl implements CorpQualificationInfoSe public void removeBatch(Long[] ids) { corpQualificationInfoRemoveExe.execute(ids); } + + @Override + public CorpQualificationInfoCO getInfoById(Long id) { + return corpQualificationInfoQueryExe.getInfoById(id); + } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/CorpQualificationInfoServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/CorpQualificationInfoServiceI.java index 40fc248..c06b7ca 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/CorpQualificationInfoServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/CorpQualificationInfoServiceI.java @@ -23,5 +23,7 @@ public interface CorpQualificationInfoServiceI { void remove(Long id); void removeBatch(Long[] ids); + + CorpQualificationInfoCO getInfoById(Long id); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java index 0732c0c..9c42ffb 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java @@ -25,13 +25,12 @@ import java.util.Date; @AllArgsConstructor public class CorpQualificationInfoUpdateCmd extends Command { @ApiModelProperty(value = "主键", name = "id", required = true) - @NotEmpty(message = "主键不能为空") + @NotNull(message = "主键不能为空") private Long id; @ApiModelProperty(value = "资质id", name = "corpQualificationinfoId", required = true) - @NotEmpty(message = "资质id不能为空") private String corpQualificationinfoId; @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) - @NotEmpty(message = "企业id不能为空") + @NotNull(message = "企业id不能为空") private Long corpinfoId; @ApiModelProperty(value = "资质名称,汉字30以内", name = "qualificationName", required = true) @NotEmpty(message = "资质名称不能为空") @@ -42,6 +41,7 @@ public class CorpQualificationInfoUpdateCmd extends Command { private Date startValidityTime; @ApiModelProperty(value = "结束证书有效期", name = "endValidityTime", required = true) @NotNull(message = "结束证书有效期不能为空") + @JsonFormat(pattern = "yyyy-MM-dd") private Date endValidityTime; @ApiModelProperty(value = "证书编号", name = "certificateNo", required = true)