Skip to content

C
certificate-print
Commit 5bb63f86 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

营业执照api接口增加执照打印时间

parent 975fb466
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 358 deletions
certificate-manager/db/add_db.sql
View file @ 5bb63f86
......@@ -63,4 +63,6 @@ ALTER TABLE `mortals_xhx_print_catalog`
ALTER TABLE `mortals_xhx_apply_log` ADD COLUMN `mobile` varchar(64) DEFAULT NULL COMMENT '手机号码';
ALTER TABLE `mortals_xhx_print_wait_queue` ADD COLUMN `mobile` varchar(64) DEFAULT NULL COMMENT '手机号码';
ALTER TABLE `mortals_xhx_retain_log` ADD COLUMN `mobile` varchar(64) DEFAULT NULL COMMENT '手机号码';
ALTER TABLE `mortals_xhx_print_log` ADD COLUMN `mobile` varchar(64) DEFAULT NULL COMMENT '手机号码';
\ No newline at end of file
ALTER TABLE `mortals_xhx_print_log` ADD COLUMN `mobile` varchar(64) DEFAULT NULL COMMENT '手机号码';
ALTER TABLE `mortals_xhx_business_license` ADD COLUMN `PermitPrintDate` varchar(32) DEFAULT '' COMMENT '签发日期';
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
View file @ 5bb63f86
......@@ -333,6 +333,11 @@ public class UserEntity extends UserEntityExt implements IUser {
return super.getSiteIds();
}
@Override
public String getAreaCodes() {
return null;
}
/**
* 设置 站点id
* @param siteId
......
certificate-manager/src/main/java/com/mortals/xhx/module/business/model/BusinessLicenseEntity.java
View file @ 5bb63f86
package com.mortals.xhx.module.business.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.business.model.vo.BusinessLicenseVo;
import lombok.Data;
/**
* 营业执照信息实体对象
*
* @author zxfei
* @date 2023-05-14
* @date 2023-11-13
*/
@Data
public class BusinessLicenseEntity extends BusinessLicenseVo {
private static final long serialVersionUID = 1L;
......@@ -96,294 +92,10 @@ public class BusinessLicenseEntity extends BusinessLicenseVo {
* 站点id
*/
private Long siteId;
public BusinessLicenseEntity(){}
/**
* 获取 经营者姓名
* @return String
*/
public String getProprietorName(){
return ProprietorName;
}
/**
* 设置 经营者姓名
* @param ProprietorName
*/
public void setProprietorName(String ProprietorName){
this.ProprietorName = ProprietorName;
}
/**
* 获取 营业执照号码
* @return String
*/
public String getBusinessLicense(){
return BusinessLicense;
}
/**
* 设置 营业执照号码
* @param BusinessLicense
*/
public void setBusinessLicense(String BusinessLicense){
this.BusinessLicense = BusinessLicense;
}
/**
* 获取 单位字号名称
* @return String
*/
public String getTypeSizeName(){
return TypeSizeName;
}
/**
* 设置 单位字号名称
* @param TypeSizeName
*/
public void setTypeSizeName(String TypeSizeName){
this.TypeSizeName = TypeSizeName;
}
/**
* 获取 开业日期
* @return String
*/
public String getStartDate(){
return StartDate;
}
/**
* 设置 开业日期
* @param StartDate
*/
public void setStartDate(String StartDate){
this.StartDate = StartDate;
}
/**
* 获取 组成形式如：个人经营
* @return String
*/
public String getComposingForm(){
return ComposingForm;
}
/**
* 设置 组成形式如：个人经营
* @param ComposingForm
*/
public void setComposingForm(String ComposingForm){
this.ComposingForm = ComposingForm;
}
/**
* 获取 经营场所
* @return String
*/
public String getManageLocation(){
return ManageLocation;
}
/**
* 设置 经营场所
* @param ManageLocation
*/
public void setManageLocation(String ManageLocation){
this.ManageLocation = ManageLocation;
}
/**
* 获取 经营范围
* @return String
*/
public String getManageRange(){
return ManageRange;
}
/**
* 设置 经营范围
* @param ManageRange
*/
public void setManageRange(String ManageRange){
this.ManageRange = ManageRange;
}
/**
* 获取 注册号
* @return String
*/
public String getRegCode(){
return RegCode;
}
/**
* 设置 注册号
* @param RegCode
*/
public void setRegCode(String RegCode){
this.RegCode = RegCode;
}
/**
* 获取 证件号码
* @return String
*/
public String getCredentialsCode(){
return CredentialsCode;
}
/**
* 设置 证件号码
* @param CredentialsCode
*/
public void setCredentialsCode(String CredentialsCode){
this.CredentialsCode = CredentialsCode;
}
/**
* 获取 证件类型
* @return String
*/
public String getCredentialsType(){
return CredentialsType;
}
/**
* 设置 证件类型
* @param CredentialsType
*/
public void setCredentialsType(String CredentialsType){
this.CredentialsType = CredentialsType;
}
/**
* 获取 移动电话
* @return String
*/
public String getProprietorMobile(){
return ProprietorMobile;
}
/**
* 设置 移动电话
* @param ProprietorMobile
*/
public void setProprietorMobile(String ProprietorMobile){
this.ProprietorMobile = ProprietorMobile;
}
/**
* 获取 营业执照正本二维码base64编码
* @return String
*/
public String getQrCodeOriginalBase64(){
return QrCodeOriginalBase64;
}
/**
* 设置 营业执照正本二维码base64编码
* @param QrCodeOriginalBase64
*/
public void setQrCodeOriginalBase64(String QrCodeOriginalBase64){
this.QrCodeOriginalBase64 = QrCodeOriginalBase64;
}
/**
* 获取 营业执照副本二维码base64编码
* @return String
*/
public String getQrCodeDuplicateBase64(){
return QrCodeDuplicateBase64;
}
/**
* 设置 营业执照副本二维码base64编码
* @param QrCodeDuplicateBase64
*/
public void setQrCodeDuplicateBase64(String QrCodeDuplicateBase64){
this.QrCodeDuplicateBase64 = QrCodeDuplicateBase64;
}
/**
* 获取 注册资本
* @return String
*/
public String getRegisteredCapital(){
return RegisteredCapital;
}
/**
* 设置 注册资本
* @param RegisteredCapital
*/
public void setRegisteredCapital(String RegisteredCapital){
this.RegisteredCapital = RegisteredCapital;
}
/**
* 获取 实收资本
* @return String
*/
public String getPaidupCapital(){
return PaidupCapital;
}
/**
* 设置 实收资本
* @param PaidupCapital
*/
public void setPaidupCapital(String PaidupCapital){
this.PaidupCapital = PaidupCapital;
}
/**
* 获取 营业期限
* @return String
*/
public String getEndDate(){
return EndDate;
}
/**
* 设置 营业期限
* @param EndDate
*/
public void setEndDate(String EndDate){
this.EndDate = EndDate;
}
/**
* 获取 允许打印 正本 1允许 2不允许
* @return Integer
*/
public Integer getDyZb(){
return dyZb;
}
/**
* 设置 允许打印 正本 1允许 2不允许
* @param dyZb
*/
public void setDyZb(Integer dyZb){
this.dyZb = dyZb;
}
/**
* 获取 允许打印 副本 1允许 2不允许
* @return Integer
*/
public Integer getDyFb(){
return dyFb;
}
/**
* 设置 允许打印 副本 1允许 2不允许
* @param dyFb
*/
public void setDyFb(Integer dyFb){
this.dyFb = dyFb;
}
/**
* 获取 处理状态0未处理1已处理
* @return Integer
*/
public Integer getStatus(){
return status;
}
/**
* 设置 处理状态0未处理1已处理
* @param status
*/
public void setStatus(Integer status){
this.status = status;
}
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
* 签发日期
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
private String PermitPrintDate;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -400,71 +112,27 @@ public class BusinessLicenseEntity extends BusinessLicenseVo {
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",ProprietorName:").append(getProprietorName());
sb.append(",BusinessLicense:").append(getBusinessLicense());
sb.append(",TypeSizeName:").append(getTypeSizeName());
sb.append(",StartDate:").append(getStartDate());
sb.append(",ComposingForm:").append(getComposingForm());
sb.append(",ManageLocation:").append(getManageLocation());
sb.append(",ManageRange:").append(getManageRange());
sb.append(",RegCode:").append(getRegCode());
sb.append(",CredentialsCode:").append(getCredentialsCode());
sb.append(",CredentialsType:").append(getCredentialsType());
sb.append(",ProprietorMobile:").append(getProprietorMobile());
sb.append(",QrCodeOriginalBase64:").append(getQrCodeOriginalBase64());
sb.append(",QrCodeDuplicateBase64:").append(getQrCodeDuplicateBase64());
sb.append(",RegisteredCapital:").append(getRegisteredCapital());
sb.append(",PaidupCapital:").append(getPaidupCapital());
sb.append(",EndDate:").append(getEndDate());
sb.append(",dyZb:").append(getDyZb());
sb.append(",dyFb:").append(getDyFb());
sb.append(",status:").append(getStatus());
sb.append(",siteId:").append(getSiteId());
return sb.toString();
}
public void initAttrValue(){
this.ProprietorName = "";
this.BusinessLicense = "";
this.TypeSizeName = "";
this.StartDate = "";
this.ComposingForm = "";
this.ManageLocation = "";
this.ManageRange = "";
this.RegCode = "";
this.CredentialsCode = "";
this.CredentialsType = "";
this.ProprietorMobile = "";
this.QrCodeOriginalBase64 = "";
this.QrCodeDuplicateBase64 = "";
this.RegisteredCapital = "";
this.PaidupCapital = "";
this.EndDate = "";
this.dyZb = null;
this.dyFb = null;
this.status = null;
this.dyZb = 0;
this.dyFb = 0;
this.status = 0;
this.siteId = null;
this.PermitPrintDate = "";
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/business/model/BusinessLicenseQuery.java
View file @ 5bb63f86
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.business.model.BusinessLicenseEntity;
* 营业执照信息查询对象
*
* @author zxfei
* @date 2023-05-14
* @date 2023-11-13
*/
public class BusinessLicenseQuery extends BusinessLicenseEntity {
/** 开始 序号，主键，自增长 */
......@@ -206,6 +206,11 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 签发日期 */
private List<String> PermitPrintDateList;
/** 签发日期排除列表 */
private List <String> PermitPrintDateNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<BusinessLicenseQuery> orConditionList;
......@@ -1357,6 +1362,38 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
}
/**
* 获取 签发日期
* @return PermitPrintDateList
*/
public List<String> getPermitPrintDateList(){
return this.PermitPrintDateList;
}
/**
* 设置 签发日期
* @param PermitPrintDateList
*/
public void setPermitPrintDateList(List<String> PermitPrintDateList){
this.PermitPrintDateList = PermitPrintDateList;
}
/**
* 获取 签发日期
* @return PermitPrintDateNotList
*/
public List<String> getPermitPrintDateNotList(){
return this.PermitPrintDateNotList;
}
/**
* 设置 签发日期
* @param PermitPrintDateNotList
*/
public void setPermitPrintDateNotList(List<String> PermitPrintDateNotList){
this.PermitPrintDateNotList = PermitPrintDateNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -2041,6 +2078,25 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
return this;
}
/**
* 设置 签发日期
* @param PermitPrintDate
*/
public BusinessLicenseQuery PermitPrintDate(String PermitPrintDate){
setPermitPrintDate(PermitPrintDate);
return this;
}
/**
* 设置 签发日期
* @param PermitPrintDateList
*/
public BusinessLicenseQuery PermitPrintDateList(List<String> PermitPrintDateList){
this.PermitPrintDateList = PermitPrintDateList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
certificate-manager/src/main/java/com/mortals/xhx/module/business/service/impl/BusinessLicenseServiceImpl.java
View file @ 5bb63f86
......@@ -43,12 +43,12 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/**
* BusinessLicenseService
* 营业执照信息 service实现
*
* @author zxfei
* @date 2022-12-12
*/
* BusinessLicenseService
* 营业执照信息 service实现
*
* @author zxfei
* @date 2022-12-12
*/
@Service("businessLicenseService")
public class BusinessLicenseServiceImpl extends AbstractCRUDServiceImpl<BusinessLicenseDao, BusinessLicenseEntity, Long> implements BusinessLicenseService {
......@@ -88,9 +88,9 @@ public class BusinessLicenseServiceImpl extends AbstractCRUDServiceImpl<Business
}
for(CertificateCatalogTemplateEntity templateEntity:templateEntityList){
ApplyLogPdu applyLogPdu = new ApplyLogPdu();
Date date = DateUtils.StrToDateTime(businessLicenseEntity.getStartDate(),"yyyy-MM-dd");
Date date = DateUtils.StrToDateTime(businessLicenseEntity.getPermitPrintDate(),"yyyy-MM-dd");
if(date==null){
date = DateUtils.StrToDateTime(businessLicenseEntity.getStartDate(),"yyyy年MM月dd日");
date = DateUtils.StrToDateTime(businessLicenseEntity.getPermitPrintDate(),"yyyy年MM月dd日");
}else {
date = new Date();
}
......@@ -158,7 +158,7 @@ public class BusinessLicenseServiceImpl extends AbstractCRUDServiceImpl<Business
if(key.indexOf("住所")>0){
formContent.put(key,businessLicenseEntity.getManageLocation());
}
String zcrq = businessLicenseEntity.getStartDate();
String zcrq = businessLicenseEntity.getPermitPrintDate();
if(key.indexOf("_年")>0){
formContent.put(key,dateFromt(zcrq).get("year"));
}
......
certificate-manager/src/main/resources/sqlmap/module/business/BusinessLicenseMapper.xml
View file @ 5bb63f86
......@@ -30,7 +30,7 @@
<result property="updateTime" column="updateTime" />
<result property="status" column="status" />
<result property="siteId" column="siteId" />
<result property="PermitPrintDate" column="PermitPrintDate" />
</resultMap>
......@@ -112,23 +112,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('PermitPrintDate') or colPickMode == 1 and data.containsKey('PermitPrintDate')))">
a.PermitPrintDate,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="BusinessLicenseEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_business_license
(ProprietorName,BusinessLicense,TypeSizeName,StartDate,ComposingForm,ManageLocation,ManageRange,RegCode,CredentialsCode,CredentialsType,ProprietorMobile,QrCodeOriginalBase64,QrCodeDuplicateBase64,RegisteredCapital,PaidupCapital,EndDate,dy_zb,dy_fb,createUserId,createTime,updateUserId,updateTime,status,siteId)
(ProprietorName,BusinessLicense,TypeSizeName,StartDate,ComposingForm,ManageLocation,ManageRange,RegCode,CredentialsCode,CredentialsType,ProprietorMobile,QrCodeOriginalBase64,QrCodeDuplicateBase64,RegisteredCapital,PaidupCapital,EndDate,dy_zb,dy_fb,createUserId,createTime,updateUserId,updateTime,status,siteId,PermitPrintDate)
VALUES
(#{ProprietorName},#{BusinessLicense},#{TypeSizeName},#{StartDate},#{ComposingForm},#{ManageLocation},#{ManageRange},#{RegCode},#{CredentialsCode},#{CredentialsType},#{ProprietorMobile},#{QrCodeOriginalBase64},#{QrCodeDuplicateBase64},#{RegisteredCapital},#{PaidupCapital},#{EndDate},#{dyZb},#{dyFb},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{status},#{siteId})
(#{ProprietorName},#{BusinessLicense},#{TypeSizeName},#{StartDate},#{ComposingForm},#{ManageLocation},#{ManageRange},#{RegCode},#{CredentialsCode},#{CredentialsType},#{ProprietorMobile},#{QrCodeOriginalBase64},#{QrCodeDuplicateBase64},#{RegisteredCapital},#{PaidupCapital},#{EndDate},#{dyZb},#{dyFb},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{status},#{siteId},#{PermitPrintDate})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_business_license
(ProprietorName,BusinessLicense,TypeSizeName,StartDate,ComposingForm,ManageLocation,ManageRange,RegCode,CredentialsCode,CredentialsType,ProprietorMobile,QrCodeOriginalBase64,QrCodeDuplicateBase64,RegisteredCapital,PaidupCapital,EndDate,dy_zb,dy_fb,createUserId,createTime,updateUserId,updateTime,status,siteId)
(ProprietorName,BusinessLicense,TypeSizeName,StartDate,ComposingForm,ManageLocation,ManageRange,RegCode,CredentialsCode,CredentialsType,ProprietorMobile,QrCodeOriginalBase64,QrCodeDuplicateBase64,RegisteredCapital,PaidupCapital,EndDate,dy_zb,dy_fb,createUserId,createTime,updateUserId,updateTime,status,siteId,PermitPrintDate)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.ProprietorName},#{item.BusinessLicense},#{item.TypeSizeName},#{item.StartDate},#{item.ComposingForm},#{item.ManageLocation},#{item.ManageRange},#{item.RegCode},#{item.CredentialsCode},#{item.CredentialsType},#{item.ProprietorMobile},#{item.QrCodeOriginalBase64},#{item.QrCodeDuplicateBase64},#{item.RegisteredCapital},#{item.PaidupCapital},#{item.EndDate},#{item.dyZb},#{item.dyFb},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.status},#{item.siteId})
(#{item.ProprietorName},#{item.BusinessLicense},#{item.TypeSizeName},#{item.StartDate},#{item.ComposingForm},#{item.ManageLocation},#{item.ManageRange},#{item.RegCode},#{item.CredentialsCode},#{item.CredentialsType},#{item.ProprietorMobile},#{item.QrCodeOriginalBase64},#{item.QrCodeDuplicateBase64},#{item.RegisteredCapital},#{item.PaidupCapital},#{item.EndDate},#{item.dyZb},#{item.dyFb},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.status},#{item.siteId},#{item.PermitPrintDate})
</foreach>
</insert>
......@@ -228,6 +231,9 @@
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('PermitPrintDate')) or (colPickMode==1 and !data.containsKey('PermitPrintDate'))">
a.PermitPrintDate=#{data.PermitPrintDate},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -438,6 +444,13 @@
</choose>
</foreach>
</trim>
<trim prefix="PermitPrintDate=(case" suffix="ELSE PermitPrintDate end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('PermitPrintDate')) or (colPickMode==1 and !item.containsKey('PermitPrintDate'))">
when a.id=#{item.id} then #{item.PermitPrintDate}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1108,7 +1121,26 @@
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('PermitPrintDate')">
<if test="conditionParamRef.PermitPrintDate != null and conditionParamRef.PermitPrintDate != ''">
${_conditionType_} a.PermitPrintDate like #{${_conditionParam_}.PermitPrintDate}
</if>
<if test="conditionParamRef.PermitPrintDate == null">
${_conditionType_} a.PermitPrintDate is null
</if>
</if>
<if test="conditionParamRef.containsKey('PermitPrintDateList') and conditionParamRef.PermitPrintDateList.size() > 0">
${_conditionType_} a.PermitPrintDate in
<foreach collection="conditionParamRef.PermitPrintDateList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('PermitPrintDateNotList') and conditionParamRef.PermitPrintDateNotList.size() > 0">
${_conditionType_} a.PermitPrintDate not in
<foreach collection="conditionParamRef.PermitPrintDateNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment