#

LSH

2023-10-16 a96bfff22df5598476f600ffb1d720668f0a2948

#

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

@@ -56,7 +56,7 @@
        EntityWrapper<BusinessTrip> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
//        wrapper.or().eq("member_id",getUserId());
        wrapper.or().eq("member_id",getUserId());
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(businessTripService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -150,6 +150,8 @@
        }

        businessTrip.setSettleMsg(JSON.toJSONString(SettleDto.initBusiness(manager,getUser())));

        businessTrip.setMemberId(manager.getId());

        businessTripService.insert(businessTrip);
        return R.ok();
@@ -281,6 +283,7 @@
                    businessTrip.setStatus(1);
                    businessTrip.setUpdateId(getUserId());
                    businessTrip.setUpdateTime(now);
                    businessTrip.setMemberId(businessTrip.getUserId());
                    if (!businessTripService.updateById(businessTrip)) {
                        throw new CoolException("审核失败，请联系管理员");
                    }

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

@@ -53,7 +53,7 @@
        EntityWrapper<BusinessTripOther> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
//        wrapper.or().eq("member_id",getUserId());
        wrapper.or().eq("member_id",getUserId());
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(businessTripOtherService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -125,6 +125,7 @@
            manager = getUser();
        }
        businessTripOther.setSettleMsg(JSON.toJSONString(SettleDto.initBusiness(manager,getUser())));
        businessTripOther.setMemberId(manager.getId());

        businessTripOtherService.insert(businessTripOther);
        return R.ok();
@@ -231,6 +232,7 @@
                    businessTripOther.setStatus(1);
                    businessTripOther.setUpdateId(getUserId());
                    businessTripOther.setUpdateTime(now);
                    businessTripOther.setMemberId(businessTripOther.getUserId());
                    if (!businessTripOtherService.updateById(businessTripOther)) {
                        throw new CoolException("审核失败，请联系管理员");
                    }

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

@@ -5,10 +5,8 @@
import com.core.common.Cools;
import com.core.common.R;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.CompanyTarget;
import com.zy.crm.manager.entity.Order;
import com.zy.crm.manager.service.CompanyTargetService;
import com.zy.crm.manager.service.OrderService;
import com.zy.crm.manager.entity.*;
import com.zy.crm.manager.service.*;
import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +28,18 @@
    private CompanyTargetService companyTargetService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private PlanService planService;
    @Autowired
    private PriOnline2Service priOnline2Service;
    @Autowired
    private PriQuoteService priQuoteService;
    @Autowired
    private BusinessTripService businessTripService;
    @Autowired
    private BusinessTripOtherService businessTripOtherService;
    @Autowired
    private ReimburseOnlineService reimburseOnlineService;

    //获取团队数据
    @RequestMapping(value = "/dashboard/companyData/auth")
@@ -108,6 +118,31 @@
        map.put("progressCount", progressCount);
        map.put("successCount", successCount);

//        planPendingTaskCount
//        priOnlinePendingTaskCount
//        priQuotePendingTaskCount
//        businessTripPendingTaskCount
//        reimburseOnlinePendingTaskCount
//        planPriOnlinePendingTaskCount

        //获取待处理任务数量
        int planPendingTaskCount = planService.selectCount(new EntityWrapper<Plan>().eq("director", getUserId()).lt("settle",4));
        map.put("planPendingTaskCount", planPendingTaskCount);
        int priOnlinePendingTaskCount = priOnline2Service.selectCount(new EntityWrapper<PriOnline2>().eq("member_id", getUserId()).lt("settle",2));
        map.put("priOnlinePendingTaskCount", priOnlinePendingTaskCount);
        int priQuotePendingTaskCount = priQuoteService.selectCount(new EntityWrapper<PriQuote>().eq("member_id", getUserId()).lt("settle",4));
        map.put("priQuotePendingTaskCount", priQuotePendingTaskCount);
        int businessTripCount = businessTripService.selectCount(new EntityWrapper<BusinessTrip>().eq("member_id", getUserId()).lt("settle", 2));
        int businessTripOtherCount = businessTripOtherService.selectCount(new EntityWrapper<BusinessTripOther>().eq("member_id", getUserId()).lt("settle",2));
        int businessTripPendingTaskCount = businessTripCount+businessTripOtherCount;
        map.put("businessTripPendingTaskCount", businessTripPendingTaskCount);
        int reimburseOnlinePendingTaskCount = reimburseOnlineService.selectCount(new EntityWrapper<ReimburseOnline>().eq("member_id", getUserId()).lt("settle",6));
        map.put("reimburseOnlinePendingTaskCount", reimburseOnlinePendingTaskCount);
        int planPriOnlinePendingTaskCount = planService.selectCount(new EntityWrapper<Plan>().eq("status", 1).eq("settle",4));
        map.put("planPriOnlinePendingTaskCount", planPriOnlinePendingTaskCount);



        return R.ok().add(map);
    }


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

@@ -194,7 +194,7 @@
        User president6 = userService.selectById(processPermissions6.getUserId());       // 获取报价流程节点6确认人

        reimburseOnline.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(reimburseOnline, manager,president3,president4,president5,president6,getUser())));
        reimburseOnline.setMemberId(getUser().getId());
        reimburseOnline.setMemberId(manager.getId());

        if (!reimburseOnlineService.insert(reimburseOnline)){
            return R.error("添加报销主档失败");

 src/main/java/com/zy/crm/manager/entity/BusinessTrip.java

@@ -286,6 +286,10 @@
    @TableField("business_end_time_day")
    private Integer businessEndTimeDay;

    @ApiModelProperty(value= "业务员")
    @TableField("member_id")
    private Long memberId;

    @TableField(exist = false)
    private String pcdStart;


 src/main/java/com/zy/crm/manager/entity/BusinessTripOther.java

@@ -287,6 +287,10 @@
    @TableField("business_end_time_day")
    private Integer businessEndTimeDay;

    @ApiModelProperty(value= "业务员")
    @TableField("member_id")
    private Long memberId;

    @TableField(exist = false)
    private String pcdStart;


 src/main/resources/mapper/BusinessTripMapper.xml

@@ -40,6 +40,7 @@
        <result column="business_trip_type" property="businessTripType" />
        <result column="business_start_time_day" property="businessStartTimeDay" />
        <result column="business_end_time_day" property="businessEndTimeDay" />
        <result column="member_id" property="memberId" />

    </resultMap>


 src/main/resources/mapper/BusinessTripOtherMapper.xml

@@ -42,6 +42,7 @@
        <result column="business_start_time_day" property="businessStartTimeDay" />
        <result column="business_end_time_day" property="businessEndTimeDay" />
        <result column="amount_of_money" property="amountOfMoney" />
        <result column="member_id" property="memberId" />

    </resultMap>


 src/main/webapp/views/home/dashboard.html

@@ -47,6 +47,53 @@
<div class="layui-fluid">
    <div class="layui-row layui-col-space15">

        <div class="layui-col-xs12 layui-col-md12" >
            <div class="layui-card" style="" id="popup1">
                <div class="layui-card-header testColorBlack" style="background-color: #FFFA1C1C">待处理任务</div>
                <div class="layui-card-body" style="padding-bottom: 20px;background-color: #FFC6A02D">
                    <div class="layui-row">
                        <!--                        <div class="testColorBlack">团队数据</div>-->
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
                            <div class="numberInfoSubTitle testColorBlack">规划申请单</div>
                            <div class="numberInfoValue">
                                <a href="#" id="openPlanPendingTasks" style="color: #1E9FFF"><span id="planPendingTaskCount">666</span><em class="numberInfoSuffix">个</em></a>
                            </div>
                        </div>
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
                            <div class="numberInfoSubTitle testColorBlack">核价审批</div>
                            <div class="numberInfoValue">
                                <a href="#" id="openPriOnlinePendingTasks" style="color: #1E9FFF"><span id="priOnlinePendingTaskCount">999</span><em class="numberInfoSuffix">个</em></a>
                            </div>
                        </div>
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
                            <div class="numberInfoSubTitle testColorBlack">报价审批</div>
                            <div class="numberInfoValue">
                                <a href="#" id="openPriQuotePendingTasks" style="color: #1E9FFF"><span id="priQuotePendingTaskCount">777</span><em class="numberInfoSuffix">个</em></a>
                            </div>
                        </div>
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
                            <div class="numberInfoSubTitle testColorBlack">出差审批</div>
                            <div class="numberInfoValue">
                                <a href="#" id="openBusinessTripPendingTasks" style="color: #1E9FFF"><span id="businessTripPendingTaskCount">2333</span><em class="numberInfoSuffix">个</em></a>
                            </div>
                        </div>
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
                            <div class="numberInfoSubTitle testColorBlack">报销审批</div>
                            <div class="numberInfoValue">
                                <a href="#" id="openReimburseOnlinePendingTasks" style="color: #1E9FFF"><span id="reimburseOnlinePendingTaskCount">12121</span><em class="numberInfoSuffix">个</em></a>
                            </div>
                        </div>
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
                            <div class="numberInfoSubTitle testColorBlack">待接收核价任务</div>
                            <div class="numberInfoValue">
                                <a href="#" id="openPlanPriOnlinePendingTasks" style="color: #1E9FFF"><span id="planPriOnlinePendingTaskCount">888</span><em class="numberInfoSuffix">个</em></a>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
        </div>

        <div class="layui-col-xs12 layui-col-md8" >
            <div class="layui-card" style="" id="popup">
                <div class="layui-card-header testColorBlack" style="background-color: #FFFA1C1C">团队活动实时交易情况</div>
@@ -312,6 +359,12 @@
                $("#successCount").text(res.data.successCount)
                $("#progressMoney").text(res.data.progressMoney2)
                $("#successMoney").text(res.data.successMoney)
                $("#planPendingTaskCount").text(res.data.planPendingTaskCount)
                $("#priOnlinePendingTaskCount").text(res.data.priOnlinePendingTaskCount)
                $("#priQuotePendingTaskCount").text(res.data.priQuotePendingTaskCount)
                $("#businessTripPendingTaskCount").text(res.data.businessTripPendingTaskCount)
                $("#reimburseOnlinePendingTaskCount").text(res.data.reimburseOnlinePendingTaskCount)
                $("#planPriOnlinePendingTaskCount").text(res.data.planPriOnlinePendingTaskCount)
            }
        });