修改签收出错bug

wjli

2024-04-10 81af4cff627b7ec1e125b90f4fd57392c6d70588

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java

@@ -5,12 +5,15 @@
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.core.entity.User;
import cn.exrick.xboot.core.service.UserService;
import cn.exrick.xboot.your.entity.*;
import cn.exrick.xboot.your.service.*;
import cn.exrick.xboot.your.util.HaiKangPost;
import cn.exrick.xboot.your.vo.AlarmVo;
import cn.exrick.xboot.your.vo.PreviewURLsVo;
import cn.exrick.xboot.your.vo.TalkURLsVo;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
@@ -20,9 +23,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.text.SimpleDateFormat;
import java.util.*;

/**
@@ -62,6 +67,18 @@
    @Autowired
    private IAlarmService iAlarmService;

    @Autowired
    private ICustomerService iCustomerService;

    @Autowired
    private IOrderTask2Service iOrderTask2Service;

    @Autowired
    private UserService userService;

    @Autowired
    private IDuoZhengService iDuoZhengService;

    @RequestMapping(value = "/getIndex1", method = RequestMethod.GET)
    @ApiOperation(value = "获取首页数据")
    public Result<Object> getIndex1() {
@@ -70,16 +87,32 @@
        for (String str : scan) {
            map.put(str.substring(12),redisTemplateHelper.get(str));
        }
        QueryWrapper<Customer> wrapper = new QueryWrapper<>();
        wrapper.eq("kstatus",0);
        map.put("taKan",iCustomerService.count(wrapper));
        return new ResultUtil<Object>().setData(map);
    }

    @RequestMapping(value = "/getTaKanList", method = RequestMethod.GET)
    @ApiOperation(value = "获取踏勘商户列表")
    public Result<Object> getTaKanList() {
        QueryWrapper<Customer> wrapper = new QueryWrapper<>();
        wrapper.eq("kstatus",0);
        return new ResultUtil<Object>().setData(iCustomerService.list(wrapper));
    }

    @RequestMapping(value = "/getTodayTask", method = RequestMethod.GET)
    @ApiOperation(value = "获取今日配送任务")
    public Result<Object> getTodayTask() {
        QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
        String format = DateUtil.format(new Date(), "yyyy-MM-dd");
        wrapper2.eq("a.send_date",format);
//        wrapper2.orderByAsc("a.seq");
    public Result<Object> getTodayTask(String sendTime) {
        //QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
        String format = "";
        if(StrUtil.isNotEmpty(sendTime)){
            format = sendTime;
        }else{
            format = DateUtil.format(new Date(), "yyyy-MM-dd");
        }
        //wrapper2.eq("a.send_date",format);
        //wrapper2.orderByAsc("a.seq");
        List<OrderTask> list = iOrderTaskService.list3(format);
        return new ResultUtil<Object>().setData(list);
    }
@@ -261,4 +294,96 @@
    public double trans2(double v2){
        return (double) Math.round(v2 * 100) / 100;
    }


    @RequestMapping(value = "/getYiHuDuoZheng", method = RequestMethod.GET)
    @ApiOperation(value = "获取配送分析详情")
    public Result<Object> getYiHuDuoZheng() {

//        List<Customer> list = iCustomerService.getYiHuDuoZheng();
//        Map<String,Object> map = new HashMap<>();
//        map.put("name","一户多证");
//        List<Object> childrens = new ArrayList<>();
//        for(Customer c:list){
//            Map<String,Object> map2 = new HashMap<>();
//            map2.put("name",c.getName());
//
//            List<Object> names = new ArrayList<>();
//            Map<String,Object> map3 = new HashMap<>();
//            map3.put("name",c.getCode());
//            names.add(map3);
//
//            map2.put("children",names);
//
//            childrens.add(map2);
//        }
//        map.put("children",childrens);


        List<String> list = iDuoZhengService.getNames();
        Map<String,Object> map = new HashMap<>();
        map.put("name","一户多证");
        List<Object> childrens = new ArrayList<>();
        for(String c:list){
            Map<String,Object> map2 = new HashMap<>();
            map2.put("name",c);

            List<Object> names = new ArrayList<>();

            QueryWrapper<DuoZheng> wp = new QueryWrapper<>();
            wp.eq("name",c);
            List<DuoZheng> list1 = iDuoZhengService.list(wp);
            for(DuoZheng dz:list1){
                Map<String,Object> map3 = new HashMap<>();
                map3.put("name",dz.getCustomerName());
                names.add(map3);
            }

            map2.put("children",names);

            childrens.add(map2);
        }
        map.put("children",childrens);
        return new ResultUtil<Object>().setData(map);
    }

    @RequestMapping(value = "/test", method = RequestMethod.GET)
    @ApiOperation(value = "测试接口，没用")
    public String test(){
        List<OrderTask> list = iOrderTaskService.list();

        List<OrderTask2> list2 = new ArrayList<>();
        for(OrderTask orderTask:list){
            OrderTask2 orderTask2 = new OrderTask2();
            BeanUtil.copyProperties(orderTask,orderTask2);

            if(StrUtil.isNotEmpty(orderTask.getUserId())){
                orderTask2.setUserName(getUser(orderTask.getUserId()));
            }
            if(StrUtil.isNotEmpty(orderTask.getCustomerId())){
                orderTask2.setCustomerName(getCustomer(orderTask.getCustomerId()));
            }
            list2.add(orderTask2);
        }
        iOrderTask2Service.saveBatch(list2);
        return list.size()+"ok";
    }

    private String getUser(String id){
        User user = userService.get(id);
        if(user!=null){
            return user.getNickname();
        }else{
            return null;
        }
    }

    private String getCustomer(String id){
        Customer customer = iCustomerService.getById(id);
        if(customer!=null){
            return customer.getName();
        }else{
            return null;
        }
    }
}