#报销审核完善

LSH

2023-08-22 95c8d8cc92be4287787f9cef4bbaccc66fed4979

#报销审核完善

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

@@ -92,12 +92,14 @@
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<ReimburseOnline> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
        wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
        wrapper.setSqlSelect("id,settle,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
//        wrapper.in("member_id", getUserRoleBelongsToUserId());
        wrapper.andNew();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(ReimburseOnline.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.or().eq("member_id",getUserId());
        return R.ok(reimburseOnlineService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -105,9 +107,13 @@
        Long deptId = getDeptId();
        boolean signUserId = false;
        boolean signDeptId = false;
        boolean signHostId = false;
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().equals("dept_id")){
                signDeptId = true;
                if (String.valueOf(entry.getValue()).equals("19")){
                    signHostId = true;
                }
            }
        }
        for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -129,6 +135,9 @@
        }
        if (!signUserId && !signDeptId){
            wrapper.eq("user_id", getUserId());
        }
        if (signHostId){
            wrapper.or().eq("host_id",1);
        }
    }
    @RequestMapping(value = "/reimburseOnline/from/add/auth")
@@ -172,9 +181,8 @@
        map.put("orderNo",param.getOrderNo());
        map.put("templateName",param.getTemplateName());
        map.put("checkData",param.getCheckData());
        map.put("reimburseOnlineDetls",param.getReimburseOnlineDetls());
        reimburseOnline.setForm(JSON.toJSONString(map));
        reimburseOnline.setMemberId(president3.getId());
        reimburseOnline.setMemberId(manager.getId());

        if (!reimburseOnlineService.insert(reimburseOnline)){
            return R.error("添加报销主档失败");
@@ -433,7 +441,7 @@
        return R.ok().add(vos);
    }

    @PostMapping(value = "/reimburseOnline/approval/auth")
    @PostMapping(value = "/reimburseOnline/approval2/auth")
    @ManagerAuth
    public R approvalReimburseOnline(@RequestParam Long planId,
                              @RequestParam(required = false) Long plannerId){
@@ -470,6 +478,8 @@
                    reimburseOnline.setSettle(2);  // 总裁办待审
                    reimburseOnline.setUpdateUserId(getUserId());
                    reimburseOnline.setUpdateTime(new Date());
                    ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", reimburseOnline.getCheckData().equals("否") ? "3-1" : "3-2"));//3：报销流程
                    reimburseOnline.setMemberId(processPermissions.getUserId());

                    if (!reimburseOnlineService.updateById(reimburseOnline)) {
                        throw new CoolException("审核失败，请联系管理员");
@@ -526,7 +536,14 @@
                reimburseOnline.setSettle(settle+1);
                reimburseOnline.setUpdateUserId(getUserId());
                reimburseOnline.setUpdateTime(new Date());
                reimburseOnline.setMemberId(planLeader.getId());
                String[] split = process.split("-");
                if (settle!=5){
                    settle=settle+2;
                }else {
                    settle++;
                }
                ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", settle+"-"+split[1]));//3：报销流程
                reimburseOnline.setMemberId(processPermissions2.getUserId());

                if (!reimburseOnlineService.updateById(reimburseOnline)) {
                    throw new CoolException("审核失败，请联系管理员");

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

@@ -74,6 +74,10 @@
    @TableField("dept_id")
    private Long deptId;

    @ApiModelProperty(value= "")
    @TableField("host_id")
    private Long hostId;

    @ApiModelProperty(value= "状态{0：未完成，1：已完成}")
    @TableField("status")
    private Integer status;
@@ -138,6 +142,17 @@
        this.updateUserId = user.getId();
    }

    public ReimburseOnline(Long itemId,String orderNum,Date createTime,User user,Integer settle) {
        this.itemId = itemId;
        this.orderNum = orderNum;
        this.createTime = createTime;
        this.updateTime = createTime;
        this.userId = user.getId();
        this.deptId = user.getDeptId();
        this.status = 0;
        this.updateUserId = user.getId();
        this.settle = settle;
    }

//    PriOnline priOnline = new PriOnline(
//            null,    // excel表标题

 src/main/resources/mapper/ReimburseOnlineMapper.xml

@@ -35,9 +35,6 @@
        <result column="dept_id" property="deptId" />
        <result column="status" property="status" />
        <result column="update_time" property="updateTime" />
        <result column="form" property="form" />
        <result column="settle" property="settle" />
        <result column="settle_msg" property="settleMsg" />
    </resultMap>

    <select id="listByPage" resultMap="NoDataResultMap">

 src/main/webapp/static/js/reimburseOnline/reimburseOnline.js

@@ -89,6 +89,7 @@
            ,{field: 'checkData', align: 'center',title: '是否冲账',hide: false}
            ,{field: 'orderNum', align: 'center',title: '报销单号',width: 320, style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
            ,{field: 'planId$', align: 'center',title: '项目号',hide: false}
            ,{field: 'settle', align: 'center',title: '进度',hide: false}
            ,{field: 'createTime$', align: 'center',title: '创建时间',hide: false}
            ,{field: 'updateTime$', align: 'center',title: '更新时间',hide: false}
            ,{field: 'status$', align: 'center',title: '状态',hide: false}
@@ -236,6 +237,17 @@
    table.on('tool(reimburseOnline)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'approval2':
                layer.confirm('审批通过？', {
                    skin: 'layui-layer-admin',
                    shade: .1,
                    offset: '200px',
                    title: data.name
                }, function (i) {
                    layer.close(i);
                    approval2(data.id);
                });
                break;
            case 'more':
                top.reimburseOnlineByMore=data.id;
                console.log(top.reimburseOnlineByMore)
@@ -712,10 +724,10 @@
        });
    }

    function approval(planId, plannerId, dIdx) {
    function approval2(planId, plannerId, dIdx) {
        let loadIndex = layer.load(2);
        $.ajax({
            url: baseUrl+"/reimburseOnline/approval/auth",
            url: baseUrl+"/reimburseOnline/approval2/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {
                planId: planId,

 src/main/webapp/views/reimburseOnline/reimburseOnline.html

@@ -82,7 +82,7 @@


<script type="text/html" id="operate">
  {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3) { }}
  {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3 || d.settle == 4 || d.settle == 5 || d.settle == 6) { }}
  <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval2">审批</a>
  {{# } }}
  <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">提交</a>