设备管理

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/EquipmentMapper.xml

@@ -14,6 +14,9 @@
             <if test="equipment.verifyStatus != '' and equipment.verifyStatus != null">
                 and `verify_status` like concat('%',#{equipment.verifyStatus},'%')
             </if>
+            <if test="equipment.companyId != '' and equipment.companyId != null">
+                and `company_id` like concat('%',#{equipment.companyId},'%')
+            </if>
         </where>
     </select>
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/EquipmentController.java

@@ -14,7 +14,9 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.AttachmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper;
 
+import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.AttachmentServiceImpl;
+import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -62,6 +64,9 @@ public class EquipmentController extends BaseController {
 	@Autowired
 	AttachmentServiceImpl attachmentService;
 
+	@Autowired
+	OrgServiceImpl orgService;
+
     /**
      * 新增设备信息表
      *
@@ -70,7 +75,9 @@ public class EquipmentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增设备信息表", notes = "新增设备信息表")
+	@BusinessIdentify
 	public ResponseModel<EquipmentDto> save(@RequestBody EquipmentDto model) {
+		model.setCompanyId(orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr());
 		model.setManufactureDate(new Date());
 		model.setInspectionDate(new Date());
 		model = equipmentServiceImpl.createWithModel(model);
@@ -128,17 +135,17 @@ public class EquipmentController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "设备信息表分页查询",  notes = "设备信息表分页查询")
+	@BusinessIdentify
 	public ResponseModel<IPage<EquipmentDto>> queryForPage(
 			@RequestParam(value = "current") int current,
 			@RequestParam(value = "size") int size, Equipment equipment) {
 		IPage<EquipmentDto> page = new Page<>();
 		page.setSize(size);
 		page.setCurrent(current);
+		equipment.setCompanyId(orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr());
 		return ResponseHelper.buildResponse(equipmentServiceImpl.queryEquipmentPage(page,equipment));
-
 	}
 
-
 	/**
 	 * 列表全部数据查询
      *