update

Lius

2024-07-08 4e5af86ad91040f4c9a2656396079b7192c8bdcf

update

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java

@@ -1,33 +1,27 @@
package org.jeecg.modules.mdc.controller;

import java.util.Arrays;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.MdcProcessQuantityDto;
import org.jeecg.modules.mdc.entity.MdcProcessQuantity;
import org.jeecg.modules.mdc.service.IMdcProcessQuantityService;
import org.jeecg.modules.mdc.vo.MdcProcessQuantityVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;

import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.MdcProcessQuantityDto;
import org.jeecg.modules.mdc.entity.MdcProcessQuantity;
import org.jeecg.modules.mdc.entity.MdcStandardProcessDuration;
import org.jeecg.modules.mdc.service.IMdcProcessQuantityService;


import org.jeecg.modules.mdc.vo.MdcProcessQuantityVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.Arrays;

/**
 * @Description: 加工数量表
@@ -77,8 +71,11 @@
    @ApiOperation(value = "加工数量表-添加", notes = "加工数量表-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody MdcProcessQuantity mdcProcessQuantity) {
        mdcProcessQuantityService.save(mdcProcessQuantity);
        return Result.OK("添加成功！");
        if (StringUtils.isBlank(mdcProcessQuantity.getEquipmentIds())) {
            return Result.error("未选择设备，请排查");
        }
        boolean flag = mdcProcessQuantityService.addData(mdcProcessQuantity);
        return flag ? Result.ok("添加成功") : Result.error("添加失败");
    }

    /**

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.mdc.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -38,9 +39,14 @@
    @ApiModelProperty(value = "主键")
    private String id;
    /**
     * 设备编号
     */
    @Excel(name = "设备编号", width = 15)
    @ApiModelProperty(value = "设备编号")
    private String equipmentId;
    /**
     * 标准加工时间id
     */
    @Excel(name = "标准加工时间id", width = 15)
    @ApiModelProperty(value = "标准加工时间id")
    private String standardId;
    /**
@@ -64,4 +70,7 @@
    @ApiModelProperty(value = "备注")
    private String remark;

    @TableField(exist = false)
    private String equipmentIds;

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcProcessQuantityService.java

@@ -46,4 +46,13 @@
     * @return
     */
    MdcProcessQuantityDto findById(String id);

    /**
     * 添加
     *
     * @param mdcProcessQuantity
     * @return
     */
    boolean addData(MdcProcessQuantity mdcProcessQuantity);

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProcessQuantityServiceImpl.java

@@ -16,6 +16,7 @@
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.ModelAndView;

@@ -141,4 +142,27 @@
    public MdcProcessQuantityDto findById(String id) {
        return this.baseMapper.findById(id);
    }


    /**
     * 添加数据
     *
     * @param mdcProcessQuantity
     * @return
     */
    @Override
    public boolean addData(MdcProcessQuantity mdcProcessQuantity) {
        boolean result = false;
        String[] equipmentIds = mdcProcessQuantity.getEquipmentIds().split(",");
        for (String equipmentId : equipmentIds) {
            MdcProcessQuantity processQuantity = new MdcProcessQuantity();
            BeanUtils.copyProperties(mdcProcessQuantity, processQuantity);
            processQuantity.setEquipmentId(equipmentId);
            boolean b = super.save(processQuantity);
            if (b) {
                result = true;
            }
        }
        return result;
    }
}