更新bom反馈和ecr日期格式扩展

whycxzp

2023-02-28 b20696271374b340244fe1ed948798d80bde4b85

更新bom反馈和ecr日期格式扩展

 src/main/java/com/whyc/controller/BOMFeedbakController.java

@@ -35,10 +35,16 @@
        return service.getRecevierStatus(flag,pageCurr,pageSize);
    }

    @ApiOperation(value = "接收者确认反馈")
    @GetMapping("setconfirmFk")
    public Response setconfirmFk(@RequestParam int id){
        return service.setconfirmFk(id);
    @ApiOperation(value = "接收者确认反馈",notes = "传入id,confirmStatus,replyContent")
    @GetMapping("confirmFeedback")
    public Response confirmFeedback(@RequestBody BOMFeedback feedback){
        return service.confirmFeedback(feedback);
    }

    @ApiOperation("更新ECR流水号")
    @PostMapping("updateEcrNumber")
    public Response updateEcrNumber(int id,String ecrNumber){
        return service.updateEcrNumber(id,ecrNumber);
    }

    @ApiOperation("提交反馈")

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.FileDirPath;
@@ -88,23 +89,38 @@
        PageInfo pageInfo = new PageInfo(list);
        return new Response().setII(1,list.size()>0,pageInfo,"接收者反馈");
    }
   //接收者确认反馈
    public Response setconfirmFk(int id) {

    /**
     * 接收者确认反馈
     *
     * @param feedback
     * @return
     */
    public Response confirmFeedback(BOMFeedback feedback) {
        String msg="";
        boolean bl=true;
        int id = feedback.getId();
        Integer confirmStatus = feedback.getConfirmStatus();
        String replyContent = feedback.getReplyContent();
        Date now = new Date();
        if(confirmStatus == 1){ //与我无关
            feedback.setReplyContent("系统默认生成回复:与我无关");
        }
        //1.确认前先判断反馈是否被确认
        QueryWrapper qwrapper=new QueryWrapper();
        qwrapper.eq("id",id);
        qwrapper.eq("confirm_status",1);
        List list=mapper.selectList(qwrapper);
        QueryWrapper<BOMFeedback> queryWrapper=new QueryWrapper<>();
        queryWrapper.eq("id",id);
        queryWrapper.ne("confirm_status",0);
        List list=mapper.selectList(queryWrapper);
        if(list!=null&&list.size()>0){
            msg="该反馈已被确认";
            bl=false;
        }else{
            //2.确认反馈
            UpdateWrapper wrapper=new UpdateWrapper();
            wrapper.set("confirm_status",1);
            UpdateWrapper<BOMFeedback> wrapper=new UpdateWrapper<>();
            wrapper.set("confirm_status",confirmStatus);
            wrapper.set("confirm_user_name",ActionUtil.getUser().getName());
            wrapper.set("reply_content",replyContent);
            wrapper.set("reply_time",now);
            wrapper.eq("id",id);
            int count=mapper.update(null,wrapper);
            bl=count>0;
@@ -214,4 +230,11 @@
            e.printStackTrace();
        }
    }

    public Response updateEcrNumber(int id, String ecrNumber) {
        UpdateWrapper<BOMFeedback> update = Wrappers.update();
        update.set("ecr_number",ecrNumber).set("confirm_status",3).eq("id",id);
        mapper.update(null, update);
        return new Response().set(1,true,"上传完成");
    }
}

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

@@ -109,8 +109,20 @@
        if(proposeDateStr.equals("")){
            return new Response().set(1,false,"申请日期不能为空!");
        }
        Date proposeDate = DateUtil.YYYY_MM_DD_UNION.parse(proposeDateStr);

        Date proposeDate;
        try {
            if(proposeDateStr.contains(".")){
                proposeDate = DateUtil.YYYY_MM_DD_UNION2.parse(proposeDateStr);
            }else if(proposeDateStr.contains("-")){
                proposeDate = DateUtil.YYYY_MM_DD_UNION3.parse(proposeDateStr);
            }else if(proposeDateStr.contains("/")){
                proposeDate = DateUtil.YYYY_MM_DD_UNION4.parse(proposeDateStr);
            }else {
                proposeDate = DateUtil.YYYY_MM_DD_UNION.parse(proposeDateStr);
            }
        }catch (ParseException e){
            return new Response().set(1,false,"申请日期格式错误!");
        }
        Cell proposerCell = sheet.getRow(2).getCell(22);
        if(proposerCell == null || !proposerCell.getStringCellValue().contains("申请人")){
            return new Response().set(1,false,"申请人不能为空或单元格格式不规范!");

 src/main/java/com/whyc/util/DateUtil.java

@@ -12,6 +12,9 @@
    public static SimpleDateFormat YYYY_MM_DD_HH_MM_SS_UNION=new SimpleDateFormat("yyyyMMddHHmmss");
    public static SimpleDateFormat YYYY_MM_DD=new SimpleDateFormat("yyyy-MM-dd");
    public static SimpleDateFormat YYYY_MM_DD_UNION=new SimpleDateFormat("yyyyMMdd");
    public static SimpleDateFormat YYYY_MM_DD_UNION2=new SimpleDateFormat("yyyy.MM.dd");
    public static SimpleDateFormat YYYY_MM_DD_UNION3=new SimpleDateFormat("yyyy-MM-dd");
    public static SimpleDateFormat YYYY_MM_DD_UNION4=new SimpleDateFormat("yyyy/MM/dd");