From 097a14bada17d8b2bc776ba0d97e6c67bf1eba89 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Sep 2021 10:30:49 +0800
Subject: [PATCH] 1.许可模板

---
 src/main/java/org/springblade/modules/licet/mapper/LicetMapper.xml                      |   18 +
 src/main/java/org/springblade/modules/licetuser/mapper/LicetuserMapper.java             |   42 ++
 src/main/java/org/springblade/common/constant/FtpConstant.java                          |    6 
 src/main/java/org/springblade/modules/licet/dto/LicetDTO.java                           |   34 ++
 src/main/java/org/springblade/modules/licetuser/mapper/LicetuserMapper.xml              |   18 +
 src/main/java/org/springblade/modules/information/controller/InformationController.java |    6 
 src/main/java/sql/licet.menu.mysql                                                      |   10 
 src/main/java/sql/licetuser.menu.mysql                                                  |   10 
 src/main/java/org/springblade/modules/licetuser/entity/Licetuser.java                   |   60 ++++
 src/main/java/org/springblade/common/config/BladeConfiguration.java                     |    2 
 src/main/java/org/springblade/modules/licet/vo/LicetVO.java                             |   36 ++
 src/main/java/org/springblade/modules/licetuser/dto/LicetuserDTO.java                   |   34 ++
 src/main/java/org/springblade/modules/licetuser/service/ILicetuserService.java          |   41 ++
 src/main/java/org/springblade/modules/licet/controller/LicetController.java             |  126 ++++++++
 src/main/java/org/springblade/modules/licet/service/ILicetService.java                  |   41 ++
 src/main/java/org/springblade/modules/licetuser/service/impl/LicetuserServiceImpl.java  |   41 ++
 src/main/java/org/springblade/modules/licet/entity/Licet.java                           |   66 ++++
 src/main/java/org/springblade/modules/licet/service/impl/LicetServiceImpl.java          |   41 ++
 src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java     |  126 ++++++++
 src/main/java/org/springblade/modules/licetuser/vo/LicetuserVO.java                     |   36 ++
 src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml                            |    5 
 src/main/java/org/springblade/modules/recordk/controller/RecordkController.java         |    6 
 src/main/java/org/springblade/modules/licet/mapper/LicetMapper.java                     |   42 ++
 23 files changed, 838 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springblade/common/config/BladeConfiguration.java b/src/main/java/org/springblade/common/config/BladeConfiguration.java
index 2bdd34a..454aa51 100644
--- a/src/main/java/org/springblade/common/config/BladeConfiguration.java
+++ b/src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -82,6 +82,8 @@
 		secureRegistry.excludePathPatterns("/chatgroup/**");
 		secureRegistry.excludePathPatterns("/chatgroupc/**");
 		secureRegistry.excludePathPatterns("/zc/**");
+		secureRegistry.excludePathPatterns("/licet/**");
+		secureRegistry.excludePathPatterns("/licetuser/**");
 		return secureRegistry;
 	}
 
diff --git a/src/main/java/org/springblade/common/constant/FtpConstant.java b/src/main/java/org/springblade/common/constant/FtpConstant.java
index 587ddce..937dfe9 100644
--- a/src/main/java/org/springblade/common/constant/FtpConstant.java
+++ b/src/main/java/org/springblade/common/constant/FtpConstant.java
@@ -18,7 +18,7 @@
 	/**
 	 * ftp服务器IP地址
 	 */
-	String ftpHost_dev = "192.168.0.108";
+	String ftpHost_dev = "192.168.0.110";
 
 	/**
 	 * ftp服务器IP地址
@@ -60,6 +60,6 @@
 	//String ip = "http://47.49.21.216:9000";
 	String ip = "http://223.82.109.183:2081";
 
-	String jsonUrl = "/home/zhongsong/anbao/";
-	//String jsonUrl = "D:\\anbao\\";
+	//String jsonUrl = "/home/zhongsong/anbao/";
+	String jsonUrl = "D:\\anbao\\";
 }
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index 480049d..ce78b24 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -211,17 +211,21 @@
 		informationService.updateById(information);
 		String businessLicense=null;
 		String licence=null;
+		String format="";
 		if(information.getBusinessLicense()!=null && !"".equals(information.getBusinessLicense())){
 			 businessLicense = information.getBusinessLicense().substring(26, information.getBusinessLicense().length());
 		}
 		if(information.getLicence()!=null && !"".equals(information.getLicence())){
 			 licence = information.getLicence().substring(26, information.getLicence().length());
 		}
+		if (information.getEstablishtime()!=null && !"".equals(information.getEstablishtime())){
+			 format = new SimpleDateFormat("yyyy-MM-dd").format(information.getEstablishtime());
+		}
 		//内网同步
 		String s1 = "update sys_information set creditcode = " + "'" + information.getCreditcode() + "'" +
 			",enterprisename = " + "'" + information.getEnterprisename() + "'" +
 			",representative = " + "'" + information.getRepresentative() + "'" +
-			",establishtime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(information.getEstablishtime()) + "'" +
+			",establishtime = " + "'" + format + "'" +
 			",registeredcapital = " + "'" + information.getRegisteredcapital() + "'" +
 			",organizationcode = " + "'" + information.getOrganizationcode() + "'" +
 			",registrationnumber = " + "'" + information.getRegistrationnumber() + "'" +
diff --git a/src/main/java/org/springblade/modules/licet/controller/LicetController.java b/src/main/java/org/springblade/modules/licet/controller/LicetController.java
new file mode 100644
index 0000000..0b71976
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licet/controller/LicetController.java
@@ -0,0 +1,126 @@
+/*
+ *      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.licet.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.licet.entity.Licet;
+import org.springblade.modules.licet.vo.LicetVO;
+import org.springblade.modules.licet.service.ILicetService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/licet")
+@Api(value = "", tags = "接口")
+public class LicetController extends BladeController {
+
+	private final ILicetService licetService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入licet")
+	public R<Licet> detail(Licet licet) {
+		Licet detail = licetService.getOne(Condition.getQueryWrapper(licet));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入licet")
+	public R<IPage<Licet>> list(Licet licet, Query query) {
+		IPage<Licet> pages = licetService.page(Condition.getPage(query), Condition.getQueryWrapper(licet));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入licet")
+	public R<IPage<LicetVO>> page(LicetVO licet, Query query) {
+		IPage<LicetVO> pages = licetService.selectLicetPage(Condition.getPage(query), licet);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入licet")
+	public R save(@Valid @RequestBody Licet licet) {
+		return R.status(licetService.save(licet));
+	}
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入licet")
+	public R update(@Valid @RequestBody Licet licet) {
+		return R.status(licetService.updateById(licet));
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入licet")
+	public R submit(@Valid @RequestBody Licet licet) {
+		return R.status(licetService.saveOrUpdate(licet));
+	}
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(licetService.removeByIds(Func.toLongList(ids)));
+	}
+
+
+}
diff --git a/src/main/java/org/springblade/modules/licet/dto/LicetDTO.java b/src/main/java/org/springblade/modules/licet/dto/LicetDTO.java
new file mode 100644
index 0000000..b07091e
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licet/dto/LicetDTO.java
@@ -0,0 +1,34 @@
+/*
+ *      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.licet.dto;
+
+import org.springblade.modules.licet.entity.Licet;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LicetDTO extends Licet {
+	private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/licet/entity/Licet.java b/src/main/java/org/springblade/modules/licet/entity/Licet.java
new file mode 100644
index 0000000..596de4f
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licet/entity/Licet.java
@@ -0,0 +1,66 @@
+/*
+ *      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.licet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+@Data
+@TableName("sys_licet")
+@ApiModel(value = "Licet对象", description = "Licet对象")
+public class Licet implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* id
+	*/
+		@ApiModelProperty(value = "id")
+		@TableId(value = "id", type = IdType.AUTO)
+	private Integer id;
+	/**
+	* 模板名称
+	*/
+		@ApiModelProperty(value = "模板名称")
+		@TableField("originalName")
+	private String originalname;
+	/**
+	* 模板下载地址
+	*/
+		@ApiModelProperty(value = "模板下载地址")
+		private String template;
+	/**
+	* 获取模板信息条件，0：保安服务许可申请，1：保安培训许可申请，2：设立分公司备案，3：自招保安单位备案，4：自招保安单位撤销备案，5：跨区域经营备案，6：武装押运许可申请，7：保安服务公司法人变更
+	*/
+		@ApiModelProperty(value = "获取模板信息条件，0：保安服务许可申请，1：保安培训许可申请，2：设立分公司备案，3：自招保安单位备案，4：自招保安单位撤销备案，5：跨区域经营备案，6：武装押运许可申请，7：保安服务公司法人变更")
+		private String ptype;
+
+
+}
diff --git a/src/main/java/org/springblade/modules/licet/mapper/LicetMapper.java b/src/main/java/org/springblade/modules/licet/mapper/LicetMapper.java
new file mode 100644
index 0000000..0ca3eb5
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licet/mapper/LicetMapper.java
@@ -0,0 +1,42 @@
+/*
+ *      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.licet.mapper;
+
+import org.springblade.modules.licet.entity.Licet;
+import org.springblade.modules.licet.vo.LicetVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+public interface LicetMapper extends BaseMapper<Licet> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param licet
+	 * @return
+	 */
+	List<LicetVO> selectLicetPage(IPage page, LicetVO licet);
+
+}
diff --git a/src/main/java/org/springblade/modules/licet/mapper/LicetMapper.xml b/src/main/java/org/springblade/modules/licet/mapper/LicetMapper.xml
new file mode 100644
index 0000000..e35e677
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licet/mapper/LicetMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.licet.mapper.LicetMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="licetResultMap" type="org.springblade.modules.licet.entity.Licet">
+        <id column="id" property="id"/>
+        <result column="originalName" property="originalname"/>
+        <result column="template" property="template"/>
+        <result column="ptype" property="ptype"/>
+    </resultMap>
+
+
+    <select id="selectLicetPage" resultMap="licetResultMap">
+        select * from sys_licet where is_deleted = 0
+    </select>
+
+</mapper>
diff --git a/src/main/java/org/springblade/modules/licet/service/ILicetService.java b/src/main/java/org/springblade/modules/licet/service/ILicetService.java
new file mode 100644
index 0000000..e9d51af
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licet/service/ILicetService.java
@@ -0,0 +1,41 @@
+/*
+ *      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.licet.service;
+
+import org.springblade.modules.licet.entity.Licet;
+import org.springblade.modules.licet.vo.LicetVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+public interface ILicetService extends IService<Licet> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param licet
+	 * @return
+	 */
+	IPage<LicetVO> selectLicetPage(IPage<LicetVO> page, LicetVO licet);
+
+}
diff --git a/src/main/java/org/springblade/modules/licet/service/impl/LicetServiceImpl.java b/src/main/java/org/springblade/modules/licet/service/impl/LicetServiceImpl.java
new file mode 100644
index 0000000..56d0255
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licet/service/impl/LicetServiceImpl.java
@@ -0,0 +1,41 @@
+/*
+ *      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.licet.service.impl;
+
+import org.springblade.modules.licet.entity.Licet;
+import org.springblade.modules.licet.vo.LicetVO;
+import org.springblade.modules.licet.mapper.LicetMapper;
+import org.springblade.modules.licet.service.ILicetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+@Service
+public class LicetServiceImpl extends ServiceImpl<LicetMapper, Licet> implements ILicetService {
+
+	@Override
+	public IPage<LicetVO> selectLicetPage(IPage<LicetVO> page, LicetVO licet) {
+		return page.setRecords(baseMapper.selectLicetPage(page, licet));
+	}
+
+}
diff --git a/src/main/java/org/springblade/modules/licet/vo/LicetVO.java b/src/main/java/org/springblade/modules/licet/vo/LicetVO.java
new file mode 100644
index 0000000..bfc1e43
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licet/vo/LicetVO.java
@@ -0,0 +1,36 @@
+/*
+ *      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.licet.vo;
+
+import org.springblade.modules.licet.entity.Licet;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "LicetVO对象", description = "LicetVO对象")
+public class LicetVO extends Licet {
+	private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java b/src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java
new file mode 100644
index 0000000..95de386
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java
@@ -0,0 +1,126 @@
+/*
+ *      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.licetuser.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.licetuser.entity.Licetuser;
+import org.springblade.modules.licetuser.vo.LicetuserVO;
+import org.springblade.modules.licetuser.service.ILicetuserService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/licetuser")
+@Api(value = "", tags = "接口")
+public class LicetuserController extends BladeController {
+
+	private final ILicetuserService licetuserService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入licetuser")
+	public R<Licetuser> detail(Licetuser licetuser) {
+		Licetuser detail = licetuserService.getOne(Condition.getQueryWrapper(licetuser));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入licetuser")
+	public R<IPage<Licetuser>> list(Licetuser licetuser, Query query) {
+		IPage<Licetuser> pages = licetuserService.page(Condition.getPage(query), Condition.getQueryWrapper(licetuser));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入licetuser")
+	public R<IPage<LicetuserVO>> page(LicetuserVO licetuser, Query query) {
+		IPage<LicetuserVO> pages = licetuserService.selectLicetuserPage(Condition.getPage(query), licetuser);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入licetuser")
+	public R save(@Valid @RequestBody Licetuser licetuser) {
+		return R.status(licetuserService.save(licetuser));
+	}
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入licetuser")
+	public R update(@Valid @RequestBody Licetuser licetuser) {
+		return R.status(licetuserService.updateById(licetuser));
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入licetuser")
+	public R submit(@Valid @RequestBody Licetuser licetuser) {
+		return R.status(licetuserService.saveOrUpdate(licetuser));
+	}
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(licetuserService.removeByIds(Func.toLongList(ids)));
+	}
+
+
+}
diff --git a/src/main/java/org/springblade/modules/licetuser/dto/LicetuserDTO.java b/src/main/java/org/springblade/modules/licetuser/dto/LicetuserDTO.java
new file mode 100644
index 0000000..4bf056d
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licetuser/dto/LicetuserDTO.java
@@ -0,0 +1,34 @@
+/*
+ *      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.licetuser.dto;
+
+import org.springblade.modules.licetuser.entity.Licetuser;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LicetuserDTO extends Licetuser {
+	private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/licetuser/entity/Licetuser.java b/src/main/java/org/springblade/modules/licetuser/entity/Licetuser.java
new file mode 100644
index 0000000..167c21e
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licetuser/entity/Licetuser.java
@@ -0,0 +1,60 @@
+/*
+ *      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.licetuser.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+@Data
+@TableName("sys_licetuser")
+@ApiModel(value = "Licetuser对象", description = "Licetuser对象")
+public class Licetuser implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@TableId(value = "id", type = IdType.AUTO)
+	private Integer id;
+	/**
+	* 用户id
+	*/
+		@ApiModelProperty(value = "用户id")
+		private String userid;
+	/**
+	* 获取模板信息条件，0：保安服务许可申请，1：保安培训许可申请，2：设立分公司备案，3：自招保安单位备案，4：自招保安单位撤销备案，5：跨区域经营备案，6：武装押运许可申请，7：保安服务公司法人变更
+	*/
+		@ApiModelProperty(value = "获取模板信息条件，0：保安服务许可申请，1：保安培训许可申请，2：设立分公司备案，3：自招保安单位备案，4：自招保安单位撤销备案，5：跨区域经营备案，6：武装押运许可申请，7：保安服务公司法人变更")
+		private String ptype;
+	/**
+	* 以上传的文件id，关联模板id
+	*/
+		@ApiModelProperty(value = "以上传的文件id，关联模板id")
+		private String templateid;
+
+
+}
diff --git a/src/main/java/org/springblade/modules/licetuser/mapper/LicetuserMapper.java b/src/main/java/org/springblade/modules/licetuser/mapper/LicetuserMapper.java
new file mode 100644
index 0000000..bef10a1
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licetuser/mapper/LicetuserMapper.java
@@ -0,0 +1,42 @@
+/*
+ *      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.licetuser.mapper;
+
+import org.springblade.modules.licetuser.entity.Licetuser;
+import org.springblade.modules.licetuser.vo.LicetuserVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+public interface LicetuserMapper extends BaseMapper<Licetuser> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param licetuser
+	 * @return
+	 */
+	List<LicetuserVO> selectLicetuserPage(IPage page, LicetuserVO licetuser);
+
+}
diff --git a/src/main/java/org/springblade/modules/licetuser/mapper/LicetuserMapper.xml b/src/main/java/org/springblade/modules/licetuser/mapper/LicetuserMapper.xml
new file mode 100644
index 0000000..edbb802
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licetuser/mapper/LicetuserMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.licetuser.mapper.LicetuserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="licetuserResultMap" type="org.springblade.modules.licetuser.entity.Licetuser">
+        <id column="id" property="id"/>
+        <result column="userid" property="userid"/>
+        <result column="ptype" property="ptype"/>
+        <result column="templateid" property="templateid"/>
+    </resultMap>
+
+
+    <select id="selectLicetuserPage" resultMap="licetuserResultMap">
+        select * from sys_licetuser where is_deleted = 0
+    </select>
+
+</mapper>
diff --git a/src/main/java/org/springblade/modules/licetuser/service/ILicetuserService.java b/src/main/java/org/springblade/modules/licetuser/service/ILicetuserService.java
new file mode 100644
index 0000000..fe67e32
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licetuser/service/ILicetuserService.java
@@ -0,0 +1,41 @@
+/*
+ *      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.licetuser.service;
+
+import org.springblade.modules.licetuser.entity.Licetuser;
+import org.springblade.modules.licetuser.vo.LicetuserVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+public interface ILicetuserService extends IService<Licetuser> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param licetuser
+	 * @return
+	 */
+	IPage<LicetuserVO> selectLicetuserPage(IPage<LicetuserVO> page, LicetuserVO licetuser);
+
+}
diff --git a/src/main/java/org/springblade/modules/licetuser/service/impl/LicetuserServiceImpl.java b/src/main/java/org/springblade/modules/licetuser/service/impl/LicetuserServiceImpl.java
new file mode 100644
index 0000000..0ce6d12
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licetuser/service/impl/LicetuserServiceImpl.java
@@ -0,0 +1,41 @@
+/*
+ *      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.licetuser.service.impl;
+
+import org.springblade.modules.licetuser.entity.Licetuser;
+import org.springblade.modules.licetuser.vo.LicetuserVO;
+import org.springblade.modules.licetuser.mapper.LicetuserMapper;
+import org.springblade.modules.licetuser.service.ILicetuserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+@Service
+public class LicetuserServiceImpl extends ServiceImpl<LicetuserMapper, Licetuser> implements ILicetuserService {
+
+	@Override
+	public IPage<LicetuserVO> selectLicetuserPage(IPage<LicetuserVO> page, LicetuserVO licetuser) {
+		return page.setRecords(baseMapper.selectLicetuserPage(page, licetuser));
+	}
+
+}
diff --git a/src/main/java/org/springblade/modules/licetuser/vo/LicetuserVO.java b/src/main/java/org/springblade/modules/licetuser/vo/LicetuserVO.java
new file mode 100644
index 0000000..b75bc7d
--- /dev/null
+++ b/src/main/java/org/springblade/modules/licetuser/vo/LicetuserVO.java
@@ -0,0 +1,36 @@
+/*
+ *      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.licetuser.vo;
+
+import org.springblade.modules.licetuser.entity.Licetuser;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "LicetuserVO对象", description = "LicetuserVO对象")
+public class LicetuserVO extends Licetuser {
+	private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
index fc63983..83f1fce 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -105,15 +105,13 @@
 		recordk.setType("2");
 		recordk.setPermitime(new Date());
 		recordkService.save(recordk);
-		String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(recordk.getEstablishtime());
 		String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(recordk.getOfficetime());
 		String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(recordk.getPermitime());
-		String s = "insert into sys_record(id,creditCode,enterpriseName,representative,establishtime," +
+		String s = "insert into sys_record(id,creditCode,enterpriseName,representative," +
 			"registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
 			"address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,perid,offices,officetime,cardid)" +
 			"values(" + "'" + recordk.getId() + "'" + "," + "'" + recordk.getCreditcode() + "'" + "," + "'" + recordk.getEnterprisename() + "'" + "," + "'"
-			+ recordk.getRepresentative() + "'" + "," +
-			"'" + formatStr + "'" + "," + "'" + recordk.getRegisteredcapital() + "'" + "," + "'"
+			+ recordk.getRepresentative() + "'" + "," +"'" + recordk.getRegisteredcapital() + "'" + "," + "'"
 			+ recordk.getOrganizationcode() + "'" + "," + "'" + recordk.getRegistrationnumber() + "'" + "," +
 			"'" + recordk.getIdentificationnumber() + "'" + "," + "'" + recordk.getEnterprises() + "'" + "," + "'" +
 			recordk.getAddress() + "'" + "," + "'" + recordk.getBusiness() + "'" + "," + "'" +
diff --git a/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml b/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
index 3b806cb..920efed 100644
--- a/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
+++ b/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
@@ -9,7 +9,7 @@
         <result column="password" property="password"/>
         <result column="sname" property="sname"/>
         <result column="sex" property="sex"/>
-        <result column="phone" property="phone"/>
+        <result column="cardid" property="cardid"/>
         <result column="zctime" property="zctime"/>
         <result column="type" property="type"/>
         <result column="deptid" property="deptid"/>
@@ -36,6 +36,9 @@
         <if test="zc.username!=null and zc.username!=''">
             and z.username like concat(concat('%', #{zc.username}),'%')
         </if>
+        <if test="zc.cardid!=null and zc.cardid!=''">
+            and z.cardid like concat(concat('%', #{zc.cardid}),'%')
+        </if>
     </select>
 
 
diff --git a/src/main/java/sql/licet.menu.mysql b/src/main/java/sql/licet.menu.mysql
new file mode 100644
index 0000000..c8b1e9b
--- /dev/null
+++ b/src/main/java/sql/licet.menu.mysql
@@ -0,0 +1,10 @@
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1434692454405111815', 1123598815738675201, 'licet', '附件模板', 'menu', '/licet/licet', NULL, 1, 1, 0, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1434692454405111816', '1434692454405111815', 'licet_add', '新增', 'add', '/licet/licet/add', 'plus', 1, 2, 1, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1434692454405111817', '1434692454405111815', 'licet_edit', '修改', 'edit', '/licet/licet/edit', 'form', 2, 2, 2, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1434692454405111818', '1434692454405111815', 'licet_delete', '删除', 'delete', '/api/blade-licet/licet/remove', 'delete', 3, 2, 3, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1434692454405111819', '1434692454405111815', 'licet_view', '查看', 'view', '/licet/licet/view', 'file-text', 4, 2, 2, 1, NULL, 0);
diff --git a/src/main/java/sql/licetuser.menu.mysql b/src/main/java/sql/licetuser.menu.mysql
new file mode 100644
index 0000000..229f776
--- /dev/null
+++ b/src/main/java/sql/licetuser.menu.mysql
@@ -0,0 +1,10 @@
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1434692663226925063', 1123598815738675201, 'licetuser', '附件模板子表', 'menu', '/licetuser/licetuser', NULL, 1, 1, 0, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1434692663226925064', '1434692663226925063', 'licetuser_add', '新增', 'add', '/licetuser/licetuser/add', 'plus', 1, 2, 1, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1434692663226925065', '1434692663226925063', 'licetuser_edit', '修改', 'edit', '/licetuser/licetuser/edit', 'form', 2, 2, 2, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1434692663226925066', '1434692663226925063', 'licetuser_delete', '删除', 'delete', '/api/blade-licetuser/licetuser/remove', 'delete', 3, 2, 3, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1434692663226925067', '1434692663226925063', 'licetuser_view', '查看', 'view', '/licetuser/licetuser/view', 'file-text', 4, 2, 2, 1, NULL, 0);

--
Gitblit v1.9.3