企业人员更新问题修改，配套设备相关接口

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/EquipmentAssociated.java

@@ -124,10 +124,5 @@ public class EquipmentAssociated extends BaseEntity {
 	@TableField("approval_certificate_number")
     private String approvalCertificateNumber;
 
-    /**
-     * 更新人id
-     */
-	@TableField("rec_user_d")
-    private Long recUserD;
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/EquipmentAssociatedController.java

 package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.Equipment;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentAssociated;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -24,7 +32,7 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
  * @date 2021-11-26
  */
 @RestController
-@Api(tags = "配套设备/设施/部件Api")
+@Api(tags = "配套设备设施部件Api")
 @RequestMapping(value = "/equipment-associated")
 public class EquipmentAssociatedController extends BaseController {
 
@@ -38,79 +46,38 @@ public class EquipmentAssociatedController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增配套设备/设施/部件", notes = "新增配套设备/设施/部件")
+	@ApiOperation(httpMethod = "POST", value = "新增配套设备设施部件", notes = "新增配套设备设施部件")
 	public ResponseModel<EquipmentAssociatedDto> save(@RequestBody EquipmentAssociatedDto model) {
 	    model = equipmentAssociatedServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
 
-	/**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新配套设备/设施/部件", notes = "根据sequenceNbr更新配套设备/设施/部件")
-	public ResponseModel<EquipmentAssociatedDto> updateBySequenceNbrEquipmentAssociated(@RequestBody EquipmentAssociatedDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(equipmentAssociatedServiceImpl.updateWithModel(model));
-	}
 
 	/**
-     * 根据sequenceNbr删除
 	 *
-     * @param sequenceNbr 主键
+	 * @param pageNum
+	 * @param pageSize
+	 * @param equipId
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除配套设备/设施/部件", notes = "根据sequenceNbr删除配套设备/设施/部件")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(equipmentAssociatedServiceImpl.removeById(sequenceNbr));
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "配套设备设施部件分页查询",  notes = "配套设备设施部件分页查询")
+	public ResponseModel<IPage<EquipmentAssociatedDto>> queryForPage(String pageNum, String pageSize, @RequestParam (value = "equipId") Long equipId) {
+		Page<EquipmentAssociated> pageBean;
+		IPage<EquipmentAssociated> page;
+		LambdaQueryWrapper<EquipmentAssociated> queryWrapper = new LambdaQueryWrapper<EquipmentAssociated>().eq(EquipmentAssociated::getIsDelete,false).eq(EquipmentAssociated::getEquipmentId,equipId);
+		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+			pageBean = new Page<>(0, Long.MAX_VALUE);
+		} else {
+			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
 		}
-
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个配套设备/设施/部件",  notes = "根据sequenceNbr查询单个配套设备/设施/部件")
-	public ResponseModel<EquipmentAssociatedDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(equipmentAssociatedServiceImpl.queryBySeq(sequenceNbr));
+		page = equipmentAssociatedServiceImpl.page(pageBean, queryWrapper);
+		int num= equipmentAssociatedServiceImpl.count(queryWrapper);
+		pageBean.setTotal(num);
+		IPage<EquipmentAssociatedDto> result = BeanDtoVoUtils.iPageVoStream(page,EquipmentAssociatedDto.class);
+		return ResponseHelper.buildResponse(result);
 	}
 
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "配套设备/设施/部件分页查询",  notes = "配套设备/设施/部件分页查询")
-	public ResponseModel<Page<EquipmentAssociatedDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<EquipmentAssociatedDto> page = new Page<EquipmentAssociatedDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(equipmentAssociatedServiceImpl.queryForEquipmentAssociatedPage(page));
-	}
 
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "配套设备/设施/部件列表全部数据查询",   notes = "配套设备/设施/部件列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<EquipmentAssociatedDto>> selectForList() {
-	    return ResponseHelper.buildResponse(equipmentAssociatedServiceImpl.queryForEquipmentAssociatedList());
-	}
 }