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

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

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

@@ -8,6 +8,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcNoplanClose;
import org.jeecg.modules.mdc.entity.MdcStandardProcessDuration;
import org.jeecg.modules.mdc.mapper.MdcStandardProcessDurationMapper;
@@ -16,6 +17,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;

@@ -142,13 +144,37 @@
        List<MdcStandardProcessDuration> mdcStandardProcessDurations = this.baseMapper.selectList(queryWrapper);
        // 导出文件名称
        mv.addObject(NormalExcelConstants.FILE_NAME, "标准加工时间列表");
        mv.addObject(NormalExcelConstants.CLASS, MdcNoplanClose.class);
        mv.addObject(NormalExcelConstants.CLASS, MdcStandardProcessDuration.class);
        //获取当前登录用户
        //update-begin---author:wangshuai ---date:20211227  for：[JTC-116]导出人写死了------------
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("标准加工时间列表数据", "导出人:"+user.getRealname(), "导出信息"));
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("标准加工时间列表数据", "导出人:" + user.getRealname(), "标准加工时间"));
        //update-end---author:wangshuai ---date:20211227  for：[JTC-116]导出人写死了------------
        mv.addObject(NormalExcelConstants.DATA_LIST, mdcStandardProcessDurations);
        return mv;
    }

    /**
     * 添加数据
     *
     * @param mdcStandardProcessDuration
     * @return
     */
    @Override
    public boolean addData(MdcStandardProcessDuration mdcStandardProcessDuration) {
        boolean result = false;
        String[] equipmentIds = mdcStandardProcessDuration.getEquipmentIds().split(",");
        for (String equipmentId : equipmentIds) {
            MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
            MdcStandardProcessDuration standardProcessDuration = new MdcStandardProcessDuration();
            BeanUtils.copyProperties(mdcStandardProcessDuration, standardProcessDuration);
            standardProcessDuration.setEquipmentId(mdcEquipment.getEquipmentId());
            standardProcessDuration.setEquipmentName(mdcEquipment.getEquipmentName());
            boolean b = super.save(standardProcessDuration);
            if (b) {
                result = true;
            }
        }
        return result;
    }
}