From 521a7e8a61d564ce50ef28e1d1db41faa825dcb4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 28 Jul 2021 11:18:19 +0800
Subject: [PATCH] 新增查询培训公司接口
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.java | 5 ++
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 29 ++++++++++++++
src/main/java/org/springblade/modules/system/controller/DeptController.java | 10 +++++
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 8 ++++
src/main/java/org/springblade/modules/training/entity/TrainExam.java | 8 ++++
src/main/java/org/springblade/modules/system/service/IDeptService.java | 5 ++
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 11 ++++-
src/main/java/org/springblade/modules/apply/controller/ExamPaymentController.java | 5 ++
8 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
index 213af5b..9ee0494 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -89,7 +89,7 @@
* @param apply 考试报名信息对象
*/
@PostMapping("/submit")
- public R submit(@RequestBody Apply apply) {
+ public R submit(@RequestBody Apply apply) throws Exception {
if (null==apply.getId()){
//去生成准考证号码
apply.setCandidateNo(getCandidateNo(apply));
@@ -98,6 +98,13 @@
//默认通过
apply.setApplyStatus(2);
apply.setApplyTime(new Date());
+ //内网新增
+ arg.test01(arg.url+"/apply/save",apply);
+ }
+ //内网修改
+ if(null!=apply.getId()){
+ //修改
+ arg.test01(arg.url+"/apply/update",apply);
}
return R.status(applyService.saveOrUpdate(apply));
}
@@ -182,7 +189,7 @@
/**
- * 生成准考证号码
+ * 生成报名编号
* @param apply 考试报名信息对象
*/
private String getApplyCode(Apply apply) {
diff --git a/src/main/java/org/springblade/modules/apply/controller/ExamPaymentController.java b/src/main/java/org/springblade/modules/apply/controller/ExamPaymentController.java
index 6cffd3a..d4f8120 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ExamPaymentController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ExamPaymentController.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.common.utils.arg;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -70,7 +71,8 @@
* @param examPayment 考试缴费信息对象
*/
@PostMapping("/submit")
- public R submit(@RequestBody ExamPayment examPayment) {
+ public R submit(@RequestBody ExamPayment examPayment) throws Exception {
+ arg.test01(arg.url+"/examPayment/submit",examPayment);
return R.status(examPaymentService.saveOrUpdate(examPayment));
}
@@ -81,6 +83,7 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+ arg.sendPostRemoveByIds(arg.url+"/examPayment/remove",ids);
return R.status(examPaymentService.removeByIds(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/system/controller/DeptController.java b/src/main/java/org/springblade/modules/system/controller/DeptController.java
index 2066d38..8cbc014 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -146,6 +146,16 @@
}
/**
+ * 懒加载获取部门树形结构(按分类查询)
+ */
+ @GetMapping("/lazy-tree-type")
+ @ApiOperation(value = "懒加载树形结构", notes = "树形结构")
+ public R<List<DeptVO>> LazyTreeType(String deptCategory, Long parentId) {
+ List<DeptVO> tree = deptService.lazyTreeType(deptCategory, parentId);
+ return R.data(tree);
+ }
+
+ /**
* 懒加载获取部门树形结构
*/
@GetMapping("/lazy-trees")
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
index a668061..aee8a53 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -95,4 +95,9 @@
@SqlParser(filter=true)
List<DeptVO> lazyTreeUser(String tenantId, @Param("parentId") Long parentId);
Long add(Dept dept);
+
+ /**
+ * 懒加载获取部门树形结构(按分类查询)
+ */
+ List<DeptVO> lazyTreeType(String tenantId, String deptCategory, Long parentId);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index b07c189..006f798 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -128,6 +128,35 @@
ORDER BY dept.sort
</select>
+ <!--懒加载获取部门树形结构(按分类查询)-->
+ <select id="lazyTreeType" resultMap="treeNodeResultMap" >
+ SELECT
+ dept.id,
+ dept.parent_id,
+ dept.dept_name AS title,
+ dept.id AS "value",
+ dept.id AS "key",
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) AS "has_children"
+ FROM
+ blade_dept dept
+ WHERE
+ dept.parent_id = #{param3} AND dept.is_deleted = 0
+ <if test="param2!=null and param2!=''">
+ and dept.dept_category = #{param2}
+ </if>
+ <if test="param1!=null and param1!=''">
+ and dept.tenant_id = #{param1}
+ </if>
+ ORDER BY dept.sort
+ </select>
+
<!--懒加载获取部门树形结构(包含用户数据)-->
<select id="lazyTreeUser" resultMap="treeNodeResultMap" >
select DISTINCT * from (
diff --git a/src/main/java/org/springblade/modules/system/service/IDeptService.java b/src/main/java/org/springblade/modules/system/service/IDeptService.java
index c24323c..99d5895 100644
--- a/src/main/java/org/springblade/modules/system/service/IDeptService.java
+++ b/src/main/java/org/springblade/modules/system/service/IDeptService.java
@@ -138,4 +138,9 @@
*/
List<DeptVO> lazyTreeUser(String tenantId, Long parentId);
Long add(Dept dept);
+
+ /**
+ * 懒加载获取部门树形结构(按分类查询)
+ */
+ List<DeptVO> lazyTreeType(String deptCategory, Long parentId);
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 4d7c958..bb8eaf4 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -216,4 +216,12 @@
public Long add(Dept dept) {
return baseMapper.add(dept);
}
+
+ /**
+ * 懒加载获取部门树形结构(按分类查询)
+ */
+ @Override
+ public List<DeptVO> lazyTreeType(String deptCategory, Long parentId) {
+ return ForestNodeMerger.merge(baseMapper.lazyTreeType("000000",deptCategory,parentId));
+ }
}
diff --git a/src/main/java/org/springblade/modules/training/entity/TrainExam.java b/src/main/java/org/springblade/modules/training/entity/TrainExam.java
index 95ac087..6f5442a 100644
--- a/src/main/java/org/springblade/modules/training/entity/TrainExam.java
+++ b/src/main/java/org/springblade/modules/training/entity/TrainExam.java
@@ -98,4 +98,12 @@
@TableField("audit_detail")
private String auditDetail;
+ /**
+ * 审核时间
+ */
+ @TableField("audit_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date auditTime;
+
}
--
Gitblit v1.9.3