Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-08-24 e4f82a68cdc10967abf0b69d9846721fdca2b77a

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

@@ -13,9 +13,11 @@
import com.core.domain.KeyValueVo;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.Item;
import com.zy.crm.manager.entity.Plan;
import com.zy.crm.manager.entity.PriOnline;
import com.zy.crm.manager.entity.PriSales;
import com.zy.crm.manager.service.ItemService;
import com.zy.crm.manager.service.PlanService;
import com.zy.crm.manager.service.PriOnlineService;
import com.zy.crm.manager.service.PriSalesService;
import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -40,7 +42,7 @@
    private PriOnlineService priOnlineService;

    @Autowired
    private ItemService itemService;
    private PlanService planService;

    @RequestMapping(value = "/priSales/{id}/auth")
    @ManagerAuth
@@ -67,15 +69,32 @@
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        boolean signUserId = false;
        boolean signDeptId = false;
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().equals("dept_id")){
                signDeptId = true;
            }
        }
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else if (entry.getKey().equals("dept_id")){
                if (!val.equals("19")){
                    wrapper.eq(entry.getKey(), val);
                }
            } else if (entry.getKey().equals("user_id") && !signDeptId){
                signUserId = true;
                wrapper.eq(entry.getKey(), val);
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
        if (!signUserId && !signDeptId){
            wrapper.eq("user_id", getUserId());
        }
    }

@@ -100,14 +119,15 @@
        priSales.setUpdateUserId(getUserId());
        //更新时间
        priSales.setUpdateTime(new Date());
        priSales.setDeptId(getDeptId());

        //业务员
        Item item = itemService.selectById(priSales.getItemId());
        priSales.setMemberId(item.getMember());
        Plan plan = planService.selectById(priSales.getItemId());
        priSales.setMemberId(plan.getUserId());

        //设置项目流程
        item.setStep(3);
        itemService.updateById(item);
        plan.setStep(3);
        planService.updateById(plan);

        priSalesService.insert(priSales);
        return R.ok();
@@ -137,8 +157,8 @@
        priSales.setUpdateTime(new Date());

        //业务员
        Item item = itemService.selectById(priSales.getItemId());
        priSales.setMemberId(item.getMember());
        Plan plan = planService.selectById(priSales.getItemId());
        priSales.setMemberId(plan.getUserId());

        priSalesService.insert(priSales);
        return R.ok();
@@ -204,7 +224,7 @@
        for (PriSales priSales : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", priSales.getId());
            map.put("value", priSales.getInOrderNum() + "/" + priSales.getItemId$() + "/" + priSales.getMemberId$());
            map.put("value", priSales.getInOrderNum() + "/" + priSales.getPlanId$() + "/" + priSales.getMemberId$());
            result.add(map);
        }
        return R.ok(result);