Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentSealController.java

@@ -8,6 +8,8 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EquipmentDisposalPage;
import org.jeecg.modules.eam.vo.EquipmentSealPage;
//import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
@@ -64,6 +66,9 @@

    @Autowired
    private IEquipmentSealDetailService equipmentSealDetailService;

    @Autowired
    private IEamEquipmentService equipmentService;

//    @Autowired
//    private IFlowMyBusinessService flowMyBusinessService;
@@ -520,6 +525,15 @@
    @PostMapping(value = "/approve")
    public Result<String> approve(@RequestBody EquipmentSeal equipmentSeal) {
        equipmentSealService.updateById(equipmentSeal);
        //审批通过后更新设备状态
        if("Approved".equals(equipmentSeal.getAuditStatus())){
            List<EquipmentSealDetail> equipmentSealDetailList = equipmentSealDetailService.selectByMainId(equipmentSeal.getId());
            for(EquipmentSealDetail equipmentSealDetail : equipmentSealDetailList){
                Equipment equipment = equipmentService.getById(equipmentSealDetail.getEquipmentId());
                equipment.setEquipmentStatus("2");
                equipmentService.updateById(equipment);
            }
        }
        return Result.OK("操作成功！");
    }