guomengjiao недель назад: 2
Родитель
Сommit
3d8b77faaf

+ 7 - 0
renren-admin/src/main/java/io/renren/modules/qyh/controller/EnterpriseController.java

@@ -35,4 +35,11 @@ public class EnterpriseController extends AbstractController {
         return R.ok().put("data", enterpriseService.info(id));
     }
 
+    @GetMapping("/passPage")
+    @ApiOperation("已入驻分页")
+    @RequiresPermissions("qyh:enterprise:list")
+    public R passPage(@RequestParam Map<String, Object> params) {
+        return R.ok().put("page", enterpriseService.queryApiPage(params));
+    }
+
 }

+ 1 - 0
renren-admin/src/main/java/io/renren/modules/qyh/service/EnterpriseService.java

@@ -34,5 +34,6 @@ public interface EnterpriseService extends IService<EnterpriseEntity> {
     PageUtils queryApiPage(Map<String, Object> params);
 
     EnterpriseEntity apiInfo(Long id);
+
 }
 

+ 14 - 16
renren-admin/src/main/java/io/renren/modules/qyh/service/impl/AuditServiceImpl.java

@@ -1,25 +1,16 @@
 package io.renren.modules.qyh.service.impl;
 
-import java.time.LocalDateTime;
-import java.util.Map;
-
-import io.renren.common.enums.EnterpriseStatusEnum;
-import io.renren.modules.qyh.entity.EnterpriseEntity;
-import io.renren.modules.qyh.service.EnterpriseService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import io.renren.common.enums.AuditCodeEnum;
 import io.renren.common.enums.AuditStatusEnum;
+import io.renren.common.enums.EnterpriseStatusEnum;
 import io.renren.common.enums.YnEnum;
 import io.renren.common.exception.RRException;
 import io.renren.common.utils.PageUtils;
@@ -30,12 +21,19 @@ import io.renren.modules.qmgj.entity.MemberInfoEntity;
 import io.renren.modules.qmgj.service.MemberInfoService;
 import io.renren.modules.qmjz.utils.BeanCopyUtils;
 import io.renren.modules.qyh.entity.AuditEntity;
+import io.renren.modules.qyh.entity.EnterpriseEntity;
 import io.renren.modules.qyh.entity.StudentStatusEntity;
 import io.renren.modules.qyh.mapper.AuditMapper;
+import io.renren.modules.qyh.mapper.EnterpriseMapper;
 import io.renren.modules.qyh.mapper.StudentStatusMapper;
 import io.renren.modules.qyh.model.dto.AuditDTO;
 import io.renren.modules.qyh.service.AuditService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Map;
 
 /**
  * 青雲慧-审核表
@@ -51,7 +49,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, AuditEntity> impl
     private final ActivityDao activityDao;
     private final MemberInfoService memberInfoService;
     private final StudentStatusMapper studentStatusMapper;
-    private final EnterpriseService enterpriseService;
+    private final EnterpriseMapper enterpriseMapper;
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
@@ -138,10 +136,10 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, AuditEntity> impl
                 memberInfoService.updateById(memberInfoEntity);
             }
         } else if (StrUtil.equals(code, AuditCodeEnum.ENTERPRISE_CERTIFICATION.code())) {
-            EnterpriseEntity enterpriseEntity = enterpriseService.loadById(businessId, true);
+            EnterpriseEntity enterpriseEntity = enterpriseMapper.selectById(businessId);
             enterpriseEntity.setStatus(EnterpriseStatusEnum.PENDING_PAYMENT.value());
             enterpriseEntity.setUpdateTime(LocalDateTime.now());
-            enterpriseService.updateById(enterpriseEntity);
+            enterpriseMapper.updateById(enterpriseEntity);
         }
 
     }

+ 19 - 1
renren-admin/src/main/resources/mapper/qyh/EnterpriseDao.xml

@@ -41,6 +41,15 @@
             <if test="params.auditStatus != null and params.auditStatus != ''">
                 AND wa.`audit_status` = #{params.auditStatus}
             </if>
+            <if test="params.enterpriseName != null and params.enterpriseName != ''">
+                AND qe.`enterprise_name` LIKE CONCAT('%',#{params.enterpriseName},'%')
+            </if>
+            <if test="params.contactPerson != null and params.contactPerson != ''">
+                AND qe.`contact_person` LIKE CONCAT('%',#{params.contactPerson},'%')
+            </if>
+            <if test="params.contactPhone != null and params.contactPhone != ''">
+                AND qe.`contact_phone` LIKE CONCAT('%',#{params.contactPhone},'%')
+            </if>
         </where>
         ORDER BY qe.create_time DESC
     </select>
@@ -51,10 +60,19 @@
         FROM
         `qyh_enterprise` qe
         <where>
-            qe.is_delete = '0'
+            qe.is_delete = '0' and qe.status != null
             <if test="params.status != null and params.status != ''">
                 AND qe.`status` = #{params.status}
             </if>
+            <if test="params.enterpriseName != null and params.enterpriseName != ''">
+                AND qe.`enterprise_name` LIKE CONCAT('%',#{params.enterpriseName},'%')
+            </if>
+            <if test="params.contactPerson != null and params.contactPerson != ''">
+                AND qe.`contact_person` LIKE CONCAT('%',#{params.contactPerson},'%')
+            </if>
+            <if test="params.contactPhone != null and params.contactPhone != ''">
+                AND qe.`contact_phone` LIKE CONCAT('%',#{params.contactPhone},'%')
+            </if>
         </where>
         ORDER BY qe.create_time DESC
     </select>

+ 184 - 0
renren-admin/src/main/resources/statics/js/modules/qyh/enterprise.js

@@ -0,0 +1,184 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: baseURL + 'qyh/enterprise/page',
+        datatype: "json",
+        colModel: [
+			{ label: 'id', name: 'id', index: 'id', width: 50, hidden:true, key: true },
+			{ label: '营业执照号', name: 'licenseNo', index: 'licenseNo', width: 80 },
+            { label: '企业全称', name: 'enterpriseName', index: 'enterpriseName', width: 80 },
+			{ label: '联系人', name: 'contactPerson', index: 'contactPerson', width: 80 },
+			{ label: '联系电话', name: 'contactPhone', index: 'contactPhone', width: 80 },
+            { label: '营业执照照片', name: 'licensePhoto', index: 'licensePhoto', width: 80,formatter: imageFormat },
+            { label: '申请时间', name: 'createTime', index: 'create_time', width: 80 },
+            { label: '状态', name: 'auditStatus', index: 'auditStatus', width: 80, formatter:function (cellvalue, options, rowdata) {
+                    if(cellvalue == 0) {
+                        return '待审核'
+                    }else if(cellvalue == 1) {
+                        return '审核通过'
+                    } else {
+                        return '审核不通过'
+                    }
+                } },
+        ],
+		viewrecords: true,
+        height: 385,
+        rowNum: 10,
+		rowList : [10,30,50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth:true,
+        multiselect: true,
+        pager: "#jqGridPager",
+        jsonReader : {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames : {
+            page:"page",
+            rows:"limit",
+            order: "order"
+        },
+        gridComplete:function(){
+        	//隐藏grid底部滚动条
+        	$("#jqGrid").closest(".ui-jqgrid-bdiv").css({ "overflow-x" : "hidden" });
+        }
+    });
+    upload(1,'images','images/*');
+    initdate()
+});
+/*日期框初始化*/
+function initdate(){
+    layui.use('laydate', function() {
+        var laydate = layui.laydate;
+
+        laydate.render({
+            elem: '#createTime'
+            ,theme: '#34B9B4'
+            ,trigger: 'click'
+            ,type: 'datetime'
+            ,format: 'yyyy-MM-dd HH:mm'
+            ,done: function(value, date, endDate){
+                vm.wjxyEnterprise.createTime = value;
+            }
+        });
+    })
+}
+var vm = new Vue({
+	el:'#rrapp',
+	data:{
+		showList: true,
+		title: null,
+        wjxyEnterprise: {
+		    state: ''
+        },
+        queryParam: {
+            auditStatus:'',
+            enterpriseName:'',
+            contactPerson:'',
+            contactPhone: ''
+        },
+        gender: [],
+        state: '',
+        isSee: false,
+        auditEnterprise: {
+            reason: '',
+            auditStatus: '',
+            code: 'enterprise'
+        },
+	},
+	methods: {
+		query: function () {
+			vm.reload(1);
+		},
+        reset() {
+		    vm.queryParam.auditStatus = ''
+            vm.queryParam.enterpriseName = ''
+            vm.queryParam.contactPerson = ''
+            vm.queryParam.contactPhone = ''
+            vm.reload(1);
+        },
+        // 审核
+        shenhe() {
+            var id = getSelectedRow();
+            if(id == null){
+                return ;
+            }
+            vm.showList = false;
+            vm.title = "审核";
+            vm.isSee = false
+            vm.getInfo(id)
+        },
+        detail: function (event) {
+			var id = getSelectedRow();
+			if(id == null){
+				return ;
+			}
+			vm.showList = false;
+            vm.title = "查看详情";
+            vm.isSee = true
+            vm.getInfo(id)
+		},
+		saveOrUpdate: function (event) {
+            if (vm.state == '') {
+                layer.msg('[审核意见]不能为空',{icon:5});
+                return false;
+            }
+            if (vm.state == 0){
+                if (!vm.wjxyEnterprise.reason){
+                    layer.msg('[驳回理由]不能为空',{icon:5});
+                    return false;
+                }
+            }
+            vm.auditEnterprise.reason = vm.wjxyEnterprise.reason
+            vm.auditEnterprise.businessId = vm.wjxyEnterprise.id
+            vm.auditEnterprise.auditStatus = vm.state == 0 ? 2 : 1
+		    $('#btnSaveOrUpdate').button('loading').delay(1000).queue(function() {
+                var url = vm.state == 0 ? "qyh/audit/reject" : "qyh/audit/pass";
+                $.ajax({
+                    type: "POST",
+                    url: baseURL + url,
+                    contentType: "application/json",
+                    data: JSON.stringify(vm.auditEnterprise),
+                    success: function(r){
+                        if(r.code === 0){
+                             layer.msg("操作成功", {icon: 1});
+                             vm.reload();
+                             $('#btnSaveOrUpdate').button('reset');
+                             $('#btnSaveOrUpdate').dequeue();
+                        }else{
+                            layer.alert(r.msg);
+                            $('#btnSaveOrUpdate').button('reset');
+                            $('#btnSaveOrUpdate').dequeue();
+                        }
+                    }
+                });
+			});
+		},
+		getInfo: function(id){
+			$.get(baseURL + "qyh/enterprise/info/"+id, function(r){
+                vm.wjxyEnterprise = r.data;
+                vm.wjxyEnterprise.statetext = r.data.auditStatus == 0 ? '待审核' : r.data.auditStatus == 1 ? '通过' : '不通过'
+                if (vm.wjxyEnterprise.licensePhoto) {
+                    $('#demo1').show();
+                    $('#demo1').attr('src',vm.wjxyEnterprise.licensePhoto);
+                }
+            });
+		},
+		reload: function (event) {
+			vm.showList = true;
+            var page;
+            if (event == 1){
+                page = 1;
+            } else {
+                page = $("#jqGrid2").jqGrid('getGridParam','page');
+            }
+			$("#jqGrid").jqGrid('setGridParam',{
+                postData:{'auditStatus': vm.queryParam.auditStatus,'enterpriseName':vm.queryParam.enterpriseName,'contactPerson':vm.queryParam.contactPerson
+                    ,'contactPhone':vm.queryParam.contactPhone},
+                page:page
+            }).trigger("reloadGrid");
+		}
+	}
+});

+ 124 - 0
renren-admin/src/main/resources/templates/modules/qyh/enterprise.html

@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>企业认证</title>
+		<#include "/header.html">
+</head>
+<body>
+<div id="rrapp" v-cloak>
+    <div v-show="showList">
+
+        <div class="grid-btn">
+            <div class="form-group col-sm-12 div-Gay">
+                <input type="text" style="display: inline-block" class="form-control" v-model="queryParam.enterpriseName" @keyup.enter="query" placeholder="企业名称">
+                <input type="text" style="display: inline-block" class="form-control" v-model="queryParam.contactPerson" @keyup.enter="query" placeholder="联系人">
+                <input type="text" style="display: inline-block" class="form-control" v-model="queryParam.contactPhone" @keyup.enter="query" placeholder="联系电话">
+                <select class="form-control" v-model="queryParam.auditStatus">
+                    <option value="" disabled hidden>--选择状态--</option>
+                    <option value="" >全部</option>
+                    <option value="0" >待审核</option>
+                    <option value="1" >已通过</option>
+                    <option value="2" >已驳回</option>
+                </select>
+                <a class="btn btn-query" @click="query"><i class="fa fa-search"></i>&nbsp;查询</a>
+                <a class="btn btn-success" @click="reset"><i class="fa fa-refresh"></i>&nbsp;刷新</a>
+            </div>
+            <#if shiro.hasPermission("qyh:enterprise:info")>
+                <a class="btn btn-primary" @click="detail"><i class="fa fa-pencil-square-o"></i>&nbsp;查看详情</a>
+             </#if>
+            <a class="btn btn-primary" @click="shenhe"><i class="fa fa-hand-stop-o"></i>&nbsp;审核</a>
+        </div>
+        <table id="jqGrid"></table>
+        <div id="jqGridPager"></div>
+    </div>
+
+    <div v-show="!showList" class="panel panel-default">
+        <div class="panel-heading">{{title}}</div>
+        <form class="form-horizontal">
+            <div class="form-group">
+                        <div class="col-sm-2 control-label">企业全称</div>
+                        <div class="col-sm-10">
+                            <input type="text" readonly="readonly" class="form-control" v-model="wjxyEnterprise.enterpriseName" />
+                        </div>
+            </div>
+            <div class="form-group">
+                <div class="col-sm-2 control-label">营业执照号</div>
+                <div class="col-sm-10">
+                    <input type="text" readonly="readonly" class="form-control" v-model="wjxyEnterprise.licenseNo" />
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-sm-2 control-label">联系人</div>
+                <div class="col-sm-10">
+                    <input type="text" readonly="readonly" class="form-control" v-model="wjxyEnterprise.contactPerson" />
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-sm-2 control-label">联系电话</div>
+                <div class="col-sm-10">
+                    <input type="text" readonly="readonly" class="form-control" v-model="wjxyEnterprise.contactPhone" />
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-sm-2 control-label">营业执照照片</div>
+                <div class="col-sm-4">
+                    <div class="layui-upload">
+<!--                        <button type="button" class="layui-btn" id="test1">上传图片</button>-->
+                        <div class="layui-upload-list">
+                            <table class="upload-table-img">
+                                <tr>
+                                    <td><img class="layui-upload-img" id="demo1" hidden></td>
+                                </tr>
+                            </table>
+                            <p id="demoText1"></p>
+                        </div>
+                    </div>
+                    <input type="hidden" class="form-control" id="imgUrl1" placeholder="图片地址"/>
+                </div>
+            </div>
+            <div class="form-group">
+                        <div class="col-sm-2 control-label">申请时间</div>
+                        <div class="col-sm-10">
+                            <input type="text" readonly="readonly" class="form-control" v-model="wjxyEnterprise.createTime" />
+                        </div>
+                    </div>
+            <div class="form-group">
+                        <div class="col-sm-2 control-label">状态</div>
+                        <div class="col-sm-10">
+                            <input type="text" readonly="readonly" class="form-control" v-model="wjxyEnterprise.statetext" />
+                        </div>
+            </div>
+            <div v-if="wjxyEnterprise.auditStatus != 1">
+            <div class="form-group" v-show="!isSee">
+                <div class="col-sm-2 control-label">审核意见</div>
+                <div class="col-sm-4">
+                    <select class="form-control" v-model="state">
+                        <option value="" disabled hidden>--审核意见--</option>
+                        <option value="1" >审核通过</option>
+                        <option value="0" >驳回</option>
+
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group" v-show="state!=1">
+                <div class="col-sm-2 control-label">驳回理由</div>
+                <div class="col-sm-10">
+                <textarea class="form-control" :readonly="isSee" v-model="wjxyEnterprise.reason">
+                </textarea>
+                </div>
+            </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-sm-2 control-label"></div>
+                <input v-show="!isSee && wjxyEnterprise.auditStatus != 1" type="button" class="btn btn-primary" id="btnSaveOrUpdate" data-loading-text="保存中..." @click="saveOrUpdate" value="确定"/>
+                &nbsp;&nbsp;<input type="button" class="btn btn-warning" @click="reload" value="返回"/>
+            </div>
+        </form>
+    </div>
+</div>
+
+<script src="${request.contextPath}/statics/js/modules/qyh/enterprise.js?_${.now?long}"></script>
+</body>
+</html>