#一键出差、报销完善相关

LSH

2023-10-10 a6535d6c9889a4240d037367db3c481a679e15a0

 src/main/java/com/zy/crm/manager/controller/PlanController.java

@@ -12,11 +12,9 @@
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
import com.zy.crm.common.entity.RouteCollectCountType;
import com.zy.crm.common.model.SettleDto;
import com.zy.crm.common.service.OssService;
import com.zy.crm.common.utils.FileSaveExampleUtil;
import com.zy.crm.common.utils.SetOfUtils;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
import com.zy.crm.manager.entity.*;
@@ -33,20 +31,11 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.core.io.Resource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;

import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;

import static java.util.stream.Collectors.toList;

@RestController
public class PlanController extends BaseController {
@@ -63,6 +52,8 @@
    private PriOnline2Service priOnline2Service;
    @Autowired
    private OrderService orderService;
    @Autowired
    private SmsCodeService smsCodeService;

    @GetMapping(value = "/plan/{id}/auth")
    @ManagerAuth
@@ -147,11 +138,17 @@
        plan.setCreateTime(now);
        plan.setUpdateBy(getUserId());
        plan.setUpdateTime(now);
        plan.setStatus(1);
        plan.setStatus(0);
        plan.setStep(1);

        plan.setForm(JSON.toJSONString(param));     // 自定义表单内容
        plan.setSettle(1);  // 1.开始
        User manager = userService.getDeptManager(hostId, getUser().getDeptId());        // 获取部门领导
        User manager = new User();
        try{
            manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        }catch (Exception e){
            manager = getUser();
        }
        PlanType planType = planTypeService.selectById(plan.getPlanType());
        User planLeader = planTypeService.findPlanLeader(planType);
        plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));
@@ -346,7 +343,12 @@
//            case 1:
//                // 本组组长审核
//                User user = userService.selectById(plan.getUserId());
//                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
//                User manager = new User();
//                try{
//                    manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
//                }catch (Exception e){
//                    manager = user;
//                }
//                if (manager.getId().equals(getUserId())) {
//
//                    // 查找规划组长
@@ -443,6 +445,11 @@
                plan.setUpdateBy(getUserId());
                plan.setUpdateTime(new Date());

                boolean sendSmsCode = smsCodeService.sendSmsCodeText(planner.getMobile());
                if (!sendSmsCode) {
                    System.out.println("短信发送失败！");
                }

                if (!planService.updateById(plan)) {
                    throw new CoolException("审核失败，请联系管理员");
                }
@@ -520,6 +527,7 @@
                plan.setSettleMsg(JSON.toJSONString(list1));
                // 修改规划单状态
                plan.setSettle(4);  // 审批通过
                plan.setStatus(1);  // 审批通过
                plan.setUpdateBy(getUserId());
                plan.setUpdateTime(new Date());

@@ -599,6 +607,39 @@
        return R.ok(result);
    }

    @RequestMapping(value = "/planQueryNameToRob/auth")
    @ManagerAuth
    public R planQueryNameToRob(String condition) {
        EntityWrapper<Plan> wrapper = new EntityWrapper<>();
        wrapper.like("name", condition);
        wrapper.eq("status",1);

        int type =1;
        if (getUser().getNickname().equals("李世豪2级")){
            type=2;
        }

        List<Long> typeList = new ArrayList<>();
        List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
        for (PlanType planType : planTypes){
            typeList.add(planType.getId());
        }
        wrapper.in("plan_type",typeList);

//        Page<Plan> page = planService.selectPage(new Page<>(0, 10), wrapper);
        List<Plan> plans = planService.selectList(wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
//        for (Plan plan : page.getRecords()){
        for (Plan plan : plans){
            Map<String, Object> map = new HashMap<>();
            map.put("id", plan.getId());
//            map.put("value", plan.getName()+"---"+plan.getId());
            map.put("value", plan.getName());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/plan/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {