1.培训单位许可设立,分公司备案,跨区域备案,法人变更备案详情查询接口新增 2.培训单位许可设立,分公司备案,跨区域备案,法人变更备案审批进度查询

钟日健

2022-02-18 07ff3643547bcb06ea73de9240724afeafecd16d

1.培训单位许可设立,分公司备案,跨区域备案,法人变更备案详情查询接口新增
2.培训单位许可设立,分公司备案,跨区域备案,法人变更备案审批进度查询

 src/main/java/org/springblade/modules/permit/controller/PermitController.java

@@ -54,9 +54,13 @@
import org.springblade.modules.FTP.OutJson;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.permit.dto.PermitDTO;
import org.springblade.modules.permit.dto.PermitRecordDTO;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.service.IPermitService;
import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.record.dto.RecordDTO;
import org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO;
import org.springblade.modules.resource.service.IAttachService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
@@ -453,4 +457,27 @@
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        return R.status(permitService.removeByIds(Func.toLongList(ids)));
    }

    /**
     * 保安公司/培训学校许可设立详情(基本信息和附件列表信息)
     * @param record
     * @return
     */
    @GetMapping("/details")
    public R details(PermitDTO record) {
        PermitDTO detail = permitService.getDetails(record);
        return R.data(detail);
    }

    /**
     * 许可备案集合信息
     * @param record
     * @return
     */
    @GetMapping("/permitRecordList")
    public R permitRecordList(PermitDTO record) {
        List<PermitRecordDTO> permitRecordList = permitService.permitRecordList(record);
        //返回
        return R.data(permitRecordList);
    }
}

 src/main/java/org/springblade/modules/permit/dto/PermitDTO.java

@@ -16,9 +16,16 @@
 */
package org.springblade.modules.permit.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.modules.licetuser.entity.Licetuser;
import org.springblade.modules.permit.entity.Permit;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
 * 数据传输对象实体类
@@ -27,8 +34,69 @@
 * @since 2021-07-12
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class PermitDTO extends Permit {
public class PermitDTO implements Serializable {
    private static final long serialVersionUID = 1L;

    private Integer id;

    private String ptype;

    /**
     * 审核状态
     */
    private String type;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date permitime;

    private String cardid;

    private String representativecell;

    private String contacts;

    private String contactscell;

    private String jurisdiction;

    /**
     * 登记机关
     */
    private String registration;

    /**
     * 所属行业
     */
    private String industry;

    /**
     * 统一社会信用代码
     */
    private String creditcode;
    /**
     * 企业名称
     */
    private String enterprisename;
    /**
     * 法定代表人
     */
    private String representative;
    /**
     * 注册地址
     */
    private String address;

    /**
     * 最后审批时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date overtime;

    /**
     * 材料集合信息
     */
    private List<Licetuser> licetusers;

}

 src/main/java/org/springblade/modules/permit/dto/PermitRecordDTO.java

New file
@@ -0,0 +1,85 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.permit.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springblade.modules.licetuser.entity.Licetuser;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
 * 数据传输对象实体类
 *
 * @author BladeX
 * @since 2021-07-12
 */
@Data
public class PermitRecordDTO implements Serializable {
    private static final long serialVersionUID = 1L;

    private Integer id;

    /**
     * 许可类型
     */
    private String ptype;

    /**
     * 企业名称
     */
    private String enterprisename;

    /**
     * 审核状态
     */
    private String type;

    /**
     * 提交时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date permitime;

    /**
     * 唯一id
     */
    private String cardid;

    /**
     * 审批意见
     */
    private String approve;


    /**
     * 法定代表人
     */
    private String representative;

    /**
     * 预计审批时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date overtime;

}

 src/main/java/org/springblade/modules/permit/mapper/PermitMapper.java

@@ -20,6 +20,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.permit.dto.PermitDTO;
import org.springblade.modules.permit.dto.PermitRecordDTO;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.vo.PermitVO;

@@ -45,4 +47,39 @@

    Map selectIn(String cardid,String type);
    void insertPer(@Param("permit") Permit permit);

    /**
     * 查询单位设立详情
     * @param record
     * @return
     */
    PermitDTO selectRecordDetail(@Param("permit") PermitDTO record);

    /**
     * 查询分公司,自招保安单位备案集合信息
     * @param record
     * @return
     */
    List<PermitRecordDTO> selectRecordList(@Param("permit") PermitDTO record);

    /**
     * 查询保安服务公司,培训单位许可设立集合信息
     * @param record
     * @return
     */
    List<PermitRecordDTO> selectPermitList(@Param("permit")PermitDTO record);

    /**
     * 查询跨区域经营备案集合信息
     * @param record
     * @return
     */
    List<PermitRecordDTO> selectRecordkList(@Param("permit")PermitDTO record);

    /**
     * 查询保安单位法人变更集合信息
     * @param record
     * @return
     */
    List<PermitRecordDTO> selectRecordLegalpersonList(@Param("permit")PermitDTO record);
}

 src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml

@@ -83,4 +83,94 @@
                #{permit.representativecell}, #{permit.contacts}, #{permit.contactscell})
    </insert>

    <select id="selectRecordDetail" resultType="org.springblade.modules.permit.dto.PermitDTO">
        select
        id,
        ptype,
        type,
        permitime,
        cardid,
        representativecell,
        contacts,
        contactscell,
        jurisdiction,
        industry,
        registration,
        creditcode,
        enterprisename,
        representative,
        address,
        overtime
        from sys_permit
        where cardid = #{permit.cardid}
        and ptype = #{permit.ptype}
    </select>

    <sql id="permitRecord">
        id,
        ptype,
        type,
        permitime,
        cardid,
        enterprisename,
        approve,
        representative,
        overtime
    </sql>

    <!--查询分公司,自招保安单位备案集合信息-->
    <select id="selectRecordList" resultType="org.springblade.modules.permit.dto.PermitRecordDTO">
        select
        <include refid="permitRecord"/>
        from sys_record
        where 1=1
        <if test="permit.cardid!=null and permit.cardid!=''">
            and cardid = #{permit.cardid}
        </if>
        <if test="permit.ptype!=null and permit.ptype!=''">
            and ptype = #{permit.ptype}
        </if>
    </select>

    <!--查询保安服务公司,培训单位许可设立集合信息-->
    <select id="selectPermitList" resultType="org.springblade.modules.permit.dto.PermitRecordDTO">
        select
        <include refid="permitRecord"/>
        from sys_permit
        where 1=1
        <if test="permit.cardid!=null and permit.cardid!=''">
            and cardid = #{permit.cardid}
        </if>
        <if test="permit.ptype!=null and permit.ptype!=''">
            and ptype = #{permit.ptype}
        </if>
    </select>

    <!--查询跨区域经营备案集合信息-->
    <select id="selectRecordkList" resultType="org.springblade.modules.permit.dto.PermitRecordDTO">
        select
        <include refid="permitRecord"/>
        from sys_recordk
        where 1=1
        <if test="permit.cardid!=null and permit.cardid!=''">
            and cardid = #{permit.cardid}
        </if>
        <if test="permit.ptype!=null and permit.ptype!=''">
            and ptype = #{permit.ptype}
        </if>
    </select>

    <!--查询保安单位法人变更集合信息-->
    <select id="selectRecordLegalpersonList" resultType="org.springblade.modules.permit.dto.PermitRecordDTO">
        select
        <include refid="permitRecord"/>
        from sys_record_legalperson
        where 1=1
        <if test="permit.cardid!=null and permit.cardid!=''">
            and cardid = #{permit.cardid}
        </if>
        <if test="permit.ptype!=null and permit.ptype!=''">
            and ptype = #{permit.ptype}
        </if>
    </select>
</mapper>

 src/main/java/org/springblade/modules/permit/service/IPermitService.java

@@ -19,9 +19,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.permit.dto.PermitDTO;
import org.springblade.modules.permit.dto.PermitRecordDTO;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.vo.PermitVO;

import java.util.List;
import java.util.Map;

/**
@@ -42,4 +45,18 @@
    IPage<PermitVO> selectPermitPage(IPage<PermitVO> page, @Param("permit") PermitVO permit,String jurisdiction);
    Map selectIn(String cardid,String type);
    void insertPer(@Param("permit") Permit permit);

    /**
     * 保安公司/培训学校许可设立详情(基本信息和附件列表信息)
     * @param record
     * @return
     */
    PermitDTO getDetails(PermitDTO record);

    /**
     * 许可备案集合信息
     * @param record
     * @return
     */
    List<PermitRecordDTO> permitRecordList(PermitDTO record);
}

 src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java

@@ -18,13 +18,22 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.modules.licetuser.entity.Licetuser;
import org.springblade.modules.licetuser.service.ILicetuserService;
import org.springblade.modules.permit.dto.PermitDTO;
import org.springblade.modules.permit.dto.PermitRecordDTO;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.mapper.PermitMapper;
import org.springblade.modules.permit.service.IPermitService;
import org.springblade.modules.permit.vo.PermitVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 *  服务实现类
@@ -34,6 +43,9 @@
 */
@Service
public class PermitServiceImpl extends ServiceImpl<PermitMapper, Permit> implements IPermitService {

    @Autowired
    private ILicetuserService licetuserService;

    @Override
    public IPage<PermitVO> selectPermitPage(IPage<PermitVO> page, PermitVO permit,String jurisdiction) {
@@ -50,4 +62,59 @@
        baseMapper.insertPer(permit);
    }


    /**
     * 保安公司/培训学校许可设立详情(基本信息和附件列表信息)
     * @param record
     * @return
     */
    @Override
    public PermitDTO getDetails(PermitDTO record) {
        //查询公司信息
        PermitDTO permitDTO = baseMapper.selectRecordDetail(record);
        if (null !=permitDTO) {
            //查询材料信息
            Licetuser licetuser = new Licetuser();
            licetuser.setUserid(record.getCardid());
            licetuser.setPtype(record.getPtype());
            List<Licetuser> licetusers = licetuserService.list(Condition.getQueryWrapper(licetuser));
            //数据封装
            permitDTO.setLicetusers(licetusers);
            //返回数据
            return permitDTO;
        }
        return null;
    }

    /**
     * 许可备案集合信息
     * @param record
     * @return
     */
    @Override
    public List<PermitRecordDTO> permitRecordList(PermitDTO record) {
        //1.查询分公司,自招保安单位备案集合信息
        List<PermitRecordDTO> recordDTOList = baseMapper.selectRecordList(record);
        //2.查询保安服务公司,培训单位许可设立集合信息
        List<PermitRecordDTO> permitRecordDTOList = baseMapper.selectPermitList(record);
        //3.查询跨区域经营备案集合信息
        List<PermitRecordDTO> recordkDTOList = baseMapper.selectRecordkList(record);
        //4.查询保安单位法人变更集合信息
        List<PermitRecordDTO> recordLegalpersonDTOList = baseMapper.selectRecordLegalpersonList(record);
        //5. 合并集合信息
        List<PermitRecordDTO> fileIdList = listIntegration(recordDTOList,permitRecordDTOList,recordkDTOList,recordLegalpersonDTOList);
        //返回
        return fileIdList;
    }

    /**
     * 合并集合
     * @param lists
     * @return
     */
    private List<PermitRecordDTO> listIntegration(List<PermitRecordDTO> ...lists){
        return Arrays.stream(lists).flatMap(List::stream).collect(Collectors.toList());
    }


}

 src/main/java/org/springblade/modules/record/controller/RecordController.java

@@ -38,9 +38,11 @@
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.record.dto.RecordDTO;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.service.IRecordService;
import org.springblade.modules.record.vo.RecordVO;
import org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO;
import org.springblade.modules.resource.service.IAttachService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
@@ -464,4 +466,15 @@
        Map map = recordService.selectIn(cardid, type);
        return R.data(map);
    }

    /**
     * 保安公司备案信息(基本信息和附件列表信息)
     * @param record
     * @return
     */
    @GetMapping("/details")
    public R details(RecordDTO record) {
        RecordDTO detail = recordService.getDetails(record);
        return R.data(detail);
    }
}

 src/main/java/org/springblade/modules/record/dto/RecordDTO.java

@@ -16,9 +16,17 @@
 */
package org.springblade.modules.record.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.modules.licetuser.entity.Licetuser;
import org.springblade.modules.record.entity.Record;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
 * 数据传输对象实体类
@@ -27,8 +35,84 @@
 * @since 2021-07-12
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class RecordDTO extends Record {
public class RecordDTO implements Serializable {
    private static final long serialVersionUID = 1L;

    private Integer id;

    private String ptype;

    /**
     * 审核状态
     */
    private String type;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date permitime;

    private String cardid;

    private String representativecell;

    private String contacts;

    private String contactscell;

    private String jurisdiction;

    /**
     * 登记机关
     */
    private String registration;

    /**
     * 所属行业
     */
    private String industry;

    /**
     * 统一社会信用代码
     */
    private String creditcode;
    /**
     * 企业名称
     */
    private String enterprisename;
    /**
     * 法定代表人
     */
    private String representative;
    /**
     * 注册地址
     */
    private String address;

    /**
     * 最后审批时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date overtime;

    /**
     * 保安服务单位许可编号
     */
    private String perid;
    /**
     * 许可发证机关
     */
    private String offices;
    /**
     * 发证时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date officetime;

    /**
     * 材料集合信息
     */
    private List<Licetuser> licetusers;

}

 src/main/java/org/springblade/modules/record/mapper/RecordMapper.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.record.dto.RecordDTO;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.vo.RecordVO;

@@ -42,4 +43,11 @@
     */
    List<RecordVO> selectRecordPage(IPage page, @Param("record") RecordVO record, String jurisdiction);
    Map selectIn(String cardid,String type);

    /**
     * 查询保安公司信息
     * @param record
     * @return
     */
    RecordDTO selectRecordDetail(@Param("record") RecordDTO record);
}

 src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml

@@ -74,4 +74,29 @@
          and ptype = #{type}
    </select>

    <select id="selectRecordDetail" resultType="org.springblade.modules.record.dto.RecordDTO">
        select
        id,
        ptype,
        type,
        permitime,
        cardid,
        representativecell,
        contacts,
        contactscell,
        jurisdiction,
        industry,
        registration,
        creditcode,
        enterprisename,
        representative,
        address,
        overtime,
        perid,
        offices,
        officetime
        from sys_record
        where cardid = #{record.cardid}
        and ptype = #{record.ptype}
    </select>
</mapper>

 src/main/java/org/springblade/modules/record/service/IRecordService.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.record.dto.RecordDTO;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.vo.RecordVO;

@@ -41,4 +42,11 @@
     */
    IPage<RecordVO> selectRecordPage(IPage<RecordVO> page, @Param("record") RecordVO record, String jurisdiction);
    Map selectIn(String cardid,String type);

    /**
     * 保安公司备案信息(基本信息和附件列表信息)
     * @param record
     * @return
     */
    RecordDTO getDetails(RecordDTO record);
}

 src/main/java/org/springblade/modules/record/service/impl/RecordServiceImpl.java

@@ -18,12 +18,19 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.modules.licetuser.entity.Licetuser;
import org.springblade.modules.licetuser.service.ILicetuserService;
import org.springblade.modules.record.dto.RecordDTO;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.mapper.RecordMapper;
import org.springblade.modules.record.service.IRecordService;
import org.springblade.modules.record.vo.RecordVO;
import org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

/**
@@ -35,6 +42,9 @@
@Service
public class RecordServiceImpl extends ServiceImpl<RecordMapper, Record> implements IRecordService {

    @Autowired
    private ILicetuserService licetuserService;

    @Override
    public IPage<RecordVO> selectRecordPage(IPage<RecordVO> page, RecordVO record,String jurisdiction) {
        return page.setRecords(baseMapper.selectRecordPage(page, record,jurisdiction));
@@ -45,4 +55,26 @@
        return baseMapper.selectIn(cardid,type);
    }

    /**
     * 保安公司备案信息(基本信息和附件列表信息)
     * @param record
     * @return
     */
    @Override
    public RecordDTO getDetails(RecordDTO record) {
        //查询公司信息
        RecordDTO recordDTO = baseMapper.selectRecordDetail(record);
        if (null!=recordDTO) {
            //查询材料信息
            Licetuser licetuser = new Licetuser();
            licetuser.setUserid(record.getCardid());
            licetuser.setPtype(record.getPtype());
            List<Licetuser> licetusers = licetuserService.list(Condition.getQueryWrapper(licetuser));
            //数据封装
            recordDTO.setLicetusers(licetusers);
            //返回数据
            return recordDTO;
        }
        return null;
    }
}

 src/main/java/org/springblade/modules/recordLegalperson/controller/RecordLegalpersonController.java

@@ -37,6 +37,7 @@
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO;
import org.springblade.modules.recordLegalperson.entity.RecordLegalperson;
import org.springblade.modules.recordLegalperson.service.IRecordLegalpersonService;
import org.springblade.modules.recordLegalperson.vo.RecordLegalpersonVO;
@@ -469,4 +470,16 @@
        Map map = recordService.selectIn(cardid, type);
        return R.data(map);
    }


    /**
     * 保安公司法人变更详情(基本信息和附件列表信息)
     * @param record
     * @return
     */
    @GetMapping("/details")
    public R details(RecordLegalpersonDTO record) {
        RecordLegalpersonDTO detail = recordService.getDetails(record);
        return R.data(detail);
    }
}

 src/main/java/org/springblade/modules/recordLegalperson/dto/RecordLegalpersonDTO.java

@@ -16,9 +16,20 @@
 */
package org.springblade.modules.recordLegalperson.dto;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.modules.licetuser.entity.Licetuser;
import org.springblade.modules.recordLegalperson.entity.RecordLegalperson;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
 * 数据传输对象实体类
@@ -27,8 +38,76 @@
 * @since 2021-07-12
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class RecordLegalpersonDTO extends RecordLegalperson {
public class RecordLegalpersonDTO implements Serializable {
    private static final long serialVersionUID = 1L;

    private Integer id;

    private String ptype;

    /**
     * 审核状态
     */
    private String type;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date permitime;

    private String cardid;

    private String representativecell;

    private String contacts;

    private String contactscell;

    private String jurisdiction;

    /**
     * 登记机关
     */
    private String registration;

    /**
     * 所属行业
     */
    private String industry;

    /**
     * 统一社会信用代码
     */
    private String creditcode;
    /**
     * 企业名称
     */
    private String enterprisename;
    /**
     * 法定代表人
     */
    private String representative;
    /**
     * 注册地址
     */
    private String address;


    /**
     * 最后审批时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date overtime;

    //更变后法人
    private String changecontacts;

    //更变后法人电话
    private String changecontactscell;

    /**
     * 材料集合信息
     */
    private List<Licetuser> licetusers;

}

 src/main/java/org/springblade/modules/recordLegalperson/mapper/RecordLegalpersonMapper.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO;
import org.springblade.modules.recordLegalperson.entity.RecordLegalperson;
import org.springblade.modules.recordLegalperson.vo.RecordLegalpersonVO;

@@ -42,4 +43,11 @@
     */
    List<RecordLegalpersonVO> selectRecordPage(IPage page, @Param("record") RecordLegalpersonVO record, String jurisdiction);
    Map selectIn(String cardid,String type);

    /**
     * 查询公司详情信息
     * @param record
     * @return
     */
    RecordLegalpersonDTO selectRecordDetail(@Param("record")RecordLegalpersonDTO record);
}

 src/main/java/org/springblade/modules/recordLegalperson/mapper/RecordLegalpersonMapper.xml

@@ -76,4 +76,29 @@
          and ptype = #{type}
    </select>

    <select id="selectRecordDetail" resultType="org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO">
        select
        id,
        ptype,
        type,
        permitime,
        cardid,
        representativecell,
        contacts,
        contactscell,
        jurisdiction,
        industry,
        registration,
        creditcode,
        enterprisename,
        representative,
        address,
        overtime,
        changecontacts,
        changecontactscell
        from sys_record_legalperson
        where cardid = #{record.cardid}
        and ptype = #{record.ptype}
    </select>

</mapper>

 src/main/java/org/springblade/modules/recordLegalperson/service/IRecordLegalpersonService.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO;
import org.springblade.modules.recordLegalperson.entity.RecordLegalperson;
import org.springblade.modules.recordLegalperson.vo.RecordLegalpersonVO;

@@ -41,4 +42,11 @@
     */
    IPage<RecordLegalpersonVO> selectRecordPage(IPage<RecordLegalpersonVO> page, @Param("record") RecordLegalpersonVO record, String jurisdiction);
    Map selectIn(String cardid,String type);

    /**
     * 保安公司法人变更详情(基本信息和附件列表信息)
     * @param record
     * @return
     */
    RecordLegalpersonDTO getDetails(RecordLegalpersonDTO record);
}

 src/main/java/org/springblade/modules/recordLegalperson/service/impl/RecordLegalpersonServiceImpl.java

@@ -18,12 +18,18 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.modules.licetuser.entity.Licetuser;
import org.springblade.modules.licetuser.service.ILicetuserService;
import org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO;
import org.springblade.modules.recordLegalperson.entity.RecordLegalperson;
import org.springblade.modules.recordLegalperson.mapper.RecordLegalpersonMapper;
import org.springblade.modules.recordLegalperson.service.IRecordLegalpersonService;
import org.springblade.modules.recordLegalperson.vo.RecordLegalpersonVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

/**
@@ -35,6 +41,9 @@
@Service
public class RecordLegalpersonServiceImpl extends ServiceImpl<RecordLegalpersonMapper, RecordLegalperson> implements IRecordLegalpersonService {

    @Autowired
    private ILicetuserService licetuserService;

    @Override
    public IPage<RecordLegalpersonVO> selectRecordPage(IPage<RecordLegalpersonVO> page, RecordLegalpersonVO record, String jurisdiction) {
        return page.setRecords(baseMapper.selectRecordPage(page, record,jurisdiction));
@@ -45,4 +54,26 @@
        return baseMapper.selectIn(cardid,type);
    }

    /**
     * 保安公司法人变更详情(基本信息和附件列表信息)
     * @param record
     * @return
     */
    @Override
    public RecordLegalpersonDTO getDetails(RecordLegalpersonDTO record) {
        //查询公司信息
        RecordLegalpersonDTO recordLegalpersonDTO = baseMapper.selectRecordDetail(record);
        if (null!= recordLegalpersonDTO) {
            //查询材料信息
            Licetuser licetuser = new Licetuser();
            licetuser.setUserid(record.getCardid());
            licetuser.setPtype(record.getPtype());
            List<Licetuser> licetusers = licetuserService.list(Condition.getQueryWrapper(licetuser));
            //数据封装
            recordLegalpersonDTO.setLicetusers(licetusers);
            //返回数据
            return recordLegalpersonDTO;
        }
        return null;
    }
}

 src/main/java/org/springblade/modules/recordk/controller/RecordkController.java

@@ -31,6 +31,8 @@
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.record.dto.RecordDTO;
import org.springblade.modules.recordk.dto.RecordkDTO;
import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.recordk.service.IRecordkService;
import org.springblade.modules.recordk.vo.RecordkVO;
@@ -225,4 +227,14 @@
        return R.data(map);
    }

    /**
     * 保安公司项目备案信息(基本信息和附件列表信息)
     * @param record
     * @return
     */
    @GetMapping("/details")
    public R details(RecordkDTO record) {
        RecordkDTO detail = recordkService.getDetails(record);
        return R.data(detail);
    }
}

 src/main/java/org/springblade/modules/recordk/dto/RecordkDTO.java

@@ -16,9 +16,17 @@
 */
package org.springblade.modules.recordk.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.modules.licetuser.entity.Licetuser;
import org.springblade.modules.recordk.entity.Recordk;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
 * 数据传输对象实体类
@@ -27,8 +35,100 @@
 * @since 2021-07-12
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class RecordkDTO extends Recordk {
public class RecordkDTO implements Serializable {
    private static final long serialVersionUID = 1L;

    private Integer id;

    private String ptype;

    /**
     * 审核状态
     */
    private String type;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date permitime;

    private String cardid;

    private String representativecell;

    private String contacts;

    private String contactscell;

    private String jurisdiction;

    /**
     * 登记机关
     */
    private String registration;

    /**
     * 所属行业
     */
    private String industry;

    /**
     * 统一社会信用代码
     */
    private String creditcode;
    /**
     * 企业名称
     */
    private String enterprisename;
    /**
     * 法定代表人
     */
    private String representative;
    /**
     * 注册地址
     */
    private String address;

    /**
     * 保安服务单位许可编号
     */
    private String perid;
    /**
     * 许可发证机关
     */
    private String offices;

    /**
     * 最后审批时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date overtime;

    /**
     * 发证时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date officetime;

    @ApiModelProperty(value = "保安人数")
    private Integer ksecuritys;

    @ApiModelProperty(value = "拟跨区域经营的保安服务项目")
    private String kproject;

    @ApiModelProperty(value = "邮编")
    private String kzipcode;

    @ApiModelProperty(value = "跨区域经营服务时间（备案有效期）")
    private String kservicetime;

    @ApiModelProperty(value = "地址")
    private String kaddress;

    /**
     * 材料集合信息
     */
    private List<Licetuser> licetusers;

}

 src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.recordk.dto.RecordkDTO;
import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.recordk.vo.RecordkVO;

@@ -42,4 +43,11 @@
     */
    List<RecordkVO> selectRecordkPage(IPage page, @Param("recordk") RecordkVO recordk, String jurisdiction);
    Map selectIn(String cardid,String type);

    /**
     * 保安公司项目备案信息
     * @param record
     * @return
     */
    RecordkDTO selectRecordDetail(@Param("recordk")RecordkDTO record);
}

 src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml

@@ -68,4 +68,35 @@
        where cardid = #{cardid}
          and ptype = #{type}
    </select>

    <select id="selectRecordDetail" resultType="org.springblade.modules.recordk.dto.RecordkDTO">
        select
            id,
            ptype,
            type,
            permitime,
            cardid,
            representativecell,
            contacts,
            contactscell,
            jurisdiction,
            industry,
            registration,
            creditcode,
            enterprisename,
            representative,
            address,
            overtime,
            perid,
            offices,
            officetime,
            ksecuritys,
            kproject,
            kzipcode,
            kservicetime,
            kaddress
        from sys_recordk
        where cardid = #{recordk.cardid}
        and ptype = #{recordk.ptype}
    </select>
</mapper>

 src/main/java/org/springblade/modules/recordk/service/IRecordkService.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.recordk.dto.RecordkDTO;
import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.recordk.vo.RecordkVO;

@@ -39,6 +40,13 @@
     * @param recordk
     * @return
     */
    IPage<RecordkVO> selectRecordkPage(IPage<RecordkVO> page, @Param("recordk")RecordkVO recordk, String jurisdiction);
    IPage<RecordkVO> selectRecordkPage(IPage<RecordkVO> page, RecordkVO recordk, String jurisdiction);
    Map selectIn(String cardid,String type);

    /**
     * 保安公司项目备案信息(基本信息和附件列表信息)
     * @param record
     * @return
     */
    RecordkDTO getDetails(RecordkDTO record);
}

 src/main/java/org/springblade/modules/recordk/service/impl/RecordkServiceImpl.java

@@ -18,12 +18,19 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.modules.licetuser.entity.Licetuser;
import org.springblade.modules.licetuser.service.ILicetuserService;
import org.springblade.modules.record.dto.RecordDTO;
import org.springblade.modules.recordk.dto.RecordkDTO;
import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.recordk.mapper.RecordkMapper;
import org.springblade.modules.recordk.service.IRecordkService;
import org.springblade.modules.recordk.vo.RecordkVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

/**
@@ -35,6 +42,9 @@
@Service
public class RecordkServiceImpl extends ServiceImpl<RecordkMapper, Recordk> implements IRecordkService {

    @Autowired
    private ILicetuserService licetuserService;

    @Override
    public IPage<RecordkVO> selectRecordkPage(IPage<RecordkVO> page, RecordkVO recordk,String jurisdiction) {
        return page.setRecords(baseMapper.selectRecordkPage(page, recordk,jurisdiction));
@@ -45,4 +55,26 @@
        return baseMapper.selectIn(cardid,type);
    }

    /**
     * 保安公司项目备案信息(基本信息和附件列表信息)
     * @param record
     * @return
     */
    @Override
    public RecordkDTO getDetails(RecordkDTO record) {
        //查询公司信息
        RecordkDTO recordkDTO = baseMapper.selectRecordDetail(record);
        if (null!= recordkDTO) {
            //查询材料信息
            Licetuser licetuser = new Licetuser();
            licetuser.setUserid(record.getCardid());
            licetuser.setPtype(record.getPtype());
            List<Licetuser> licetusers = licetuserService.list(Condition.getQueryWrapper(licetuser));
            //数据封装
            recordkDTO.setLicetusers(licetusers);
            //返回数据
            return recordkDTO;
        }
        return null;
    }
}

 src/main/resources/application.yml

@@ -1,6 +1,6 @@
#服务器配置
server:
  port: 81
  port: 82
  undertow:
    # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
    io-threads: 16
@@ -204,9 +204,16 @@
      - /zc/inster
      - /licetuser/liceUpload
      - /licetuser/list
      - /permit/save
      - /licet/list
      - /licet/lists
      - /permit/save
      - /permit/details
      - /permit/permitRecordList
      - /recordlegalperson/save
      - /recordlegalperson/details
      - /record/save
      - /record/details
      - /recordk/save
      - /recordk/details

    #授权认证配置
    auth: