验收报告修改

whyclxw

2 天以前 cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7

 src/main/java/com/whyc/service/DefectiveProductsService.java

@@ -1,6 +1,5 @@
package com.whyc.service;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
@@ -15,6 +14,7 @@
import com.whyc.pojo.DocUser;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
import com.whyc.util.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -54,15 +54,18 @@
        String senderName = ActionUtil.getUser().getName();
        Integer senderId =ActionUtil.getUser().getId().intValue();
        defective.setSenderId(senderId);
        defective.setSenderName(senderName);
        Date date=new Date();
        defective.setRecordTime(date);
        defective.setRestProduct(defective.getBadProduct());
        if(defective.getStartTime()==null){
            //保存
            defective.setStartTime(new Date());
            defective.setStartTime(date);
        }
        String time = ActionUtil.sdfwithday.format(defective.getStartTime());
        //String feedbackZipPath = "defective" + File.separator + username + "_" + time+".zip";
        String recordtime = ActionUtil.sdfwithFTP.format(defective.getRecordTime());
        String rootFile = CommonUtil.getRootFile();
        if(multipartFileList!=null && multipartFileList.size()!=0){
            String defectiveDirSuffix = "defective" + File.separator + senderName + File.separator + time + File.separator;
            String defectiveDirSuffix = "defective" + File.separator + senderName + File.separator+ recordtime + File.separator;
            String feedbackDir = rootFile + defectiveDirSuffix;
            File fileDir = new File(feedbackDir);
            if (!fileDir.exists()) {
@@ -80,7 +83,7 @@
                multipartFile.transferTo(file);
            }
            //ZipUtils.toZip(fileList,new FileOutputStream(new File(rootFile+feedbackZipPath)));
            defective.setFileUrl("doc_file" + File.separator + defectiveDirSuffix);
            defective.setFileUrl(defectiveDirSuffix);
        }


@@ -112,7 +115,8 @@
        }

        String subject = "【不良品记录】-"+senderName;
        String content = defective.getContent();
        String content = senderName+"上传了不良品记录,信息如下:\n厂商:"+defective.getProvideName()+"\n产品:"+defective.getProductName()+"\n型号:"+defective.getType()
                +"\n不良品数量:"+defective.getBadProduct()+"\n具体不良信息:"+defective.getContent();

        MailDTO mailDTO = new MailDTO();
        mailDTO.setTitle(subject);
@@ -129,6 +133,28 @@
    public Response getDefectiveLimit(DefectiveDto defectiveDto) {
        PageHelper.startPage(defectiveDto.getPageCurr(),defectiveDto.getPageSize());
        List<DefectiveProducts> list=mapper.getDefectiveLimit(defectiveDto);
        String rootFile = CommonUtil.getRootFile();//主路径
        for (DefectiveProducts defective:list) {
            String filePath=defective.getFileUrl();
            String startTimeEx=ActionUtil.sdfwithday.format(defective.getStartTime());
            defective.setStartTimeEx(startTimeEx);
            if(filePath!=null&&!filePath.isEmpty()){
                defective.setFileUrl("doc_file"+File.separator+filePath);
                defective.setNameList(FileUtil.getFileNameWithOutDirectory(rootFile+filePath));

            }
            List<DefectiveProductsHistory> hisList=defective.getHisList();
            if(hisList!=null&&hisList.size()>0){
                for (DefectiveProductsHistory his:defective.getHisList()) {
                    String hisDelPath=his.getDelUrl();
                    if(hisDelPath!=null&&!hisDelPath.isEmpty()){
                        his.setDelUrl("doc_file"+File.separator+hisDelPath);
                        his.setHisNameList(FileUtil.getFileNameWithOutDirectory(rootFile+hisDelPath));
                    }
                }

            }
        }
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list!=null,pageInfo,"不良品首页推送");
    }
@@ -157,8 +183,10 @@
        UpdateWrapper wrapper=new UpdateWrapper();
        wrapper.set("receiver_ids",defectiveHis.getReceiverIds());
        wrapper.set("receiver_names",defectiveHis.getReceiverNames());
        wrapper.set("bad_product",defectiveHis.getBadProduct());
        if(defectiveHis.getBadProduct()==0){
        int resProduct=defective.getRestProduct()-defectiveHis.getDelProduct();
        defectiveHis.setRestProduct(resProduct);
        wrapper.set("rest_product",resProduct);
        if(resProduct==0){
            defectiveHis.setConfirmStatus(2);//不良品数量为0结束
        }else {
            defectiveHis.setConfirmStatus(1);
@@ -167,8 +195,8 @@
        wrapper.set("note",defectiveHis.getNote());
        wrapper.eq("id",defectiveHis.getDeftId());
        mapper.update(null,wrapper);

        //记录处理记录

        defectiveHisService.updateDefective(defective,defectiveHis,multipartFileList);

        //发送邮件
@@ -189,7 +217,9 @@
        }

        String subject = "【不良品处理记录】-"+senderName;
        String content = defective.getContent();
        String content = defectiveHis.getDelName()+"修复了不良品,记录信息如下:\n厂商:"+defective.getProvideName()+"\n产品:"+defective.getProductName()+"\n型号:"+defective.getType()+
                "\n不良品数量:"+defective.getBadProduct()+"\n修复不良品个数:"+defectiveHis.getDelProduct()+"\n剩余不良品个数:"+defectiveHis.getRestProduct()+"\n"
                +"修复方式:"+defectiveHis.getNote();

        MailDTO mailDTO = new MailDTO();
        mailDTO.setTitle(subject);
@@ -208,7 +238,7 @@
        wrapper.set("confirm_status",3);//归档
        wrapper.set("receiver_ids","");
        wrapper.set("receiver_names","");
        wrapper.set("bad_product",0);
        wrapper.set("rest_product",0);
        wrapper.set("note","");
        wrapper.eq("id",deftId);
        mapper.update(null,wrapper);
@@ -217,7 +247,9 @@
        defectiveHis.setDeftId(deftId);
        defectiveHis.setDelId(ActionUtil.getUser().getId().intValue());
        defectiveHis.setConfirmStatus(3);
        defectiveHis.setBadProduct(0);
        defectiveHis.setDelProduct(0);
        defectiveHis.setDelName(ActionUtil.getUser().getName());
        defectiveHis.setRestProduct(0);
        defectiveHisService.stopDefective(defectiveHis);
        return new Response().set(1,true);
    }