根据ID删除该条职务职称变更记录接口修改

daqe-center/src/main/java/com/lantone/daqe/dto/GetFieldCalibrationPageDTO.java

@@ -25,11 +25,11 @@ public class GetFieldCalibrationPageDTO implements Serializable {
     @ApiModelProperty(value = "序号")
     private Long Id;
 
-    @ApiModelProperty(value = "表字段（中文）")
-    private String tableFieldChinese;
+    @ApiModelProperty(value = "表名称（中文）")
+    private String tableNameChinese;
 
-    @ApiModelProperty(value = "表字段（英文）")
-    private String tableFieldEnglish;
+    @ApiModelProperty(value = "表名称（英文）")
+    private String tableNameEnglish;
 
     @ApiModelProperty(value = "字段名称（中文）")
     private String fieldNameChinese;

daqe-center/src/main/java/com/lantone/daqe/facade/OfficialCapacityManagementFacade.java

@@ -9,7 +9,6 @@ import com.lantone.common.util.StringUtil;
 import com.lantone.daqe.dto.GetOfficialCapacityPageDTO;
 import com.lantone.daqe.entity.OfficialCapacity;
 import com.lantone.daqe.facade.base.OfficialCapacityFacade;
-import com.lantone.daqe.vo.DelOfficialCapacityByIdVO;
 import com.lantone.daqe.vo.GetOfficialCapacityPageVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -73,13 +72,17 @@ public class OfficialCapacityManagementFacade {
      * @param delOfficialCapacityByIdVO
      * @return: 是否成功
      */
-    public Boolean delOfficialCapacityPage(DelOfficialCapacityByIdVO delOfficialCapacityByIdVO) {
+    /**
+     * @param idList
+     * @return: 是否成功
+     */
+    public Boolean delOfficialCapacityPage(Long idList[]) {
         OfficialCapacity officialCapacity = new OfficialCapacity();
         officialCapacity.setIsDeleted(IsDeleteEnum.Y.getKey());
         officialCapacity.setGmtModified(new Date());
         return officialCapacityFacade.update(officialCapacity, new QueryWrapper<OfficialCapacity>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", delOfficialCapacityByIdVO.getId())
+                .in("id", idList)
         );
     }
 

daqe-center/src/main/java/com/lantone/daqe/vo/DelOfficialCapacityByIdVO.java

@@ -1,27 +0,0 @@
-package com.lantone.daqe.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * @Description: 删除职务职称变更记录-接口入参
- * @author: zhanghang
- * @time: 2022/2/28 17:47
- */
-@ApiModel(value = "删除职务职称变更记录-接口入参")
-@Getter
-@Setter
-public class DelOfficialCapacityByIdVO implements Serializable {
-
-    private static final long serialVersionUID = 730596041870962141L;
-
-    @ApiModelProperty(value = "记录ID", required = true)
-    @NotNull(message = "记录ID不能为空")
-    private Long id;
-
-}

daqe-center/src/main/java/com/lantone/daqe/vo/GetFieldCalibrationPageVO.java

@@ -20,11 +20,11 @@ public class GetFieldCalibrationPageVO extends Page {
     @ApiModelProperty(value = "组织机构ID")
     private Long hospitalId;
 
-    @ApiModelProperty(value = "表字段（中文）")
-    private String tableFieldChinese;
+    @ApiModelProperty(value = "表名称（中文）")
+    private String tableNameChinese;
 
-    @ApiModelProperty(value = "表字段（英文）")
-    private String tableFieldEnglish;
+    @ApiModelProperty(value = "表名称（英文）")
+    private String tableNameEnglish;
 
     @ApiModelProperty(value = "字段名称（中文）")
     private String fieldNameChinese;

daqe-center/src/main/java/com/lantone/daqe/web/FieldCalibrationManagementController.java

@@ -28,12 +28,6 @@ public class FieldCalibrationManagementController {
     private FieldCalibrationManagementFacade fieldCalibrationManagementFacade;
 
 
-    /**
-     * 获取字段校验规则分页列表数据
-     *
-     * @param getFieldCalibrationPageVO
-     * @return: 字段校验规则分页数据
-     */
     @ApiOperation(value = "获取字段校验规则维护分页列表 [by:zhanghang]")
     @PostMapping("/getFieldCalibrationPage")
     public CommonResult<IPage<GetFieldCalibrationPageDTO>> getFieldCalibrationPage(@RequestBody GetFieldCalibrationPageVO getFieldCalibrationPageVO) {

daqe-center/src/main/java/com/lantone/daqe/web/OfficialCapacityManagementController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.daqe.dto.GetOfficialCapacityPageDTO;
 import com.lantone.daqe.facade.OfficialCapacityManagementFacade;
-import com.lantone.daqe.vo.DelOfficialCapacityByIdVO;
 import com.lantone.daqe.vo.GetOfficialCapacityPageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,28 +28,18 @@ public class OfficialCapacityManagementController {
     @Autowired
     private OfficialCapacityManagementFacade officialCapacityManagementFacade;
 
-    /**
-     * 获取获取职务职称变更记录分页列表数据
-     *
-     * @param getOfficialCapacityPageVO
-     * @return: 职务职称变更记录分页数据
-     */
+
     @ApiOperation(value = "获取职务职称变更记录 [by:zhanghang]")
     @PostMapping("/getOfficialCapacityPage")
     public CommonResult<IPage<GetOfficialCapacityPageDTO>> getOfficialCapacityPage(@RequestBody GetOfficialCapacityPageVO getOfficialCapacityPageVO) {
         return CommonResult.success(officialCapacityManagementFacade.getOfficialCapacityPage(getOfficialCapacityPageVO));
     }
 
-    /**
-     * 删除职务职称变更记录
-     *
-     * @param delOfficialCapacityByIdVO
-     * @return: 是否成功
-     */
+
     @ApiOperation(value = "删除职务职称变更记录 [by:zhanghang]")
     @PostMapping("/delOfficialCapacityPage")
-    public CommonResult<Boolean> delOfficialCapacityPage(@RequestBody DelOfficialCapacityByIdVO delOfficialCapacityByIdVO) {
-        return CommonResult.success(officialCapacityManagementFacade.delOfficialCapacityPage(delOfficialCapacityByIdVO));
+    public CommonResult<Boolean> delOfficialCapacityPage(@RequestBody Long idList[]) {
+        return CommonResult.success(officialCapacityManagementFacade.delOfficialCapacityPage(idList));
     }
 
 }

daqe-center/src/main/java/com/lantone/daqe/web/RecordTemplateManagementController.java

@@ -29,24 +29,14 @@ public class RecordTemplateManagementController {
     @Autowired
     private RecordTemplateManagementFacade recordTemplateManagementFacade;
 
-    /**
-     * 获取文书模板信息分页列表数据
-     *
-     * @param getRecordTemplatePageVO
-     * @return: 文书模板信息分页数据
-     */
+
     @ApiOperation(value = "获取文书模板分页列表 [by:zhanghang]")
     @PostMapping("/getRecordTemplatePage")
     public CommonResult<IPage<GetRecordTemplatePageDTO>> getRecordTemplatePage(@RequestBody GetRecordTemplatePageVO getRecordTemplatePageVO) {
         return CommonResult.success(recordTemplateManagementFacade.getRecordTemplatePage(getRecordTemplatePageVO));
     }
 
-    /**
-     * 根据ID获取具体的模板内容
-     *
-     * @param getRecordTemplateByIdVO
-     * @return: 模板具体的内容
-     */
+
     @ApiOperation(value = "查看文书模板信息 [by:zhanghang]")
     @PostMapping("/getRecordTemplateManage")
     public CommonResult<RecordTemplate> getRecordTemplateManage(@RequestBody GetRecordTemplateByIdVO getRecordTemplateByIdVO) {