Skip to content

O
one-certificate-system
Commit 6abd8ed6 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/first' into first

parents a8e3a10d 00ea90b8
Show whitespace changes
Inline Side-by-side
Showing with 6650 additions and 4807 deletions
one-certificate-manager/src/main/java/com/mortals/xhx/base/system/upload/web/UploadController.java
View file @ 6abd8ed6
package com.mortals.xhx.base.system.upload.web; package com.mortals.xhx.base.system.upload.web;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth; import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
...@@ -60,6 +61,7 @@ public class UploadController extends BaseController { ...@@ -60,6 +61,7 @@ public class UploadController extends BaseController {
String jsonStr = ""; String jsonStr = "";
try { try {
String filePath = uploadService.saveFileUpload(file, prePath, getCurUser()); String filePath = uploadService.saveFileUpload(file, prePath, getCurUser());
filePath = StrUtil.prependIfMissing(filePath, "/");
model.put("url", filePath); model.put("url", filePath);
model.put("fileName", file.getOriginalFilename()); model.put("fileName", file.getOriginalFilename());
model.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); model.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
...@@ -122,5 +124,4 @@ public class UploadController extends BaseController { ...@@ -122,5 +124,4 @@ public class UploadController extends BaseController {
} }
} }
} }
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/vo/CertificateIndustryVo.java
View file @ 6abd8ed6
package com.mortals.xhx.module.certificate.model.vo; package com.mortals.xhx.module.certificate.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.CertificateIndustryEntity; import com.mortals.xhx.module.certificate.model.CertificateIndustryEntity;
import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -9,6 +11,7 @@ import java.util.List; ...@@ -9,6 +11,7 @@ import java.util.List;
* @author zxfei * @author zxfei
* @date 2022-10-14 * @date 2022-10-14
*/ */
@Data
public class CertificateIndustryVo extends BaseEntityLong { public class CertificateIndustryVo extends BaseEntityLong {
List<CertificateIndustryEntity> children;
} }
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/impl/CertificateIndustryServiceImpl.java
View file @ 6abd8ed6
...@@ -36,4 +36,12 @@ public class CertificateIndustryServiceImpl extends AbstractCRUDServiceImpl<Cert ...@@ -36,4 +36,12 @@ public class CertificateIndustryServiceImpl extends AbstractCRUDServiceImpl<Cert
throw new AppException("行业名称重复"); throw new AppException("行业名称重复");
} }
} }
@Override
protected void saveBefore(CertificateIndustryEntity entity, Context context) throws AppException {
super.saveBefore(entity,context);
if(entity.getParentId()==null){
entity.setParentId(-1l);
}
}
} }
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificateIndustryController.java
View file @ 6abd8ed6
package com.mortals.xhx.module.certificate.web; package com.mortals.xhx.module.certificate.web;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.annotation.DataPermission; import com.mortals.xhx.annotation.DataPermission;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.certificate.model.CertificateIndustryEntity; import com.mortals.xhx.module.certificate.model.CertificateIndustryEntity;
import com.mortals.xhx.module.certificate.service.CertificateIndustryService; import com.mortals.xhx.module.certificate.service.CertificateIndustryService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.stream.Collector;
import java.util.stream.Collectors;
/** /**
* *
* 行业目录 * 行业目录
...@@ -40,4 +52,54 @@ public class CertificateIndustryController extends BaseCRUDJsonBodyMappingContro ...@@ -40,4 +52,54 @@ public class CertificateIndustryController extends BaseCRUDJsonBodyMappingContro
public Rest<Object> list(CertificateIndustryEntity query) { public Rest<Object> list(CertificateIndustryEntity query) {
return super.list(query); return super.list(query);
} }
@PostMapping({"treeList"})
@UnAuth
public Rest<Object> treeList(@RequestBody CertificateIndustryEntity query) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "查询" + this.getModuleDesc();
int code;
try {
List<CertificateIndustryEntity> result = this.getService().find(query, context);
if(CollectionUtils.isNotEmpty(result)){
List<CertificateIndustryEntity> collect = result.stream().filter(t -> t.getParentId() == -1).map(
m -> {
m.setChildren(getChildren(m, result));
return m;
}
).collect(Collectors.toList());
model.put("data", collect);
}else {
model.put("data", result);
}
code = this.doListAfter(query, (Map)model, context);
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
this.init(model, context);
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
private static List<CertificateIndustryEntity> getChildren(CertificateIndustryEntity root, List<CertificateIndustryEntity> all) {
List<CertificateIndustryEntity> children = all.stream().filter(t -> {
return Objects.equals(t.getParentId(), root.getId());
}).map(
m -> {
m.setChildren(getChildren(m, all));
return m;
}
).collect(Collectors.toList());
return children;
}
} }
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/child/web/ChildLicenseController.java
View file @ 6abd8ed6
...@@ -5,6 +5,8 @@ import com.mortals.framework.exception.AppException; ...@@ -5,6 +5,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.annotation.DataPermission; import com.mortals.xhx.annotation.DataPermission;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.module.certificate.model.CertificateDocumentQuery; import com.mortals.xhx.module.certificate.model.CertificateDocumentQuery;
import com.mortals.xhx.module.certificate.service.CertificateDocumentService; import com.mortals.xhx.module.certificate.service.CertificateDocumentService;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
...@@ -33,6 +35,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -33,6 +35,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*; import static com.mortals.framework.ap.SysConstains.*;
import static java.util.stream.Collectors.toMap;
import com.mortals.xhx.common.code.*; import com.mortals.xhx.common.code.*;
...@@ -49,6 +52,8 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch ...@@ -49,6 +52,8 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
@Autowired @Autowired
private CertificateDocumentService certificateDocumentService; private CertificateDocumentService certificateDocumentService;
@Autowired
private UserService userService;
public ChildLicenseController() { public ChildLicenseController() {
super.setModuleDesc("行业许可子证"); super.setModuleDesc("行业许可子证");
...@@ -62,6 +67,7 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch ...@@ -62,6 +67,7 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
this.addDict(model, "deleted", DeletedEnum.getEnumMap()); this.addDict(model, "deleted", DeletedEnum.getEnumMap());
this.addDict(model, "documentId", certificateDocumentService.find(new CertificateDocumentQuery()) this.addDict(model, "documentId", certificateDocumentService.find(new CertificateDocumentQuery())
.stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDocumentName(), (o, n) -> n))); .stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDocumentName(), (o, n) -> n)));
this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
super.init(model, context); super.init(model, context);
} }
...@@ -80,7 +86,7 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch ...@@ -80,7 +86,7 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
query.setDeptId(deptId); query.setDeptId(deptId);
} }
} }
query.setChildStatus(ChildStatusEnum.启用.getValue());
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
} }
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/dao/ibatis/ApplyLogDaoImpl.java
View file @ 6abd8ed6
package com.mortals.xhx.module.record.dao.ibatis; package com.mortals.xhx.module.record.dao.ibatis;
import com.mortals.framework.util.EntityUtil;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.record.dao.ApplyLogDao; import com.mortals.xhx.module.record.dao.ApplyLogDao;
import com.mortals.xhx.module.record.model.ApplyLogEntity; import com.mortals.xhx.module.record.model.ApplyLogEntity;
import java.util.Date; import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis; import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 证照申请DaoImpl DAO接口 * 证照申请DaoImpl DAO接口
* *
...@@ -16,6 +21,19 @@ import java.util.List; ...@@ -16,6 +21,19 @@ import java.util.List;
@Repository("applyLogDao") @Repository("applyLogDao")
public class ApplyLogDaoImpl extends BaseCRUDDaoMybatis<ApplyLogEntity,Long> implements ApplyLogDao { public class ApplyLogDaoImpl extends BaseCRUDDaoMybatis<ApplyLogEntity,Long> implements ApplyLogDao {
@Override
public int update(ApplyLogEntity entity) {
Map<String,Object> data = new HashMap();
EntityUtil.entityToMap(entity, data);
Map condition = new HashMap();
condition.put(this.getPrimaryKeyLabel(), entity.getId());
if(entity.getValidityStart()==null){
data.put("validityStart",null);
}
if(entity.getValidityEnd()==null){
data.put("validityEnd",null);
}
return this.update((Map)data, (Map)condition);
}
} }
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java
View file @ 6abd8ed6
...@@ -11,11 +11,11 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -11,11 +11,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.ApplyLogVo; import com.mortals.xhx.module.record.model.vo.ApplyLogVo;
import lombok.Data; import lombok.Data;
/** /**
* 证照申请实体对象 * 证照申请实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-07-31
*/ */
@Data @Data
public class ApplyLogEntity extends ApplyLogVo { public class ApplyLogEntity extends ApplyLogVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -152,6 +152,14 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -152,6 +152,14 @@ public class ApplyLogEntity extends ApplyLogVo {
* 制证机关 * 制证机关
*/ */
private String authority; private String authority;
/**
* 附件名称
*/
private String annexName;
/**
* 附件地址
*/
private String annexUrl;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -202,5 +210,7 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -202,5 +210,7 @@ public class ApplyLogEntity extends ApplyLogVo {
this.businessPlace = ""; this.businessPlace = "";
this.licenseProject = ""; this.licenseProject = "";
this.authority = ""; this.authority = "";
this.annexName = "";
this.annexUrl = "";
} }
} }
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogQuery.java
View file @ 6abd8ed6
...@@ -4,11 +4,11 @@ import java.util.Date; ...@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.record.model.ApplyLogEntity; import com.mortals.xhx.module.record.model.ApplyLogEntity;
/** /**
* 证照申请查询对象 * 证照申请查询对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-07-31
*/ */
public class ApplyLogQuery extends ApplyLogEntity { public class ApplyLogQuery extends ApplyLogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -315,6 +315,16 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -315,6 +315,16 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 制证机关排除列表 */ /** 制证机关排除列表 */
private List <String> authorityNotList; private List <String> authorityNotList;
/** 附件名称 */
private List<String> annexNameList;
/** 附件名称排除列表 */
private List <String> annexNameNotList;
/** 附件地址 */
private List<String> annexUrlList;
/** 附件地址排除列表 */
private List <String> annexUrlNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<ApplyLogQuery> orConditionList; private List<ApplyLogQuery> orConditionList;
...@@ -2078,6 +2088,70 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -2078,6 +2088,70 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.authorityNotList = authorityNotList; this.authorityNotList = authorityNotList;
} }
/**
* 获取 附件名称
* @return annexNameList
*/
public List<String> getAnnexNameList(){
return this.annexNameList;
}
/**
* 设置 附件名称
* @param annexNameList
*/
public void setAnnexNameList(List<String> annexNameList){
this.annexNameList = annexNameList;
}
/**
* 获取 附件名称
* @return annexNameNotList
*/
public List<String> getAnnexNameNotList(){
return this.annexNameNotList;
}
/**
* 设置 附件名称
* @param annexNameNotList
*/
public void setAnnexNameNotList(List<String> annexNameNotList){
this.annexNameNotList = annexNameNotList;
}
/**
* 获取 附件地址
* @return annexUrlList
*/
public List<String> getAnnexUrlList(){
return this.annexUrlList;
}
/**
* 设置 附件地址
* @param annexUrlList
*/
public void setAnnexUrlList(List<String> annexUrlList){
this.annexUrlList = annexUrlList;
}
/**
* 获取 附件地址
* @return annexUrlNotList
*/
public List<String> getAnnexUrlNotList(){
return this.annexUrlNotList;
}
/**
* 设置 附件地址
* @param annexUrlNotList
*/
public void setAnnexUrlNotList(List<String> annexUrlNotList){
this.annexUrlNotList = annexUrlNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -3095,6 +3169,44 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -3095,6 +3169,44 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 附件名称
* @param annexName
*/
public ApplyLogQuery annexName(String annexName){
setAnnexName(annexName);
return this;
}
/**
* 设置 附件名称
* @param annexNameList
*/
public ApplyLogQuery annexNameList(List<String> annexNameList){
this.annexNameList = annexNameList;
return this;
}
/**
* 设置 附件地址
* @param annexUrl
*/
public ApplyLogQuery annexUrl(String annexUrl){
setAnnexUrl(annexUrl);
return this;
}
/**
* 设置 附件地址
* @param annexUrlList
*/
public ApplyLogQuery annexUrlList(List<String> annexUrlList){
this.annexUrlList = annexUrlList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogEntity.java
View file @ 6abd8ed6
package com.mortals.xhx.module.record.model; package com.mortals.xhx.module.record.model;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -10,11 +11,11 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -10,11 +11,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.RetainLogVo; import com.mortals.xhx.module.record.model.vo.RetainLogVo;
import lombok.Data; import lombok.Data;
/** /**
* 证照持有实体对象 * 证照持有实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-08-01
*/ */
@Data @Data
public class RetainLogEntity extends RetainLogVo { public class RetainLogEntity extends RetainLogVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -103,6 +104,46 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -103,6 +104,46 @@ public class RetainLogEntity extends RetainLogVo {
* 制证机关 * 制证机关
*/ */
private String authority; private String authority;
/**
* 颁发时间
*/
private Date issueTime;
/**
* 附件名称
*/
private String annexName;
/**
* 附件地址
*/
private String annexUrl;
/**
* 有效期起始
*/
private Date validityStart;
/**
* 有效期截止
*/
private Date validityEnd;
/**
* 持有者类型，1：自然人，2：法人，3：自然人法人
*/
private Integer holderType;
/**
* 持有者证件类型，1：身份证，2：组织机构代码等
*/
private Integer holderIdType;
/**
* 专网ID
*/
private String privateID;
/**
* 申请ID
*/
private Long applyId;
/**
* 打印次数
*/
private Integer total;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -141,5 +182,15 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -141,5 +182,15 @@ public class RetainLogEntity extends RetainLogVo {
this.businessPlace = ""; this.businessPlace = "";
this.licenseProject = ""; this.licenseProject = "";
this.authority = ""; this.authority = "";
this.issueTime = null;
this.annexName = "";
this.annexUrl = "";
this.validityStart = null;
this.validityEnd = null;
this.holderType = 1;
this.holderIdType = 1;
this.privateID = "";
this.applyId = null;
this.total = 1;
} }
} }
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogQuery.java
View file @ 6abd8ed6
package com.mortals.xhx.module.record.model; package com.mortals.xhx.module.record.model;
import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.record.model.RetainLogEntity; import com.mortals.xhx.module.record.model.RetainLogEntity;
/** /**
* 证照持有查询对象 * 证照持有查询对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-08-01
*/ */
public class RetainLogQuery extends RetainLogEntity { public class RetainLogQuery extends RetainLogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -211,6 +212,99 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -211,6 +212,99 @@ public class RetainLogQuery extends RetainLogEntity {
/** 制证机关排除列表 */ /** 制证机关排除列表 */
private List <String> authorityNotList; private List <String> authorityNotList;
/** 开始 颁发时间 */
private String issueTimeStart;
/** 结束 颁发时间 */
private String issueTimeEnd;
/** 附件名称 */
private List<String> annexNameList;
/** 附件名称排除列表 */
private List <String> annexNameNotList;
/** 附件地址 */
private List<String> annexUrlList;
/** 附件地址排除列表 */
private List <String> annexUrlNotList;
/** 开始 有效期起始 */
private String validityStartStart;
/** 结束 有效期起始 */
private String validityStartEnd;
/** 开始 有效期截止 */
private String validityEndStart;
/** 结束 有效期截止 */
private String validityEndEnd;
/** 开始 持有者类型，1：自然人，2：法人，3：自然人法人 */
private Integer holderTypeStart;
/** 结束 持有者类型，1：自然人，2：法人，3：自然人法人 */
private Integer holderTypeEnd;
/** 增加 持有者类型，1：自然人，2：法人，3：自然人法人 */
private Integer holderTypeIncrement;
/** 持有者类型，1：自然人，2：法人，3：自然人法人列表 */
private List <Integer> holderTypeList;
/** 持有者类型，1：自然人，2：法人，3：自然人法人排除列表 */
private List <Integer> holderTypeNotList;
/** 开始 持有者证件类型，1：身份证，2：组织机构代码等 */
private Integer holderIdTypeStart;
/** 结束 持有者证件类型，1：身份证，2：组织机构代码等 */
private Integer holderIdTypeEnd;
/** 增加 持有者证件类型，1：身份证，2：组织机构代码等 */
private Integer holderIdTypeIncrement;
/** 持有者证件类型，1：身份证，2：组织机构代码等列表 */
private List <Integer> holderIdTypeList;
/** 持有者证件类型，1：身份证，2：组织机构代码等排除列表 */
private List <Integer> holderIdTypeNotList;
/** 专网ID */
private List<String> privateIDList;
/** 专网ID排除列表 */
private List <String> privateIDNotList;
/** 开始 申请ID */
private Long applyIdStart;
/** 结束 申请ID */
private Long applyIdEnd;
/** 增加 申请ID */
private Long applyIdIncrement;
/** 申请ID列表 */
private List <Long> applyIdList;
/** 申请ID排除列表 */
private List <Long> applyIdNotList;
/** 开始 打印次数 */
private Integer totalStart;
/** 结束 打印次数 */
private Integer totalEnd;
/** 增加 打印次数 */
private Integer totalIncrement;
/** 打印次数列表 */
private List <Integer> totalList;
/** 打印次数排除列表 */
private List <Integer> totalNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<RetainLogQuery> orConditionList; private List<RetainLogQuery> orConditionList;
...@@ -1394,6 +1488,522 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -1394,6 +1488,522 @@ public class RetainLogQuery extends RetainLogEntity {
this.authorityNotList = authorityNotList; this.authorityNotList = authorityNotList;
} }
/**
* 获取 开始 颁发时间
* @return issueTimeStart
*/
public String getIssueTimeStart(){
return this.issueTimeStart;
}
/**
* 设置 开始 颁发时间
* @param issueTimeStart
*/
public void setIssueTimeStart(String issueTimeStart){
this.issueTimeStart = issueTimeStart;
}
/**
* 获取 结束 颁发时间
* @return issueTimeEnd
*/
public String getIssueTimeEnd(){
return this.issueTimeEnd;
}
/**
* 设置 结束 颁发时间
* @param issueTimeEnd
*/
public void setIssueTimeEnd(String issueTimeEnd){
this.issueTimeEnd = issueTimeEnd;
}
/**
* 获取 附件名称
* @return annexNameList
*/
public List<String> getAnnexNameList(){
return this.annexNameList;
}
/**
* 设置 附件名称
* @param annexNameList
*/
public void setAnnexNameList(List<String> annexNameList){
this.annexNameList = annexNameList;
}
/**
* 获取 附件名称
* @return annexNameNotList
*/
public List<String> getAnnexNameNotList(){
return this.annexNameNotList;
}
/**
* 设置 附件名称
* @param annexNameNotList
*/
public void setAnnexNameNotList(List<String> annexNameNotList){
this.annexNameNotList = annexNameNotList;
}
/**
* 获取 附件地址
* @return annexUrlList
*/
public List<String> getAnnexUrlList(){
return this.annexUrlList;
}
/**
* 设置 附件地址
* @param annexUrlList
*/
public void setAnnexUrlList(List<String> annexUrlList){
this.annexUrlList = annexUrlList;
}
/**
* 获取 附件地址
* @return annexUrlNotList
*/
public List<String> getAnnexUrlNotList(){
return this.annexUrlNotList;
}
/**
* 设置 附件地址
* @param annexUrlNotList
*/
public void setAnnexUrlNotList(List<String> annexUrlNotList){
this.annexUrlNotList = annexUrlNotList;
}
/**
* 获取 开始 有效期起始
* @return validityStartStart
*/
public String getValidityStartStart(){
return this.validityStartStart;
}
/**
* 设置 开始 有效期起始
* @param validityStartStart
*/
public void setValidityStartStart(String validityStartStart){
this.validityStartStart = validityStartStart;
}
/**
* 获取 结束 有效期起始
* @return validityStartEnd
*/
public String getValidityStartEnd(){
return this.validityStartEnd;
}
/**
* 设置 结束 有效期起始
* @param validityStartEnd
*/
public void setValidityStartEnd(String validityStartEnd){
this.validityStartEnd = validityStartEnd;
}
/**
* 获取 开始 有效期截止
* @return validityEndStart
*/
public String getValidityEndStart(){
return this.validityEndStart;
}
/**
* 设置 开始 有效期截止
* @param validityEndStart
*/
public void setValidityEndStart(String validityEndStart){
this.validityEndStart = validityEndStart;
}
/**
* 获取 结束 有效期截止
* @return validityEndEnd
*/
public String getValidityEndEnd(){
return this.validityEndEnd;
}
/**
* 设置 结束 有效期截止
* @param validityEndEnd
*/
public void setValidityEndEnd(String validityEndEnd){
this.validityEndEnd = validityEndEnd;
}
/**
* 获取 开始 持有者类型，1：自然人，2：法人，3：自然人法人
* @return holderTypeStart
*/
public Integer getHolderTypeStart(){
return this.holderTypeStart;
}
/**
* 设置 开始 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderTypeStart
*/
public void setHolderTypeStart(Integer holderTypeStart){
this.holderTypeStart = holderTypeStart;
}
/**
* 获取 结束 持有者类型，1：自然人，2：法人，3：自然人法人
* @return $holderTypeEnd
*/
public Integer getHolderTypeEnd(){
return this.holderTypeEnd;
}
/**
* 设置 结束 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderTypeEnd
*/
public void setHolderTypeEnd(Integer holderTypeEnd){
this.holderTypeEnd = holderTypeEnd;
}
/**
* 获取 增加 持有者类型，1：自然人，2：法人，3：自然人法人
* @return holderTypeIncrement
*/
public Integer getHolderTypeIncrement(){
return this.holderTypeIncrement;
}
/**
* 设置 增加 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderTypeIncrement
*/
public void setHolderTypeIncrement(Integer holderTypeIncrement){
this.holderTypeIncrement = holderTypeIncrement;
}
/**
* 获取 持有者类型，1：自然人，2：法人，3：自然人法人
* @return holderTypeList
*/
public List<Integer> getHolderTypeList(){
return this.holderTypeList;
}
/**
* 设置 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderTypeList
*/
public void setHolderTypeList(List<Integer> holderTypeList){
this.holderTypeList = holderTypeList;
}
/**
* 获取 持有者类型，1：自然人，2：法人，3：自然人法人
* @return holderTypeNotList
*/
public List<Integer> getHolderTypeNotList(){
return this.holderTypeNotList;
}
/**
* 设置 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderTypeNotList
*/
public void setHolderTypeNotList(List<Integer> holderTypeNotList){
this.holderTypeNotList = holderTypeNotList;
}
/**
* 获取 开始 持有者证件类型，1：身份证，2：组织机构代码等
* @return holderIdTypeStart
*/
public Integer getHolderIdTypeStart(){
return this.holderIdTypeStart;
}
/**
* 设置 开始 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdTypeStart
*/
public void setHolderIdTypeStart(Integer holderIdTypeStart){
this.holderIdTypeStart = holderIdTypeStart;
}
/**
* 获取 结束 持有者证件类型，1：身份证，2：组织机构代码等
* @return $holderIdTypeEnd
*/
public Integer getHolderIdTypeEnd(){
return this.holderIdTypeEnd;
}
/**
* 设置 结束 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdTypeEnd
*/
public void setHolderIdTypeEnd(Integer holderIdTypeEnd){
this.holderIdTypeEnd = holderIdTypeEnd;
}
/**
* 获取 增加 持有者证件类型，1：身份证，2：组织机构代码等
* @return holderIdTypeIncrement
*/
public Integer getHolderIdTypeIncrement(){
return this.holderIdTypeIncrement;
}
/**
* 设置 增加 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdTypeIncrement
*/
public void setHolderIdTypeIncrement(Integer holderIdTypeIncrement){
this.holderIdTypeIncrement = holderIdTypeIncrement;
}
/**
* 获取 持有者证件类型，1：身份证，2：组织机构代码等
* @return holderIdTypeList
*/
public List<Integer> getHolderIdTypeList(){
return this.holderIdTypeList;
}
/**
* 设置 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdTypeList
*/
public void setHolderIdTypeList(List<Integer> holderIdTypeList){
this.holderIdTypeList = holderIdTypeList;
}
/**
* 获取 持有者证件类型，1：身份证，2：组织机构代码等
* @return holderIdTypeNotList
*/
public List<Integer> getHolderIdTypeNotList(){
return this.holderIdTypeNotList;
}
/**
* 设置 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdTypeNotList
*/
public void setHolderIdTypeNotList(List<Integer> holderIdTypeNotList){
this.holderIdTypeNotList = holderIdTypeNotList;
}
/**
* 获取 专网ID
* @return privateIDList
*/
public List<String> getPrivateIDList(){
return this.privateIDList;
}
/**
* 设置 专网ID
* @param privateIDList
*/
public void setPrivateIDList(List<String> privateIDList){
this.privateIDList = privateIDList;
}
/**
* 获取 专网ID
* @return privateIDNotList
*/
public List<String> getPrivateIDNotList(){
return this.privateIDNotList;
}
/**
* 设置 专网ID
* @param privateIDNotList
*/
public void setPrivateIDNotList(List<String> privateIDNotList){
this.privateIDNotList = privateIDNotList;
}
/**
* 获取 开始 申请ID
* @return applyIdStart
*/
public Long getApplyIdStart(){
return this.applyIdStart;
}
/**
* 设置 开始 申请ID
* @param applyIdStart
*/
public void setApplyIdStart(Long applyIdStart){
this.applyIdStart = applyIdStart;
}
/**
* 获取 结束 申请ID
* @return $applyIdEnd
*/
public Long getApplyIdEnd(){
return this.applyIdEnd;
}
/**
* 设置 结束 申请ID
* @param applyIdEnd
*/
public void setApplyIdEnd(Long applyIdEnd){
this.applyIdEnd = applyIdEnd;
}
/**
* 获取 增加 申请ID
* @return applyIdIncrement
*/
public Long getApplyIdIncrement(){
return this.applyIdIncrement;
}
/**
* 设置 增加 申请ID
* @param applyIdIncrement
*/
public void setApplyIdIncrement(Long applyIdIncrement){
this.applyIdIncrement = applyIdIncrement;
}
/**
* 获取 申请ID
* @return applyIdList
*/
public List<Long> getApplyIdList(){
return this.applyIdList;
}
/**
* 设置 申请ID
* @param applyIdList
*/
public void setApplyIdList(List<Long> applyIdList){
this.applyIdList = applyIdList;
}
/**
* 获取 申请ID
* @return applyIdNotList
*/
public List<Long> getApplyIdNotList(){
return this.applyIdNotList;
}
/**
* 设置 申请ID
* @param applyIdNotList
*/
public void setApplyIdNotList(List<Long> applyIdNotList){
this.applyIdNotList = applyIdNotList;
}
/**
* 获取 开始 打印次数
* @return totalStart
*/
public Integer getTotalStart(){
return this.totalStart;
}
/**
* 设置 开始 打印次数
* @param totalStart
*/
public void setTotalStart(Integer totalStart){
this.totalStart = totalStart;
}
/**
* 获取 结束 打印次数
* @return $totalEnd
*/
public Integer getTotalEnd(){
return this.totalEnd;
}
/**
* 设置 结束 打印次数
* @param totalEnd
*/
public void setTotalEnd(Integer totalEnd){
this.totalEnd = totalEnd;
}
/**
* 获取 增加 打印次数
* @return totalIncrement
*/
public Integer getTotalIncrement(){
return this.totalIncrement;
}
/**
* 设置 增加 打印次数
* @param totalIncrement
*/
public void setTotalIncrement(Integer totalIncrement){
this.totalIncrement = totalIncrement;
}
/**
* 获取 打印次数
* @return totalList
*/
public List<Integer> getTotalList(){
return this.totalList;
}
/**
* 设置 打印次数
* @param totalList
*/
public void setTotalList(List<Integer> totalList){
this.totalList = totalList;
}
/**
* 获取 打印次数
* @return totalNotList
*/
public List<Integer> getTotalNotList(){
return this.totalNotList;
}
/**
* 设置 打印次数
* @param totalNotList
*/
public void setTotalNotList(List<Integer> totalNotList){
this.totalNotList = totalNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2097,6 +2707,282 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -2097,6 +2707,282 @@ public class RetainLogQuery extends RetainLogEntity {
return this; return this;
} }
/**
* 设置 附件名称
* @param annexName
*/
public RetainLogQuery annexName(String annexName){
setAnnexName(annexName);
return this;
}
/**
* 设置 附件名称
* @param annexNameList
*/
public RetainLogQuery annexNameList(List<String> annexNameList){
this.annexNameList = annexNameList;
return this;
}
/**
* 设置 附件地址
* @param annexUrl
*/
public RetainLogQuery annexUrl(String annexUrl){
setAnnexUrl(annexUrl);
return this;
}
/**
* 设置 附件地址
* @param annexUrlList
*/
public RetainLogQuery annexUrlList(List<String> annexUrlList){
this.annexUrlList = annexUrlList;
return this;
}
/**
* 设置 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderType
*/
public RetainLogQuery holderType(Integer holderType){
setHolderType(holderType);
return this;
}
/**
* 设置 开始 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderTypeStart
*/
public RetainLogQuery holderTypeStart(Integer holderTypeStart){
this.holderTypeStart = holderTypeStart;
return this;
}
/**
* 设置 结束 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderTypeEnd
*/
public RetainLogQuery holderTypeEnd(Integer holderTypeEnd){
this.holderTypeEnd = holderTypeEnd;
return this;
}
/**
* 设置 增加 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderTypeIncrement
*/
public RetainLogQuery holderTypeIncrement(Integer holderTypeIncrement){
this.holderTypeIncrement = holderTypeIncrement;
return this;
}
/**
* 设置 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderTypeList
*/
public RetainLogQuery holderTypeList(List<Integer> holderTypeList){
this.holderTypeList = holderTypeList;
return this;
}
/**
* 设置 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderTypeNotList
*/
public RetainLogQuery holderTypeNotList(List<Integer> holderTypeNotList){
this.holderTypeNotList = holderTypeNotList;
return this;
}
/**
* 设置 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdType
*/
public RetainLogQuery holderIdType(Integer holderIdType){
setHolderIdType(holderIdType);
return this;
}
/**
* 设置 开始 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdTypeStart
*/
public RetainLogQuery holderIdTypeStart(Integer holderIdTypeStart){
this.holderIdTypeStart = holderIdTypeStart;
return this;
}
/**
* 设置 结束 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdTypeEnd
*/
public RetainLogQuery holderIdTypeEnd(Integer holderIdTypeEnd){
this.holderIdTypeEnd = holderIdTypeEnd;
return this;
}
/**
* 设置 增加 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdTypeIncrement
*/
public RetainLogQuery holderIdTypeIncrement(Integer holderIdTypeIncrement){
this.holderIdTypeIncrement = holderIdTypeIncrement;
return this;
}
/**
* 设置 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdTypeList
*/
public RetainLogQuery holderIdTypeList(List<Integer> holderIdTypeList){
this.holderIdTypeList = holderIdTypeList;
return this;
}
/**
* 设置 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdTypeNotList
*/
public RetainLogQuery holderIdTypeNotList(List<Integer> holderIdTypeNotList){
this.holderIdTypeNotList = holderIdTypeNotList;
return this;
}
/**
* 设置 专网ID
* @param privateID
*/
public RetainLogQuery privateID(String privateID){
setPrivateID(privateID);
return this;
}
/**
* 设置 专网ID
* @param privateIDList
*/
public RetainLogQuery privateIDList(List<String> privateIDList){
this.privateIDList = privateIDList;
return this;
}
/**
* 设置 申请ID
* @param applyId
*/
public RetainLogQuery applyId(Long applyId){
setApplyId(applyId);
return this;
}
/**
* 设置 开始 申请ID
* @param applyIdStart
*/
public RetainLogQuery applyIdStart(Long applyIdStart){
this.applyIdStart = applyIdStart;
return this;
}
/**
* 设置 结束 申请ID
* @param applyIdEnd
*/
public RetainLogQuery applyIdEnd(Long applyIdEnd){
this.applyIdEnd = applyIdEnd;
return this;
}
/**
* 设置 增加 申请ID
* @param applyIdIncrement
*/
public RetainLogQuery applyIdIncrement(Long applyIdIncrement){
this.applyIdIncrement = applyIdIncrement;
return this;
}
/**
* 设置 申请ID
* @param applyIdList
*/
public RetainLogQuery applyIdList(List<Long> applyIdList){
this.applyIdList = applyIdList;
return this;
}
/**
* 设置 申请ID
* @param applyIdNotList
*/
public RetainLogQuery applyIdNotList(List<Long> applyIdNotList){
this.applyIdNotList = applyIdNotList;
return this;
}
/**
* 设置 打印次数
* @param total
*/
public RetainLogQuery total(Integer total){
setTotal(total);
return this;
}
/**
* 设置 开始 打印次数
* @param totalStart
*/
public RetainLogQuery totalStart(Integer totalStart){
this.totalStart = totalStart;
return this;
}
/**
* 设置 结束 打印次数
* @param totalEnd
*/
public RetainLogQuery totalEnd(Integer totalEnd){
this.totalEnd = totalEnd;
return this;
}
/**
* 设置 增加 打印次数
* @param totalIncrement
*/
public RetainLogQuery totalIncrement(Integer totalIncrement){
this.totalIncrement = totalIncrement;
return this;
}
/**
* 设置 打印次数
* @param totalList
*/
public RetainLogQuery totalList(List<Integer> totalList){
this.totalList = totalList;
return this;
}
/**
* 设置 打印次数
* @param totalNotList
*/
public RetainLogQuery totalNotList(List<Integer> totalNotList){
this.totalNotList = totalNotList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/RetainLogVo.java
View file @ 6abd8ed6
...@@ -17,4 +17,6 @@ import java.util.List; ...@@ -17,4 +17,6 @@ import java.util.List;
public class RetainLogVo extends BaseEntityLong { public class RetainLogVo extends BaseEntityLong {
/** 查询条件 */ /** 查询条件 */
private String query; private String query;
/** 子证联报状态 已联报数/子证总数 */
private String processStatus;
} }
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java
View file @ 6abd8ed6
...@@ -29,6 +29,7 @@ import com.mortals.xhx.module.certificate.pdu.ApplyLogPdu; ...@@ -29,6 +29,7 @@ import com.mortals.xhx.module.certificate.pdu.ApplyLogPdu;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService; import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.certificate.service.CertificateClassifyService; import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
import com.mortals.xhx.module.certificate.service.CertificateDocumentService; import com.mortals.xhx.module.certificate.service.CertificateDocumentService;
import com.mortals.xhx.module.certificate.service.CertificateIndustryService;
import com.mortals.xhx.module.child.model.ChildLicenseEntity; import com.mortals.xhx.module.child.model.ChildLicenseEntity;
import com.mortals.xhx.module.child.model.ChildLicenseQuery; import com.mortals.xhx.module.child.model.ChildLicenseQuery;
import com.mortals.xhx.module.child.service.ChildLicenseService; import com.mortals.xhx.module.child.service.ChildLicenseService;
...@@ -89,6 +90,8 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -89,6 +90,8 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
private UserService userService; private UserService userService;
@Autowired @Autowired
private ChildLicenseService childLicenseService; private ChildLicenseService childLicenseService;
@Autowired
private CertificateIndustryService certificateIndustryService;
@Override @Override
protected void removeAfter(Long[] ids, Context context,int result) throws AppException { protected void removeAfter(Long[] ids, Context context,int result) throws AppException {
...@@ -184,10 +187,18 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -184,10 +187,18 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
// if(StringUtils.isEmpty(entity.getAuthority())){ // if(StringUtils.isEmpty(entity.getAuthority())){
// throw new AppException("制证机关不能为空"); // throw new AppException("制证机关不能为空");
// } // }
if(StringUtils.isEmpty(entity.getSocialCode())){ if(entity.getId()==null) {
entity.setSocialCode(DateUtils.getCurrDateTime("yyyyMMddHHmmss")+RandomUtil.randomNumbers(4)); if (StringUtils.isEmpty(entity.getSocialCode())) {
entity.setSocialCode(DateUtils.getCurrDateTime("yyyyMMddHHmmss") + RandomUtil.randomNumbers(4));
//throw new AppException("统一社会信用代码不能为空"); //throw new AppException("统一社会信用代码不能为空");
} }
ApplyLogEntity temp = this.selectOne(new ApplyLogQuery().socialCode(entity.getSocialCode()).recordStatus(YesNoEnum.NO.getValue()));
if (temp != null) {
throw new AppException("统一社会信用代码重复");
}
}else {
entity.setSocialCode(null);
}
// if(StringUtils.isEmpty(entity.getLicenseProject())){ // if(StringUtils.isEmpty(entity.getLicenseProject())){
// throw new AppException("许可项目不能为空"); // throw new AppException("许可项目不能为空");
// } // }
...@@ -216,9 +227,12 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -216,9 +227,12 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
// formContentJson.put("i_14_制证机关",applyLogEntity.getAuthority()); // formContentJson.put("i_14_制证机关",applyLogEntity.getAuthority());
formContentJson.put("@qrcode_1_二维码",applyLogEntity.getSocialCode()); formContentJson.put("@qrcode_1_二维码",applyLogEntity.getSocialCode());
if(CollectionUtils.isNotEmpty(applyLogEntity.getChildCertificate())){ if(CollectionUtils.isNotEmpty(applyLogEntity.getChildCertificate())){
int index = 1;
for(int i = 0;i<applyLogEntity.getChildCertificate().size();i++){ for(int i = 0;i<applyLogEntity.getChildCertificate().size();i++){
int index = i+1; if(applyLogEntity.getChildCertificate().get(i).getStatus()==1) {
formContentJson.put("i_"+ index +"_子证",applyLogEntity.getChildCertificate().get(i).getShortName()); formContentJson.put("i_" + index + "_子证", applyLogEntity.getChildCertificate().get(i).getShortName());
index++;
}
} }
} }
applyLogEntity.setFormContent(formContentJson.toJSONString()); applyLogEntity.setFormContent(formContentJson.toJSONString());
...@@ -235,6 +249,8 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -235,6 +249,8 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
applyLogEntity.setCatalogCode(catalog.getCatalogCode()); applyLogEntity.setCatalogCode(catalog.getCatalogCode());
applyLogEntity.setCatalogName(catalog.getCatalogName()); applyLogEntity.setCatalogName(catalog.getCatalogName());
applyLogEntity.setFormTemplate(catalog.getFormContent()); applyLogEntity.setFormTemplate(catalog.getFormContent());
CertificateIndustryEntity industryEntity = certificateIndustryService.get(catalog.getIndustryId());
applyLogEntity.setIndustryName(industryEntity==null?"":industryEntity.getIndustryName());
DocTemplateVO docTemplate = new DocTemplateVO(catalog.getTemplateFileUrl(),applyLogEntity.getFormContent()); DocTemplateVO docTemplate = new DocTemplateVO(catalog.getTemplateFileUrl(),applyLogEntity.getFormContent());
try { try {
String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/"; String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
...@@ -430,7 +446,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -430,7 +446,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
log.info("Image path: " + imagepath); log.info("Image path: " + imagepath);
try { try {
PictureRenderData pictureRenderData = Pictures.ofStream(new FileInputStream(imagepath), PictureType.JPEG) PictureRenderData pictureRenderData = Pictures.ofStream(new FileInputStream(imagepath), PictureType.JPEG)
.size(100, 120).create(); .size(120, 120).create();
addMap.put(StrUtil.removePrefixIgnoreCase(entry.getKey(),"@"),pictureRenderData); addMap.put(StrUtil.removePrefixIgnoreCase(entry.getKey(),"@"),pictureRenderData);
//entry.setValue(pictureRenderData); //entry.setValue(pictureRenderData);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java
View file @ 6abd8ed6
...@@ -19,7 +19,9 @@ import com.mortals.xhx.module.record.dao.PrintLogDao; ...@@ -19,7 +19,9 @@ import com.mortals.xhx.module.record.dao.PrintLogDao;
import com.mortals.xhx.module.record.dao.PrintWaitQueueDao; import com.mortals.xhx.module.record.dao.PrintWaitQueueDao;
import com.mortals.xhx.module.record.dao.RetainLogDao; import com.mortals.xhx.module.record.dao.RetainLogDao;
import com.mortals.xhx.module.record.model.*; import com.mortals.xhx.module.record.model.*;
import com.mortals.xhx.module.record.service.ApplyLogService;
import com.mortals.xhx.module.record.service.PrintWaitQueueService; import com.mortals.xhx.module.record.service.PrintWaitQueueService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -58,6 +60,8 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait ...@@ -58,6 +60,8 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
private CertificateClassifyService certificateClassifyService; private CertificateClassifyService certificateClassifyService;
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private ApplyLogService applyLogService;
@Override @Override
protected void findAfter(PrintWaitQueueEntity entity, Context context, List<PrintWaitQueueEntity> list) throws AppException { protected void findAfter(PrintWaitQueueEntity entity, Context context, List<PrintWaitQueueEntity> list) throws AppException {
...@@ -153,17 +157,10 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait ...@@ -153,17 +157,10 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
} }
private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity){ private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity){
RetainLogEntity retainLogEntity = new RetainLogEntity();
Date now = new Date();
BeanUtils.copyProperties(waitQueueEntity, retainLogEntity, BeanUtil.getNullPropertyNames(waitQueueEntity));
retainLogEntity.setId(null);
retainLogEntity.setUpdateUserId(null);
retainLogEntity.setUpdateTime(null);
retainLogEntity.setCertificateStatus(CertificateStatus.NORMAL.getValue()); ApplyLogEntity applyLogEntity = applyLogService.get(waitQueueEntity.getApplyId());
Date now = new Date();
retainLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId());
retainLogEntity.setCreateTime(now);
PrintLogEntity printLogEntity = new PrintLogEntity(); PrintLogEntity printLogEntity = new PrintLogEntity();
BeanUtils.copyProperties(waitQueueEntity, printLogEntity, BeanUtil.getNullPropertyNames(waitQueueEntity)); BeanUtils.copyProperties(waitQueueEntity, printLogEntity, BeanUtil.getNullPropertyNames(waitQueueEntity));
...@@ -175,7 +172,28 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait ...@@ -175,7 +172,28 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
printLogEntity.setCreateTime(now); printLogEntity.setCreateTime(now);
printLogEntity.setPrintStatus(PrintStatus.SUCCESS.getValue()); printLogEntity.setPrintStatus(PrintStatus.SUCCESS.getValue());
printLogEntity.setStatusRemark(PrintStatus.SUCCESS.getDesc()); printLogEntity.setStatusRemark(PrintStatus.SUCCESS.getDesc());
RetainLogEntity retainLogquery = new RetainLogEntity();
retainLogquery.setApplyId(waitQueueEntity.getApplyId());
List<RetainLogEntity> tempRetainLogList = retainLogDao.getList(retainLogquery);
if(CollectionUtils.isNotEmpty(tempRetainLogList)){
RetainLogQuery updateRetainLog = new RetainLogQuery();
updateRetainLog.setUpdateTime(now);
updateRetainLog.setId(tempRetainLogList.get(0).getId());
updateRetainLog.setTotalIncrement(1);
retainLogDao.update(updateRetainLog);
}else {
RetainLogEntity retainLogEntity = new RetainLogEntity();
BeanUtils.copyProperties(applyLogEntity, retainLogEntity, BeanUtil.getNullPropertyNames(applyLogEntity));
retainLogEntity.setId(null);
retainLogEntity.setUpdateUserId(null);
retainLogEntity.setUpdateTime(null);
retainLogEntity.setCertificateStatus(CertificateStatus.NORMAL.getValue());
retainLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId());
retainLogEntity.setCreateTime(now);
retainLogDao.insert(retainLogEntity); retainLogDao.insert(retainLogEntity);
}
printLogDao.insert(printLogEntity); printLogDao.insert(printLogEntity);
CertificateCatalogEntity catalogEntity = certificateCatalogService.get(waitQueueEntity.getCatalogId()); CertificateCatalogEntity catalogEntity = certificateCatalogService.get(waitQueueEntity.getCatalogId());
CertificateClassifyQuery query = new CertificateClassifyQuery(); CertificateClassifyQuery query = new CertificateClassifyQuery();
...@@ -183,7 +201,13 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait ...@@ -183,7 +201,13 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
query.setTotalIncrement(1); query.setTotalIncrement(1);
query.setUpdateTime(now); query.setUpdateTime(now);
certificateClassifyService.update(query); certificateClassifyService.update(query);
ApplyLogEntity updateApply = new ApplyLogEntity();
updateApply.setId(applyLogEntity.getId());
updateApply.setCertificateCode(applyLogEntity.getCertificateCode());
updateApply.setEnterpriseName(applyLogEntity.getEnterpriseName());
updateApply.setCatalogId(applyLogEntity.getCatalogId());
updateApply.setRecordStatus(YesNoEnum.YES.getValue());
updateApply.setUpdateTime(new Date());
applyLogService.update(updateApply);
} }
} }
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/RetainLogServiceImpl.java
View file @ 6abd8ed6
...@@ -4,12 +4,22 @@ import com.mortals.framework.exception.AppException; ...@@ -4,12 +4,22 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.common.code.ProcessStatusEnum;
import com.mortals.xhx.common.code.StatusEnum;
import com.mortals.xhx.common.utils.StringUtils; import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.certificate.model.CertificateDocumentEntity;
import com.mortals.xhx.module.certificate.model.vo.CertificateDocumentPdu;
import com.mortals.xhx.module.child.model.ChildLicenseEntity;
import com.mortals.xhx.module.child.model.ChildLicenseQuery;
import com.mortals.xhx.module.child.service.ChildLicenseService;
import com.mortals.xhx.module.record.dao.RetainLogDao; import com.mortals.xhx.module.record.dao.RetainLogDao;
import com.mortals.xhx.module.record.model.ApplyLogEntity;
import com.mortals.xhx.module.record.model.RetainLogEntity; import com.mortals.xhx.module.record.model.RetainLogEntity;
import com.mortals.xhx.module.record.model.RetainLogQuery; import com.mortals.xhx.module.record.model.RetainLogQuery;
import com.mortals.xhx.module.record.service.RetainLogService; import com.mortals.xhx.module.record.service.RetainLogService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -25,6 +35,9 @@ import java.util.List; ...@@ -25,6 +35,9 @@ import java.util.List;
@Service("retainLogService") @Service("retainLogService")
public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao, RetainLogEntity, Long> implements RetainLogService { public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao, RetainLogEntity, Long> implements RetainLogService {
@Autowired
private ChildLicenseService childLicenseService;
@Override @Override
protected RetainLogEntity findBefore(RetainLogEntity entity, PageInfo pageInfo, Context context) throws AppException { protected RetainLogEntity findBefore(RetainLogEntity entity, PageInfo pageInfo, Context context) throws AppException {
RetainLogQuery query = new RetainLogQuery(); RetainLogQuery query = new RetainLogQuery();
...@@ -44,4 +57,39 @@ public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao, ...@@ -44,4 +57,39 @@ public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao,
return query; return query;
} }
@Override
protected void findAfter(RetainLogEntity params, PageInfo pageInfo, Context context, List<RetainLogEntity> list) throws AppException {
if(CollectionUtils.isNotEmpty(list)){
for(RetainLogEntity entity:list){
List<ChildLicenseEntity> childLicenseList = childLicenseService.find(new ChildLicenseQuery().applyId(entity.getApplyId()));
// if(CollectionUtils.isEmpty(childLicenseList)){
// entity.setProcessStatus("0/0");
// }else {
// Map<Integer, List<ChildLicenseEntity>> group = childLicenseList.stream().collect(Collectors.groupingBy(x -> x.getProcessStatus()));
// int pCount = CollectionUtils.isEmpty(group.get(1)) ? 0 : group.get(1).size();
// entity.setProcessStatus(pCount + "/" + childLicenseList.size());
// }
int childSum = 0;
int pCount = 0;
List<CertificateDocumentPdu> documentEntityList = new ArrayList<>();
for(ChildLicenseEntity item:childLicenseList){
CertificateDocumentEntity documentEntity = new CertificateDocumentEntity();
BeanUtils.copyProperties(item,documentEntity);
documentEntity.setId(item.getDocumentId());
documentEntity.setStatus(StatusEnum.DISABLE.getValue());
if(item.getChildStatus()==StatusEnum.ENABLE.getValue()){
documentEntity.setStatus(StatusEnum.ENABLE.getValue());
childSum++;
if(item.getProcessStatus()== ProcessStatusEnum.已处理.getValue().intValue()){
pCount++;
}
}
CertificateDocumentPdu pdu = new CertificateDocumentPdu();
BeanUtils.copyProperties(documentEntity, pdu);
documentEntityList.add(pdu);
}
entity.setProcessStatus(pCount + "/" + childSum);
}
}
}
} }
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java
View file @ 6abd8ed6
...@@ -9,6 +9,8 @@ import com.mortals.framework.utils.poi.ExcelUtil; ...@@ -9,6 +9,8 @@ import com.mortals.framework.utils.poi.ExcelUtil;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.upload.service.UploadService; import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*; import com.mortals.xhx.common.code.*;
import com.mortals.xhx.common.utils.ImportExcelUtil; import com.mortals.xhx.common.utils.ImportExcelUtil;
import com.mortals.xhx.common.utils.ReadExcelPictureUtil; import com.mortals.xhx.common.utils.ReadExcelPictureUtil;
...@@ -39,6 +41,8 @@ import com.alibaba.fastjson.JSONObject; ...@@ -39,6 +41,8 @@ import com.alibaba.fastjson.JSONObject;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*; import static com.mortals.framework.ap.SysConstains.*;
import static java.util.stream.Collectors.toMap;
/** /**
* *
* 证照申请 * 证照申请
...@@ -55,6 +59,8 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL ...@@ -55,6 +59,8 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
@Autowired @Autowired
private CertificateDocumentService certificateDocumentService; private CertificateDocumentService certificateDocumentService;
@Autowired
private UserService userService;
public ApplyLogController(){ public ApplyLogController(){
super.setModuleDesc( "证照申请"); super.setModuleDesc( "证照申请");
...@@ -66,6 +72,7 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL ...@@ -66,6 +72,7 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
this.addDict(model,"holderType", IBaseEnum.getEnumMap(HolderType.class)); this.addDict(model,"holderType", IBaseEnum.getEnumMap(HolderType.class));
this.addDict(model,"holderIdType", IBaseEnum.getEnumMap(HolderIdType.class)); this.addDict(model,"holderIdType", IBaseEnum.getEnumMap(HolderIdType.class));
this.addDict(model,"generateStatus", IBaseEnum.getEnumMap(GenerateStatus.class)); this.addDict(model,"generateStatus", IBaseEnum.getEnumMap(GenerateStatus.class));
this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
super.init(model, context); super.init(model, context);
} }
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/PrintLogController.java
View file @ 6abd8ed6
...@@ -4,6 +4,8 @@ import com.mortals.framework.common.IBaseEnum; ...@@ -4,6 +4,8 @@ import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.PrintStatus; import com.mortals.xhx.common.code.PrintStatus;
import com.mortals.xhx.common.code.StatusEnum; import com.mortals.xhx.common.code.StatusEnum;
import com.mortals.xhx.module.record.model.PrintLogEntity; import com.mortals.xhx.module.record.model.PrintLogEntity;
...@@ -13,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -13,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Map; import java.util.Map;
import static java.util.stream.Collectors.toMap;
/** /**
* *
* 证照打印记录 * 证照打印记录
...@@ -26,6 +31,8 @@ public class PrintLogController extends BaseCRUDJsonBodyMappingController<PrintL ...@@ -26,6 +31,8 @@ public class PrintLogController extends BaseCRUDJsonBodyMappingController<PrintL
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private UserService userService;
public PrintLogController(){ public PrintLogController(){
super.setModuleDesc( "证照打印记录"); super.setModuleDesc( "证照打印记录");
...@@ -35,6 +42,7 @@ public class PrintLogController extends BaseCRUDJsonBodyMappingController<PrintL ...@@ -35,6 +42,7 @@ public class PrintLogController extends BaseCRUDJsonBodyMappingController<PrintL
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model,"status", IBaseEnum.getEnumMap(StatusEnum.class)); this.addDict(model,"status", IBaseEnum.getEnumMap(StatusEnum.class));
this.addDict(model,"printStatus", IBaseEnum.getEnumMap(PrintStatus.class)); this.addDict(model,"printStatus", IBaseEnum.getEnumMap(PrintStatus.class));
this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
super.init(model, context); super.init(model, context);
} }
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/RetainLogController.java
View file @ 6abd8ed6
...@@ -2,6 +2,8 @@ package com.mortals.xhx.module.record.web; ...@@ -2,6 +2,8 @@ package com.mortals.xhx.module.record.web;
import com.mortals.framework.common.IBaseEnum; import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.CertificateStatus; import com.mortals.xhx.common.code.CertificateStatus;
import com.mortals.xhx.common.code.StatusEnum; import com.mortals.xhx.common.code.StatusEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -25,6 +27,8 @@ import java.util.Arrays; ...@@ -25,6 +27,8 @@ import java.util.Arrays;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*; import static com.mortals.framework.ap.SysConstains.*;
import static java.util.stream.Collectors.toMap;
/** /**
* *
* 证照持有 * 证照持有
...@@ -38,6 +42,8 @@ public class RetainLogController extends BaseCRUDJsonBodyMappingController<Retai ...@@ -38,6 +42,8 @@ public class RetainLogController extends BaseCRUDJsonBodyMappingController<Retai
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private UserService userService;
public RetainLogController(){ public RetainLogController(){
super.setModuleDesc( "证照持有"); super.setModuleDesc( "证照持有");
...@@ -47,6 +53,7 @@ public class RetainLogController extends BaseCRUDJsonBodyMappingController<Retai ...@@ -47,6 +53,7 @@ public class RetainLogController extends BaseCRUDJsonBodyMappingController<Retai
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model,"status", IBaseEnum.getEnumMap(StatusEnum.class)); this.addDict(model,"status", IBaseEnum.getEnumMap(StatusEnum.class));
this.addDict(model,"certificateStatus", IBaseEnum.getEnumMap(CertificateStatus.class)); this.addDict(model,"certificateStatus", IBaseEnum.getEnumMap(CertificateStatus.class));
this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
super.init(model, context); super.init(model, context);
} }
......
one-certificate-manager/src/main/resources/sqlmap/module/record/ApplyLogMapper.xml
View file @ 6abd8ed6
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.record.dao.ibatis.ApplyLogDaoImpl"> <mapper namespace="com.mortals.xhx.module.record.dao.ibatis.ApplyLogDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
<result property="businessPlace" column="businessPlace" /> <result property="businessPlace" column="businessPlace" />
<result property="licenseProject" column="licenseProject" /> <result property="licenseProject" column="licenseProject" />
<result property="authority" column="authority" /> <result property="authority" column="authority" />
<result property="annexName" column="annexName" />
<result property="annexUrl" column="annexUrl" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
...@@ -162,23 +164,29 @@ ...@@ -162,23 +164,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('authority') or colPickMode == 1 and data.containsKey('authority')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('authority') or colPickMode == 1 and data.containsKey('authority')))">
a.authority, a.authority,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annexName') or colPickMode == 1 and data.containsKey('annexName')))">
a.annexName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annexUrl') or colPickMode == 1 and data.containsKey('annexUrl')))">
a.annexUrl,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="ApplyLogEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="ApplyLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_apply_log insert into mortals_xhx_apply_log
(siteId,recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,mobile,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,legalPerson,socialCode,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,recordStatus,qRCode,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority) (siteId,recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,mobile,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,legalPerson,socialCode,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,recordStatus,qRCode,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority,annexName,annexUrl)
VALUES VALUES
(#{siteId},#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{mobile},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{legalPerson},#{socialCode},#{validityStart},#{validityEnd},#{privateID},#{certificateUrl},#{previewUrl},#{formContent},#{formTemplate},#{generateStatus},#{operType},#{recordStatus},#{qRCode},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{industryName},#{businessPlace},#{licenseProject},#{authority}) (#{siteId},#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{mobile},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{legalPerson},#{socialCode},#{validityStart},#{validityEnd},#{privateID},#{certificateUrl},#{previewUrl},#{formContent},#{formTemplate},#{generateStatus},#{operType},#{recordStatus},#{qRCode},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{industryName},#{businessPlace},#{licenseProject},#{authority},#{annexName},#{annexUrl})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_apply_log insert into mortals_xhx_apply_log
(siteId,recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,mobile,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,legalPerson,socialCode,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,recordStatus,qRCode,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority) (siteId,recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,mobile,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,legalPerson,socialCode,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,recordStatus,qRCode,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority,annexName,annexUrl)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateCode},#{item.certificateName},#{item.issueTime},#{item.pickerName},#{item.pickerIDCardNo},#{item.mobile},#{item.holderType},#{item.holderIdType},#{item.holderName},#{item.holderIDCardNo},#{item.enterpriseName},#{item.legalPerson},#{item.socialCode},#{item.validityStart},#{item.validityEnd},#{item.privateID},#{item.certificateUrl},#{item.previewUrl},#{item.formContent},#{item.formTemplate},#{item.generateStatus},#{item.operType},#{item.recordStatus},#{item.qRCode},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.industryName},#{item.businessPlace},#{item.licenseProject},#{item.authority}) (#{item.siteId},#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateCode},#{item.certificateName},#{item.issueTime},#{item.pickerName},#{item.pickerIDCardNo},#{item.mobile},#{item.holderType},#{item.holderIdType},#{item.holderName},#{item.holderIDCardNo},#{item.enterpriseName},#{item.legalPerson},#{item.socialCode},#{item.validityStart},#{item.validityEnd},#{item.privateID},#{item.certificateUrl},#{item.previewUrl},#{item.formContent},#{item.formTemplate},#{item.generateStatus},#{item.operType},#{item.recordStatus},#{item.qRCode},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.industryName},#{item.businessPlace},#{item.licenseProject},#{item.authority},#{item.annexName},#{item.annexUrl})
</foreach> </foreach>
</insert> </insert>
...@@ -329,6 +337,12 @@ ...@@ -329,6 +337,12 @@
<if test="(colPickMode==0 and data.containsKey('authority')) or (colPickMode==1 and !data.containsKey('authority'))"> <if test="(colPickMode==0 and data.containsKey('authority')) or (colPickMode==1 and !data.containsKey('authority'))">
a.authority=#{data.authority}, a.authority=#{data.authority},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('annexName')) or (colPickMode==1 and !data.containsKey('annexName'))">
a.annexName=#{data.annexName},
</if>
<if test="(colPickMode==0 and data.containsKey('annexUrl')) or (colPickMode==1 and !data.containsKey('annexUrl'))">
a.annexUrl=#{data.annexUrl},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -650,6 +664,20 @@ ...@@ -650,6 +664,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="annexName=(case" suffix="ELSE annexName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('annexName')) or (colPickMode==1 and !item.containsKey('annexName'))">
when a.id=#{item.id} then #{item.annexName}
</if>
</foreach>
</trim>
<trim prefix="annexUrl=(case" suffix="ELSE annexUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('annexUrl')) or (colPickMode==1 and !item.containsKey('annexUrl'))">
when a.id=#{item.id} then #{item.annexUrl}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -1604,6 +1632,48 @@ ...@@ -1604,6 +1632,48 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('annexName')">
<if test="conditionParamRef.annexName != null and conditionParamRef.annexName != ''">
${_conditionType_} a.annexName like #{${_conditionParam_}.annexName}
</if>
<if test="conditionParamRef.annexName == null">
${_conditionType_} a.annexName is null
</if>
</if>
<if test="conditionParamRef.containsKey('annexNameList') and conditionParamRef.annexNameList.size() > 0">
${_conditionType_} a.annexName in
<foreach collection="conditionParamRef.annexNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('annexNameNotList') and conditionParamRef.annexNameNotList.size() > 0">
${_conditionType_} a.annexName not in
<foreach collection="conditionParamRef.annexNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('annexUrl')">
<if test="conditionParamRef.annexUrl != null and conditionParamRef.annexUrl != ''">
${_conditionType_} a.annexUrl like #{${_conditionParam_}.annexUrl}
</if>
<if test="conditionParamRef.annexUrl == null">
${_conditionType_} a.annexUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('annexUrlList') and conditionParamRef.annexUrlList.size() > 0">
${_conditionType_} a.annexUrl in
<foreach collection="conditionParamRef.annexUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('annexUrlNotList') and conditionParamRef.annexUrlNotList.size() > 0">
${_conditionType_} a.annexUrl not in
<foreach collection="conditionParamRef.annexUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1961,6 +2031,16 @@ ...@@ -1961,6 +2031,16 @@
<if test='orderCol.authority != null and "DESC".equalsIgnoreCase(orderCol.authority)'>DESC</if> <if test='orderCol.authority != null and "DESC".equalsIgnoreCase(orderCol.authority)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('annexName')">
a.annexName
<if test='orderCol.annexName != null and "DESC".equalsIgnoreCase(orderCol.annexName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('annexUrl')">
a.annexUrl
<if test='orderCol.annexUrl != null and "DESC".equalsIgnoreCase(orderCol.annexUrl)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
......
one-certificate-manager/src/main/resources/sqlmap/module/record/RetainLogMapper.xml
View file @ 6abd8ed6
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.record.dao.ibatis.RetainLogDaoImpl"> <mapper namespace="com.mortals.xhx.module.record.dao.ibatis.RetainLogDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -31,6 +31,16 @@ ...@@ -31,6 +31,16 @@
<result property="businessPlace" column="businessPlace" /> <result property="businessPlace" column="businessPlace" />
<result property="licenseProject" column="licenseProject" /> <result property="licenseProject" column="licenseProject" />
<result property="authority" column="authority" /> <result property="authority" column="authority" />
<result property="issueTime" column="issueTime" />
<result property="annexName" column="annexName" />
<result property="annexUrl" column="annexUrl" />
<result property="validityStart" column="validityStart" />
<result property="validityEnd" column="validityEnd" />
<result property="holderType" column="holderType" />
<result property="holderIdType" column="holderIdType" />
<result property="privateID" column="privateID" />
<result property="applyId" column="applyId" />
<result property="total" column="total" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
...@@ -114,23 +124,53 @@ ...@@ -114,23 +124,53 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('authority') or colPickMode == 1 and data.containsKey('authority')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('authority') or colPickMode == 1 and data.containsKey('authority')))">
a.authority, a.authority,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('issueTime') or colPickMode == 1 and data.containsKey('issueTime')))">
a.issueTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annexName') or colPickMode == 1 and data.containsKey('annexName')))">
a.annexName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annexUrl') or colPickMode == 1 and data.containsKey('annexUrl')))">
a.annexUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('validityStart') or colPickMode == 1 and data.containsKey('validityStart')))">
a.validityStart,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('validityEnd') or colPickMode == 1 and data.containsKey('validityEnd')))">
a.validityEnd,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderType') or colPickMode == 1 and data.containsKey('holderType')))">
a.holderType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderIdType') or colPickMode == 1 and data.containsKey('holderIdType')))">
a.holderIdType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('privateID') or colPickMode == 1 and data.containsKey('privateID')))">
a.privateID,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applyId') or colPickMode == 1 and data.containsKey('applyId')))">
a.applyId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('total') or colPickMode == 1 and data.containsKey('total')))">
a.total,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="RetainLogEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="RetainLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_retain_log insert into mortals_xhx_retain_log
(siteId,recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,legalPerson,socialCode,qRCode,holderName,holderIDCardNo,mobile,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority) (siteId,recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,legalPerson,socialCode,qRCode,holderName,holderIDCardNo,mobile,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority,issueTime,annexName,annexUrl,validityStart,validityEnd,holderType,holderIdType,privateID,applyId,total)
VALUES VALUES
(#{siteId},#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{legalPerson},#{socialCode},#{qRCode},#{holderName},#{holderIDCardNo},#{mobile},#{certificateStatus},#{certificateUrl},#{previewUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{industryName},#{businessPlace},#{licenseProject},#{authority}) (#{siteId},#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{legalPerson},#{socialCode},#{qRCode},#{holderName},#{holderIDCardNo},#{mobile},#{certificateStatus},#{certificateUrl},#{previewUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{industryName},#{businessPlace},#{licenseProject},#{authority},#{issueTime},#{annexName},#{annexUrl},#{validityStart},#{validityEnd},#{holderType},#{holderIdType},#{privateID},#{applyId},#{total})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_retain_log insert into mortals_xhx_retain_log
(siteId,recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,legalPerson,socialCode,qRCode,holderName,holderIDCardNo,mobile,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority) (siteId,recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,legalPerson,socialCode,qRCode,holderName,holderIDCardNo,mobile,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority,issueTime,annexName,annexUrl,validityStart,validityEnd,holderType,holderIdType,privateID,applyId,total)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.legalPerson},#{item.socialCode},#{item.qRCode},#{item.holderName},#{item.holderIDCardNo},#{item.mobile},#{item.certificateStatus},#{item.certificateUrl},#{item.previewUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.industryName},#{item.businessPlace},#{item.licenseProject},#{item.authority}) (#{item.siteId},#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.legalPerson},#{item.socialCode},#{item.qRCode},#{item.holderName},#{item.holderIDCardNo},#{item.mobile},#{item.certificateStatus},#{item.certificateUrl},#{item.previewUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.industryName},#{item.businessPlace},#{item.licenseProject},#{item.authority},#{item.issueTime},#{item.annexName},#{item.annexUrl},#{item.validityStart},#{item.validityEnd},#{item.holderType},#{item.holderIdType},#{item.privateID},#{item.applyId},#{item.total})
</foreach> </foreach>
</insert> </insert>
...@@ -233,6 +273,48 @@ ...@@ -233,6 +273,48 @@
<if test="(colPickMode==0 and data.containsKey('authority')) or (colPickMode==1 and !data.containsKey('authority'))"> <if test="(colPickMode==0 and data.containsKey('authority')) or (colPickMode==1 and !data.containsKey('authority'))">
a.authority=#{data.authority}, a.authority=#{data.authority},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('issueTime')) or (colPickMode==1 and !data.containsKey('issueTime'))">
a.issueTime=#{data.issueTime},
</if>
<if test="(colPickMode==0 and data.containsKey('annexName')) or (colPickMode==1 and !data.containsKey('annexName'))">
a.annexName=#{data.annexName},
</if>
<if test="(colPickMode==0 and data.containsKey('annexUrl')) or (colPickMode==1 and !data.containsKey('annexUrl'))">
a.annexUrl=#{data.annexUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('validityStart')) or (colPickMode==1 and !data.containsKey('validityStart'))">
a.validityStart=#{data.validityStart},
</if>
<if test="(colPickMode==0 and data.containsKey('validityEnd')) or (colPickMode==1 and !data.containsKey('validityEnd'))">
a.validityEnd=#{data.validityEnd},
</if>
<if test="(colPickMode==0 and data.containsKey('holderType')) or (colPickMode==1 and !data.containsKey('holderType'))">
a.holderType=#{data.holderType},
</if>
<if test="(colPickMode==0 and data.containsKey('holderTypeIncrement')) or (colPickMode==1 and !data.containsKey('holderTypeIncrement'))">
a.holderType=ifnull(a.holderType,0) + #{data.holderTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('holderIdType')) or (colPickMode==1 and !data.containsKey('holderIdType'))">
a.holderIdType=#{data.holderIdType},
</if>
<if test="(colPickMode==0 and data.containsKey('holderIdTypeIncrement')) or (colPickMode==1 and !data.containsKey('holderIdTypeIncrement'))">
a.holderIdType=ifnull(a.holderIdType,0) + #{data.holderIdTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('privateID')) or (colPickMode==1 and !data.containsKey('privateID'))">
a.privateID=#{data.privateID},
</if>
<if test="(colPickMode==0 and data.containsKey('applyId')) or (colPickMode==1 and !data.containsKey('applyId'))">
a.applyId=#{data.applyId},
</if>
<if test="(colPickMode==0 and data.containsKey('applyIdIncrement')) or (colPickMode==1 and !data.containsKey('applyIdIncrement'))">
a.applyId=ifnull(a.applyId,0) + #{data.applyIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('total')) or (colPickMode==1 and !data.containsKey('total'))">
a.total=#{data.total},
</if>
<if test="(colPickMode==0 and data.containsKey('totalIncrement')) or (colPickMode==1 and !data.containsKey('totalIncrement'))">
a.total=ifnull(a.total,0) + #{data.totalIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -450,6 +532,96 @@ ...@@ -450,6 +532,96 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="issueTime=(case" suffix="ELSE issueTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('issueTime')) or (colPickMode==1 and !item.containsKey('issueTime'))">
when a.id=#{item.id} then #{item.issueTime}
</if>
</foreach>
</trim>
<trim prefix="annexName=(case" suffix="ELSE annexName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('annexName')) or (colPickMode==1 and !item.containsKey('annexName'))">
when a.id=#{item.id} then #{item.annexName}
</if>
</foreach>
</trim>
<trim prefix="annexUrl=(case" suffix="ELSE annexUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('annexUrl')) or (colPickMode==1 and !item.containsKey('annexUrl'))">
when a.id=#{item.id} then #{item.annexUrl}
</if>
</foreach>
</trim>
<trim prefix="validityStart=(case" suffix="ELSE validityStart end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('validityStart')) or (colPickMode==1 and !item.containsKey('validityStart'))">
when a.id=#{item.id} then #{item.validityStart}
</if>
</foreach>
</trim>
<trim prefix="validityEnd=(case" suffix="ELSE validityEnd end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('validityEnd')) or (colPickMode==1 and !item.containsKey('validityEnd'))">
when a.id=#{item.id} then #{item.validityEnd}
</if>
</foreach>
</trim>
<trim prefix="holderType=(case" suffix="ELSE holderType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('holderType')) or (colPickMode==1 and !item.containsKey('holderType'))">
when a.id=#{item.id} then #{item.holderType}
</when>
<when test="(colPickMode==0 and item.containsKey('holderTypeIncrement')) or (colPickMode==1 and !item.containsKey('holderTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.holderType,0) + #{item.holderTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="holderIdType=(case" suffix="ELSE holderIdType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('holderIdType')) or (colPickMode==1 and !item.containsKey('holderIdType'))">
when a.id=#{item.id} then #{item.holderIdType}
</when>
<when test="(colPickMode==0 and item.containsKey('holderIdTypeIncrement')) or (colPickMode==1 and !item.containsKey('holderIdTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.holderIdType,0) + #{item.holderIdTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="privateID=(case" suffix="ELSE privateID end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('privateID')) or (colPickMode==1 and !item.containsKey('privateID'))">
when a.id=#{item.id} then #{item.privateID}
</if>
</foreach>
</trim>
<trim prefix="applyId=(case" suffix="ELSE applyId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('applyId')) or (colPickMode==1 and !item.containsKey('applyId'))">
when a.id=#{item.id} then #{item.applyId}
</when>
<when test="(colPickMode==0 and item.containsKey('applyIdIncrement')) or (colPickMode==1 and !item.containsKey('applyIdIncrement'))">
when a.id=#{item.id} then ifnull(a.applyId,0) + #{item.applyIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="total=(case" suffix="ELSE total end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('total')) or (colPickMode==1 and !item.containsKey('total'))">
when a.id=#{item.id} then #{item.total}
</when>
<when test="(colPickMode==0 and item.containsKey('totalIncrement')) or (colPickMode==1 and !item.containsKey('totalIncrement'))">
when a.id=#{item.id} then ifnull(a.total,0) + #{item.totalIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -1146,6 +1318,222 @@ ...@@ -1146,6 +1318,222 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('issueTime')">
<if test="conditionParamRef.issueTime != null ">
${_conditionType_} a.issueTime = #{${_conditionParam_}.issueTime}
</if>
<if test="conditionParamRef.issueTime == null">
${_conditionType_} a.issueTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('issueTimeStart') and conditionParamRef.issueTimeStart != null and conditionParamRef.issueTimeStart!=''">
${_conditionType_} a.issueTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.issueTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('issueTimeEnd') and conditionParamRef.issueTimeEnd != null and conditionParamRef.issueTimeEnd!=''">
${_conditionType_} a.issueTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.issueTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('annexName')">
<if test="conditionParamRef.annexName != null and conditionParamRef.annexName != ''">
${_conditionType_} a.annexName like #{${_conditionParam_}.annexName}
</if>
<if test="conditionParamRef.annexName == null">
${_conditionType_} a.annexName is null
</if>
</if>
<if test="conditionParamRef.containsKey('annexNameList') and conditionParamRef.annexNameList.size() > 0">
${_conditionType_} a.annexName in
<foreach collection="conditionParamRef.annexNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('annexNameNotList') and conditionParamRef.annexNameNotList.size() > 0">
${_conditionType_} a.annexName not in
<foreach collection="conditionParamRef.annexNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('annexUrl')">
<if test="conditionParamRef.annexUrl != null and conditionParamRef.annexUrl != ''">
${_conditionType_} a.annexUrl like #{${_conditionParam_}.annexUrl}
</if>
<if test="conditionParamRef.annexUrl == null">
${_conditionType_} a.annexUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('annexUrlList') and conditionParamRef.annexUrlList.size() > 0">
${_conditionType_} a.annexUrl in
<foreach collection="conditionParamRef.annexUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('annexUrlNotList') and conditionParamRef.annexUrlNotList.size() > 0">
${_conditionType_} a.annexUrl not in
<foreach collection="conditionParamRef.annexUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('validityStart')">
<if test="conditionParamRef.validityStart != null ">
${_conditionType_} a.validityStart = #{${_conditionParam_}.validityStart}
</if>
<if test="conditionParamRef.validityStart == null">
${_conditionType_} a.validityStart is null
</if>
</if>
<if test="conditionParamRef.containsKey('validityStartStart') and conditionParamRef.validityStartStart != null and conditionParamRef.validityStartStart!=''">
${_conditionType_} a.validityStart <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.validityStartStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('validityStartEnd') and conditionParamRef.validityStartEnd != null and conditionParamRef.validityStartEnd!=''">
${_conditionType_} a.validityStart <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.validityStartEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('validityEnd')">
<if test="conditionParamRef.validityEnd != null ">
${_conditionType_} a.validityEnd = #{${_conditionParam_}.validityEnd}
</if>
<if test="conditionParamRef.validityEnd == null">
${_conditionType_} a.validityEnd is null
</if>
</if>
<if test="conditionParamRef.containsKey('validityEndStart') and conditionParamRef.validityEndStart != null and conditionParamRef.validityEndStart!=''">
${_conditionType_} a.validityEnd <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.validityEndStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('validityEndEnd') and conditionParamRef.validityEndEnd != null and conditionParamRef.validityEndEnd!=''">
${_conditionType_} a.validityEnd <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.validityEndEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('holderType')">
<if test="conditionParamRef.holderType != null ">
${_conditionType_} a.holderType = #{${_conditionParam_}.holderType}
</if>
<if test="conditionParamRef.holderType == null">
${_conditionType_} a.holderType is null
</if>
</if>
<if test="conditionParamRef.containsKey('holderTypeList') and conditionParamRef.holderTypeList.size() > 0">
${_conditionType_} a.holderType in
<foreach collection="conditionParamRef.holderTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderTypeNotList') and conditionParamRef.holderTypeNotList.size() > 0">
${_conditionType_} a.holderType not in
<foreach collection="conditionParamRef.holderTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderTypeStart') and conditionParamRef.holderTypeStart != null">
${_conditionType_} a.holderType <![CDATA[ >= ]]> #{${_conditionParam_}.holderTypeStart}
</if>
<if test="conditionParamRef.containsKey('holderTypeEnd') and conditionParamRef.holderTypeEnd != null">
${_conditionType_} a.holderType <![CDATA[ <= ]]> #{${_conditionParam_}.holderTypeEnd}
</if>
<if test="conditionParamRef.containsKey('holderIdType')">
<if test="conditionParamRef.holderIdType != null ">
${_conditionType_} a.holderIdType = #{${_conditionParam_}.holderIdType}
</if>
<if test="conditionParamRef.holderIdType == null">
${_conditionType_} a.holderIdType is null
</if>
</if>
<if test="conditionParamRef.containsKey('holderIdTypeList') and conditionParamRef.holderIdTypeList.size() > 0">
${_conditionType_} a.holderIdType in
<foreach collection="conditionParamRef.holderIdTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderIdTypeNotList') and conditionParamRef.holderIdTypeNotList.size() > 0">
${_conditionType_} a.holderIdType not in
<foreach collection="conditionParamRef.holderIdTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderIdTypeStart') and conditionParamRef.holderIdTypeStart != null">
${_conditionType_} a.holderIdType <![CDATA[ >= ]]> #{${_conditionParam_}.holderIdTypeStart}
</if>
<if test="conditionParamRef.containsKey('holderIdTypeEnd') and conditionParamRef.holderIdTypeEnd != null">
${_conditionType_} a.holderIdType <![CDATA[ <= ]]> #{${_conditionParam_}.holderIdTypeEnd}
</if>
<if test="conditionParamRef.containsKey('privateID')">
<if test="conditionParamRef.privateID != null and conditionParamRef.privateID != ''">
${_conditionType_} a.privateID like #{${_conditionParam_}.privateID}
</if>
<if test="conditionParamRef.privateID == null">
${_conditionType_} a.privateID is null
</if>
</if>
<if test="conditionParamRef.containsKey('privateIDList') and conditionParamRef.privateIDList.size() > 0">
${_conditionType_} a.privateID in
<foreach collection="conditionParamRef.privateIDList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('privateIDNotList') and conditionParamRef.privateIDNotList.size() > 0">
${_conditionType_} a.privateID not in
<foreach collection="conditionParamRef.privateIDNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applyId')">
<if test="conditionParamRef.applyId != null ">
${_conditionType_} a.applyId = #{${_conditionParam_}.applyId}
</if>
<if test="conditionParamRef.applyId == null">
${_conditionType_} a.applyId is null
</if>
</if>
<if test="conditionParamRef.containsKey('applyIdList') and conditionParamRef.applyIdList.size() > 0">
${_conditionType_} a.applyId in
<foreach collection="conditionParamRef.applyIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applyIdNotList') and conditionParamRef.applyIdNotList.size() > 0">
${_conditionType_} a.applyId not in
<foreach collection="conditionParamRef.applyIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applyIdStart') and conditionParamRef.applyIdStart != null">
${_conditionType_} a.applyId <![CDATA[ >= ]]> #{${_conditionParam_}.applyIdStart}
</if>
<if test="conditionParamRef.containsKey('applyIdEnd') and conditionParamRef.applyIdEnd != null">
${_conditionType_} a.applyId <![CDATA[ <= ]]> #{${_conditionParam_}.applyIdEnd}
</if>
<if test="conditionParamRef.containsKey('total')">
<if test="conditionParamRef.total != null ">
${_conditionType_} a.total = #{${_conditionParam_}.total}
</if>
<if test="conditionParamRef.total == null">
${_conditionType_} a.total is null
</if>
</if>
<if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
${_conditionType_} a.total in
<foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('totalNotList') and conditionParamRef.totalNotList.size() > 0">
${_conditionType_} a.total not in
<foreach collection="conditionParamRef.totalNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null">
${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart}
</if>
<if test="conditionParamRef.containsKey('totalEnd') and conditionParamRef.totalEnd != null">
${_conditionType_} a.total <![CDATA[ <= ]]> #{${_conditionParam_}.totalEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1199,6 +1587,34 @@ ...@@ -1199,6 +1587,34 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('holderTypeList') and conditionParamRef.holderTypeList.size() > 0">
field(a.holderType,
<foreach collection="conditionParamRef.holderTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('holderIdTypeList') and conditionParamRef.holderIdTypeList.size() > 0">
field(a.holderIdType,
<foreach collection="conditionParamRef.holderIdTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('applyIdList') and conditionParamRef.applyIdList.size() > 0">
field(a.applyId,
<foreach collection="conditionParamRef.applyIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
field(a.total,
<foreach collection="conditionParamRef.totalList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
a.${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
...@@ -1256,6 +1672,34 @@ ...@@ -1256,6 +1672,34 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('holderTypeList') and conditionParamRef.holderTypeList.size() > 0">
field(a.holderType,
<foreach collection="conditionParamRef.holderTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('holderIdTypeList') and conditionParamRef.holderIdTypeList.size() > 0">
field(a.holderIdType,
<foreach collection="conditionParamRef.holderIdTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('applyIdList') and conditionParamRef.applyIdList.size() > 0">
field(a.applyId,
<foreach collection="conditionParamRef.applyIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
field(a.total,
<foreach collection="conditionParamRef.totalList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -1387,6 +1831,56 @@ ...@@ -1387,6 +1831,56 @@
<if test='orderCol.authority != null and "DESC".equalsIgnoreCase(orderCol.authority)'>DESC</if> <if test='orderCol.authority != null and "DESC".equalsIgnoreCase(orderCol.authority)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('issueTime')">
a.issueTime
<if test='orderCol.issueTime != null and "DESC".equalsIgnoreCase(orderCol.issueTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('annexName')">
a.annexName
<if test='orderCol.annexName != null and "DESC".equalsIgnoreCase(orderCol.annexName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('annexUrl')">
a.annexUrl
<if test='orderCol.annexUrl != null and "DESC".equalsIgnoreCase(orderCol.annexUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('validityStart')">
a.validityStart
<if test='orderCol.validityStart != null and "DESC".equalsIgnoreCase(orderCol.validityStart)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('validityEnd')">
a.validityEnd
<if test='orderCol.validityEnd != null and "DESC".equalsIgnoreCase(orderCol.validityEnd)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('holderType')">
a.holderType
<if test='orderCol.holderType != null and "DESC".equalsIgnoreCase(orderCol.holderType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('holderIdType')">
a.holderIdType
<if test='orderCol.holderIdType != null and "DESC".equalsIgnoreCase(orderCol.holderIdType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('privateID')">
a.privateID
<if test='orderCol.privateID != null and "DESC".equalsIgnoreCase(orderCol.privateID)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('applyId')">
a.applyId
<if test='orderCol.applyId != null and "DESC".equalsIgnoreCase(orderCol.applyId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('total')">
a.total
<if test='orderCol.total != null and "DESC".equalsIgnoreCase(orderCol.total)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
......
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