优化

“linengliang”

2023-11-27 bdcf57bd9679e916b378f1384d875dff6579033e

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

@@ -2,11 +2,13 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
@@ -14,12 +16,12 @@
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentReportRepair;
import org.jeecg.modules.eam.entity.FaultDescription;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEquipmentReportRepairService;
import org.jeecg.modules.eam.service.IFaultDescriptionService;
import org.jeecg.modules.eam.entity.QuanlityConfirm;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +30,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -46,15 +49,20 @@
    private IEquipmentReportRepairService equipmentReportRepairService;
    @Autowired
    private IEamEquipmentService equipmentService;

    @Autowired
    private ISysBaseAPI sysBaseApi;
    @Autowired
    private ISysUserService userService;

    @Autowired
    private IQuanlityConfirmService quanlityConfirmService;
    @Autowired
    @Lazy
    private IFaultDescriptionService faultDescriptionService;
    @Autowired
    @Lazy
    private IdentityService sysIdentityService;


    /**
     * 分页列表查询
     *
@@ -95,14 +103,29 @@
    @PostMapping(value = "/add")
    @Transactional(rollbackFor = {Exception.class})
    public Result<String> add(@RequestBody EquipmentReportRepair equipmentReportRepair) {
        LoginUser curUser= (LoginUser) SecurityUtils.getSubject().getPrincipal();
        equipmentReportRepair.setStatus("1");
        equipmentReportRepair.setSource("1");
        equipmentReportRepair.setIsCreateOrder(0);
        equipmentReportRepairService.save(equipmentReportRepair);
        String IS_PRODUCT_YES = "yes";
        if(IS_PRODUCT_YES.equals(equipmentReportRepair.getErrUda1())){
            String num = sysIdentityService.getNumByTypeAndLength("QuanlityConfirm",4);
            QuanlityConfirm quanlityConfirm = new QuanlityConfirm();
            quanlityConfirm.setNum(num);
            quanlityConfirm.setReportId(equipmentReportRepair.getId());
            String IS_PRODUCT_NO = "no";
            quanlityConfirm.setIsConfirm(IS_PRODUCT_NO);
            quanlityConfirm.setBatchNo(equipmentReportRepair.getBatchNo());
            quanlityConfirm.setPartNumber(equipmentReportRepair.getPartNumber());
            quanlityConfirm.setQuantity(equipmentReportRepair.getQuantity());
            quanlityConfirm.setOperator(curUser.getId());
            quanlityConfirmService.save(quanlityConfirm);
        }
        Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId());
        equipment.setEquipmentStatus("2");
        String teamId = equipment.getTeamId();
        if(StringUtils.isNotBlank(teamId)){
        if(ObjectUtils.isNotNull(teamId)){
            List<SysUser> sysUsers = userService.list(new QueryWrapper<SysUser>()
                    .eq("team_id",teamId)
                    .eq("del_flag",0));
@@ -218,4 +241,12 @@
        IPage<Map<String, Object>> equipmentReportRepairList = equipmentReportRepairService.getReportRepairList(pageNo, pageSize, params);
        return Result.ok(equipmentReportRepairList);
    }

    @PutMapping("/accept")
    public Result<?> accept(@RequestBody EquipmentReportRepair equipmentReportRepair ){
        equipmentReportRepair.setStatus("5");
        equipmentReportRepair.setAcceptTime(new Date());
        equipmentReportRepairService.updateById(equipmentReportRepair);
        return Result.OK("验收成功");
    }
}